You can subscribe to this list here.
2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
From: <wis...@us...> - 2015-12-01 11:48:30
|
Revision: 13170 http://sourceforge.net/p/xoops/svn/13170 Author: wishcraft Date: 2015-12-01 11:48:27 +0000 (Tue, 01 Dec 2015) Log Message: ----------- Pingtrax -- the Pinglist and Trackback Automated module -- Pre-alpha 1.01 -- Planning Added Paths: ----------- XoopsModules/pingtrax/data/ XoopsModules/pingtrax/data/ping-resources.json Added: XoopsModules/pingtrax/data/ping-resources.json =================================================================== --- XoopsModules/pingtrax/data/ping-resources.json (rev 0) +++ XoopsModules/pingtrax/data/ping-resources.json 2015-12-01 11:48:27 UTC (rev 13170) @@ -0,0 +1 @@ +{"7316f65ff94cfaddad8f757278b7739fe651291f":{"type":"XML-RPC","uri":"http:\/\/feedburner.google.com\/fb\/a\/pingSubmit?bloglink=%url"},"c04a74256fe9eb8e10b7ddad3129a279cf958612":{"type":"XML-RPC","uri":"http:\/\/rpc.weblogs.com\/pingSiteForm?name=%title&url=%url"},"cc793152f02383ca15ef3a31e467f1e4b6b3c423":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com\/ping\/RPC2"},"382c38f300f113f0f45f0fc404da76964d5d46fa":{"type":"XML-RPC","uri":"http:\/\/api.my.yahoo.com\/RPC2"},"529fb0320405c9a67cdaec0ee866355e69715cd7":{"type":"SITEMAPS","uri":"http:\/\/www.bing.com\/ping?sitemap=%url"},"6222205ce495f0a60f36fa6414216e0a1be2494c":{"type":"XML-RPC","uri":"http:\/\/api.my.yahoo.com\/rss\/ping"},"8fb83eeffec9e8b6a3c0783ec9b046a3fc66c6c6":{"type":"XML-RPC","uri":"http:\/\/bblog.com\/ping.php"},"f0683d5bd56fae5b3b014f83377630c590bcad0a":{"type":"XML-RPC","uri":"http:\/\/blog.goo.ne.jp\/XMLRPC"},"2944b7d8115f5b4997c62901b833b19ee5634fb6":{"type":"XML-RPC","uri":"http:\/\/blogdb.jp\/xmlrpc"},"af57e5bbb1734f7c7cca2f1931916e3af3fdd650":{"type":"XML-RPC","uri":"http:\/\/blogmatcher.com\/u.php"},"9e893b41ef46001780476321d8fc0dbb2b035236":{"type":"XML-RPC","uri":"http:\/\/bulkfeeds.net\/rpc"},"2bc4776643a440d33dd190edc23f2373d889c24d":{"type":"XML-RPC","uri":"http:\/\/coreblog.org\/ping\/"},"28ec8143dd32a3772bb78953e5832a4dae2c9304":{"type":"XML-RPC","uri":"http:\/\/mod-pubsub.org\/kn_apps\/blogchatt"},"6a3c21035d8d90c067d77a4ecfc1ec63b50e66db":{"type":"XML-RPC","uri":"http:\/\/www.lasermemory.com\/lsrpc\/"},"39524c5c101a4ada73ac2e976e9ded030f64f999":{"type":"XML-RPC","uri":"http:\/\/ping.amagle.com\/"},"b476efa949c3cabd28b2dd5832f18f933489b39d":{"type":"XML-RPC","uri":"http:\/\/ping.bitacoras.com"},"b2e77f4e79d4d25f16fd3c216a9217cbc3cbea89":{"type":"XML-RPC","uri":"http:\/\/ping.blo.gs\/"},"2332c6e7a4afefa85054afd2199ecfb34f8b07cf":{"type":"XML-RPC","uri":"http:\/\/ping.bloggers.jp\/rpc\/"},"3438b9c7e6f78c1bb504b06f63eb73e30272387e":{"type":"XML-RPC","uri":"http:\/\/ping.cocolog-nifty.com\/xmlrpc"},"7eeaeea6789c0b1151befb69ed0686b741cc4320":{"type":"XML-RPC","uri":"http:\/\/ping.blogmura.jp\/rpc\/"},"7dbde537866d978ec2ac7292c28b3dff589feb43":{"type":"XML-RPC","uri":"http:\/\/ping.feedburner.com"},"360b63598d7475264e7bfd893d3700d373928398":{"type":"XML-RPC","uri":"http:\/\/ping.myblog.jp"},"5991bd2f360b140c76f0d0b185d3b813c862b6e5":{"type":"XML-RPC","uri":"http:\/\/ping.rootblog.com\/rpc.php"},"29d6c22480a1ec546b186305eb9613f4db996c74":{"type":"XML-RPC","uri":"http:\/\/ping.weblogs.se\/"},"aa03e735a7250164fb4cbc6048ec2c3d12e6aa3d":{"type":"XML-RPC","uri":"http:\/\/pingoat.com\/goat\/RPC2"},"931a3eccc17023c4903e948b1e2cc73d859a76c6":{"type":"XML-RPC","uri":"http:\/\/rcs.datashed.net\/RPC2\/"},"c61f5629941a8067dac826bdd362ff885b97224b":{"type":"XML-RPC","uri":"http:\/\/rpc.blogbuzzmachine.com\/RPC2"},"a5ee3040e5629a5ad130025b711287d2f000d38e":{"type":"XML-RPC","uri":"http:\/\/rpc.icerocket.com:10080\/"},"baa599e29fe35baa81907a9c60e1de62bb3853eb":{"type":"XML-RPC","uri":"http:\/\/rpc.newsgator.com\/"},"65c065933ba53b9ebc811acac8ba09b8412437a0":{"type":"XML-RPC","uri":"http:\/\/rpc.pingomatic.com"},"183e07e3fd1ac30c73403c8d0aac246a1cb2b845":{"type":"XML-RPC","uri":"http:\/\/rpc.technorati.com\/rpc\/ping"},"525d9f79190a8246f64205c893ad6920daa97b6a":{"type":"XML-RPC","uri":"http:\/\/rpc.weblogs.com\/RPC2"},"1011261ef2a170c2a2e1c089dcce9fc90b739d2a":{"type":"XML-RPC","uri":"http:\/\/topicexchange.com\/RPC2"},"3a81f63dc6fd19a2afd90ba2608750d14d78b8b1":{"type":"XML-RPC","uri":"http:\/\/trackback.bakeinu.jp\/bakeping.php"},"72a73954d397374491f86221da0c7ba7f8e129b0":{"type":"XML-RPC","uri":"http:\/\/www.a2b.cc\/setloc\/bp.a2b"},"a2c5c61f9dda5b97d3118881afdb290706ebc878":{"type":"XML-RPC","uri":"http:\/\/www.blogoole.com\/ping\/"},"1f63ad887f47832c8fbf5ec05da4fa0868b1d0aa":{"type":"XML-RPC","uri":"http:\/\/www.blogoon.net\/ping\/"},"f1c24832456fadc1507a2c7713cb888c2d6b66f5":{"type":"XML-RPC","uri":"http:\/\/www.blogpeople.net\/servlet\/weblogUpdates"},"9d272966b012bf19a34fc8b4073f2303821727c4":{"type":"XML-RPC","uri":"http:\/\/www.blogroots.com\/tb_populi.blog?id=1"},"5b11eeba3663d3a79304d16cfb5991a1071f7030":{"type":"XML-RPC","uri":"http:\/\/www.blogstreet.com\/xrbin\/xmlrpc.cgi"},"8cfd88dba0cd1e0921c257b9e7a1216fbf932881":{"type":"XML-RPC","uri":"http:\/\/www.mod-pubsub.org\/kn_apps\/blogchatter\/ping.php"},"277cd44a3d69292d4c79186dfbee485e0b82e137":{"type":"XML-RPC","uri":"http:\/\/www.popdex.com\/addsite.php"},"a7487cd6db1e14d23db34420ae3a226ac29f9fe8":{"type":"XML-RPC","uri":"http:\/\/www.snipsnap.org\/RPC2"},"3e3fb95faf0d2361e50a507090eba40abcdb8606":{"type":"XML-RPC","uri":"http:\/\/www.weblogues.com\/RPC\/"},"38457437eba9b6a329c370d7b19cce7ef06af757":{"type":"XML-RPC","uri":"http:\/\/xmlrpc.blogg.de"},"f11db7253708f9ec5c580c65ba69d38483e15d0f":{"type":"XML-RPC","uri":"http:\/\/xping.pubsub.com\/ping\/"},"bbe0dba709b6dfe73faa935debd18a9c60b00096":{"type":"XML-RPC","uri":"http:\/\/ping.blo.gs\/"},"1a68c1c1caaa56715a63e386e8ea549954ecdff2":{"type":"XML-RPC","uri":"http:\/\/blog.goo.ne.jp\/XMLRPC"},"b42a50aa3bb05f1bfc0784eceef7c51933fe28ac":{"type":"XML-RPC","uri":"http:\/\/blog.with2.net\/ping.php"},"88796b1030f253d849280474b7413bdc94b6e32e":{"type":"XML-RPC","uri":"http:\/\/blogping.unidatum.com\/RPC2"},"c332e3141d1b292e425b139ff5e1d979081d352f":{"type":"XML-RPC","uri":"http:\/\/blogpingr.de\/ping\/rpc2"},"cf145feb5a01325acfd9ed5c8386a6cbd7165a8d":{"type":"XML-RPC","uri":"https:\/\/ping.blogs.yandex.ru\/RPC2"},"460333f2ec808f56be029face63adb9774f8ad87":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ae\/ping\/RPC2"},"019091155f30938f66d5d527ddd3df8b3bac61a0":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.at\/ping\/RPC2"},"c6439a72e25a99ef95200173afbdf183ef64e3b9":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.be\/ping\/RPC2"},"d294000e738a28705b666c8a01908f610122b099":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.bg\/ping\/RPC2"},"b1f41598cf155eeaf3c0c4d1b40ea817bb17fb07":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ca\/ping\/RPC2"},"81ab67d50dd66f2a40982a75f22a75eeef7417ef":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ch\/ping\/RPC2"},"6b55c5dab140bf10f27223da2381c3e27acbe6c0":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.cl\/ping\/RPC2"},"31a89b7a87e789e3df41ecaa638228f2fedfb969":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.cr\/ping\/RPC2"},"f648fc1be9f114c2b7ad4e1a1e04b3ddf901be74":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.hu\/ping\/RPC2"},"bcdc1dcfa961e77d7f6e5a2b3791e74cec4eef07":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.id\/ping\/RPC2"},"53c67e8aa62f0a29831a41f3a41ce6b3fbe68162":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.il\/ping\/RPC2"},"638c8b404ea1375fb1b3321a895d4eee71b1c4d7":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.in\/ping\/RPC2"},"6b3c9bbd32757f5e0e4d9a0a504fde8fe58c8061":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.it\/ping\/RPC2"},"76b8f98acad1cec3d44e6a823ad94197d5be473c":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.jp\/ping\/RPC2"},"b795f319c290cdab4e4211c189d4989bd46ce40d":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.ma\/ping\/RPC2"},"ce746bf1ea3594a3c813390ca9001580702600b4":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.nz\/ping\/RPC2"},"6727276f4843f869ebc88cfc20fd9536898aa33d":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.th\/ping\/RPC2"},"23b91df58c00f7bc205773b939a7c7b5ec8718a4":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.uk\/ping\/RPC2"},"e93a15ffbb01bdb74eb4c1103b78e631e0918e9c":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.ve\/ping\/RPC2"},"5fb894edab2d240f4d94d2166a9a937a784a849b":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.co.za\/ping\/RPC2"},"942332df8fa0c6d35d84f271606f6503821a5ec1":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.ar\/ping\/RPC2"},"b4acdda0cf8bdaf285c88da38a9e642697c77146":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.au\/ping\/RPC2"},"5a29022c4578b19eeb2c58a0cc1929e6175a11cd":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.br\/ping\/RPC2"},"7a7312fbd01dcaaf37655c0c0dd6a3fe61ba0440":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.co\/ping\/RPC2"},"8a0ae89c6e611f9093b98ecdd8831b762e39fbd1":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.do\/ping\/RPC2"},"02cc2cdf073640c761837f73f441552698a99b56":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.mx\/ping\/RPC2"},"366dbe9d547cf62128aa6298260369df655a2a99":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.my\/ping\/RPC2"},"6f947e5debc331ede9eb31bf4da4bf032ff079b8":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.pe\/ping\/RPC2"},"ee2c83597c4b7e7ab3e55aaf7d689aaf2cd5cc3a":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.sa\/ping\/RPC2"},"71b08d645ae9777d122208b4c9b68fbaceda4f5c":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.sg\/ping\/RPC2"},"0989a43db8f2f9ecaed1853e134f9587cb2dbd58":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.tr\/ping\/RPC2"},"89a579322e118b4eef7b7a3acc8aadba2d6b43f9":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.tw\/ping\/RPC2"},"ba17f76352dad5d67d44417fb2dd5e5c9eafc40c":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.ua\/ping\/RPC2"},"4afdd9e9e312a5a0f90386e5fbb891a73e586cce":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.uy\/ping\/RPC2"},"399ce59dc4eb766d7c80ba93e215b7cc425c1f7a":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com.vn\/ping\/RPC2"},"a45bb56738bdbc9fc50ff3f01b792b4857dfa8db":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.com\/ping\/RPC2"},"88a697eeb34f3ecc4730486095a00021742142a5":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.de\/ping\/RPC2"},"f08fb186bccdb92e6cf28193e485f30cfe5045f4":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.es\/ping\/RPC2"},"102f15d72bae6b762b49b4e2bf5f0ae75b511d24":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.fi\/ping\/RPC2"},"33671d0b4601ddfb44cdbc6143719046c6b78641":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.fr\/ping\/RPC2"},"83650edecb9a245bff5fa6d63b77a9164747ea19":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.gr\/ping\/RPC2"},"51c7593d04dab395445ca837a19ff22c1c62de3b":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.hr\/ping\/RPC2"},"ac1a080eae9b1ce92df1c5304cefbf96789eeaee":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ie\/ping\/RPC2"},"1c8547d977f3546d77d47f3d5252540827148bdd":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.in\/ping\/RPC2"},"eb1d1f6c71f40ad389959d42d2ddc5d1b163176c":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.it\/ping\/RPC2"},"53d47f5785340beebde422a91bdec911dea9ad8e":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.jp\/ping\/RPC2"},"60171b59160dac4e7e357ded51cd74173a8b1fa0":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ki\/ping\/RPC2"},"acffc7361697e2edda8bea8977c8576795bd5008":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.kz\/ping\/RPC2"},"4a6a3e402b8f1b75d6f0cc5b5e7f6e8ef229b86f":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.la\/ping\/RPC2"},"b9e9756e0df597a274e6629dfa889676c3f90cc7":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.li\/ping\/RPC2"},"22d53b028a5dd0f543bca8a6b1399b70c25df038":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.lk\/ping\/RPC2"},"1ae28b9caeab31919018a19b571295ac996a0729":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.lt\/ping\/RPC2"},"78ae49807132da0e22ea7394fbb5fec0eb313050":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.lu\/ping\/RPC2"},"3326366b3984112495ca5f75381c4df3f1d81512":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.md\/ping\/RPC2"},"7e583c8560a7c7fb9c08e9d4c00c2888b5128fc6":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.mn\/ping\/RPC2"},"9ad60a2d2977d3dc615e9467e2a95efbddfb6d13":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ms\/ping\/RPC2"},"dbd474bcdf6b6a53a912ae67369ad6f4cb00902b":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.mu\/ping\/RPC2"},"095689ab1246371c6ae5753b2cf1e84b7993d285":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.mv\/ping\/RPC2"},"b5ebe472a6da2c79c8b4426708be216d6ee7d9b7":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.mw\/ping\/RPC2"},"ab069dfa2aa25d9fdbde3c0661b878cbf660ecff":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.nl\/ping\/RPC2"},"def11305df119e03193369dfd689c94a6b520e43":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.no\/ping\/RPC2"},"722d28d8d34318ab4f5a74017f15a2915e7afde2":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.nr\/ping\/RPC2"},"5974b1e708336bc9381dca3e0d73434dac0a0dbf":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.nu\/ping\/RPC2"},"ea09012bd02272c56472cf07e0c3fd09c96b478f":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.pl\/ping\/RPC2"},"ca87c63b294595a69cc47681e8bb12ec08bad20a":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.pn\/ping\/RPC2"},"9c7896bbb9c9a7ce8a0f67e65ebe060fa6f7006f":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.pt\/ping\/RPC2"},"9f81539271b3c620e182a0568b251cd93926626a":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ro\/ping\/RPC2"},"3478adffacda66919463825886405f4bd92932da":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ru\/ping\/RPC2"},"bcebe6d4df240654ed13e9f98bf7cca5423b8458":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.rw\/ping\/RPC2"},"d9119b44be77e41f6555770bcea3f270176b3886":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.sc\/ping\/RPC2"},"0af16277ab509b09552611db8fa857e676f94e88":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.se\/ping\/RPC2"},"4afa80bb4a158d8dc3b3e88d3b908d57fdbd8ecd":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.sh\/ping\/RPC2"},"22db7327c408be9982e64d4b13b7dfb2aaba3102":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.si\/ping\/RPC2"},"4ea4e9594f2662bfa8ffd3282c00b401a9d2f5bc":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.sk\/ping\/RPC2"},"2fe8b83635088583a458147b9529820b735e274f":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.sm\/ping\/RPC2"},"36f2894f6d2aba1e6538aca827ff94c0a7587397":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.sn\/ping\/RPC2"},"d2b857da222f5426a1481c808d45e54da01a8c13":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.st\/ping\/RPC2"},"88c269654839720c29aec21385c561e584dd0e72":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tk\/ping\/RPC2"},"87d0eaa7f3f00c35fc8edf9d5d4382f86d0499b3":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tl\/ping\/RPC2"},"8621a435345964d34613978f430b98ccd09ae589":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tm\/ping\/RPC2"},"e1ca0585c2b5a92cc0f6596596a9401d3e61f379":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.to\/ping\/RPC2"},"2614665a9b5ccd568b4145e31e95c78ef480aee6":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tp\/ping\/RPC2"},"b269945ef9985135d7f0b9b9026036acb7907712":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tt\/ping\/RPC2"},"46da9c8ecaaae611db7deb7c1419d7277972b306":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.tw\/ping\/RPC2"},"43cf6fcb82b80f6b708ca15e20c8b78cd88cadef":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.us\/ping\/RPC2"},"47e54e8fe919200d08c68f98192d44106cfe9f2d":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.vg\/ping\/RPC2"},"edcc57888cf3d14eac38f4fe6280e98fec214c84":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.vu\/ping\/RPC2"},"114ec0c1c6a1f70f87d1b0df8603e5fa8d72e412":{"type":"XML-RPC","uri":"http:\/\/blogsearch.google.ws\/ping\/RPC2"},"5bedee508aca71c3054664fddc8181b974ababa8":{"type":"XML-RPC","uri":"http:\/\/news2paper.com\/ping"},"6a39c650b84c03b6b7a51a7bd5797142d1453629":{"type":"XML-RPC","uri":"http:\/\/ping.bloggers.jp\/rpc"},"4526584784861b57dcd1a9d602d65adb8528c92e":{"type":"XML-RPC","uri":"http:\/\/ping.fc2.com"},"111052cd4d6f2a7e7aab08c4f70d09d770971cb3":{"type":"XML-RPC","uri":"http:\/\/ping.rss.drecom.jp"},"2b6df6456594f96b23c048437f5af4ce5b0e5d8c":{"type":"XML-RPC","uri":"http:\/\/rpc.bloggerei.de\/ping\/"},"731cf9c74c99b8986f24a5944cf9274341abbe9c":{"type":"XML-RPC","uri":"http:\/\/rpc.pingomatic.com"},"bb5dd04b9ff18f4a3087c38c727faa9b41437f85":{"type":"XML-RPC","uri":"http:\/\/rpc.technorati.com\/rpc\/ping"},"ebe83fd384fc762c6bc8472976d76988cfc123e8":{"type":"XML-RPC","uri":"http:\/\/rpc.twingly.com"},"047d5d2930e8615c9c0f89059393bdd405abee90":{"type":"XML-RPC","uri":"http:\/\/services.newsgator.com\/ngws\/xmlrpcping.aspx"}} \ No newline at end of file |
From: <wis...@us...> - 2015-12-01 11:20:58
|
Revision: 13169 http://sourceforge.net/p/xoops/svn/13169 Author: wishcraft Date: 2015-12-01 11:20:55 +0000 (Tue, 01 Dec 2015) Log Message: ----------- Pingtrax -- the Pinglist and Trackback Automated module -- Pre-alpha 1.01 -- Planning Added Paths: ----------- XoopsModules/pingtrax/ XoopsModules/pingtrax/branches/ XoopsModules/pingtrax/releases/ XoopsModules/pingtrax/trunk/ XoopsModules/pingtrax/trunk/admin/ XoopsModules/pingtrax/trunk/admin/index.html XoopsModules/pingtrax/trunk/api/ XoopsModules/pingtrax/trunk/blocks/ XoopsModules/pingtrax/trunk/blocks/index.html XoopsModules/pingtrax/trunk/class/ XoopsModules/pingtrax/trunk/class/index.html XoopsModules/pingtrax/trunk/class/items.php XoopsModules/pingtrax/trunk/class/items_pings.php XoopsModules/pingtrax/trunk/class/items_sitemaps.php XoopsModules/pingtrax/trunk/class/pings.php XoopsModules/pingtrax/trunk/class/pings_sitemaps.php XoopsModules/pingtrax/trunk/class/plugins.php XoopsModules/pingtrax/trunk/class/sitemaps.php XoopsModules/pingtrax/trunk/class/trackback.php XoopsModules/pingtrax/trunk/images/ XoopsModules/pingtrax/trunk/images/logo.png XoopsModules/pingtrax/trunk/include/ XoopsModules/pingtrax/trunk/include/index.html XoopsModules/pingtrax/trunk/language/ XoopsModules/pingtrax/trunk/language/english/ XoopsModules/pingtrax/trunk/language/english/help/ XoopsModules/pingtrax/trunk/language/english/help/help.html XoopsModules/pingtrax/trunk/language/english/help/index.html XoopsModules/pingtrax/trunk/language/english/index.html XoopsModules/pingtrax/trunk/language/english/modinfo.php XoopsModules/pingtrax/trunk/language/index.html XoopsModules/pingtrax/trunk/plugins/ XoopsModules/pingtrax/trunk/plugins/default.php XoopsModules/pingtrax/trunk/plugins/index.html XoopsModules/pingtrax/trunk/preloads/ XoopsModules/pingtrax/trunk/preloads/index.html XoopsModules/pingtrax/trunk/preloads/ping.php XoopsModules/pingtrax/trunk/preloads/sitemap.php XoopsModules/pingtrax/trunk/preloads/trackback.php XoopsModules/pingtrax/trunk/sql/ XoopsModules/pingtrax/trunk/sql/index.html XoopsModules/pingtrax/trunk/sql/mysql.sql XoopsModules/pingtrax/trunk/sql/tables.json XoopsModules/pingtrax/trunk/templates/ XoopsModules/pingtrax/trunk/templates/admin/ XoopsModules/pingtrax/trunk/templates/admin/index.html XoopsModules/pingtrax/trunk/templates/blocks/ XoopsModules/pingtrax/trunk/templates/blocks/index.html XoopsModules/pingtrax/trunk/templates/index.html XoopsModules/pingtrax/trunk/xoops_version.php Added: XoopsModules/pingtrax/trunk/admin/index.html =================================================================== --- XoopsModules/pingtrax/trunk/admin/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/admin/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/admin/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/blocks/index.html =================================================================== --- XoopsModules/pingtrax/trunk/blocks/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/blocks/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/blocks/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/class/index.html =================================================================== --- XoopsModules/pingtrax/trunk/class/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/class/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/class/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/class/items.php =================================================================== --- XoopsModules/pingtrax/trunk/class/items.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/items.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,114 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxItems + * + * @subpackage pingtrax + * + * Database MySQL Table:- + * + * CREATE TABLE `pingtrax_items` ( + * `id` mediumint(20) NOT NULL AUTO_INCREMENT, + * `referer` varchar(44) NOT NULL DEFAULT '', + * `type` enum('local','remote','unknown') NOT NULL DEFAULT 'unknown', + * `module-dirname` varchar(30) NOT NULL DEFAULT '', + * `module-class` varchar(100) NOT NULL DEFAULT '', + * `module-item-id` mediumint(30) NOT NULL DEFAULT '0', + * `module-php-self` varchar(150) NOT NULL DEFAULT '', + * `module-get` tinytext, + * `item-author-uid` int(13) NOT NULL DEFAULT '0', + * `item-author-name` varchar(64) NOT NULL DEFAULT '', + * `item-category-id` int(20) NOT NULL DEFAULT '0', + * `item-title` varchar(180) NOT NULL DEFAULT '', + * `item-description` varchar(250) NOT NULL DEFAULT '', + * `item-protocol` enum('https://','http://') NOT NULL DEFAULT 'http://', + * `item-domain` varchar(150) NOT NULL DEFAULT '', + * `item-referer-uri` varchar(250) NOT NULL DEFAULT '', + * `item-php-self` varchar(250) NOT NULL DEFAULT '', + * `feed-protocol` enum('https://','http://') NOT NULL DEFAULT 'http://', + * `feed-domain` varchar(150) NOT NULL DEFAULT '', + * `feed-referer-uri` varchar(250) NOT NULL DEFAULT '', + * `discovery-hook` enum('php','preloader','smarty','combination','unknown') NOT NULL DEFAULT 'unknown', + * `user-session` enum('admin','user','guest','unknown') NOT NULL DEFAULT 'unknown', + * `created` int(12) NOT NULL DEFAULT '0', + * `updated` int(12) NOT NULL DEFAULT '0', + * `offlined` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`), + * KEY `SEARCH` (`referer`,`item-author-uid`,`item-author-name`,`module-dirname`,`item-protocol`,`item-domain`,`item-referer-uri`,`module-php-self`,`item-php-self`,`discovery-hook`,`id`) KEY_BLOCK_SIZE=128, + * KEY `CHRONOLOGISTICS` (`id`,`referer`,`created`,`updated`,`offlined`) USING BTREE KEY_BLOCK_SIZE=64 + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=16; + */ +class PingtraxItems extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('referer', XOBJ_DTYPE_OTHER, sha1(NULL), false, 44); + $this->initVar('type', XOBJ_DTYPE_ENUM, 'unknown', true, false, false, false, array('local','remote','unknown')); + $this->initVar('module-dirname', XOBJ_DTYPE_OTHER, '', false, 30); + $this->initVar('module-class', XOBJ_DTYPE_OTHER, '', false, 100); + $this->initVar('module-item-id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('module-php-self', XOBJ_DTYPE_OTHER, '', false, 150); + $this->initVar('module-get', XOBJ_DTYPE_ARRAY, array(), false); + $this->initVar('item-author-uid', XOBJ_DTYPE_INT, 0, false); + $this->initVar('item-author-name', XOBJ_DTYPE_TXTBOX, 0, false, 64); + $this->initVar('item-title', XOBJ_DTYPE_TXTBOX, 0, false, 180); + $this->initVar('item-description', XOBJ_DTYPE_TXTBOX, 0, false, 250); + $this->initVar('item-protocol', XOBJ_DTYPE_ENUM, XOOPS_PROT, true, false, false, false, array('https://','http://')); + $this->initVar('item-domain', XOBJ_DTYPE_TXTBOX, parse_url(XOOPS_URL, PHP_URL_HOST), true, 150); + $this->initVar('item-referer-uri', XOBJ_DTYPE_TXTBOX, $_SERVER["REQUEST_URI"], true, 250); + $this->initVar('item-php-self', XOBJ_DTYPE_TXTBOX, str_replace(XOOPS_ROOT_PATH, "", $_SERVER["PHP_SELF"]), true, 250); + $this->initVar('feed-protocol', XOBJ_DTYPE_ENUM, XOOPS_PROT, true, false, false, false, array('https://','http://')); + $this->initVar('feed-domain', XOBJ_DTYPE_TXTBOX, parse_url(XOOPS_URL, PHP_URL_HOST), true, 150); + $this->initVar('feed-referer-uri', XOBJ_DTYPE_TXTBOX, parse_url(XOOPS_URL, PHP_URL_PATH) . '/backend.php', true, 250); + $this->initVar('discovery-hook', XOBJ_DTYPE_ENUM, 'unknown', true, false, false, false, array('php','preloader','smarty','combination','unknown')); + $this->initVar('user-session', XOBJ_DTYPE_ENUM, 'unknown', true, false, false, false, array('admin','user','guest','unknown')); + $this->initVar('written', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('updated', XOBJ_DTYPE_INT, 0, false); + $this->initVar('offline', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxItemsHandler + */ +class PintraxItemsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "pingtrax_items", 'PingtraxItems', 'id', 'referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/items_pings.php =================================================================== --- XoopsModules/pingtrax/trunk/class/items_pings.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/items_pings.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,73 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxItems_pings + * + * @subpackage itemtrax + * + * Database MySQL Table:- + * + * CREATE TABLE `pingtrax_items_pings` ( + * `id` mediumint(32) NOT NULL AUTO_INCREMENT, + * `ping-referer` varchar(44) NOT NULL DEFAULT '', + * `item-referer` varchar(44) NOT NULL DEFAULT '', + * `when` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`), + * KEY `SEARCH` (`id`,`ping-referer`,`item-referer`) USING BTREE, + * KEY `CHRONOLOGISTICS` (`ping-referer`,`item-referer`,`when`) USING BTREE KEY_BLOCK_SIZE=64 + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=8; + * + */ +class PingtraxItems_pings extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('ping-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('item-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('when', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxItems_pingsHandler + */ +class PintraxItems_pingsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "pingtrax_items_pings", 'PingtraxItems_pings', 'id', 'ping-referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/items_sitemaps.php =================================================================== --- XoopsModules/pingtrax/trunk/class/items_sitemaps.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/items_sitemaps.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,73 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxItems_sitemaps + * + * @subpackage itemtrax + * + * Database MySQL Table:- + * + * CREATE TABLE `itemtrax_items_sitemaps` ( + * `id` mediumint(32) NOT NULL AUTO_INCREMENT, + * `map-referer` varchar(44) NOT NULL DEFAULT '', + * `item-referer` varchar(44) NOT NULL DEFAULT '', + * `when` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`), + * KEY `SEARCH` (`id`,`map-referer`,`item-referer`) USING BTREE, + * KEY `CHRONOLOGISTICS` (`map-referer`,`item-referer`,`when`) USING BTREE KEY_BLOCK_SIZE=64 + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=8; + * + */ +class PingtraxItems_sitemaps extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('map-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('item-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('when', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxItems_sitemapsHandler + */ +class PintraxItems_sitemapsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "itemtrax_items_sitemaps", 'PingtraxItems_sitemaps', 'id', 'map-referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/pings.php =================================================================== --- XoopsModules/pingtrax/trunk/class/pings.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/pings.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,92 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxPings + * + * @subpackage pingtrax + * + * Database MySQL Table:- + * + * CREATE TABLE `pingtrax_pings` ( + * `id` int(14) NOT NULL AUTO_INCREMENT, + * `referer` varchar(44) NOT NULL DEFAULT '', + * `type` enum('XML-RPC','SITEMAPS') NOT NULL DEFAULT 'XML-RPC', + * `uri` varchar(250) NOT NULL DEFAULT '', + * `last-item-referer` varchar(44) NOT NULL DEFAULT '', + * `successful-pings` int(18) NOT NULL DEFAULT '0', + * `failed-pings` int(18) NOT NULL DEFAULT '0', + * `sleep-till` int(12) NOT NULL DEFAULT '0', + * `success-time` int(12) NOT NULL DEFAULT '0', + * `failure-time` int(12) NOT NULL DEFAULT '0', + * `created` int(12) NOT NULL DEFAULT '0', + * `updated` int(12) NOT NULL DEFAULT '0', + * `offlined` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`,`referer`,`type`,`uri`), + * KEY `SEARCH` (`referer`,`type`,`uri`,`last-item-referer`,`successful-pings`,`failed-pings`,`id`) USING BTREE, + * KEY `CHRONOLOGISTICS` (`id`,`referer`,`created`,`updated`,`offlined`,`failure-time`,`success-time`,`sleep-till`) USING BTREE KEY_BLOCK_SIZE=128 + * ) ENGINE=InnoDB AUTO_INCREMENT=150 DEFAULT CHARSET=utf8 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=16; + * + */ +class PingtraxPings extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('referer', XOBJ_DTYPE_OTHER, sha1(NULL), false, 44); + $this->initVar('type', XOBJ_DTYPE_ENUM, 'XML-RPC', true, false, false, false, array('XML-RPC','SITEMAPS')); + $this->initVar('uri', XOBJ_DTYPE_TXTBOX, null, true, 250); + $this->initVar('last-item-referer', XOBJ_DTYPE_OTHER, sha1(NULL), false, 44); + $this->initVar('successful-pings', XOBJ_DTYPE_INT, 0, false); + $this->initVar('failed-pings', XOBJ_DTYPE_INT, 0, false); + $this->initVar('sleep-till', XOBJ_DTYPE_INT, 0, false); + $this->initVar('success-time', XOBJ_DTYPE_INT, 0, false); + $this->initVar('failure-time', XOBJ_DTYPE_INT, 0, false); + $this->initVar('written', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('updated', XOBJ_DTYPE_INT, 0, false); + $this->initVar('offline', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxPingsHandler + */ +class PintraxPingsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "pingtrax_pings", 'PingtraxPings', 'id', 'referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/pings_sitemaps.php =================================================================== --- XoopsModules/pingtrax/trunk/class/pings_sitemaps.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/pings_sitemaps.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,73 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxPings_sitemaps + * + * @subpackage pingtrax + * + * Database MySQL Table:- + * + * CREATE TABLE `pingtrax_pings_sitemaps` ( + * `id` mediumint(32) NOT NULL AUTO_INCREMENT, + * `map-referer` varchar(44) NOT NULL DEFAULT '', + * `ping-referer` varchar(44) NOT NULL DEFAULT '', + * `when` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`), + * KEY `SEARCH` (`id`,`map-referer`,`ping-referer`) USING BTREE, + * KEY `CHRONOLOGISTICS` (`map-referer`,`ping-referer`,`when`) USING BTREE KEY_BLOCK_SIZE=64 + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=8; + * + */ +class PingtraxPings_sitemaps extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('map-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('ping-referer', XOBJ_DTYPE_TXTBOX, null, true, 44); + $this->initVar('when', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxPings_sitemapsHandler + */ +class PintraxPings_sitemapsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "pingtrax_pings_sitemaps", 'PingtraxPings_sitemaps', 'id', 'map-referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/plugins.php =================================================================== --- XoopsModules/pingtrax/trunk/class/plugins.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/plugins.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,51 @@ +<?php +/** + * PingTrax Constructor for Plugin's + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + +defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +/** + * Class PingtraxPluginsDefault + */ +class PingtraxPlugins +{ + /** + * @param $args + + function eventCoreIncludeFunctionsRedirectheader($args) + { + $context = stream_context_create(array('http' => array( + 'method' => "POST", + 'header' => "Content-Type: text/xml\r\n", + 'content' => $xml + ))); + $file = @file_get_contents($post_to, false, $context); + if ($file === false) { echo '<p>Couldn\'t connect!</p>'; } + elseif ($file) { + echo '<p>The following response was returned:</p>'; + echo '<pre>'.htmlspecialchars($file).'</pre>'; + } else { + echo '<p>Empty response!</p>'; + } + } + */ + +} Added: XoopsModules/pingtrax/trunk/class/sitemaps.php =================================================================== --- XoopsModules/pingtrax/trunk/class/sitemaps.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/sitemaps.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,98 @@ +<?php +/** + * Pintrax Database Class Handler module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + + +/** + * Class PintraxSitemaps + * + * Database MySQL Table:- + * + * CREATE TABLE `pingtrax_sitemaps` ( + * `id` int(10) NOT NULL AUTO_INCREMENT, + * `referer` varchar(44) NOT NULL DEFAULT '', + * `protocol` enum('https://','http://') NOT NULL DEFAULT 'http://', + * `domain` varchar(100) NOT NULL DEFAULT '', + * `baseurl` varchar(100) NOT NULL DEFAULT '', + * `filename` varchar(65) NOT NULL DEFAULT '', + * `items` int(18) NOT NULL DEFAULT '0', + * `bytes` int(18) NOT NULL DEFAULT '0', + * `successful-pings` int(18) NOT NULL DEFAULT '0', + * `failed-pings` int(18) NOT NULL DEFAULT '0', + * `sleep-till` int(12) NOT NULL DEFAULT '0', + * `success-time` int(12) NOT NULL DEFAULT '0', + * `failure-time` int(12) NOT NULL DEFAULT '0', + * `written` int(12) NOT NULL DEFAULT '0', + * `created` int(12) NOT NULL DEFAULT '0', + * `updated` int(12) NOT NULL DEFAULT '0', + * `offlined` int(12) NOT NULL DEFAULT '0', + * PRIMARY KEY (`id`), + * KEY `SEARCH` (`id`,`referer`,`protocol`,`filename`,`domain`,`baseurl`) USING BTREE, + * KEY `CHRONOLOGISTICS` (`id`,`written`,`created`,`updated`,`offlined`,`referer`) USING BTREE KEY_BLOCK_SIZE=64 + * ) ENGINE=InnoDB DEFAULT CHARSET=utf8 PACK_KEYS=1 CHECKSUM=1 DELAY_KEY_WRITE=1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=16; + * + * @subpackage pingtrax + */ +class PingtraxSitemaps extends XoopsObject +{ + /** + * + */ + function __construct() + { + $this->XoopsObject(); + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('referer', XOBJ_DTYPE_OTHER, sha1(NULL), true, 44); + $this->initVar('protocol', XOBJ_DTYPE_ENUM, 'http://', true, false, false, false, array('https://','http://')); + $this->initVar('domain', XOBJ_DTYPE_TXTBOX, parse_url(XOOPS_URL, PHP_URL_HOST), true, 100); + $this->initVar('baseurl', XOBJ_DTYPE_TXTBOX, parse_url(XOOPS_URL, PHP_URL_PATH), true, 100); + $this->initVar('filename', XOBJ_DTYPE_TXTBOX, 'sitemap.'.parse_url(XOOPS_URL, PHP_URL_HOST).'.xml', true, 64); + $this->initVar('items', XOBJ_DTYPE_INT, 0, false); + $this->initVar('bytes', XOBJ_DTYPE_INT, 0, false); + $this->initVar('successful-pings', XOBJ_DTYPE_INT, 0, false); + $this->initVar('failed-pings', XOBJ_DTYPE_INT, 0, false); + $this->initVar('sleep-till', XOBJ_DTYPE_INT, 0, false); + $this->initVar('success-time', XOBJ_DTYPE_INT, 0, false); + $this->initVar('failure-time', XOBJ_DTYPE_INT, 0, false); + $this->initVar('written', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('updated', XOBJ_DTYPE_INT, 0, false); + $this->initVar('offline', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * Class PintraxSitemapsHandler + */ +class PintraxSitemapsHandler extends XoopsPersistableObjectHandler +{ + + /** + * @param null|object $db + */ + function __construct(&$db) + { + parent::__construct($db, "pingtrax_sitemaps", 'PingtraxSitemaps', 'id', 'referer'); + } + + +} Added: XoopsModules/pingtrax/trunk/class/trackback.php =================================================================== --- XoopsModules/pingtrax/trunk/class/trackback.php (rev 0) +++ XoopsModules/pingtrax/trunk/class/trackback.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,442 @@ +<?php +/** + * PingTrax Constructor for Plugin's + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + +defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +/** + * Class PingtraxTrackback + * + * @param string $blog_name + * @param string $author + * @param string $encoding + */ +class PingtraxTrackback { + + var $blog_name = ''; // Default blog name used throughout the class (ie. Chronolabs Cooperative) + var $author = ''; // Default author name used throughout the class (ie. Simon Antony Roberts) + var $encoding = ''; // Default encoding used throughout the class (ie. UTF-8) + var $get_id = ''; // Retreives and holds $_GET['id'] (if not empty) + var $post_id = ''; // Retreives and holds $_POST['id'] (if not empty) + var $url = ''; // Retreives and holds $_POST['url'] (if not empty) + var $title = ''; // Retreives and holds $_POST['title'] (if not empty) + var $expert = ''; // Retreives and holds $_POST['expert'] (if not empty) + /** + * Class Constructure + * + * @param string $blog_name + * @param string $author + * @param string $encoding + * @return + */ + function PingtraxTrackback($blog_name, $author, $encoding = "UTF-8") + { + $this->blog_name = $blog_name; + $this->author = $author; + $this->encoding = $encoding; + + // Gather $_POST information + if (isset($_GET['id'])) { + $this->get_id = $_GET['id']; + } + if (isset($_POST['id'])) { + $this->post_id = $_POST['id']; + } + if (isset($_POST['url'])) { + $this->url = $_POST['url']; + } + if (isset($_POST['title'])) { + $this->title = $_POST['url']; + } + if (isset($_POST['expert'])) { + $this->expert = $_POST['expert']; + } + } + + /** + * Sends a trackback ping to a specified trackback URL. + * allowing clients to auto-discover the TrackBack Ping URL. + * + * <code><?php + * include('trackback.php'); + * $trackback = new PingtraxTrackback('Chronolabs Cooperative', 'Simon Antony Roberts', 'UTF-8'); + * if ($trackback->ping('http://example.com/modules/pingtrax/api/', 'http://your-url.com', 'Your entry title')) { + * echo "PingtraxTrackback sent successfully..."; + * } else { + * echo "Error sending trackback...."; + * } + * ?></code> + * + * @param string $trackback + * @param string $url + * @param string $title + * @param string $excerpt + * @return boolean + */ + function ping($trackback, $url, $title = "", $excerpt = "") + { + $response = ""; + $reason = ""; + // Set default values + if (empty($title)) { + $title = "PingtraxTrackbacking your entry..."; + } + if (empty($excerpt)) { + $excerpt = "I found your entry interesting do I've added a PingtraxTrackback to it on my weblog :)"; + } + // Parse the target + $target = parse_url($trackback); + + if ((isset($target["query"])) && ($target["query"] != "")) { + $target["query"] = "?" . $target["query"]; + } else { + $target["query"] = ""; + } + + if ((isset($target["port"]) && !is_numeric($target["port"])) || (!isset($target["port"]))) { + $target["port"] = 80; + } + // Open the socket + $trackback_sock = fsockopen($target["host"], $target["port"]); + // Something didn't work out, return + if (!is_resource($trackback_sock)) { + return '$trackback->ping: can\'t connect to: ' . $trackback . '.'; + exit; + } + // Put together the things we want to send + $trackback_send = "url=" . rawurlencode($url) . "&title=" . rawurlencode($title) . "&blog_name=" . rawurlencode($this->blog_name) . "&excerpt=" . rawurlencode($excerpt); + // Send the trackback + fputs($trackback_sock, "POST " . $target["path"] . $target["query"] . " HTTP/1.1\r\n"); + fputs($trackback_sock, "Host: " . $target["host"] . "\r\n"); + fputs($trackback_sock, "Content-type: application/x-www-form-urlencoded\r\n"); + fputs($trackback_sock, "Content-length: " . strlen($trackback_send) . "\r\n"); + fputs($trackback_sock, "Connection: close\r\n\r\n"); + fputs($trackback_sock, $trackback_send); + // Gather result + while (!feof($trackback_sock)) { + $response .= fgets($trackback_sock, 128); + } + // Close socket + fclose($trackback_sock); + // Did the trackback ping work + strpos($response, '<error>0</error>') ? $return = true : $return = false; + // send result + return $return; + } + + /** + * Produces XML response for trackbackers with ok/error message. + * + * <code><?php + * // Set page header to XML + * header('Content-Type: text/xml'); // MUST be the 1st line + * // + * // Instantiate the class + * // + * include('trackback.php'); + * $trackback = new PingtraxTrackback('Chronolabs Cooperative', 'Simon Antony Roberts', 'UTF-8'); + * // + * // Get trackback information + * // + * $trackback_id = $trackback->post_id; // The id of the item being trackbacked + * $trackback_url = $trackback->url; // The URL from which we got the trackback + * $trackback_title = $trackback->title; // Subject/title send by trackback + * $trackback_expert = $trackback->expert; // Short text send by trackback + * // + * // Do whatever to log the trackback (save in DB, flatfile, etc...) + * // + * if (TRACKBACK_LOGGED_SUCCESSFULLY) { + * // Logged successfully... + * echo $trackback->recieve(true); + * } else { + * // Something went wrong... + * echo $trackback->recieve(false, 'Explain why you return error'); + * } + * ?></code> + * + * @param boolean $success + * @param string $err_response + * @return boolean + */ + function recieve($success = false, $err_response = "") + { + // Default error response in case of problems... + if (!$success && empty($err_response)) { + $err_response = "An error occured while tring to log your trackback..."; + } + // Start response to trackbacker... + $return = '<?xml version="1.0" encoding="' . $this->encoding . '"?>' . "\n"; + $return .= "<response> \n"; + // Send back response... + if ($success) { + // PingtraxTrackback received successfully... + $return .= " <error>0</error> \n"; + } else { + // Something went wrong... + $return .= " <error>1</error> \n"; + $return .= " <message>" . $this->xml_safe($err_response) . "</message>\n"; + } + // End response to trackbacker... + $return .= "</response>"; + + return $return; + } + + /** + * Feteched trackback information and produces an RSS-0.91 feed. + * + * <code><?php + * // 1 + * header('Content-Type: text/xml'); // MUST be the 1st line + * // 2 + * include('trackback.php'); + * $trackback = new PingtraxTrackback('Chronolabs Cooperative', 'Simon Antony Roberts', 'UTF-8'); + * // 3 + * $trackback_id = $trackback->get_id; + * // 4 + * Do whatever to get trackback information by ID (search db, etc...) + * if (GOT_TRACKBACK_INFO) { + * // Successful - pass trackback info as array()... + * $trackback_info = array('title' => string TRACKBACK_TITLE, + * 'expert' => string TRACKBACK_EXPERT, + * 'permalink' => string PERMALINK_URL, + * 'trackback' => string TRACKBACK_URL + * ); + * echo $trackback->fetch(true, $trackback_info); + * } else { + * // Something went wrong - tell my why... + * echo $trackback->fetch(false, string RESPONSE); + * } + * ?></code> + * + * @param boolean $success + * @param string $response + * @return string XML response to the caller + */ + function fetch($success = false, $response = "") + { + if (!$success && empty($response)) { + $response = "An error occured while tring to retreive trackback information..."; + } + // Start response to caller + $return = '<?xml version="1.0" encoding="' . $this->encoding . '"?>' . "\n"; + $return .= "<response> \n"; + // Send back response... + if ($success) { + // PingtraxTrackback retreived successfully... + // Sending back an RSS (0.91) - trackback information from $response (array)... + $return .= " <error>0</error> \n"; + $return .= " <rss version=\"0.91\"> \n"; + $return .= " <channel> \n"; + $return .= " <title>" . $this->xml_safe($response['title']) . "</title> \n"; + $return .= " <link>" . $this->xml_safe($response['trackback']) . "</link> \n"; + $return .= " <description>" . $this->xml_safe($response['expert']) . "</description> \n"; + $return .= " <item> \n"; + $return .= " <title>" . $this->xml_safe($response['title']) . "</title> \n"; + $return .= " <link>" . $this->xml_safe($response['permalink']) . "</link> \n"; + $return .= " <description>" . $this->xml_safe($response['expert']) . "</description> \n"; + $return .= " </item> \n"; + $return .= " </channel> \n"; + $return .= " </rss> \n"; + } else { + // Something went wrong - provide reason from $response (string)... + $return .= " <error>1</error> \n"; + $return .= " <message>" . $this->xml_safe($response) . "</message>\n"; + } + // End response to trackbacker + $return .= "</response>"; + + return $return; + } + + /** + * Produces embedded RDF representing metadata about the entry, + * allowing clients to auto-discover the TrackBack Ping URL. + * + * NOTE: DATE should be string in RFC822 Format - Use RFC822_from_datetime(). + * + * <code><?php + * include('trackback.php'); + * $trackback = new PingtraxTrackback('Chronolabs Cooperative', 'Simon Antony Roberts', 'UTF-8'); + * + * echo $trackback->rdf_autodiscover(string DATE, string TITLE, string EXPERT, string PERMALINK, string TRACKBACK [, string AUTHOR]); + * ?></code> + * + * @param string $RFC822_date + * @param string $title + * @param string $expert + * @param string $permalink + * @param string $trackback + * @param string $author + * @return string + */ + function rdf_autodiscover($RFC822_date, $title, $expert, $permalink, $trackback, $author = "") + { + if (!$author) { + $author = $this->author; + } + + $return = "<!-- \n"; + $return .= "<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" \n"; + $return .= " xmlns:dc=\"http://purl.org/dc/elements/1.1/\" \n"; + $return .= " xmlns:trackback=\"http://madskills.com/public/xml/rss/module/trackback/\"> \n"; + $return .= "<rdf:Description \n"; + $return .= " rdf:about=\"" . $this->xml_safe($permalink) . "\" \n"; + $return .= " dc:identifier=\"" . $this->xml_safe($permalink) . "\" \n"; + $return .= " trackback:ping=\"" . $this->xml_safe($trackback) . "\" \n"; + $return .= " dc:title=\"" . $this->xml_safe($title) . "\" \n"; + $return .= " dc:subject=\"TrackBack\" \n"; + $return .= " dc:description=\"" . $this->xml_safe($this->cut_short($expert)) . "\" \n"; + $return .= " dc:creator=\"" . $this->xml_safe($author) . "\" \n"; + $return .= " dc:date=\"" . $RFC822_date . "\" /> \n"; + $return .= "</rdf:RDF> \n"; + $return .= "--> \n"; + + return $return; + } + + /** + * Search text for links, and searches links for trackback URLs. + * + * <code><?php + * + * include('trackback.php'); + * $trackback = new PingtraxTrackback('Chronolabs Cooperative', 'Simon Antony Roberts', 'UTF-8'); + * + * if ($trackback_array = $trackback->auto_discovery(string TEXT)) { + * // Found trackbacks in TEXT. Looping... + * foreach($trackback_array as $trackback_key => $trackback_url) { + * // Attempt to ping each one... + * if ($trackback->ping($trackback_url, string URL, [string TITLE], [string EXPERT])) { + * // Successful ping... + * echo "PingtraxTrackback sent to <i>$trackback_url</i>...\n"; + * } else { + * // Error pinging... + * echo "PingtraxTrackback to <i>$trackback_url</i> failed....\n"; + * } + * } + * } else { + * // No trackbacks in TEXT... + * echo "No trackbacks were auto-discover...\n" + * } + * ?></code> + * + * @param string $text + * @return array PingtraxTrackback URLs. + */ + function auto_discovery($text) + { + // Get a list of UNIQUE links from text... + // --------------------------------------- + // RegExp to look for (0=>link, 4=>host in 'replace') + $reg_exp = "/(http)+(s)?:(\\/\\/)((\\w|\\.)+)(\\/)?(\\S+)?/i"; + // Make sure each link ends with [sapce] + $text = eregi_replace("www.", "http://www.", $text); + $text = eregi_replace("http://http://", "http://", $text); + $text = eregi_replace("\"", " \"", $text); + $text = eregi_replace("'", " '", $text); + $text = eregi_replace(">", " >", $text); + // Create an array with unique links + $uri_array = array(); + if (preg_match_all($reg_exp, strip_tags($text, "<a>"), $array, PREG_PATTERN_ORDER)) { + foreach($array[0] as $key => $link) { + foreach((array(",", ".", ":", ";")) as $t_key => $t_value) { + $link = trim($link, $t_value); + } + $uri_array[] = ($link); + } + $uri_array = array_unique($uri_array); + } + // Get the trackback URIs from those links... + // ------------------------------------------ + // Loop through the URIs array and extract RDF segments + $rdf_array = array(); // <- holds list of RDF segments + foreach($uri_array as $key => $link) { + if ($link_content = implode("", @file($link))) { + preg_match_all('/(<rdf:RDF.*?<\/rdf:RDF>)/sm', $link_content, $link_rdf, PREG_SET_ORDER); + for ($i = 0; $i < count($link_rdf); $i++) { + if (preg_match('|dc:identifier="' . preg_quote($link) . '"|ms', $link_rdf[$i][1])) { + $rdf_array[] = trim($link_rdf[$i][1]); + } + } + } + } + // Loop through the RDFs array and extract trackback URIs + $trackback_array = array(); // <- holds list of trackback URIs + if (!empty($rdf_array)) { + for ($i = 0; $i < count($rdf_array); $i++) { + if (preg_match('/trackback:ping="([^"]+)"/', $rdf_array[$i], $array)) { + $trackback_array[] = trim($array[1]); + } + } + } + // Return Trackbacks + return $trackback_array; + } + + /** + * Other Useful functions used in this class + */ + + /** + * Converts MySQL datetime to a standart RFC 822 date format + * + * @param string $datetime + * @return string RFC 822 date + */ + function RFC822_from_datetime($datetime) + { + $timestamp = mktime( + substr($datetime, 8, 2), substr($datetime, 10, 2), substr($datetime, 12, 2), + substr($datetime, 4, 2), substr($datetime, 6, 2), substr($datetime, 0, 4) + ); + return date("r", $timestamp); + } + + /** + * Converts a string into an XML-safe string (replaces &, <, >, " and ') + * + * @param string $string + * @return string + */ + function xml_safe($string) + { + return htmlspecialchars($string, ENT_QUOTES); + } + + /** + * Cuts a string short (with "...") accroding to $max_length... + * + * @param string $string + * @param integer $max_length + * @return string + */ + function cut_short($string, $max_length = 255) + { + if (strlen($string) > $max_length) { + $string = substr($string, 0, $max_length) . '...'; + } + + return $string; + } +} + +?> \ No newline at end of file Added: XoopsModules/pingtrax/trunk/images/logo.png =================================================================== (Binary files differ) Index: XoopsModules/pingtrax/trunk/images/logo.png =================================================================== --- XoopsModules/pingtrax/trunk/images/logo.png 2015-11-24 16:41:43 UTC (rev 13168) +++ XoopsModules/pingtrax/trunk/images/logo.png 2015-12-01 11:20:55 UTC (rev 13169) Property changes on: XoopsModules/pingtrax/trunk/images/logo.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/pingtrax/trunk/include/index.html =================================================================== --- XoopsModules/pingtrax/trunk/include/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/include/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/include/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/language/english/help/help.html =================================================================== --- XoopsModules/pingtrax/trunk/language/english/help/help.html (rev 0) +++ XoopsModules/pingtrax/trunk/language/english/help/help.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,19 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1> + <!-- -----Help Content ---------- --> + <h4 class="odd">Description</h4> + <p class="even">The PM module is for private messaging between users</p> + <h4 class="odd">Install/uninstall</h4> + <p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p> + <p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p> + <h4 class="odd">Operating instructions</h4> + <p class="even">To set up this module you need to:</p> + <ul> + <li>You enter your Inbox directly from the front page, or by clicking on the top link “Go to module” in the PM's Admin area.</li> + <li>Configure your preferences for the module (see “Preferences”) and optionally the PM block if you intend to use it (see “Blocks”).</li> + <li>You can do mass deleting of your messages by using the “Prune” Messages" tab.</li> + </ul> + <h4 class="odd">Tutorial</h4> + <p class="even">Tutorial coming soon.</p> + <!-- -----Help Content ---------- --> +</div> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/language/english/help/help.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/language/english/help/index.html =================================================================== --- XoopsModules/pingtrax/trunk/language/english/help/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/language/english/help/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/language/english/help/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/language/english/index.html =================================================================== --- XoopsModules/pingtrax/trunk/language/english/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/language/english/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/language/english/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/language/english/modinfo.php =================================================================== --- XoopsModules/pingtrax/trunk/language/english/modinfo.php (rev 0) +++ XoopsModules/pingtrax/trunk/language/english/modinfo.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,14 @@ +<?php +// $Id: modinfo.php 12363 2014-03-08 10:39:06Z beckmi $ +// _LANGCODE: en +// _CHARSET : UTF-8 +// Translator: XOOPS Translation Team +define('_IPV4_MI_NAME',"IPv4 Debt"); +define('_IPV4_MI_DESC',"Module for displaying the IPv4 debt to Chronolabs Cooperative"); +define('_IPV4_MI_HTACCESS',"Support HTACCESS"); +define('_IPV4_MI_HTACCESS_DESC',"This will enable support for htaccess"); +define('_IPV4_MI_BASEURL',"Base URL for htaccess"); +define('_IPV4_MI_BASEURL_DESC',"This is the base URL of htaccess"); +define('_IPV4_MI_ENDURL',"End of URL"); +define('_IPV4_MI_ENDURL_DESC',""); + Property changes on: XoopsModules/pingtrax/trunk/language/english/modinfo.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/language/index.html =================================================================== --- XoopsModules/pingtrax/trunk/language/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/language/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/language/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/plugins/default.php =================================================================== --- XoopsModules/pingtrax/trunk/plugins/default.php (rev 0) +++ XoopsModules/pingtrax/trunk/plugins/default.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,51 @@ +<?php +/** + * PingTrax Default Plugin + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + +defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +/** + * Class PingtraxPluginsDefault + */ +class PingtraxPluginsDefault extends PingtraxPlugins +{ + /** + * @param $args + + function eventCoreIncludeFunctionsRedirectheader($args) + { + $context = stream_context_create(array('http' => array( + 'method' => "POST", + 'header' => "Content-Type: text/xml\r\n", + 'content' => $xml + ))); + $file = @file_get_contents($post_to, false, $context); + if ($file === false) { echo '<p>Couldn\'t connect!</p>'; } + elseif ($file) { + echo '<p>The following response was returned:</p>'; + echo '<pre>'.htmlspecialchars($file).'</pre>'; + } else { + echo '<p>Empty response!</p>'; + } + } + */ + +} Added: XoopsModules/pingtrax/trunk/plugins/index.html =================================================================== --- XoopsModules/pingtrax/trunk/plugins/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/plugins/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/plugins/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/preloads/index.html =================================================================== --- XoopsModules/pingtrax/trunk/preloads/index.html (rev 0) +++ XoopsModules/pingtrax/trunk/preloads/index.html 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/pingtrax/trunk/preloads/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/preloads/ping.php =================================================================== --- XoopsModules/pingtrax/trunk/preloads/ping.php (rev 0) +++ XoopsModules/pingtrax/trunk/preloads/ping.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,51 @@ +<?php +/** + * PingTrax Preloads + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + +defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +/** + * Class PingtraxPingPreload + */ +class PingtraxPingPreload extends XoopsPreloadItem +{ + /** + * @param $args + + function eventCoreIncludeFunctionsRedirectheader($args) + { + $context = stream_context_create(array('http' => array( + 'method' => "POST", + 'header' => "Content-Type: text/xml\r\n", + 'content' => $xml + ))); + $file = @file_get_contents($post_to, false, $context); + if ($file === false) { echo '<p>Couldn\'t connect!</p>'; } + elseif ($file) { + echo '<p>The following response was returned:</p>'; + echo '<pre>'.htmlspecialchars($file).'</pre>'; + } else { + echo '<p>Empty response!</p>'; + } + } + */ + +} Property changes on: XoopsModules/pingtrax/trunk/preloads/ping.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/pingtrax/trunk/preloads/sitemap.php =================================================================== --- XoopsModules/pingtrax/trunk/preloads/sitemap.php (rev 0) +++ XoopsModules/pingtrax/trunk/preloads/sitemap.php 2015-12-01 11:20:55 UTC (rev 13169) @@ -0,0 +1,51 @@ +<?php +/** + * PingTrax Preloads + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright Chronolabs Cooperative http://sourceforge.net/projects/chronolabs/ + * @license GNU GPL 3 (http://labs.coop/briefs/legal/general-public-licence/13,3.html) + * @author Simon Antony Roberts <wis...@us...> + * @see http://sourceforge.net/projects/xoops/ + * @see http://sourceforge.net/projects/chronolabs/ + * @see http://sourceforge.net/projects/chronolabsapi/ + * @see http://labs.coop + * @version 1.0.1 + * @since 1.0.1 + */ + +defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +/** + * Class PingtraxSitemapPreload + */ +class PingtraxSitemapPreload extends XoopsPreloadItem +{ + /** + * @param $args + + function eventCoreIncludeFunctionsRedirectheader($args) + { + $context = stream_context_create(array('http' => array( + 'method' => "POST", + 'header' => "Content-Type: text/xml\r\n", + 'content' => $xm... [truncated message content] |
From: <wis...@us...> - 2015-11-24 16:41:45
|
Revision: 13168 http://sourceforge.net/p/xoops/svn/13168 Author: wishcraft Date: 2015-11-24 16:41:43 +0000 (Tue, 24 Nov 2015) Log Message: ----------- APP Module Builder Frameworks IPv6 Added Paths: ----------- XoopsModules/ipv6/ XoopsModules/ipv6/releases/ XoopsModules/ipv6/releases/1.10/ XoopsModules/ipv6/releases/1.10/modules/ XoopsModules/ipv6/releases/1.10/modules/ipv6/ XoopsModules/ipv6/releases/1.10/modules/ipv6/images/ XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png XoopsModules/ipv6/releases/1.10/modules/ipv6/index.php XoopsModules/ipv6/releases/1.10/modules/ipv6/language/ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/help.html XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/index.html XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/index.html XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/modinfo.php XoopsModules/ipv6/releases/1.10/modules/ipv6/language/index.html XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/index.html XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ipv6_index.tpl XoopsModules/ipv6/releases/1.10/modules/ipv6/xoops_version.php XoopsModules/ipv6/trunk/ XoopsModules/ipv6/trunk/images/ XoopsModules/ipv6/trunk/images/logo.png XoopsModules/ipv6/trunk/index.php XoopsModules/ipv6/trunk/language/ XoopsModules/ipv6/trunk/language/english/ XoopsModules/ipv6/trunk/language/english/help/ XoopsModules/ipv6/trunk/language/english/help/help.html XoopsModules/ipv6/trunk/language/english/help/index.html XoopsModules/ipv6/trunk/language/english/index.html XoopsModules/ipv6/trunk/language/english/modinfo.php XoopsModules/ipv6/trunk/language/index.html XoopsModules/ipv6/trunk/templates/ XoopsModules/ipv6/trunk/templates/index.html XoopsModules/ipv6/trunk/templates/ipv6_index.tpl XoopsModules/ipv6/trunk/xoops_version.php Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png =================================================================== (Binary files differ) Index: XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png 2015-11-24 16:41:26 UTC (rev 13167) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png 2015-11-24 16:41:43 UTC (rev 13168) Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/images/logo.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/index.php =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/index.php (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/index.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,56 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: index.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +require ( "../../mainfile.php"); + +if ($GLOBALS['xoopsModuleConfig']['htaccess']) + if (strpos($_SERVER['REQUEST_URI'], 'odules/')>0) { + $uri = XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['base_url'].'/debt'.$GLOBALS['xoopsModuleConfig']['end_url']; + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$uri); + } + +$fee = 0.50 * 340000000000000000000000000000000000000; +$interest = 0.27; +$period = 3600 * 24 * 7 * 4; +$when = strtotime("2021-12-08"); + +$segments = array(); +$due = $fee; +if ($when < time()) +{ + $j = $when; + while($j < time()) + { + $j = $j + $period; + $segments[date("D, d-m-Y",$j)] = number_format($due * $interest, 2); + $due = $due + ($due * $interest); + } +} + +$xoopsOption['template_main'] = 'ipv6_index.tpl'; +include $GLOBALS['xoops']->path('header.php'); + +$GLOBALS['xoopsTpl']->assign('when', date("D, d-m-Y", $when)); +$GLOBALS['xoopsTpl']->assign('fee', number_format($fee,2)); +$GLOBALS['xoopsTpl']->assign('due', number_format($due, 2)); +$GLOBALS['xoopsTpl']->assign('interest', $segments); + $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', "IPv6 -- $ " . number_format($due, 2) . " AUD due Right now IP Address Stack 2 @ChronolabsCoop"); +include $GLOBALS['xoops']->path('footer.php'); Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/index.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/help.html =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/help.html (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/help.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,19 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1> + <!-- -----Help Content ---------- --> + <h4 class="odd">Description</h4> + <p class="even">The PM module is for private messaging between users</p> + <h4 class="odd">Install/uninstall</h4> + <p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p> + <p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p> + <h4 class="odd">Operating instructions</h4> + <p class="even">To set up this module you need to:</p> + <ul> + <li>You enter your Inbox directly from the front page, or by clicking on the top link “Go to module” in the PM's Admin area.</li> + <li>Configure your preferences for the module (see “Preferences”) and optionally the PM block if you intend to use it (see “Blocks”).</li> + <li>You can do mass deleting of your messages by using the “Prune” Messages" tab.</li> + </ul> + <h4 class="odd">Tutorial</h4> + <p class="even">Tutorial coming soon.</p> + <!-- -----Help Content ---------- --> +</div> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/help.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/index.html =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/index.html (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/help/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/index.html =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/index.html (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/modinfo.php =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/modinfo.php (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/modinfo.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,14 @@ +<?php +// $Id: modinfo.php 12363 2014-03-08 10:39:06Z beckmi $ +// _LANGCODE: en +// _CHARSET : UTF-8 +// Translator: XOOPS Translation Team +define('_IPV6_MI_NAME',"IPv6 Debt"); +define('_IPV6_MI_DESC',"Module for displaying the IPv4 debt to Chronolabs Cooperative"); +define('_IPV6_MI_HTACCESS',"Support HTACCESS"); +define('_IPV6_MI_HTACCESS_DESC',"This will enable support for htaccess"); +define('_IPV6_MI_BASEURL',"Base URL for htaccess"); +define('_IPV6_MI_BASEURL_DESC',"This is the base URL of htaccess"); +define('_IPV6_MI_ENDURL',"End of URL"); +define('_IPV6_MI_ENDURL_DESC',""); + Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/english/modinfo.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/index.html =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/language/index.html (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/language/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/language/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/index.html =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/index.html (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ipv6_index.tpl =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ipv6_index.tpl (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ipv6_index.tpl 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,10 @@ +<h1>IPv6 Stack Node Debt Listing</h1> +<p>Chronolabs was the orginal origins of the IPv4 stack design, it was originally charged at 50c per IP address for the total fee of $ <{$fee}> AUD to paid by <{$when}> by the holding members as they are being credited by Chronolabs and the Omnipotent entities that belong to this cooperative!</p> +<h2>Current amount due!</h2> +<p style="font-size: 167%; font-weight: 800; text-align: center;">$ <{$due}> AUD</p> +<{if count($interest) > 0 }> +<h2>Interest in monthly cycles earned!</h2> +<p style="font-size: 97%; font-weight: 600; text-align: center;"><{foreach from=$interest key=date item=segment}>Charged on <{$date}>: <font style="color:rgb(230,0,0);"><em>$ <{$segment}> AUD</em></font><br /><{/foreach}></p> +<{else}> +<h3>No Interest Earned So Far</h3> +<{/if}> \ No newline at end of file Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/templates/ipv6_index.tpl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/releases/1.10/modules/ipv6/xoops_version.php =================================================================== --- XoopsModules/ipv6/releases/1.10/modules/ipv6/xoops_version.php (rev 0) +++ XoopsModules/ipv6/releases/1.10/modules/ipv6/xoops_version.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,110 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: xoops_version.php 12593 2014-06-14 16:04:02Z beckmi $ + */ + +/** + * This is a temporary solution for merging XOOPS 2.0 and 2.2 series + * A thorough solution will be available in XOOPS 3.0 + * + */ + +$modversion = array(); +$modversion['name'] = _IPV6_MI_NAME; +$modversion['version'] = 1.10; +$modversion['description'] = _IPV6_MI_DESC; +$modversion['author'] = "Simon Antony Roberts"; +$modversion['credits'] = "Chronolabs"; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL 2.0 or later'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['image'] = "images/logo.png"; +$modversion['dirname'] = "ipv6"; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion["module_status"] = "Final"; +$modversion['release_date'] = '2015/11/23'; +$modversion["module_website_url"] = "http://labs.coop/"; +$modversion["module_website_name"] = "Chronolabs"; +$modversion['min_php'] = '5.3.7'; +$modversion['min_xoops'] = "2.5.7"; +$modversion['min_admin'] = '1.1'; +$modversion['min_db'] = array( + 'mysql' => '5.0.7', + 'mysqli' => '5.0.7' +); + +// Admin menu +// Set to 1 if you want to display menu generated by system module +$modversion['system_menu'] = 0; + +// Admin things +$modversion['hasAdmin'] = 0; +$modversion['adminindex'] = "admin/admin.php"; +$modversion['adminmenu'] = "admin/menu.php"; + +// Mysql file +//$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; + +// Table +//$modversion['tables'][0] = "pm_messages"; + +// Scripts to run upon installation or update +//$modversion['onInstall'] = "include/install.php"; +//$modversion['onUpdate'] = "include/update.php"; + +// Templates +$modversion['templates'] = array(); +$modversion['templates'][1]['file'] = 'ipv6_index.tpl'; +$modversion['templates'][1]['description'] = ''; +//$modversion['templates'][4]['file'] = 'pm_lookup.tpl'; +//$modversion['templates'][4]['description'] = ''; + +// Menu +$modversion['hasMain'] = 1; + +$modversion['config'] = array(); +$modversion['config'][] = array( + 'name' => 'htaccess', + 'title' => '_IPV6_MI_HTACCESS', + 'description' => '_IPV6_MI_HTACCESS_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => false +); + +$modversion['config'][] = array( + 'name' => 'base_url', + 'title' => '_IPV6_MI_BASEURL', + 'description' => '_IPV6_MI_BASEURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => "ipv6" +); + +$modversion['config'][] = array( + 'name' => 'end_url', + 'title' => '_IPV6_MI_ENDURL', + 'description' => '_IPV6_MI_ENDURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => ".html" +); Property changes on: XoopsModules/ipv6/releases/1.10/modules/ipv6/xoops_version.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/images/logo.png =================================================================== (Binary files differ) Index: XoopsModules/ipv6/trunk/images/logo.png =================================================================== --- XoopsModules/ipv6/trunk/images/logo.png 2015-11-24 16:41:26 UTC (rev 13167) +++ XoopsModules/ipv6/trunk/images/logo.png 2015-11-24 16:41:43 UTC (rev 13168) Property changes on: XoopsModules/ipv6/trunk/images/logo.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/ipv6/trunk/index.php =================================================================== --- XoopsModules/ipv6/trunk/index.php (rev 0) +++ XoopsModules/ipv6/trunk/index.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,56 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: index.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +require ( "../../mainfile.php"); + +if ($GLOBALS['xoopsModuleConfig']['htaccess']) + if (strpos($_SERVER['REQUEST_URI'], 'odules/')>0) { + $uri = XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['base_url'].'/debt'.$GLOBALS['xoopsModuleConfig']['end_url']; + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$uri); + } + +$fee = 0.50 * 340000000000000000000000000000000000000; +$interest = 0.27; +$period = 3600 * 24 * 7 * 4; +$when = strtotime("2021-12-08"); + +$segments = array(); +$due = $fee; +if ($when < time()) +{ + $j = $when; + while($j < time()) + { + $j = $j + $period; + $segments[date("D, d-m-Y",$j)] = number_format($due * $interest, 2); + $due = $due + ($due * $interest); + } +} + +$xoopsOption['template_main'] = 'ipv6_index.tpl'; +include $GLOBALS['xoops']->path('header.php'); + +$GLOBALS['xoopsTpl']->assign('when', date("D, d-m-Y", $when)); +$GLOBALS['xoopsTpl']->assign('fee', number_format($fee,2)); +$GLOBALS['xoopsTpl']->assign('due', number_format($due, 2)); +$GLOBALS['xoopsTpl']->assign('interest', $segments); + $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', "IPv6 -- $ " . number_format($due, 2) . " AUD due Right now IP Address Stack 2 @ChronolabsCoop"); +include $GLOBALS['xoops']->path('footer.php'); Property changes on: XoopsModules/ipv6/trunk/index.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/language/english/help/help.html =================================================================== --- XoopsModules/ipv6/trunk/language/english/help/help.html (rev 0) +++ XoopsModules/ipv6/trunk/language/english/help/help.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,19 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1> + <!-- -----Help Content ---------- --> + <h4 class="odd">Description</h4> + <p class="even">The PM module is for private messaging between users</p> + <h4 class="odd">Install/uninstall</h4> + <p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p> + <p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p> + <h4 class="odd">Operating instructions</h4> + <p class="even">To set up this module you need to:</p> + <ul> + <li>You enter your Inbox directly from the front page, or by clicking on the top link “Go to module” in the PM's Admin area.</li> + <li>Configure your preferences for the module (see “Preferences”) and optionally the PM block if you intend to use it (see “Blocks”).</li> + <li>You can do mass deleting of your messages by using the “Prune” Messages" tab.</li> + </ul> + <h4 class="odd">Tutorial</h4> + <p class="even">Tutorial coming soon.</p> + <!-- -----Help Content ---------- --> +</div> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/language/english/help/help.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/language/english/help/index.html =================================================================== --- XoopsModules/ipv6/trunk/language/english/help/index.html (rev 0) +++ XoopsModules/ipv6/trunk/language/english/help/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/language/english/help/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/language/english/index.html =================================================================== --- XoopsModules/ipv6/trunk/language/english/index.html (rev 0) +++ XoopsModules/ipv6/trunk/language/english/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/language/english/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/language/english/modinfo.php =================================================================== --- XoopsModules/ipv6/trunk/language/english/modinfo.php (rev 0) +++ XoopsModules/ipv6/trunk/language/english/modinfo.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,14 @@ +<?php +// $Id: modinfo.php 12363 2014-03-08 10:39:06Z beckmi $ +// _LANGCODE: en +// _CHARSET : UTF-8 +// Translator: XOOPS Translation Team +define('_IPV6_MI_NAME',"IPv6 Debt"); +define('_IPV6_MI_DESC',"Module for displaying the IPv4 debt to Chronolabs Cooperative"); +define('_IPV6_MI_HTACCESS',"Support HTACCESS"); +define('_IPV6_MI_HTACCESS_DESC',"This will enable support for htaccess"); +define('_IPV6_MI_BASEURL',"Base URL for htaccess"); +define('_IPV6_MI_BASEURL_DESC',"This is the base URL of htaccess"); +define('_IPV6_MI_ENDURL',"End of URL"); +define('_IPV6_MI_ENDURL_DESC',""); + Property changes on: XoopsModules/ipv6/trunk/language/english/modinfo.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/language/index.html =================================================================== --- XoopsModules/ipv6/trunk/language/index.html (rev 0) +++ XoopsModules/ipv6/trunk/language/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/language/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/templates/index.html =================================================================== --- XoopsModules/ipv6/trunk/templates/index.html (rev 0) +++ XoopsModules/ipv6/trunk/templates/index.html 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/templates/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/templates/ipv6_index.tpl =================================================================== --- XoopsModules/ipv6/trunk/templates/ipv6_index.tpl (rev 0) +++ XoopsModules/ipv6/trunk/templates/ipv6_index.tpl 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,10 @@ +<h1>IPv6 Stack Node Debt Listing</h1> +<p>Chronolabs was the orginal origins of the IPv4 stack design, it was originally charged at 50c per IP address for the total fee of $ <{$fee}> AUD to paid by <{$when}> by the holding members as they are being credited by Chronolabs and the Omnipotent entities that belong to this cooperative!</p> +<h2>Current amount due!</h2> +<p style="font-size: 167%; font-weight: 800; text-align: center;">$ <{$due}> AUD</p> +<{if count($interest) > 0 }> +<h2>Interest in monthly cycles earned!</h2> +<p style="font-size: 97%; font-weight: 600; text-align: center;"><{foreach from=$interest key=date item=segment}>Charged on <{$date}>: <font style="color:rgb(230,0,0);"><em>$ <{$segment}> AUD</em></font><br /><{/foreach}></p> +<{else}> +<h3>No Interest Earned So Far</h3> +<{/if}> \ No newline at end of file Property changes on: XoopsModules/ipv6/trunk/templates/ipv6_index.tpl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv6/trunk/xoops_version.php =================================================================== --- XoopsModules/ipv6/trunk/xoops_version.php (rev 0) +++ XoopsModules/ipv6/trunk/xoops_version.php 2015-11-24 16:41:43 UTC (rev 13168) @@ -0,0 +1,110 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: xoops_version.php 12593 2014-06-14 16:04:02Z beckmi $ + */ + +/** + * This is a temporary solution for merging XOOPS 2.0 and 2.2 series + * A thorough solution will be available in XOOPS 3.0 + * + */ + +$modversion = array(); +$modversion['name'] = _IPV6_MI_NAME; +$modversion['version'] = 1.10; +$modversion['description'] = _IPV6_MI_DESC; +$modversion['author'] = "Simon Antony Roberts"; +$modversion['credits'] = "Chronolabs"; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL 2.0 or later'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['image'] = "images/logo.png"; +$modversion['dirname'] = "ipv6"; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion["module_status"] = "Final"; +$modversion['release_date'] = '2015/11/23'; +$modversion["module_website_url"] = "http://labs.coop/"; +$modversion["module_website_name"] = "Chronolabs"; +$modversion['min_php'] = '5.3.7'; +$modversion['min_xoops'] = "2.5.7"; +$modversion['min_admin'] = '1.1'; +$modversion['min_db'] = array( + 'mysql' => '5.0.7', + 'mysqli' => '5.0.7' +); + +// Admin menu +// Set to 1 if you want to display menu generated by system module +$modversion['system_menu'] = 0; + +// Admin things +$modversion['hasAdmin'] = 0; +$modversion['adminindex'] = "admin/admin.php"; +$modversion['adminmenu'] = "admin/menu.php"; + +// Mysql file +//$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; + +// Table +//$modversion['tables'][0] = "pm_messages"; + +// Scripts to run upon installation or update +//$modversion['onInstall'] = "include/install.php"; +//$modversion['onUpdate'] = "include/update.php"; + +// Templates +$modversion['templates'] = array(); +$modversion['templates'][1]['file'] = 'ipv6_index.tpl'; +$modversion['templates'][1]['description'] = ''; +//$modversion['templates'][4]['file'] = 'pm_lookup.tpl'; +//$modversion['templates'][4]['description'] = ''; + +// Menu +$modversion['hasMain'] = 1; + +$modversion['config'] = array(); +$modversion['config'][] = array( + 'name' => 'htaccess', + 'title' => '_IPV6_MI_HTACCESS', + 'description' => '_IPV6_MI_HTACCESS_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => false +); + +$modversion['config'][] = array( + 'name' => 'base_url', + 'title' => '_IPV6_MI_BASEURL', + 'description' => '_IPV6_MI_BASEURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => "ipv6" +); + +$modversion['config'][] = array( + 'name' => 'end_url', + 'title' => '_IPV6_MI_ENDURL', + 'description' => '_IPV6_MI_ENDURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => ".html" +); Property changes on: XoopsModules/ipv6/trunk/xoops_version.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property |
From: <wis...@us...> - 2015-11-24 16:41:28
|
Revision: 13167 http://sourceforge.net/p/xoops/svn/13167 Author: wishcraft Date: 2015-11-24 16:41:26 +0000 (Tue, 24 Nov 2015) Log Message: ----------- APP Module Builder Frameworks IPv4 Added Paths: ----------- XoopsModules/ipv4/ XoopsModules/ipv4/releases/ XoopsModules/ipv4/releases/1.10/ XoopsModules/ipv4/releases/1.10/modules/ XoopsModules/ipv4/releases/1.10/modules/ipv4/ XoopsModules/ipv4/releases/1.10/modules/ipv4/images/ XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png XoopsModules/ipv4/releases/1.10/modules/ipv4/index.php XoopsModules/ipv4/releases/1.10/modules/ipv4/language/ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/help.html XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/index.html XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/index.html XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/modinfo.php XoopsModules/ipv4/releases/1.10/modules/ipv4/language/index.html XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/index.html XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ipv4_index.tpl XoopsModules/ipv4/releases/1.10/modules/ipv4/xoops_version.php XoopsModules/ipv4/trunk/ XoopsModules/ipv4/trunk/images/ XoopsModules/ipv4/trunk/images/logo.png XoopsModules/ipv4/trunk/index.php XoopsModules/ipv4/trunk/language/ XoopsModules/ipv4/trunk/language/english/ XoopsModules/ipv4/trunk/language/english/help/ XoopsModules/ipv4/trunk/language/english/help/help.html XoopsModules/ipv4/trunk/language/english/help/index.html XoopsModules/ipv4/trunk/language/english/index.html XoopsModules/ipv4/trunk/language/english/modinfo.php XoopsModules/ipv4/trunk/language/index.html XoopsModules/ipv4/trunk/templates/ XoopsModules/ipv4/trunk/templates/index.html XoopsModules/ipv4/trunk/templates/ipv4_index.tpl XoopsModules/ipv4/trunk/xoops_version.php Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png =================================================================== (Binary files differ) Index: XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png 2015-11-21 04:07:01 UTC (rev 13166) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png 2015-11-24 16:41:26 UTC (rev 13167) Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/images/logo.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/index.php =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/index.php (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/index.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,56 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: index.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +require ( "../../mainfile.php"); + +if ($GLOBALS['xoopsModuleConfig']['htaccess']) + if (strpos($_SERVER['REQUEST_URI'], 'odules/')>0) { + $uri = XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['base_url'].'/debt'.$GLOBALS['xoopsModuleConfig']['end_url']; + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$uri); + } + +$fee = 0.50 * 4294967296; +$interest = 0.27; +$period = 3600 * 24 * 7 * 4; +$when = strtotime("2008-12-08"); + +$segments = array(); +$due = $fee; +if ($when < time()) +{ + $j = $when; + while($j < time()) + { + $j = $j + $period; + $segments[date("D, d-m-Y",$j)] = number_format($due * $interest, 2); + $due = $due + ($due * $interest); + } +} + +$xoopsOption['template_main'] = 'ipv4_index.tpl'; +include $GLOBALS['xoops']->path('header.php'); + +$GLOBALS['xoopsTpl']->assign('when', date("D, d-m-Y", $when)); +$GLOBALS['xoopsTpl']->assign('fee', number_format($fee,2)); +$GLOBALS['xoopsTpl']->assign('due', number_format($due, 2)); +$GLOBALS['xoopsTpl']->assign('interest', $segments); + $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', "IPv4 -- $ " . number_format($due, 2) . " AUD due Right now IP Address Stack 2 @ChronolabsCoop"); +include $GLOBALS['xoops']->path('footer.php'); Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/index.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/help.html =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/help.html (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/help.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,19 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1> + <!-- -----Help Content ---------- --> + <h4 class="odd">Description</h4> + <p class="even">The PM module is for private messaging between users</p> + <h4 class="odd">Install/uninstall</h4> + <p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p> + <p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p> + <h4 class="odd">Operating instructions</h4> + <p class="even">To set up this module you need to:</p> + <ul> + <li>You enter your Inbox directly from the front page, or by clicking on the top link “Go to module” in the PM's Admin area.</li> + <li>Configure your preferences for the module (see “Preferences”) and optionally the PM block if you intend to use it (see “Blocks”).</li> + <li>You can do mass deleting of your messages by using the “Prune” Messages" tab.</li> + </ul> + <h4 class="odd">Tutorial</h4> + <p class="even">Tutorial coming soon.</p> + <!-- -----Help Content ---------- --> +</div> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/help.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/index.html =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/index.html (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/help/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/index.html =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/index.html (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/modinfo.php =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/modinfo.php (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/modinfo.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,14 @@ +<?php +// $Id: modinfo.php 12363 2014-03-08 10:39:06Z beckmi $ +// _LANGCODE: en +// _CHARSET : UTF-8 +// Translator: XOOPS Translation Team +define('_IPV4_MI_NAME',"IPv4 Debt"); +define('_IPV4_MI_DESC',"Module for displaying the IPv4 debt to Chronolabs Cooperative"); +define('_IPV4_MI_HTACCESS',"Support HTACCESS"); +define('_IPV4_MI_HTACCESS_DESC',"This will enable support for htaccess"); +define('_IPV4_MI_BASEURL',"Base URL for htaccess"); +define('_IPV4_MI_BASEURL_DESC',"This is the base URL of htaccess"); +define('_IPV4_MI_ENDURL',"End of URL"); +define('_IPV4_MI_ENDURL_DESC',""); + Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/english/modinfo.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/index.html =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/language/index.html (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/language/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/language/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/index.html =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/index.html (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ipv4_index.tpl =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ipv4_index.tpl (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ipv4_index.tpl 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,6 @@ +<h1>IPv4 Stack Node Debt Listing</h1> +<p>Chronolabs was the orginal origins of the IPv4 stack design, it was originally charged at 50c per IP address for the total fee of $ <{$fee}> AUD to paid by <{$when}> by the holding members as they are being credited by Chronolabs and the Omnipotent entities that belong to this cooperative!</p> +<h2>Current amount due!</h2> +<p style="font-size: 167%; font-weight: 800; text-align: center;">$ <{$due}> AUD</p> +<h2>Interest in monthly cycles earned!</h2> +<p style="font-size: 97%; font-weight: 600; text-align: center;"><{foreach from=$interest key=date item=segment}>Charged on <{$date}>: <font style="color:rgb(230,0,0);"><em>$ <{$segment}> AUD</em></font><br /><{/foreach}></p> \ No newline at end of file Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/templates/ipv4_index.tpl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/releases/1.10/modules/ipv4/xoops_version.php =================================================================== --- XoopsModules/ipv4/releases/1.10/modules/ipv4/xoops_version.php (rev 0) +++ XoopsModules/ipv4/releases/1.10/modules/ipv4/xoops_version.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,110 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: xoops_version.php 12593 2014-06-14 16:04:02Z beckmi $ + */ + +/** + * This is a temporary solution for merging XOOPS 2.0 and 2.2 series + * A thorough solution will be available in XOOPS 3.0 + * + */ + +$modversion = array(); +$modversion['name'] = _IPV4_MI_NAME; +$modversion['version'] = 1.10; +$modversion['description'] = _IPV4_MI_DESC; +$modversion['author'] = "Simon Antony Roberts"; +$modversion['credits'] = "Chronolabs"; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL 2.0 or later'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['image'] = "images/logo.png"; +$modversion['dirname'] = "ipv4"; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion["module_status"] = "Final"; +$modversion['release_date'] = '2015/11/23'; +$modversion["module_website_url"] = "http://labs.coop/"; +$modversion["module_website_name"] = "Chronolabs"; +$modversion['min_php'] = '5.3.7'; +$modversion['min_xoops'] = "2.5.7"; +$modversion['min_admin'] = '1.1'; +$modversion['min_db'] = array( + 'mysql' => '5.0.7', + 'mysqli' => '5.0.7' +); + +// Admin menu +// Set to 1 if you want to display menu generated by system module +$modversion['system_menu'] = 0; + +// Admin things +$modversion['hasAdmin'] = 0; +$modversion['adminindex'] = "admin/admin.php"; +$modversion['adminmenu'] = "admin/menu.php"; + +// Mysql file +//$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; + +// Table +//$modversion['tables'][0] = "pm_messages"; + +// Scripts to run upon installation or update +//$modversion['onInstall'] = "include/install.php"; +//$modversion['onUpdate'] = "include/update.php"; + +// Templates +$modversion['templates'] = array(); +$modversion['templates'][1]['file'] = 'ipv4_index.tpl'; +$modversion['templates'][1]['description'] = ''; +//$modversion['templates'][4]['file'] = 'pm_lookup.tpl'; +//$modversion['templates'][4]['description'] = ''; + +// Menu +$modversion['hasMain'] = 1; + +$modversion['config'] = array(); +$modversion['config'][] = array( + 'name' => 'htaccess', + 'title' => '_IPV4_MI_HTACCESS', + 'description' => '_IPV4_MI_HTACCESS_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => false +); + +$modversion['config'][] = array( + 'name' => 'base_url', + 'title' => '_IPV4_MI_BASEURL', + 'description' => '_IPV4_MI_BASEURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => "ipv4" +); + +$modversion['config'][] = array( + 'name' => 'end_url', + 'title' => '_IPV4_MI_ENDURL', + 'description' => '_IPV4_MI_ENDURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => ".html" +); Property changes on: XoopsModules/ipv4/releases/1.10/modules/ipv4/xoops_version.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/images/logo.png =================================================================== (Binary files differ) Index: XoopsModules/ipv4/trunk/images/logo.png =================================================================== --- XoopsModules/ipv4/trunk/images/logo.png 2015-11-21 04:07:01 UTC (rev 13166) +++ XoopsModules/ipv4/trunk/images/logo.png 2015-11-24 16:41:26 UTC (rev 13167) Property changes on: XoopsModules/ipv4/trunk/images/logo.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/ipv4/trunk/index.php =================================================================== --- XoopsModules/ipv4/trunk/index.php (rev 0) +++ XoopsModules/ipv4/trunk/index.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,56 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: index.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +require ( "../../mainfile.php"); + +if ($GLOBALS['xoopsModuleConfig']['htaccess']) + if (strpos($_SERVER['REQUEST_URI'], 'odules/')>0) { + $uri = XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['base_url'].'/debt'.$GLOBALS['xoopsModuleConfig']['end_url']; + header( "HTTP/1.1 301 Moved Permanently" ); + header('Location: '.$uri); + } + +$fee = 0.50 * 4294967296; +$interest = 0.27; +$period = 3600 * 24 * 7 * 4; +$when = strtotime("2008-12-08"); + +$segments = array(); +$due = $fee; +if ($when < time()) +{ + $j = $when; + while($j < time()) + { + $j = $j + $period; + $segments[date("D, d-m-Y",$j)] = number_format($due * $interest, 2); + $due = $due + ($due * $interest); + } +} + +$xoopsOption['template_main'] = 'ipv4_index.tpl'; +include $GLOBALS['xoops']->path('header.php'); + +$GLOBALS['xoopsTpl']->assign('when', date("D, d-m-Y", $when)); +$GLOBALS['xoopsTpl']->assign('fee', number_format($fee,2)); +$GLOBALS['xoopsTpl']->assign('due', number_format($due, 2)); +$GLOBALS['xoopsTpl']->assign('interest', $segments); + $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', "IPv4 -- $ " . number_format($due, 2) . " AUD due Right now IP Address Stack 2 @ChronolabsCoop"); +include $GLOBALS['xoops']->path('footer.php'); Property changes on: XoopsModules/ipv4/trunk/index.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/language/english/help/help.html =================================================================== --- XoopsModules/ipv4/trunk/language/english/help/help.html (rev 0) +++ XoopsModules/ipv4/trunk/language/english/help/help.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,19 @@ +<div id="help-template" class="outer"> + <h1 class="head">Help: <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/pm/admin/admin.php" title="Back to the administration of PM"> Private Messaging <img src="<{xoAdminIcons home.png}>" alt="Back to the administration of PM"/></a></h1> + <!-- -----Help Content ---------- --> + <h4 class="odd">Description</h4> + <p class="even">The PM module is for private messaging between users</p> + <h4 class="odd">Install/uninstall</h4> + <p>No special measures necessary, follow the standard installation process – extract the /pm folder into the ../modules directory. Install the module through Admin -> System Module -> Modules.</p> + <p>Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i" title="XOOPS Operations Manual">XOOPS Operations Manual</a> </p> + <h4 class="odd">Operating instructions</h4> + <p class="even">To set up this module you need to:</p> + <ul> + <li>You enter your Inbox directly from the front page, or by clicking on the top link “Go to module” in the PM's Admin area.</li> + <li>Configure your preferences for the module (see “Preferences”) and optionally the PM block if you intend to use it (see “Blocks”).</li> + <li>You can do mass deleting of your messages by using the “Prune” Messages" tab.</li> + </ul> + <h4 class="odd">Tutorial</h4> + <p class="even">Tutorial coming soon.</p> + <!-- -----Help Content ---------- --> +</div> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/language/english/help/help.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/language/english/help/index.html =================================================================== --- XoopsModules/ipv4/trunk/language/english/help/index.html (rev 0) +++ XoopsModules/ipv4/trunk/language/english/help/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/language/english/help/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/language/english/index.html =================================================================== --- XoopsModules/ipv4/trunk/language/english/index.html (rev 0) +++ XoopsModules/ipv4/trunk/language/english/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/language/english/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/language/english/modinfo.php =================================================================== --- XoopsModules/ipv4/trunk/language/english/modinfo.php (rev 0) +++ XoopsModules/ipv4/trunk/language/english/modinfo.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,14 @@ +<?php +// $Id: modinfo.php 12363 2014-03-08 10:39:06Z beckmi $ +// _LANGCODE: en +// _CHARSET : UTF-8 +// Translator: XOOPS Translation Team +define('_IPV4_MI_NAME',"IPv4 Debt"); +define('_IPV4_MI_DESC',"Module for displaying the IPv4 debt to Chronolabs Cooperative"); +define('_IPV4_MI_HTACCESS',"Support HTACCESS"); +define('_IPV4_MI_HTACCESS_DESC',"This will enable support for htaccess"); +define('_IPV4_MI_BASEURL',"Base URL for htaccess"); +define('_IPV4_MI_BASEURL_DESC',"This is the base URL of htaccess"); +define('_IPV4_MI_ENDURL',"End of URL"); +define('_IPV4_MI_ENDURL_DESC',""); + Property changes on: XoopsModules/ipv4/trunk/language/english/modinfo.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/language/index.html =================================================================== --- XoopsModules/ipv4/trunk/language/index.html (rev 0) +++ XoopsModules/ipv4/trunk/language/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/language/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/templates/index.html =================================================================== --- XoopsModules/ipv4/trunk/templates/index.html (rev 0) +++ XoopsModules/ipv4/trunk/templates/index.html 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/templates/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/templates/ipv4_index.tpl =================================================================== --- XoopsModules/ipv4/trunk/templates/ipv4_index.tpl (rev 0) +++ XoopsModules/ipv4/trunk/templates/ipv4_index.tpl 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,6 @@ +<h1>IPv4 Stack Node Debt Listing</h1> +<p>Chronolabs was the orginal origins of the IPv4 stack design, it was originally charged at 50c per IP address for the total fee of $ <{$fee}> AUD to paid by <{$when}> by the holding members as they are being credited by Chronolabs and the Omnipotent entities that belong to this cooperative!</p> +<h2>Current amount due!</h2> +<p style="font-size: 167%; font-weight: 800; text-align: center;">$ <{$due}> AUD</p> +<h2>Interest in monthly cycles earned!</h2> +<p style="font-size: 97%; font-weight: 600; text-align: center;"><{foreach from=$interest key=date item=segment}>Charged on <{$date}>: <font style="color:rgb(230,0,0);"><em>$ <{$segment}> AUD</em></font><br /><{/foreach}></p> \ No newline at end of file Property changes on: XoopsModules/ipv4/trunk/templates/ipv4_index.tpl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ipv4/trunk/xoops_version.php =================================================================== --- XoopsModules/ipv4/trunk/xoops_version.php (rev 0) +++ XoopsModules/ipv4/trunk/xoops_version.php 2015-11-24 16:41:26 UTC (rev 13167) @@ -0,0 +1,110 @@ +<?php +/** + * Private message module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package pm + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: xoops_version.php 12593 2014-06-14 16:04:02Z beckmi $ + */ + +/** + * This is a temporary solution for merging XOOPS 2.0 and 2.2 series + * A thorough solution will be available in XOOPS 3.0 + * + */ + +$modversion = array(); +$modversion['name'] = _IPV4_MI_NAME; +$modversion['version'] = 1.10; +$modversion['description'] = _IPV4_MI_DESC; +$modversion['author'] = "Simon Antony Roberts"; +$modversion['credits'] = "Chronolabs"; +$modversion['help'] = 'page=help'; +$modversion['license'] = 'GNU GPL 2.0 or later'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['image'] = "images/logo.png"; +$modversion['dirname'] = "ipv4"; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion["module_status"] = "Final"; +$modversion['release_date'] = '2015/11/23'; +$modversion["module_website_url"] = "http://labs.coop/"; +$modversion["module_website_name"] = "Chronolabs"; +$modversion['min_php'] = '5.3.7'; +$modversion['min_xoops'] = "2.5.7"; +$modversion['min_admin'] = '1.1'; +$modversion['min_db'] = array( + 'mysql' => '5.0.7', + 'mysqli' => '5.0.7' +); + +// Admin menu +// Set to 1 if you want to display menu generated by system module +$modversion['system_menu'] = 0; + +// Admin things +$modversion['hasAdmin'] = 0; +$modversion['adminindex'] = "admin/admin.php"; +$modversion['adminmenu'] = "admin/menu.php"; + +// Mysql file +//$modversion['sqlfile']['mysql'] = "sql/mysql.sql"; + +// Table +//$modversion['tables'][0] = "pm_messages"; + +// Scripts to run upon installation or update +//$modversion['onInstall'] = "include/install.php"; +//$modversion['onUpdate'] = "include/update.php"; + +// Templates +$modversion['templates'] = array(); +$modversion['templates'][1]['file'] = 'ipv4_index.tpl'; +$modversion['templates'][1]['description'] = ''; +//$modversion['templates'][4]['file'] = 'pm_lookup.tpl'; +//$modversion['templates'][4]['description'] = ''; + +// Menu +$modversion['hasMain'] = 1; + +$modversion['config'] = array(); +$modversion['config'][] = array( + 'name' => 'htaccess', + 'title' => '_IPV4_MI_HTACCESS', + 'description' => '_IPV4_MI_HTACCESS_DESC', + 'formtype' => 'yesno', + 'valuetype' => 'int', + 'default' => false +); + +$modversion['config'][] = array( + 'name' => 'base_url', + 'title' => '_IPV4_MI_BASEURL', + 'description' => '_IPV4_MI_BASEURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => "ipv4" +); + +$modversion['config'][] = array( + 'name' => 'end_url', + 'title' => '_IPV4_MI_ENDURL', + 'description' => '_IPV4_MI_ENDURL_DESC', + 'formtype' => 'textbox', + 'valuetype' => 'text', + 'default' => ".html" +); Property changes on: XoopsModules/ipv4/trunk/xoops_version.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property |
From: <rgr...@us...> - 2015-11-21 04:07:05
|
Revision: 13166 http://sourceforge.net/p/xoops/svn/13166 Author: rgriffith Date: 2015-11-21 04:07:01 +0000 (Sat, 21 Nov 2015) Log Message: ----------- Cleanup for several issues Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/admin/system_comments.html XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/templates/admin/system_users.html Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/xoopsmultimailer.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -35,7 +35,8 @@ return false; } -include_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php'; +require_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/PHPMailerAutoload.php'; +//include_once XOOPS_ROOT_PATH . '/class/mail/phpmailer/class.phpmailer.php'; /** * Mailer Class. @@ -171,26 +172,6 @@ } else { $this->SetLanguage('en', XOOPS_ROOT_PATH . '/class/mail/phpmailer/language/'); } - $this->PluginDir = XOOPS_ROOT_PATH . '/class/mail/phpmailer/'; + //$this->PluginDir = XOOPS_ROOT_PATH . '/class/mail/phpmailer/'; } - - /** - * Formats an address correctly. This overrides the default addr_format method which does not seem to encode $FromName correctly - * - * @access private - * - * @param $addr - * - * @return string - */ - function AddrFormat($addr) - { - if (empty($addr[1])) { - $formatted = $addr[0]; - } else { - $formatted = sprintf('%s <%s>', '=?' . $this->CharSet . '?B?' . base64_encode($addr[1]) . '?=', $addr[0]); - } - - return $formatted; - } } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopssecurity.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -111,8 +111,10 @@ } } } - if (!$validFound) { - $xoopsLogger->addExtra('Token Validation', 'No valid token found'); + if (!$validFound && !isset($str)) { + $str = 'No valid token found'; + $this->setErrors($str); + $xoopsLogger->addExtra('Token Validation', $str); } $this->garbageCollection($name); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/comment_post.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -200,6 +200,7 @@ break; case "post": + XoopsLoad::load('XoopsRequest'); $doimage = 1; $comment_handler =& xoops_gethandler('comment'); // Start add by voltan @@ -322,10 +323,8 @@ } $comment->setVar('com_uid', $uid); } - $com_title = xoops_trim($_POST['com_title']); - $com_title = ($com_title == '') ? _NOTITLE : $com_title; - $comment->setVar('com_title', $com_title); - $comment->setVar('com_text', $_POST['com_text']); + $comment->setVar('com_title', XoopsRequest::getString('com_title', _NOTITLE, 'POST')); + $comment->setVar('com_text', XoopsRequest::getString('com_text', '', 'POST')); $comment->setVar('dohtml', $dohtml); $comment->setVar('dosmiley', $dosmiley); $comment->setVar('doxcode', $doxcode); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/comments/main.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -290,10 +290,10 @@ $comments['comments_id'] = $com_id; $comments['comments_poster'] = $comments_poster_uname; $comments['comments_icon'] = $comments_icon; - $comments['comments_title'] = '<a href="admin.php?fct=comments&op=comments_jump&com_id='.$comments_arr[$i]->getVar("com_id").'">'.$comments_arr[$i]->getVar("com_title"); + $comments['comments_title'] = $myts->htmlSpecialChars($comments_arr[$i]->getVar("com_title")); $comments['comments_ip'] = $comments_arr[$i]->getVar('com_ip'); $comments['comments_date'] = formatTimeStamp($comments_arr[$i]->getVar('com_created')); - $comments['comments_text'] = $myts->undoHtmlSpecialChars($comments_arr[$i]->getVar('com_text')); + $comments['comments_text'] = $myts->htmlSpecialChars($comments_arr[$i]->getVar('com_text')); $comments['comments_status'] = @$status_array2[$comments_arr[$i]->getVar('com_status')]; $comments['comments_date_created'] = formatTimestamp($comments_arr[$i]->getVar('com_created'), 'm'); $comments['comments_modid'] = @$module_array[$comments_arr[$i]->getVar('com_modid')]; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/jquery.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -32,14 +32,11 @@ include_once './../../language/english/admin/tplsets.php'; } -if (isset($_REQUEST["op"])) { - $op = $_REQUEST["op"]; -} else { - @$op = "default"; -} +XoopsLoad::load('XoopsRequest'); $GLOBALS['xoopsLogger']->usePopup = true; +$op = XoopsRequest::getCmd('op', 'default'); switch ($op) { // Display tree folder case "tpls_display_folder": @@ -84,7 +81,9 @@ break; // Edit File case 'tpls_edit_file': - $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($_REQUEST['path_file'])); + $clean_file = XoopsRequest::getString('file', ''); + $clean_path_file = XoopsRequest::getString('path_file', ''); + $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($clean_path_file)); $path_file = str_replace('\\','/',$path_file); //Button restore @@ -103,7 +102,7 @@ if (empty($content)) { echo _AM_SYSTEM_TEMPLATES_EMPTY_FILE; } - $ext = preg_replace('/^.*\./', '', $_REQUEST['path_file']); + $ext = preg_replace('/^.*\./', '', $clean_path_file); echo '<form name="back" action="admin.php?fct=tplsets&op=tpls_save" method="POST"> <table border="0"> @@ -127,7 +126,10 @@ <td><textarea id="code_mirror" name="templates" rows=24 cols=110>'.$content.'</textarea></td> </tr> </table>'; - echo '<input type="hidden" name="path_file" value="'.$path_file.'"><input type="hidden" name="file" value="'.trim($_REQUEST['file']).'"><input type="hidden" name="ext" value="'.$ext.'"></form>'; + XoopsLoad::load('XoopsFormHiddenToken'); + $xoopsToken = new XoopsFormHiddenToken(); + echo $xoopsToken->render(); + echo '<input type="hidden" name="path_file" value="'.$clean_path_file.'"><input type="hidden" name="file" value="'.trim($clean_file).'"><input type="hidden" name="ext" value="'.$ext.'"></form>'; break; // Restore backup file Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/tplsets/main.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -352,11 +352,23 @@ // save case 'tpls_save': - $path_file = $_REQUEST['path_file']; - if (isset($path_file)) { + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('admin.php?fct=tplsets', 2, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + exit(); + } + XoopsLoad::load('XoopsRequest'); + $clean_path_file = XoopsRequest::getString('path_file', ''); + if (!empty($clean_path_file)) { + $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($clean_path_file)); + $path_file = str_replace('\\','/',$path_file); + $pathInfo = pathinfo($path_file); + if (!in_array($pathInfo['extension'], array('css', 'html', 'tpl'))) { + redirect_header("admin.php?fct=tplsets", 2, _AM_SYSTEM_TEMPLATES_ERROR); + exit; + } // copy file - $copy_file = $path_file; - copy($copy_file, $path_file.'.back'); + $copy_file = $path_file . '.back'; + copy($path_file, $copy_file); // Save modif if (isset($_REQUEST['templates'])) { $open = fopen("".$path_file."","w+"); Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/admin/users/main.php 2015-11-21 04:07:01 UTC (rev 13166) @@ -728,7 +728,7 @@ if ( isset($_REQUEST['selgroups']) ) { if ($_REQUEST['selgroups'] != 0) { if ( count($_REQUEST['selgroups']) == 1 ) { - $groups = array( 0 => $_REQUEST['selgroups']); + $groups = array( 0 => (int) $_REQUEST['selgroups']); } else { $groups = array_map("intval", $_REQUEST['selgroups']); } @@ -759,7 +759,6 @@ $xoopsTpl->assign( 'users_count', $users_count ); $xoopsTpl->assign( 'users_display', true ); - $xoopsTpl->assign( 'php_selft', $_SERVER['PHP_SELF'] ); //User limit //$user_limit = (!isset($_REQUEST['user_limit'])) ? 20 : $_REQUEST['user_limit']; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.css 2015-11-21 04:07:01 UTC (rev 13166) @@ -1,7 +1,7 @@ -/*! jQuery UI - v1.11.4 - 2015-05-23 +/*! jQuery UI - v1.11.4 - 2015-03-11 * http://jqueryui.com -* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px * Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ /* Layout helpers @@ -86,93 +86,6 @@ width: 100%; height: 100%; } -.ui-draggable-handle { - -ms-touch-action: none; - touch-action: none; -} -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; - -ms-touch-action: none; - touch-action: none; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable { - -ms-touch-action: none; - touch-action: none; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} -.ui-sortable-handle { - -ms-touch-action: none; - touch-action: none; -} .ui-accordion .ui-accordion-header { display: block; cursor: pointer; @@ -534,6 +447,10 @@ .ui-draggable .ui-dialog-titlebar { cursor: move; } +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-menu { list-style: none; padding: 0; @@ -605,6 +522,85 @@ .ui-progressbar-indeterminate .ui-progressbar-value { background-image: none; } +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-selectable { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} .ui-selectmenu-menu { padding: 0; margin: 0; @@ -719,6 +715,10 @@ .ui-slider-vertical .ui-slider-range-max { top: 0; } +.ui-sortable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-spinner { position: relative; display: inline-block; @@ -830,7 +830,7 @@ /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana,Arial,sans-serif; + font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { @@ -840,25 +840,25 @@ .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana,Arial,sans-serif; + font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { - border: 1px solid #aaaaaa; - background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #dddddd; + background: #eeeeee url("images/ui-bg_highlight-soft_100_eeeeee_1x100.png") 50% top repeat-x; + color: #333333; } .ui-widget-content a { - color: #222222; + color: #333333; } .ui-widget-header { - border: 1px solid #aaaaaa; - background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #e78f08; + background: #f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x; + color: #ffffff; font-weight: bold; } .ui-widget-header a { - color: #222222; + color: #ffffff; } /* Interaction states @@ -866,15 +866,15 @@ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #555555; + border: 1px solid #cccccc; + background: #f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #1c94c4; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555555; + color: #1c94c4; text-decoration: none; } .ui-state-hover, @@ -883,10 +883,10 @@ .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999; - background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #212121; + border: 1px solid #fbcb09; + background: #fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #c77405; } .ui-state-hover a, .ui-state-hover a:hover, @@ -896,21 +896,21 @@ .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited { - color: #212121; + color: #c77405; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa; + border: 1px solid #fbd850; background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #212121; + font-weight: bold; + color: #eb8f00; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #212121; + color: #eb8f00; text-decoration: none; } @@ -919,8 +919,8 @@ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1; - background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; + border: 1px solid #fed22f; + background: #ffe45c url("images/ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% top repeat-x; color: #363636; } .ui-state-highlight a, @@ -932,18 +932,18 @@ .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { border: 1px solid #cd0a0a; - background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; - color: #cd0a0a; + background: #b81900 url("images/ui-bg_diagonals-thick_18_b81900_40x40.png") 50% 50% repeat; + color: #ffffff; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #cd0a0a; + color: #ffffff; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #cd0a0a; + color: #ffffff; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -981,24 +981,24 @@ background-image: url("images/ui-icons_222222_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url("images/ui-icons_222222_256x240.png"); + background-image: url("images/ui-icons_ffffff_256x240.png"); } .ui-state-default .ui-icon { - background-image: url("images/ui-icons_888888_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-active .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-highlight .ui-icon { - background-image: url("images/ui-icons_2e83ff_256x240.png"); + background-image: url("images/ui-icons_228ef1_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url("images/ui-icons_cd0a0a_256x240.png"); + background-image: url("images/ui-icons_ffd27a_256x240.png"); } /* positioning */ @@ -1211,15 +1211,15 @@ /* Overlays */ .ui-widget-overlay { - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); /* support: IE8 */ + background: #666666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; + opacity: .5; + filter: Alpha(Opacity=50); /* support: IE8 */ } .ui-widget-shadow { - margin: -8px 0 0 -8px; - padding: 8px; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); /* support: IE8 */ - border-radius: 8px; + margin: -5px 0 0 -5px; + padding: 5px; + background: #000000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x; + opacity: .2; + filter: Alpha(Opacity=20); /* support: IE8 */ + border-radius: 5px; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.structure.css 2015-11-21 04:07:01 UTC (rev 13166) @@ -91,93 +91,6 @@ width: 100%; height: 100%; } -.ui-draggable-handle { - -ms-touch-action: none; - touch-action: none; -} -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; - -ms-touch-action: none; - touch-action: none; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable { - -ms-touch-action: none; - touch-action: none; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} -.ui-sortable-handle { - -ms-touch-action: none; - touch-action: none; -} .ui-accordion .ui-accordion-header { display: block; cursor: pointer; @@ -539,6 +452,10 @@ .ui-draggable .ui-dialog-titlebar { cursor: move; } +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-menu { list-style: none; padding: 0; @@ -610,6 +527,85 @@ .ui-progressbar-indeterminate .ui-progressbar-value { background-image: none; } +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + -ms-touch-action: none; + touch-action: none; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-selectable { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} .ui-selectmenu-menu { padding: 0; margin: 0; @@ -724,6 +720,10 @@ .ui-slider-vertical .ui-slider-range-max { top: 0; } +.ui-sortable-handle { + -ms-touch-action: none; + touch-action: none; +} .ui-spinner { position: relative; display: inline-block; Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/jquery-ui.theme.css 2015-11-21 04:07:01 UTC (rev 13166) @@ -8,14 +8,14 @@ * * http://api.jqueryui.com/category/theming/ * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px */ /* Component containers ----------------------------------*/ .ui-widget { - font-family: Verdana,Arial,sans-serif; + font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { @@ -25,25 +25,25 @@ .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Verdana,Arial,sans-serif; + font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { - border: 1px solid #aaaaaa; - background: #ffffff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #dddddd; + background: #eeeeee url("images/ui-bg_highlight-soft_100_eeeeee_1x100.png") 50% top repeat-x; + color: #333333; } .ui-widget-content a { - color: #222222; + color: #333333; } .ui-widget-header { - border: 1px solid #aaaaaa; - background: #cccccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x; - color: #222222; + border: 1px solid #e78f08; + background: #f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x; + color: #ffffff; font-weight: bold; } .ui-widget-header a { - color: #222222; + color: #ffffff; } /* Interaction states @@ -51,15 +51,15 @@ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - border: 1px solid #d3d3d3; - background: #e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #555555; + border: 1px solid #cccccc; + background: #f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #1c94c4; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { - color: #555555; + color: #1c94c4; text-decoration: none; } .ui-state-hover, @@ -68,10 +68,10 @@ .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { - border: 1px solid #999999; - background: #dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #212121; + border: 1px solid #fbcb09; + background: #fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x; + font-weight: bold; + color: #c77405; } .ui-state-hover a, .ui-state-hover a:hover, @@ -81,21 +81,21 @@ .ui-state-focus a:hover, .ui-state-focus a:link, .ui-state-focus a:visited { - color: #212121; + color: #c77405; text-decoration: none; } .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { - border: 1px solid #aaaaaa; + border: 1px solid #fbd850; background: #ffffff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x; - font-weight: normal; - color: #212121; + font-weight: bold; + color: #eb8f00; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #212121; + color: #eb8f00; text-decoration: none; } @@ -104,8 +104,8 @@ .ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight { - border: 1px solid #fcefa1; - background: #fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x; + border: 1px solid #fed22f; + background: #ffe45c url("images/ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% top repeat-x; color: #363636; } .ui-state-highlight a, @@ -117,18 +117,18 @@ .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error { border: 1px solid #cd0a0a; - background: #fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x; - color: #cd0a0a; + background: #b81900 url("images/ui-bg_diagonals-thick_18_b81900_40x40.png") 50% 50% repeat; + color: #ffffff; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { - color: #cd0a0a; + color: #ffffff; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { - color: #cd0a0a; + color: #ffffff; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, @@ -166,24 +166,24 @@ background-image: url("images/ui-icons_222222_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url("images/ui-icons_222222_256x240.png"); + background-image: url("images/ui-icons_ffffff_256x240.png"); } .ui-state-default .ui-icon { - background-image: url("images/ui-icons_888888_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-active .ui-icon { - background-image: url("images/ui-icons_454545_256x240.png"); + background-image: url("images/ui-icons_ef8c08_256x240.png"); } .ui-state-highlight .ui-icon { - background-image: url("images/ui-icons_2e83ff_256x240.png"); + background-image: url("images/ui-icons_228ef1_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url("images/ui-icons_cd0a0a_256x240.png"); + background-image: url("images/ui-icons_ffd27a_256x240.png"); } /* positioning */ @@ -396,15 +396,15 @@ /* Overlays */ .ui-widget-overlay { - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); /* support: IE8 */ + background: #666666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; + opacity: .5; + filter: Alpha(Opacity=50); /* support: IE8 */ } .ui-widget-shadow { - margin: -8px 0 0 -8px; - padding: 8px; - background: #aaaaaa url("images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x; - opacity: .3; - filter: Alpha(Opacity=30); /* support: IE8 */ - border-radius: 8px; + margin: -5px 0 0 -5px; + padding: 5px; + background: #000000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x; + opacity: .2; + filter: Alpha(Opacity=20); /* support: IE8 */ + border-radius: 5px; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css 2015-11-05 16:06:09 UTC (rev 13165) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css 2015-11-21 04:07:01 UTC (rev 13166) @@ -1,7 +1,7 @@ -/*! jQuery UI - v1.11.4 - 2015-05-23 +/*! jQuery UI - v1.11.4 - 2015-03-11 * http://jqueryui.com -* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px +* Includes: core.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, draggable.css, menu.css, progressbar.css, resizable.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px * Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ -.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;min-height:0;font-size:100%}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;cursor:pointer}.ui-selectmenu-button span.ui-icon{right:0.5em;left:auto;margin-top:-8px;position:absolute;top:50%}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:0.4em 2.1em 0.4em 1em;display:block;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #aaa;background:#fff url("images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;color:#222}.ui-widget-content a{color:#222}.ui-widget-header{border:1px solid #aaa;background:#ccc url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;color:#222;font-weight:bold}.ui-widget-header a{color:#222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #d3d3d3;background:#e6e6e6 url("images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #999;background:#dadada url("images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaa;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:normal;color:#212121}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fcefa1;background:#fbf9ee url("images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#fef1ec url("images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;color:#cd0a0a}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_888888_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_454545_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_2e83ff_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cd0a0a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144... [truncated message content] |
From: <wis...@us...> - 2015-11-05 16:06:14
|
Revision: 13165 http://sourceforge.net/p/xoops/svn/13165 Author: wishcraft Date: 2015-11-05 16:06:09 +0000 (Thu, 05 Nov 2015) Log Message: ----------- Complexity 1.3.1 Final Release Candidatesvn add ./* --force Modified Paths: -------------- XoopsThemes/Complexity/trunk/theme.html Added Paths: ----------- XoopsThemes/Complexity/releases/1.3.1/ XoopsThemes/Complexity/releases/1.3.1/complexity/ XoopsThemes/Complexity/releases/1.3.1/complexity/NEWS-ARTICLE XoopsThemes/Complexity/releases/1.3.1/complexity/css/ XoopsThemes/Complexity/releases/1.3.1/complexity/css/blocks.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/blotter.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/classes.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/conteness.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/elements.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/headers.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/css/navigation.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/style.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/uniqueness.css XoopsThemes/Complexity/releases/1.3.1/complexity/css/xoops.css XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/ XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/ XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/10.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/11.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/12.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/13.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/14.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/15.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/16.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/17.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/18.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/19.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/2.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/20.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/21.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/22.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/23.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/24.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/25.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/26.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/27.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/28.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/29.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/3.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/30.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/31.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/32.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/33.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/34.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/35.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/36.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/37.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/38.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/39.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/4.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/40.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/5.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/6.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/7.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/8.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/9.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/images/close.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/facebook.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/images/li-ul-li.gif XoopsThemes/Complexity/releases/1.3.1/complexity/images/li.gif XoopsThemes/Complexity/releases/1.3.1/complexity/images/link_out.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/link_out_h.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/loading.gif XoopsThemes/Complexity/releases/1.3.1/complexity/images/quote.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/rss.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/twitter.png XoopsThemes/Complexity/releases/1.3.1/complexity/images/youtube.png XoopsThemes/Complexity/releases/1.3.1/complexity/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/js/ XoopsThemes/Complexity/releases/1.3.1/complexity/js/._pulse.jquery.js XoopsThemes/Complexity/releases/1.3.1/complexity/js/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/js/jquery.bgswitcher.js XoopsThemes/Complexity/releases/1.3.1/complexity/language/ XoopsThemes/Complexity/releases/1.3.1/complexity/language/english/ XoopsThemes/Complexity/releases/1.3.1/complexity/language/english/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/language/english/main.php XoopsThemes/Complexity/releases/1.3.1/complexity/language/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/screenshot.jpg XoopsThemes/Complexity/releases/1.3.1/complexity/screenshot.png XoopsThemes/Complexity/releases/1.3.1/complexity/theme.html XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/ XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/body.html XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/gradients.html XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/index.html XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/metas.html XoopsThemes/Complexity/releases/1.3.1/complexity/xotpl/scripts.html XoopsThemes/Complexity/trunk/NEWS-ARTICLE XoopsThemes/Complexity/trunk/css/ XoopsThemes/Complexity/trunk/css/blocks.css XoopsThemes/Complexity/trunk/css/blotter.css XoopsThemes/Complexity/trunk/css/classes.css XoopsThemes/Complexity/trunk/css/conteness.css XoopsThemes/Complexity/trunk/css/elements.css XoopsThemes/Complexity/trunk/css/headers.css XoopsThemes/Complexity/trunk/css/index.html XoopsThemes/Complexity/trunk/css/navigation.css XoopsThemes/Complexity/trunk/css/style.css XoopsThemes/Complexity/trunk/css/uniqueness.css XoopsThemes/Complexity/trunk/css/xoops.css XoopsThemes/Complexity/trunk/images/ XoopsThemes/Complexity/trunk/images/backgrounds/ XoopsThemes/Complexity/trunk/images/backgrounds/1.jpg XoopsThemes/Complexity/trunk/images/backgrounds/10.jpg XoopsThemes/Complexity/trunk/images/backgrounds/11.jpg XoopsThemes/Complexity/trunk/images/backgrounds/12.jpg XoopsThemes/Complexity/trunk/images/backgrounds/13.jpg XoopsThemes/Complexity/trunk/images/backgrounds/14.jpg XoopsThemes/Complexity/trunk/images/backgrounds/15.jpg XoopsThemes/Complexity/trunk/images/backgrounds/16.jpg XoopsThemes/Complexity/trunk/images/backgrounds/17.jpg XoopsThemes/Complexity/trunk/images/backgrounds/18.jpg XoopsThemes/Complexity/trunk/images/backgrounds/19.jpg XoopsThemes/Complexity/trunk/images/backgrounds/2.jpg XoopsThemes/Complexity/trunk/images/backgrounds/20.jpg XoopsThemes/Complexity/trunk/images/backgrounds/21.jpg XoopsThemes/Complexity/trunk/images/backgrounds/22.jpg XoopsThemes/Complexity/trunk/images/backgrounds/23.jpg XoopsThemes/Complexity/trunk/images/backgrounds/24.jpg XoopsThemes/Complexity/trunk/images/backgrounds/25.jpg XoopsThemes/Complexity/trunk/images/backgrounds/26.jpg XoopsThemes/Complexity/trunk/images/backgrounds/27.jpg XoopsThemes/Complexity/trunk/images/backgrounds/28.jpg XoopsThemes/Complexity/trunk/images/backgrounds/29.jpg XoopsThemes/Complexity/trunk/images/backgrounds/3.jpg XoopsThemes/Complexity/trunk/images/backgrounds/30.jpg XoopsThemes/Complexity/trunk/images/backgrounds/31.jpg XoopsThemes/Complexity/trunk/images/backgrounds/32.jpg XoopsThemes/Complexity/trunk/images/backgrounds/33.jpg XoopsThemes/Complexity/trunk/images/backgrounds/34.jpg XoopsThemes/Complexity/trunk/images/backgrounds/35.jpg XoopsThemes/Complexity/trunk/images/backgrounds/36.jpg XoopsThemes/Complexity/trunk/images/backgrounds/37.jpg XoopsThemes/Complexity/trunk/images/backgrounds/38.jpg XoopsThemes/Complexity/trunk/images/backgrounds/39.jpg XoopsThemes/Complexity/trunk/images/backgrounds/4.jpg XoopsThemes/Complexity/trunk/images/backgrounds/40.jpg XoopsThemes/Complexity/trunk/images/backgrounds/5.jpg XoopsThemes/Complexity/trunk/images/backgrounds/6.jpg XoopsThemes/Complexity/trunk/images/backgrounds/7.jpg XoopsThemes/Complexity/trunk/images/backgrounds/8.jpg XoopsThemes/Complexity/trunk/images/backgrounds/9.jpg XoopsThemes/Complexity/trunk/images/backgrounds/index.html XoopsThemes/Complexity/trunk/images/close.png XoopsThemes/Complexity/trunk/images/facebook.png XoopsThemes/Complexity/trunk/images/index.html XoopsThemes/Complexity/trunk/images/li-ul-li.gif XoopsThemes/Complexity/trunk/images/li.gif XoopsThemes/Complexity/trunk/images/link_out.png XoopsThemes/Complexity/trunk/images/link_out_h.png XoopsThemes/Complexity/trunk/images/loading.gif XoopsThemes/Complexity/trunk/images/quote.png XoopsThemes/Complexity/trunk/images/rss.png XoopsThemes/Complexity/trunk/images/twitter.png XoopsThemes/Complexity/trunk/images/youtube.png XoopsThemes/Complexity/trunk/js/ XoopsThemes/Complexity/trunk/js/._pulse.jquery.js XoopsThemes/Complexity/trunk/js/index.html XoopsThemes/Complexity/trunk/js/jquery.bgswitcher.js XoopsThemes/Complexity/trunk/language/ XoopsThemes/Complexity/trunk/language/english/ XoopsThemes/Complexity/trunk/language/english/index.html XoopsThemes/Complexity/trunk/language/english/main.php XoopsThemes/Complexity/trunk/language/index.html XoopsThemes/Complexity/trunk/screenshot.jpg XoopsThemes/Complexity/trunk/screenshot.png XoopsThemes/Complexity/trunk/xotpl/ XoopsThemes/Complexity/trunk/xotpl/body.html XoopsThemes/Complexity/trunk/xotpl/gradients.html XoopsThemes/Complexity/trunk/xotpl/index.html XoopsThemes/Complexity/trunk/xotpl/metas.html XoopsThemes/Complexity/trunk/xotpl/scripts.html Added: XoopsThemes/Complexity/releases/1.3.1/complexity/NEWS-ARTICLE =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/NEWS-ARTICLE (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/NEWS-ARTICLE 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,67 @@ +[img]http:http://labs.partnerconsole.net/execute2/external/reseller-logo[/img] +[size=medium][u][b]Chronolabs Cooperative Proudly Presents[/b][/u][/size] + +[size=medium][u][i]for XOOPS 2.5[/i][/u][/size] +[size=large][u][b]Complexity Theme [i]v1.2.8[/i][/b][/u][/size] +[img]http://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsThemes/Complexity/releases/1.2.8/complexity/screenshot.jpg?format=raw[/img] + +[i]Demo of theme: http://2.5.xoops.themes.labs.coop/?xoops_theme_select=complexity[/i] + +[size=medium][b]Introduction to Complexity Theme[/b][/size] + +[i][u]Complexity is a complete theme, it includes features that need to be studied by theme designer to be incorporated into their theme designs including the following features:~[/u][/i] + +[ul][li]Social Network Meta Tags[/li][li]Anti-keyword Stuffing (SEO)[/li][li]iOS Iconographic Tags (So Icons Appear on iPhone all macintosh)[/li][li]CSS3 Gradients and Highlights[/li][li]CSS3 Rounded Edges[/li][li]CSS3 Text and Object Shadows[/li][li]Correct File Implementations[/li][li]No Jugganaut Single CSS use of @import()[/li][/ul] + +This theme was developed for the love of the [b]XOOPS Community[/b] and broader themery; to explain some of the features I will first go into meta tagging for facebook and third party references to the site you have to include in your meta tags the following lines, to [u]force your site logo if there is no image[/u] as well as in the [u]google index and search engines[/u] they are:- + +[code] +<meta property="og:title" content=""/> +<meta property="og:type" content=""/> +<meta property="og:image" content=""/> +<meta property="og:url" content="" /> +<meta property="og:site_name" content=""/> +[/code] + +As well as the apple touch icon meta tags in the icons, these are in particular sizes and need to be PNG images for all touch buttons like book marks and save references in macintosh; otherwise you get the default icon, these three lines are:- + +[code] +<link rel="apple-touch-icon" href=""> +<link rel="apple-touch-icon" sizes="72x72" href=""> +<link rel="apple-touch-icon" sizes="114x114" href=""> +[/code] + +There is also the following code in the meta keyword which stops [u]keyword stuffing[/u], that is the repeatative use of the same keywords on every page of your site this will lower you SEO Score with search engines the following code you will find in the meta template in the theme:- + +[code] +<meta name="keywords" content="<{php}> + $search = array(' with ', ' and ', ' the ', ' there ', ' their ', ' they\'re ', ' are ', ' to ', ' when ', ' on ', ' by ', ' you ',' ','.','<','>','"',';',':','}','{','[',']','|','\\','/','=','+','-','_',')','(','*','&','^','%','$','#','@','!','~','`'); + $minimumwordlen = 3; + // Gets Meta Data + $path = str_replace($search, ',', str_replace(basename($_SERVER['REQUEST_URI']), '', $_SERVER['REQUEST_URI'])); + $sitename = htmlspecialchars_decode($this->_tpl_vars['xoops_sitename']); + $slogon = htmlspecialchars_decode($this->_tpl_vars['xoops_slogan']); + $pagetitle = htmlspecialchars_decode($this->_tpl_vars['xoops_pagetitle']); + $keywords = htmlspecialchars_decode($this->_tpl_vars['xoops_meta_keywords']); + $description = htmlspecialchars_decode($this->_tpl_vars['xoops_meta_description']); + // Makes Unique Keyword Sentence with NO KEYPHRASES - A KEY PHRASE IS AN INCORRECT USE OF THE META TAG 'KEYWORDS' that is singlar words a KEYWORD not a sentence or phrase + $nophrase = str_replace($search, ',', $path.str_replace($search, ',', $sitename).','.str_replace($search, ',', $slogon).','.str_replace($search, ',', $pagetitle).','.str_replace($search, ',', $keywords).','.str_replace($search, ',', $description)); + $keywords = array_unique(explode(',', $nophrase)); + foreach($keywords as $id => $word) { + if (strlen($word)<$minimumwordlen||is_numeric($word)) { + unset($keywords[$id]); + } + } + echo implode(', ', $keywords);<{/php}>" /> +[/code] + +[size=medium][b]Download Complexity Theme[/b][/size] + + * [url=http://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Themes/xoops2.5_theme_complexity_v1.2.8.7z/download]xoops2.5_theme_complexity_v1.2.8.7z[/url] ~ 2.8Mb + * [url=http://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Themes/xoops2.5_theme_complexity_v1.2.8.rar/download]xoops2.5_theme_complexity_v1.2.8.rar[/url] ~ 2.8Mb + * [url=http://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Themes/xoops2.5_theme_complexity_v1.2.8.tar.gz/download]xoops2.5_theme_complexity_v1.2.8.tar.gz[/url] ~ 2.8Mb + * [url=http://sourceforge.net/projects/chronolabs/files/XOOPS%202.5/Themes/xoops2.5_theme_complexity_v1.2.8.zip/download]xoops2.5_theme_complexity_v1.2.8.zip[/url] ~ 2.8Mb + +[size=medium][b]Reporting Complexity Theme Bug[/b][/size] + +If you do find a bug in the theme and need it fixed please used our tickets support on sourceforge at the following URL:~ http://sourceforge.net/p/chronolabs/tickets/milestone/XOOPS%20Themes/ Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/NEWS-ARTICLE ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/blocks.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/blocks.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/blocks.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,584 @@ +@CHARSET "UTF-8"; + + +#left input { + margin-top: 9px; + margin-bottom: 9px; +} + +#left div#box { + width: auto !important; + margin-bottom: 13px; + background-color: #feecef !important; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=81)"; + filter: alpha(opacity=81); + -moz-opacity: 0.81; + -khtml-opacity: 0.81; + opacity: 0.81; +} + +#left div#box h2{ + text-align: left; + margin-top: 3px; + margin-bottom: 0px; + color: #c00000; + font-size: 1.8702em; + letter-spacing:-1px; + -webkit-text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; + -moz-text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; + text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; + +} + +/* box content */ +#left div#box ul { + margin:0; + padding:0; + +} + +#left #btmbox { + height: 22px + +} + +#left div#box li { + list-style-type:none; + font-size: 1.76502em !important; +} + +#left div#box a, #right div#box a { + color: #533221; + text-decoration: italic; + font-size: 1.36502em !important; + margin:2px 3px; +} + + +#left div#box a:hover, #right div#box a:hover { + color: #011220; + letter-spacing: -3px; +} + +#left #preboxthing, #right #preboxthing { +} + +#left #boxthing, #right #boxthing { + +} + +#left div#box li, #right div.box li +{ + left: 12px !important; + position: relative; + margin: 2px; + padding: 2px; +} + +#left { + vertical-align: top !important; + padding-left: 5px; + text-align: left !important; + width: 235px !important; + font-size:0.76113em !important; + text-align: justify !important; +} + + +#right { + vertical-align: top !important; + font-size:0.87113em; + text-align: justify !important; + padding-right: 11px; + position: relative; + width: 215px !important; +} + +#right div#box { + width: auto !important; + margin-bottom: 13px; + background-color: #feecef !important; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=81)"; + filter: alpha(opacity=81); + -moz-opacity: 0.81; + -khtml-opacity: 0.81; + opacity: 0.81; +} + +#right div#box +{ + position: relative; + padding: 5px; +} + +#right div#box h2 { + text-align: left; + color: #c00000; + font-size: 1.766502em; + letter-spacing:-1px; + -webkit-text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; + -moz-text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; + text-shadow: + 2px 3px 0 #001112, + -2px -2px 0 #001112, + 2px -2px 0 #001112, + -2px 2px 0 #001112, + 2px 2px 0 #001112; +} + +/* box content */ +#right div#box ul { + font-size:1.011113em; + margin:0; + padding:0; +} + +#right #btmbox { + height: 22px + +} + +#right div#box li { + list-style-type:none; +} + +#centern { + vertical-align: top; + width: auto; + padding-left: 10px; + padding-right: 30px; + height: auto; +} + +#center { + vertical-align: top; + width: auto; + padding-left: 10px; + padding-right: 30px; + height: auto; +} + +#centerb { + vertical-align: top; + width: auto; + padding-left: 10px; + padding-right: 30px; + height: auto; +} + +#center #narco { + padding: 0 0 5px 0; + float: left; +} +#narcob { + padding: 0 0 5px 0; + float: left; +} +#narcon { + padding: 0 0 5px 0; + float: left; +} +#center #narco .prebox { + +} + +#center #narco .boxed { + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} + +#narcob #boxed { + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} + +#center #narco #btmbox { + height: 23px; + background-repeat: no-repeat; + +} +#narcob #btmbox { + height: 23px; + background-repeat: no-repeat; + +} +#center #narco h2 { + margin-top: 3px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c0c1c1; + font-size: 1.6502992em; + -webkit-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + -moz-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; +} +#narcob h2 { + text-align: right; + margin-top: 3px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c00000; + -webkit-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + -moz-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; +} +#center #narco1 { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 10px; + width: 48%; + float: left; + } +#narco1b { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 10px; + width: 48%; + float: left; + } +#narco1n { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 10px; + width: 48%; + float: left; + } +#center #narco1 h2 { + text-align: right; + margin-top: 3px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c00000; + -webkit-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + -moz-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + padding-left: 10px; +} +#narco1b h2 { + text-align: right; + margin-top: 3px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c00000; + font-size: 1.39992em; + -webkit-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + -moz-text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + text-shadow: + 2px 3px 0 #e511a2, + -2px -2px 0 #e511a2, + 2px -2px 0 #e511a2, + -2px 2px 0 #e511a2, + 2px 2px 0 #e511a2; + padding-left: 10px; +} +#center #narco1 .preboxed { +} +#center #narco1 .boxed { + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} +#narco1b .boxed { + background-repeat: no-repeat; + background-position: bottom; + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} + +#center #narco1 .btmbox { + height: 24px; + background-repeat: no-repeat; + +} +#narco1b .btmbox { + height: 24px; + background-repeat: no-repeat; + +} +#center #narco2 { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 10px; + width: 48%; + float: left; +} + +#narco2b { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 3px; + width: 48%; + float: left; +} + +#narco2n { + padding: 0 0 5px 0; + margin-top: 10px; + margin-bottom: 0px; + margin-right: auto; + margin-left: 3px; + width: 48%; + float: left; +} +#center #narco2 h2 { + text-align: right; + margin-top: 3px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c00000; + font-size: 1.549992em; + -webkit-text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; + -moz-text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; + text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; +} + +#narco2b h2 { + text-align: right; + margin-top: 5px; + margin-bottom: 0px; + padding: 7px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #c00000; + font-size: 1.549992em; + -webkit-text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; + -moz-text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; + text-shadow: + 2px 3px 0 #e4ef41, + -2px -2px 0 #e4ef41, + 2px -2px 0 #e4ef41, + -2px 2px 0 #e4ef41, + 2px 2px 0 #e4ef41; +} + +#center #narco2 .preboxed { + background-repeat: repeat-y; +} +#center #narco2 .boxed { + background-repeat: repeat-y; + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} + +#narco2b .boxed { + background-repeat: repeat-y; + line-height: 15px; + padding: 10px; + font-size: 0.936372em; +} + +#center #narco2 .btmbox { + height: 24px; + background-repeat: no-repeat; + +} +#narco2b .btmbox { + height: 24px; + background-repeat: no-repeat; + +} +#center #narco p { + line-height: 15px; + font-size: 0.936372em; +} +#center #narco1 p { + line-height: 15px; + font-size: 0.936372em; +} +#center #narco2 p { + line-height: 15px; + font-size: 0.936372em; +} +#center #narco ul { + padding: 3%; +} + +#center #narco img { + float: left; + padding-top: 10px; + padding-right: 10px; + padding-bottom: 10px; +} + +#pnxcontent { + font-size: 1.115em; +} + + +#pnxcontentb { + padding-top: 15px; + font-size: 0.9534515em; + margin-top: 10px; +} + + +#pnxcontent table, .icxcontentb table +{ + width: auto !important; + font-size: 1.19615em; +} + +#center, #right, #left +{ + color: #000001 !important; +} + +.content +{ + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 11px; + padding: 9px; + background-color: rgba(254,235,255, 0.6374893792734); + color: #000000 !important; +} + +#content +{margin-bottom: 23px;} + +#content table +{ + width: auto !important; + z-index: 1000; +} \ No newline at end of file Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/blocks.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/blotter.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/blotter.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/blotter.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,79 @@ +@CHARSET "UTF-8"; + + +#mainthing +{ + background: inherit !important; +} + +#prewrapp, .prewrapp { + width: 100%; + height: 100%; + position: absolute; + clear: none; + left: 0px; + top: 0px; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=41)"; + filter: alpha(opacity=41); + -moz-opacity: 0.41; + -khtml-opacity: 0.41; + opacity: 0.41; + z-index: 10; +} + +#preshade, .preshade { + width: 100%; + height: 100%; + position: absolute; + clear: none; + left: 0px; + top: 0px; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=81)"; + filter: alpha(opacity=81); + -moz-opacity: 0.81; + -khtml-opacity: 0.81; + opacity: 0.81; + z-index: 100; +} + +#wrapper { + margin-top: 11px; + display: block; + width: 1098px !important; + min-height: 101.99%; + position: relative; + margin-bottom: 20px; + z-index: 400; + margin-left: auto; + margin-right: auto; +} + +#mainbody { + border-radius: 18px; + padding: 0px; + display: inline-block; + text-shadow: 1px 3px 3px #a0880a; + -webkit-text-shadow: 1px 3px 3px #a0880a; + -moz-text-shadow: 1px 3px 3px #a0880a; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + border-radius: 30px; + -webkit-box-shadow: 9px 12px 19px #120021; + -moz-box-shadow: 9px 12px 19px #120021; + box-shadow: 9px 12px 19px #120021; + padding-bottom: 15px; + margin-bottom: 10px; + width: 1098px !important; + border: 5px solid #000; + text-align: justify !important; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=81)"; + filter: alpha(opacity=81); + -moz-opacity: 0.81; + -khtml-opacity: 0.81; + opacity: 0.81; +} + + +#mainback { + height: auto; +} Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/blotter.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/classes.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/classes.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/classes.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,18 @@ +@CHARSET "UTF-8"; + +.floatleft +{ + float: left; +} + +.floatright +{ + float: left; +} + +.width50 +{ + margin: 1% !important; + padding: 1% !important; + width: 46% !important; +} \ No newline at end of file Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/classes.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/conteness.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/conteness.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/conteness.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,62 @@ +@CHARSET "UTF-8"; + + + +#content{ + display: block; + color: #bbbeff; + font-style: normal !important; + font-weight: normal !important; + line-spacing: 1.32em; +} + +#content +{ + text-align: justify !important; +} + +#content .outline {text-align: justify; -webkit-border-radius: 11px; -moz-border-radius: 11px; border-radius: 11px; border: none !important; padding: 6px;} +#content table {text-align: justify; -webkit-border-radius: 11px; -moz-border-radius: 11px; border-radius: 11px; padding: 0px; min-width: 85% !important; width: auto; max-width: 99% !important; border: none; -webkit-box-shadow: 6px 6px 3px #000; -moz-box-shadow: 6px 6px 3px #000; box-shadow: 6px 6px 3px #000;} +#content table td {vertical-align: top; font-size: 1.1123em; padding: 4px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px;} + +#content table .odd, #content table .even, #content table .head +{ + border-top: 1px solid #300800; +} + +#content table .head, #content table .txtcenter +{ + color: #0030e2; + font-size: 111%; + border-top: 3px solid #300800; +} + +#content table +{ + margin-bottom: 17px; +} + +#content table a +{ + color: #090983; +} + +#content table a:hover +{ + color: #e9ff89; +} + +#content p { + margin-right: 15px; + margin-bottom: 21px; +} + +#content img { + -webkit-box-shadow: 6px 5px 7px rgba(120, 120, 120, 0.8); + -moz-box-shadow: 6px 5px 7px rgba(120, 120, 120, 0.8); + box-shadow: 6px 5px 7px rgba(120, 120, 120, 0.8); + -webkit-border-radius: 16px; + -moz-border-radius: 16px; + border-radius: 16px; + margin: 15px 15px 15px 15px; +} \ No newline at end of file Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/conteness.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/elements.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/elements.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/elements.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,321 @@ +@CHARSET "UTF-8"; + + +img{ + padding: 0px; + border: none; + border-radius: 2px; +} + +a{ + color: #ae65fe; + text-decoration: none; + font-weight: 500; +} + +a:hover { + text-decoration: none; + font-weight: bold; + color: #c70000; + letter-spacing: -2px; +} + +html { + min-height: 101.99%; +} + +body { + margin: 0px 0px 0px 0px; + padding-top: 26px; + font-size: 1.125666em; + font-family: sans-serif; + font-family: 'Ubuntu Condensed', sans-serif; + line-height: 1.222337em; + color: #9aeea8; + text-align: justify; + min-height: 101.99%; + text-shadow: 1px 1px 2px #fafafa; + -webkit-text-shadow: 1px 1px 2px #fafafa; + -moz-text-shadow: 1px 1px 2px #fafafa; +} + +h1{ + font-size: 155.1831%; + font-style: italic; + font-weight: bold; + margin-top: 18px; + margin-bottom: 5px; + -webkit-text-stroke: 2px black; + -moz-text-stroke: 2px black; + text-stroke: 2px black; + color: #e4187c; + -webkit-text-shadow: + 4px 4px 0 #feed98, + -2px -2px 0 #feed98, + 2px -2px 0 #feed98, + -2px 2px 0 #feed98, + 2px 2px 0 #feed98; + -moz-text-shadow: + 4px 4px 0 #feed98, + -2px -2px 0 #feed98, + 2px -2px 0 #feed98, + -2px 2px 0 #feed98, + 2px 2px 0 #feed98; + text-shadow: + 4px 4px 0 #feed98, + -2px -2px 0 #feed98, + 2px -2px 0 #feed98, + -2px 2px 0 #feed98, + 2px 2px 0 #feed98; +} + +h2{ + font-size: 141.1831%; + font-style: italic; + font-weight: bold; + margin-top: 13px; + margin-bottom: 7px; + -webkit-text-stroke: 2px #097500; + -moz-text-stroke: 2px #097500; + text-stroke: 2px #097500; + color: #fedefe; + -webkit-text-shadow: + 3px 3px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + -moz-text-shadow: + 3px 3px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + text-shadow: + 3px 3px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; +} + +h3{ + + font-size: 133.1831%; + font-style: italic; + font-weight: normal; + background: url(images/title_footer2.jpg) repeat-x bottom; + padding-bottom: 4px; + margin-bottom: 9px; + -webkit-text-stroke: 1px #feedcb; + -moz-text-stroke: 1px #feedcb; + text-stroke: 1px #feedcb; + color: #e4187c; + -webkit-text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + -moz-text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; +} + +h4{ + + font-size: 124.1831%; + -webkit-text-stroke: 1px #feedcb; + -moz-text-stroke: 1px #feedcb; + text-stroke: 1px #feedcb; + color: #e4187c; + -webkit-text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + -moz-text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + text-shadow: + 2px 2px 0 #002255, + -1px -1px 0 #002255, + 1px -1px 0 #002255, + -1px 1px 0 #002255, + 1px 1px 0 #002255; + font-style: italic; + font-weight: normal; +} + +h1, h2, h3, h4 +{ + letter-spacing: -2px; + margin: 9px 8px 8px 11px; + padding: 0px; +} + +br { + clear: both; + margin-top: -12px; + padding: 0px; +} + +blockquote, textarea +{ + padding: 12px !important;; + background-color: #eeaeef !important; + color: rgb(40, 235, 99) !important; + background-image: url(../images/quote.png) no-repeat; + font-weight: 700 !important; + margin-top: 15px; + margin-bottom: 4px; + margin-left: 19px; + margin-right: 59px; + border: 3px dash rgb(11, 11 11) !important; + text-shadow: 2px 4px 3px #786e99 !important; + box-shadow: 6px 4px 9px #0ee111 !important; + -webkit-box-shadow: 6px 4px 9px #0ee111 !important; + -moz-box-shadow: 6px 4px 9px #0ee111 !important; + border-radius: 12px; + font-size: 1.04555em !important; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=93)"; + filter: alpha(opacity=93); + -moz-opacity: 0.93; + -khtml-opacity: 0.93; + opacity: 0.93; +} + + +#content li { + margin-bottom: 9px; + margin-left: 17px; + margin-right: 99px; + font-size: 81.998111%; + list-style: img(../images/li.gif) +} + +#content li ul li { + margin-bottom: 9px; + margin-left: 17px; + margin-right: 99px; + font-size: 81.998111%; + list-style: img(../images/li-ul-li.gif) +} + + +#mainbody p { + margin-left: 17px; + font-size: 142.138111%; + letter-spacing: 92%; + line-height: 0.99221em; +} + + +#content h3, #content h4 +{ + margin-top: 22px; +} + +p, #content ol, #content ul, label, blockquote { + margin-bottom: 11px; + font-size: 123.138111%; + padding-top: 4px; + padding-bottom: 5px; + line-height: 0.986521em; + letter-spacing: 89%; + padding-right: 21px; +} + +input, select, checkbox, radio, textarea, blockquote, button, iframe { + font-name: inherit !important; + padding: 4px 3px 2px; + margin: 3px 3px 4px; + font-size: 0.89133em !important; + text-shadow: 3px 2px 2px #000111; + -webkit-text-shadow: 3px 2px 2px #000111; + -moz-text-shadow: 3px 2px 2px #000111; + line-height: 0.986521em; + letter-spacing: 89%; + border-radius: 5px; + border: 2px solid #0ee111; + box-shadow: 2px 3px 3px #0ee111; + -webkit-box-shadow: 2px 3px 3px #0ee111; + -moz-box-shadow: 2px 3px 3px #0ee111; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=93)"; + filter: alpha(opacity=93); + -moz-opacity: 0.93; + -khtml-opacity: 0.93; + opacity: 0.93; +} + +iframe +{ + box-shadow: 6px 4px 9px #0ee111 !important; + -webkit-box-shadow: 6px 4px 9px #0ee111 !important; + -moz-box-shadow: 6px 4px 9px #0ee111 !important; + border: 5px solid #0ee111 !important; + margin-top: 7px !important; + margin-bottom: 8px !important; + margin-right: 11% !important; + margin-left: 9% !important; + width: 79% !important; + border-radius: 9px; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=93)"; + filter: alpha(opacity=93); + -moz-opacity: 0.93; + -khtml-opacity: 0.93; + opacity: 0.93; +} + +#mainbody embed +{ + text-align: center !important; + box-shadow: 6px 4px 9px #0ee111 !important; + -webkit-box-shadow: 6px 4px 9px #0ee111 !important; + -moz-box-shadow: 6px 4px 9px #0ee111 !important; + background-color: #099111 !important; + margin-top: 15px !important; + margin-bottom: 8px !important; + margin-right: 2% !important; + margin-left: 1.99% !important; + border-radius: 5px !important; + width: 235px !important; + border: 1px solid rgb(11, 11 11) !important; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=93)"; + filter: alpha(opacity=93); + -moz-opacity: 0.93; + -khtml-opacity: 0.93; + opacity: 0.93; +} + + +#content ol, #content ul { + margin-left: 21px !important; + list-color: RGB(196, 112, 210) !important; +} + +#content a { + background-image: url(../image/link_out.png); + background-repeat: none; + padding-left: 16px; +} + + +#content a:hover { + background-image: url(../image/link_out_h.png); + background-repeat: none; + padding-left: 16px; +} Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/elements.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/headers.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/headers.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/headers.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,50 @@ +@CHARSET "UTF-8"; + + + +#header { + max-width: 1040px; + min-width: 1040px; + width: 990px; + margin-left: auto; + margin-right: auto; + padding-top: 15px; + margin-top: -10px; +} + +#headmenu { + color: #fff; + -webkit-border-radius: 11px; + -moz-border-radius: 11px; + border-radius: 11px; + border: 2px solid #0330c0; + background-color: #e4187c; + -webkit-box-shadow: 5px 4px 9px #090909; + -moz-box-shadow: 5px 4px 9px #090909; + box-shadow: 5px 4px 9px #090909; + margin-left: auto; + margin-right: auto; + background-color: #e4187c; + width: 1036px; + margin-top: 12px; + margin-bottom: 29px; + display: inline-block; + padding-top: 11px; + padding-bottom: 4px; +} + +#headmenu ul +{ + text-shadow: -1px 3px 3px #5511d4; + -webkit-text-shadow: 1px 3px 3px #5511d4; + -moz-text-shadow: 1px 3px 3px #5511d4; + margin-top: auto; + margin-bottom: auto; + margin-left: auto; + margin-right: auto; + padding-left: auto; + padding-right: auto; + width: auto; + display: inline-block; + text-align: center; +} Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/headers.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/index.html =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/index.html (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/index.html 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/index.html ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/navigation.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/navigation.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/navigation.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,85 @@ +@CHARSET "UTF-8"; + + +#nav, #nav ul { /* all lists */ + text-align: left !important; + padding: 0; + margin: 0; + list-style: none; + line-height: 0.85; +} + +#nav a { + text-align: center !important; + display: block; + padding-left: auto; + padding-right: auto; + width: 185px; + color: black !important; +} + +#nav li { /* all list items */ + text-align: center !important; + float: left; + width: 185px; /* width needed or else Opera goes nuts */ +} + +#nav li ul { /* second-level lists */ + text-align: left !important; + -webkit-box-shadow: 4px 3px 6px rgba(30, 20, 30, 0.93); + -moz-box-shadow: 4px 3px 6px rgba(30, 20, 30, 0.93); + box-shadow: 4px 3px 6px rgba(30, 20, 30, 0.93); + border: 1px solid #004060; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + padding: 11px; + position: absolute; + background: #fefffc; + left: -999em; /* using left instead of display to hide menus because display: none isn't read by screen readers */ +} + +#nav li ul ul { /* third-and-above-level lists */ + margin: -1em 0 0 10em; + left: 120px; +} + +#nav li:hover ul ul, #nav li.sfhover ul ul { + left: -999em; +} + +#nav li:hover ul, #nav li li:hover ul, #nav li.sfhover ul, #nav li li.sfhover ul { /* lists nested under hovered list items */ + left: auto; + margin-left: -108px !important; + margin-top: -2px !important; + background: #feffeb; + z-index: 99999; +} + +#nav li { /* all list items */ + font-size: 17pt !important; +} + +#nav li ul li { /* all list items */ + font-size: 16pt !important; + width: 185px !important; + padding: 3px !important; + margin: auto !important; + clear: both !important; +} + +#nav li ul li { /* all list items */ + font-size: 15pt !important; + width: 185px !important; + padding: 3px !important; + margin: auto !important; + clear: both !important; +} + +#nav li ul li ul li { /* all list items */ + font-size: 14pt !important; + width: 185px !important; + padding: 3px !important; + margin: auto !important; + clear: both !important; +} \ No newline at end of file Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/style.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/style.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/style.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,152 @@ +@CHARSET "UTF-8"; + +@import url("./blotter.css"); +@import url("./elements.css"); +@import url("./headers.css"); +@import url("./blocks.css"); +@import url("./uniqueness.css"); +@import url("./conteness.css"); +@import url("./classes.css"); +@import url("./xoops.css"); +@import url("./navigation.css"); + +*{ + margin: 0px; + padding: 0px; +} + +#clear, #clear +{ + margin-top: 19px; + clear: both; +} + + +#menuheader +{ + display: inline-block; + +} + +#wrapper .titles { + margin-left: auto; + color: #f4f3fa; + width: 1298px !important; + margin-top: 19px; + margin-right: auto; + padding-bottom:9px; + margin-bottom:8px; +} + +#wrapper .titles span{ + font-weight: bold; + -webkit-text-stroke: 3px black; + -moz-text-stroke: 3px black; + text-stroke: 3px black; + color: #e4187c; + -webkit-text-shadow: + 4px 4px 1px black, + -2px -2px 1px black, + 2px -2px 1px black, + -2px 2px 1px black, + 2px 2px 1px black; + -moz-text-shadow: + 4px 4px 1px black, + -2px -2px 1px black, + 2px -2px 1px black, + -2px 2px 1px black, + 2px 2px 1px black; + text-shadow: + 4px 4px 1px black, + -2px -2px 1px black, + 2px -2px 1px black, + -2px 2px 1px black, + 2px 2px 1px black; +} + +#box, #boxed { + -webkit-box-shadow: 4px 3px 8px rgba(30, 20, 30, 0.93); + -moz-box-shadow: 4px 3px 8px rgba(30, 20, 30, 0.93); + box-shadow: 4px 3px 8px rgba(30, 20, 30, 0.93); + border: 3px solid #044e60; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + width: auto; + padding: 5px; + margin: 2px; +} + + +#footer { + background: #110011; + color: #fefdf9; + -webkit-border-radius: 14px; + -moz-border-radius: 14px; + border-radius: 14px; + border: 4px solid #fff023; + -webkit-box-shadow: -4px 6px 11px #120021; + -moz-box-shadow: -4px 6px 11px #120021; + box-shadow: -4px 6px 11px #120021; + -webkit-text-shadow: 1px -3px 4px #f0000e; + -moz-text-shadow: 1px -3px 4px #f0000e; + text-shadow: 1px -3px 4px #f0000e; + text-align: center; + height: auto; + width: 870px; + text-transform: uppercase; + font-size: 63.9999921%; + margin-top: 26px; + margin-left: auto; + margin-right: auto; + margin-bottom: 20px; + padding-top: 9px; + padding-bottom: 4px; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=341)"; + filter: alpha(opacity=341); + -moz-opacity: 3.41; + -khtml-opacity: 3.41; + opacity: 3.41; + z-index: 99999; +} + +#footer a { + color: #f2f2f2; +} +#footer a:hover { + color: #e1f3a9; +} + +#footer #radioo +{ + margin: 9px; + width: 201px; + margin-left: 300px; + z-index: 1000; +} + +/* XOOPS ICMS SPECIFIC DATA */ + + + +#mainmenu { font-size: 119.11199%; } +#mainmenu a { display: block; margin: 0; padding: 4px;} +#mainmenu a:hover {} +#mainmenu a.menuTop {padding-left: 3px; } +#mainmenu a.menuMain {padding-left: 3px;} +#mainmenu a.menuSub {padding-left: 9px;} + +#usermenu { font-size: 119.11199%; } +#usermenu a {display: block; margin: 0; padding: 4px;} +#usermenu a:hover {} +#usermenu a.menuTop {} +#usermenu a.highlight {} + +div.errorMsg { background-color: #FFCCCC; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;} +div.confirmMsg { background-color: #DDFFDF; color: #136C99; text-align: center; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; border-bottom: 1px solid #AAAAAA; font-weight: bold; padding: 10px;} +div.resultMsg { background-color : #CCCCCC; color: #333333; text-align: center; border-top: 1px solid silver; border-left: 1px solid silver; font-weight: bold; border-right: 1px solid #666666; border-bottom: 1px solid #666666; padding: 10px;} + +div.xoopsCode { background: #FFFFFF; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0px 6px 6px 6px;} +div.xoopsQuote { background: #FFFFFF; border: 1px inset #000080; font-family: "Courier New",Courier,monospace; padding: 0px 6px 6px 6px;} + +/* End of XOOPS-ICMS data */ Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/style.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/uniqueness.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/uniqueness.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/uniqueness.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,42 @@ +@CHARSET "UTF-8"; + + +#xoBreadcrumb +{ + display: none; + float: right !important; + text-shadow: 2px 1px 4px #11d00f !important; + font-size: 1.2933429em !important; + color: #020122 !important; + text-align: center; +} + +#xoBreadcrumb a { + text-shadow: 4px 2px 4px #11d00f !important; + font-size: 1.299729em !important; + color: #020122 !important; +} + +#xoBreadcrumb a:hover { + text-shadow: 2px 3px 6px #11d00f !important; + font-size: 1.299729em !important; + color: #e2dde2 !important; +} + +#twitter-timeline +{ + margin-top: 13px !important; + position: relative; + width: 97% !important; + font-name: inherit !important; + padding: 0px !important; + margin-left: -4px !important; + text-shadow: 1px 2px 2px #000111; + -webkit-text-shadow: 1px 2px 2px #000111; + -moz-text-shadow: 1px 2px 2px #000111; + line-height: 0.986521em; + letter-spacing: 89%; + border-radius: 12px; + border: 3px solid #0ee111; + box-shadow: 2px 4px 2px #0ee111; +} Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/uniqueness.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/css/xoops.css =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/css/xoops.css (rev 0) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/css/xoops.css 2015-11-05 16:06:09 UTC (rev 13165) @@ -0,0 +1,15 @@ +@CHARSET "UTF-8"; + +.item {border: 1px solid #cccccc;} +.itemHead {padding: 3px; background-color: #023765; color: #FFFFFF;} +.itemInfo {text-align: right; padding: 3px; background-color: #efefef} +.itemTitle a {font-size: 130%; font-weight: bold; font-variant: small-caps; color: #ffffff; background-color: transparent;} +.itemPoster {font-size: 90%; font-style:italic;} +.itemPostDate {font-size: 90%; font-style:italic;} +.itemStats {font-size: 90%; font-style:italic;} +.itemBody {padding-left: 5px;} +.itemText {margin-top: 5px; margin-bottom: 5px; line-height: 1.5em;} +.itemText:first-letter {font-size: 133%; font-weight: bold;} +.itemFoot {text-align: right; padding: 3px; background-color: #efefef} +.itemAdminLink {font-size: 90%;} +.itemPermaLink {font-size: 90%;} \ No newline at end of file Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/css/xoops.css ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/favicon.ico ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-114x114.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-48x48.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-56x56.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/icon-72x72.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/1.jpg ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/10.jpg =================================================================== (Binary files differ) Index: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/10.jpg =================================================================== --- XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/10.jpg 2015-10-20 05:21:53 UTC (rev 13164) +++ XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds/10.jpg 2015-11-05 16:06:09 UTC (rev 13165) Property changes on: XoopsThemes/Complexity/releases/1.3.1/complexity/images/backgrounds... [truncated message content] |
From: <be...@us...> - 2015-10-20 05:21:56
|
Revision: 13164 http://sourceforge.net/p/xoops/svn/13164 Author: beckmi Date: 2015-10-20 05:21:53 +0000 (Tue, 20 Oct 2015) Log Message: ----------- phpMailer 5.2.13 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/README.md XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/changelog.md XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.pop3.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.smtp.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/index.html XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/index.html XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ar.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-be.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-br.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ca.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ch.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-cz.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-de.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-dk.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-el.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-eo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-es.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-et.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-fa.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-fi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-fo.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-fr.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-gl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-hr.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-hu.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-it.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ja.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ka.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-lt.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-lv.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-nl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-no.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-pl.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-pt.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ro.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ru.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-se.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-sk.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-sr.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-tr.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-uk.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-vi.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-zh.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-zh_cn.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmaileroauth.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmaileroauthgoogle.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/get_oauth_token.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-am.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-az.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-bg.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-id.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ko.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-ms.php XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/language/phpmailer.lang-sl.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-10-20 00:07:35 UTC (rev 13163) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-10-20 05:21:53 UTC (rev 13164) @@ -26,7 +26,7 @@ - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) - add option to set height of Themes block (mamba) - fix: Invalid argument supplied for foreach() (cesagonchu/mamba) -- fix profile/search (cesag/slider84) +- fix profile/search (cesagonchu/slider84) Security fixes @@ -35,7 +35,7 @@ Updated: - TinyMCE to 3.5.11 (mamba) - - PHPMailer to 5.2.9 (rgriffith) + - PHPMailer to 5.2.13 (mamba) - jQuery to 1.11.3 (mamba) - jQuery UI 1.11.4 (mamba) - jGrowl to 1.4.3 (mamba) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/README.md =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/README.md 2015-10-20 00:07:35 UTC (rev 13163) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/README.md 2015-10-20 05:21:53 UTC (rev 13164) @@ -6,16 +6,18 @@ [](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/) [](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/) +[](https://packagist.org/packages/phpmailer/phpmailer) [](https://packagist.org/packages/phpmailer/phpmailer) [](https://packagist.org/packages/phpmailer/phpmailer) [](https://packagist.org/packages/phpmailer/phpmailer) + ## Class Features - Probably the world's most popular code for sending email from PHP! -- Used by many open-source projects: Drupal, SugarCRM, Yii, Joomla! and many more +- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more - Integrated SMTP support - send without a local mail server - Send emails with multiple TOs, CCs, BCCs and REPLY-TOs - Multipart/alternative emails for mail clients that do not read HTML email - Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings -- SMTP authentication with LOGIN, PLAIN, NTLM and CRAM-MD5 mechanisms over SSL and TLS transports -- Native language support +- SMTP authentication with LOGIN, PLAIN, NTLM, CRAM-MD5 and Google's XOAUTH2 mechanisms over SSL and TLS transports +- Error messages in 47 languages! - DKIM and S/MIME signing support - Compatible with PHP 5.0 and later - Much more! @@ -31,19 +33,36 @@ ## License -This software is licenced under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html). Please read LICENSE for information on the +This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license. Please read LICENSE for information on the software availability and distribution. ## Installation & loading -PHPMailer is available via [Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer). Alternatively, just copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub. +PHPMailer is available via [Composer/Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), so just add this line to your `composer.json` file: -PHPMailer provides an SPL-compatible autoloader, and that is the preferred way of loading the library - just `require '/path/to/PHPMailerAutoload.php';` and everything should work. The autoloader does not throw errors if it can't find classes so it prepends itself to the SPL list, allowing your own (or your framework's) autoloader to catch errors. SPL autoloading was introduced in PHP 5.1.0, so if you are using a version older than that you will need to require/include each class manually. +```json +"phpmailer/phpmailer": "~5.2" +``` + +or + +```sh +composer require phpmailer/phpmailer +``` + +If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package. + +Alternatively, copy the contents of the PHPMailer folder into somewhere that's in your PHP `include_path` setting. If you don't speak git or just want a tarball, click the 'zip' button at the top of the page in GitHub. + +If you're not using composer's autoloader, PHPMailer provides an SPL-compatible autoloader, and that is the preferred way of loading the library - just `require '/path/to/PHPMailerAutoload.php';` and everything should work. The autoloader does not throw errors if it can't find classes so it prepends itself to the SPL list, allowing your own (or your framework's) autoloader to catch errors. SPL autoloading was introduced in PHP 5.1.0, so if you are using a version older than that you will need to require/include each class manually. + PHPMailer does *not* declare a namespace because namespaces were only introduced in PHP 5.3. +If you want to use Google's XOAUTH2 authentication mechanism, you need to be running at least PHP 5.4, and load the dependencies listed in `composer.json`. + ### Minimal installation -While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [class.phpmailer.php](class.phpmailer.php). If you're using SMTP, you'll need [class.smtp.php](class.smtp.php), and if you're using POP-before SMTP, you'll need [class.pop3.php](class.pop3.php). For all of these, we recommend you use [the autoloader](PHPMailerAutoload.php) too as otherwise you will either have to `require` all classes manually or use some other autoloader. You can skip the [language](language/) folder if you're not showing errors to users and can make do with English-only errors. You may need the additional classes in the [extras](extras/) folder if you are using those features, including NTLM authentication, advanced HTML-to-text conversion and ics generation. +While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [class.phpmailer.php](class.phpmailer.php). If you're using SMTP, you'll need [class.smtp.php](class.smtp.php), and if you're using POP-before SMTP, you'll need [class.pop3.php](class.pop3.php). For all of these, we recommend you use [the autoloader](PHPMailerAutoload.php) too as otherwise you will either have to `require` all classes manually or use some other autoloader. You can skip the [language](language/) folder if you're not showing errors to users and can make do with English-only errors. You may need the additional classes in the [extras](extras/) folder if you are using those features, including NTLM authentication and ics generation. If you're using Google XOAUTH2 you will need `class.phpmaileroauth.php` and `class.oauth.php` classes too, as well as the composer dependencies. ## A Simple Example @@ -71,7 +90,6 @@ $mail->addCC('cc...@ex...'); $mail->addBCC('bc...@ex...'); -$mail->WordWrap = 50; // Set word wrap to 50 characters $mail->addAttachment('/var/tmp/file.tar.gz'); // Add attachments $mail->addAttachment('/tmp/image.jpg', 'new.jpg'); // Optional name $mail->isHTML(true); // Set email format to HTML @@ -93,7 +111,7 @@ That's it. You should now be ready to use PHPMailer! ## Localization -PHPMailer defaults to English, but in the [language](language/) folder you'll find numerous (39 at the time of writing) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this: +PHPMailer defaults to English, but in the [language](language/) folder you'll find numerous (46 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this: ```php // To load the French version @@ -104,10 +122,16 @@ ## Documentation -Generated documentation is [available online](http://phpmailer.github.io/PHPMailer/). +Examples of how to use PHPMailer for common scenarios can be found in the [examples](examples/) folder. If you're looking for a good starting point, we recommend you start with [the gmail example](examples/gmail.phps). +There are tips and a troubleshooting guide in the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated. + +Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/). + You'll find some basic user-level docs in the [docs](docs/) folder, and you can generate complete API-level documentation using the [generatedocs.sh](docs/generatedocs.sh) shell script in the docs folder, though you'll need to install [PHPDocumentor](http://www.phpdoc.org) first. You may find [the unit tests](test/phpmailerTest.php) a good source of how to do various operations such as encryption. +If the documentation doesn't cover what you need, search the [many questions on StackOverflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting). + ## Tests There is a PHPUnit test script in the [test](test/) folder. @@ -124,10 +148,20 @@ With the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone: -`git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git` +```sh +git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git +``` Please *don't* use the SourceForge or Google Code projects any more. +## Sponsorship + +Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), a powerful email marketing system. + +<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="250" height="28" alt="Smartmessages email marketing"></a> + +Other contributions are gladly received, whether in beer 🍺, T-shirts 👕, Amazon wishlist raids, or cold, hard cash 💰. + ## Changelog See [changelog](changelog.md). Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/changelog.md =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/changelog.md 2015-10-20 00:07:35 UTC (rev 13163) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/changelog.md 2015-10-20 05:21:53 UTC (rev 13164) @@ -1,5 +1,58 @@ # ChangeLog +## Version 5.2.13 (Sep 14th 2015) +* Rename internal oauth class to avoid name clashes +* Improve Estonian translations + +## Version 5.2.12 (Sep 1st 2015) +* Fix incorrect composer package dependencies +* Skip existing embedded image `cid`s in `msgHTML` + +## Version 5.2.11 (Aug 31st 2015) +* Don't switch to quoted-printable for long lines if already using base64 +* Fixed Travis-CI config when run on PHP 7 +* Added Google XOAUTH2 authentication mechanism, thanks to @sherryl4george +* Add address parser for RFC822-format addresses +* Update MS Office MIME types +* Don't convert line breaks when using quoted-printable encoding +* Handle MS Exchange returning an invalid empty AUTH-type list in EHLO +* Don't set name or filename properties on MIME parts that don't have one + +## Version 5.2.10 (May 4th 2015) +* Add custom header getter +* Use `application/javascript` for .js attachments +* Improve RFC2821 compliance for timelimits, especially for end-of-data +* Add Azerbaijani translations (Thanks to @mirjalal) +* Minor code cleanup for robustness +* Add Indonesian translations (Thanks to @ceceprawiro) +* Avoid `error_log` Debugoutput naming clash +* Add ability to parse server capabilities in response to EHLO (useful for SendGrid etc) +* Amended default values for WordWrap to match RFC +* Remove html2text converter class (has incompatible license) +* Provide new mechanism for injecting html to text converters +* Improve pointers to docs and support in README +* Add example file upload script +* Refactor and major cleanup of EasyPeasyICS, now a lot more usable +* Make set() method simpler and more reliable +* Add Malay translation (Thanks to @nawawi) +* Add Bulgarian translation (Thanks to @mialy) +* Add Armenian translation (Thanks to Hrayr Grigoryan) +* Add Slovenian translation (Thanks to Klemen Tušar) +* More efficient word wrapping +* Add support for S/MIME signing with additional CA certificate (thanks to @IgitBuh) +* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372) +* Improved checks and error messages for missing extensions +* Store and report SMTP errors more consistently +* Add MIME multipart preamble for better Outlook compatibility +* Enable TLS encryption automatically if the server offers it +* Provide detailed errors when individual recipients fail +* Report more errors when connecting +* Add extras classes to composer classmap +* Expose stream_context_create options via new SMTPOptions property +* Automatic encoding switch to quoted-printable if message lines are too long +* Add Korean translation (Thanks to @ChalkPE) +* Provide a pointer to troubleshooting docs on SMTP connection failure + ## Version 5.2.9 (Sept 25th 2014) * **Important: The autoloader is no longer autoloaded by the PHPMailer class** * Update html2text from https://github.com/mtibben/html2text @@ -64,7 +117,7 @@ * Better default behaviour for validateAddress ## Version 5.2.7 (September 12th 2013) -* Add Ukranian translation from @Krezalis +* Add Ukrainian translation from @Krezalis * Support for do_verp * Fix bug in CRAM-MD5 AUTH * Propagate Debugoutput option to SMTP class (@Reblutus) @@ -502,7 +555,7 @@ ## Version 1.15 (Fri, Jun 15 2001) Note: these changes contributed by Patrice Fournier * Changed all remaining \n to \r\n -* Bcc: header no longer writen to message except +* Bcc: header no longer written to message except when sent directly to sendmail * Added a small message to non-MIME compliant mail reader * Added Sender variable to change the Sender email Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2015-10-20 00:07:35 UTC (rev 13163) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/mail/phpmailer/class.phpmailer.php 2015-10-20 05:21:53 UTC (rev 13164) @@ -31,14 +31,15 @@ * The PHPMailer Version number. * @type string */ - public $Version = '5.2.9'; + public $Version = '5.2.13'; /** * Email priority. - * Options: 1 = High, 3 = Normal, 5 = low. + * Options: null (default), 1 = High, 3 = Normal, 5 = low. + * When null, the header is not set at all. * @type integer */ - public $Priority = 3; + public $Priority = null; /** * The character set of the message. @@ -149,6 +150,7 @@ /** * Word-wrap the message body to this number of chars. + * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance. * @type integer */ public $WordWrap = 0; @@ -239,13 +241,21 @@ public $Helo = ''; /** - * The secure connection prefix. - * Options: "", "ssl" or "tls" + * What kind of encryption to use on the SMTP connection. + * Options: '', 'ssl' or 'tls' * @type string */ public $SMTPSecure = ''; /** + * Whether to enable TLS encryption automatically if a server supports it, + * even if `SMTPSecure` is not set to 'tls'. + * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid. + * @type boolean + */ + public $SMTPAutoTLS = true; + + /** * Whether to use SMTP authentication. * Uses the Username and Password properties. * @type boolean @@ -255,6 +265,12 @@ public $SMTPAuth = false; /** + * Options array passed to stream_context_create when connecting via SMTP. + * @type array + */ + public $SMTPOptions = array(); + + /** * SMTP username. * @type string */ @@ -289,9 +305,10 @@ /** * The SMTP server timeout in seconds. + * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2 * @type integer */ - public $Timeout = 10; + public $Timeout = 300; /** * SMTP class debug output mode. @@ -422,13 +439,24 @@ public $action_function = ''; /** - * What to use in the X-Mailer header. - * Options: null for default, whitespace for none, or a string to use + * What to put in the X-Mailer header. + * Options: An empty string for PHPMailer default, whitespace for none, or a string to use * @type string */ public $XMailer = ''; - + /** + * Only For XOAUTH - Google + * Options: An empty string for PHPMailer default, Enter the email used to get access token + * @type string + */ +// public $UserEmail = ''; +// public $RefreshToken = ''; +// public $ClientId = ''; +// public $ClientSecret = ''; + + + /** * An instance of the SMTP sender class. * @type SMTP * @access protected @@ -465,7 +493,7 @@ /** * An array of all kinds of addresses. - * Includes all of $to, $cc, $bcc, $replyto + * Includes all of $to, $cc, $bcc * @type array * @access protected */ @@ -535,6 +563,13 @@ protected $sign_key_file = ''; /** + * The optional S/MIME extra certificates ("CA Chain") file path. + * @type string + * @access protected + */ + protected $sign_extracerts_file = ''; + + /** * The S/MIME password for the key. * Used only if the key is encrypted. * @type string @@ -550,6 +585,13 @@ protected $exceptions = false; /** + * Unique ID used for message ID and boundaries. + * @type string + * @access protected + */ + protected $uniqueid = ''; + + /** * Error severity: message only, continue processing. */ const STOP_MESSAGE = 0; @@ -570,12 +612,18 @@ const CRLF = "\r\n"; /** + * The maximum line length allowed by RFC 2822 section 2.1.1 + * @type integer + */ + const MAX_LINE_LENGTH = 998; + + /** * Constructor. * @param boolean $exceptions Should we throw external exceptions? */ public function __construct($exceptions = false) { - $this->exceptions = ($exceptions == true); + $this->exceptions = (boolean)$exceptions; } /** @@ -583,7 +631,8 @@ */ public function __destruct() { - if ($this->Mailer == 'smtp') { //close any open SMTP connection nicely + //Close any open SMTP connection nicely + if ($this->Mailer == 'smtp') { $this->smtpClose(); } } @@ -629,7 +678,8 @@ if ($this->SMTPDebug <= 0) { return; } - if (is_callable($this->Debugoutput)) { + //Avoid clash with built-in function names + if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) { call_user_func($this->Debugoutput, $str, $this->SMTPDebug); return; } @@ -815,6 +865,61 @@ } /** + * Parse and validate a string containing one or more RFC822-style comma-separated email addresses + * of the form "display name <address>" into an array of name/address pairs. + * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available. + * Note that quotes in the name part are removed. + * @param string $addrstr The address list string + * @param bool $useimap Whether to use the IMAP extension to parse the list + * @return array + * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation + */ + public function parseAddresses($addrstr, $useimap = true) + { + $addresses = array(); + if ($useimap and function_exists('imap_rfc822_parse_adrlist')) { + //Use this built-in parser if it's available + $list = imap_rfc822_parse_adrlist($addrstr, ''); + foreach ($list as $address) { + if ($address->host != '.SYNTAX-ERROR.') { + if ($this->validateAddress($address->mailbox . '@' . $address->host)) { + $addresses[] = array( + 'name' => (property_exists($address, 'personal') ? $address->personal : ''), + 'address' => $address->mailbox . '@' . $address->host + ); + } + } + } + } else { + //Use this simpler parser + $list = explode(',', $addrstr); + foreach ($list as $address) { + $address = trim($address); + //Is there a separate name part? + if (strpos($address, '<') === false) { + //No separate name, just use the whole thing + if ($this->validateAddress($address)) { + $addresses[] = array( + 'name' => '', + 'address' => $address + ); + } + } else { + list($name, $email) = explode('<', $address); + $email = trim(str_replace('>', '', $email)); + if ($this->validateAddress($email)) { + $addresses[] = array( + 'name' => trim(str_replace(array('"', "'"), '', $name)), + 'address' => $email + ); + } + } + } + } + return $addresses; + } + + /** * Set the From and FromName properties. * @param string $address * @param string $name @@ -992,15 +1097,20 @@ $this->ContentType = 'multipart/alternative'; } - $this->error_count = 0; // reset errors + $this->error_count = 0; // Reset errors $this->setMessageType(); // Refuse to send an empty message unless we are specifically allowing it if (!$this->AllowEmpty and empty($this->Body)) { throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL); } + // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding) + $this->MIMEHeader = ''; + $this->MIMEBody = $this->createBody(); + // createBody may have added some headers, so retain them + $tempheaders = $this->MIMEHeader; $this->MIMEHeader = $this->createHeader(); - $this->MIMEBody = $this->createBody(); + $this->MIMEHeader .= $tempheaders; // To capture the complete message when using mail(), create // an extra header list which createHeader() doesn't fold in @@ -1020,7 +1130,6 @@ if (!empty($this->DKIM_domain) && !empty($this->DKIM_private) && !empty($this->DKIM_selector) - && !empty($this->DKIM_domain) && file_exists($this->DKIM_private)) { $header_dkim = $this->DKIM_Add( $this->MIMEHeader . $this->mailHeader, @@ -1031,7 +1140,6 @@ str_replace("\r\n", "\n", $header_dkim) . self::CRLF; } return true; - } catch (phpmailerException $exc) { $this->setError($exc->getMessage()); if ($this->exceptions) { @@ -1101,7 +1209,7 @@ $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail)); } } - if ($this->SingleTo === true) { + if ($this->SingleTo) { foreach ($this->SingleToArray as $toAddr) { if (!@$mail = popen($sendmail, 'w')) { throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL); @@ -1165,7 +1273,7 @@ ini_set('sendmail_from', $this->Sender); } $result = false; - if ($this->SingleTo === true && count($toArr) > 1) { + if ($this->SingleTo && count($toArr) > 1) { foreach ($toArr as $toAddr) { $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params); $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From); @@ -1211,58 +1319,51 @@ protected function smtpSend($header, $body) { $bad_rcpt = array(); - - if (!$this->smtpConnect()) { + if (!$this->smtpConnect($this->SMTPOptions)) { throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL); } - $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender; + if ('' == $this->Sender) { + $smtp_from = $this->From; + } else { + $smtp_from = $this->Sender; + } if (!$this->smtp->mail($smtp_from)) { $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError())); throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL); } // Attempt to send to all recipients - foreach ($this->to as $to) { - if (!$this->smtp->recipient($to[0])) { - $bad_rcpt[] = $to[0]; - $isSent = false; - } else { - $isSent = true; + foreach (array($this->to, $this->cc, $this->bcc) as $togroup) { + foreach ($togroup as $to) { + if (!$this->smtp->recipient($to[0])) { + $error = $this->smtp->getError(); + $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']); + $isSent = false; + } else { + $isSent = true; + } + $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); } - $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From); } - foreach ($this->cc as $cc) { - if (!$this->smtp->recipient($cc[0])) { - $bad_rcpt[] = $cc[0]; - $isSent = false; - } else { - $isSent = true; - } - $this->doCallback($isSent, array(), array($cc[0]), array(), $this->Subject, $body, $this->From); - } - foreach ($this->bcc as $bcc) { - if (!$this->smtp->recipient($bcc[0])) { - $bad_rcpt[] = $bcc[0]; - $isSent = false; - } else { - $isSent = true; - } - $this->doCallback($isSent, array(), array(), array($bcc[0]), $this->Subject, $body, $this->From); - } // Only send the DATA command if we have viable recipients if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) { throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL); } - if ($this->SMTPKeepAlive == true) { + if ($this->SMTPKeepAlive) { $this->smtp->reset(); } else { $this->smtp->quit(); $this->smtp->close(); } - if (count($bad_rcpt) > 0) { // Create error message for any bad addresses + //Create error message for any bad addresses + if (count($bad_rcpt) > 0) { + $errstr = ''; + foreach ($bad_rcpt as $bad) { + $errstr .= $bad['to'] . ': ' . $bad['error']; + } throw new phpmailerException( - $this->lang('recipients_failed') . implode(', ', $bad_rcpt), + $this->lang('recipients_failed') . $errstr, self::STOP_CONTINUE ); } @@ -1283,7 +1384,7 @@ if (is_null($this->smtp)) { $this->smtp = $this->getSMTPInstance(); } - + // Already connected? if ($this->smtp->connected()) { return true; @@ -1308,14 +1409,25 @@ // The host string prefix can temporarily override the current setting for SMTPSecure // If it's not specified, the default value is used $prefix = ''; + $secure = $this->SMTPSecure; $tls = ($this->SMTPSecure == 'tls'); - if ($hostinfo[2] == 'ssl' or ($hostinfo[2] == '' and $this->SMTPSecure == 'ssl')) { + if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) { $prefix = 'ssl://'; - $tls = false; // Can't have SSL and TLS at once + $tls = false; // Can't have SSL and TLS at the same time + $secure = 'ssl'; } elseif ($hostinfo[2] == 'tls') { $tls = true; // tls doesn't use a prefix + $secure = 'tls'; } + //Do we need the OpenSSL extension? + $sslext = defined('OPENSSL_ALGO_SHA1'); + if ('tls' === $secure or 'ssl' === $secure) { + //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled + if (!$sslext) { + throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL); + } + } $host = $hostinfo[3]; $port = $this->Port; $tport = (integer)$hostinfo[4]; @@ -1330,7 +1442,14 @@ $hello = $this->serverHostname(); } $this->smtp->hello($hello); - + //Automatically enable TLS encryption if: + // * it's not disabled + // * we have openssl extension + // * we are not already using SSL + // * the server offers STARTTLS + if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) { + $tls = true; + } if ($tls) { if (!$this->smtp->startTLS()) { throw new phpmailerException($this->lang('connect_host')); @@ -1340,10 +1459,10 @@ } if ($this->SMTPAuth) { if (!$this->smtp->authenticate( - $this->Username, - $this->Password, - $this->AuthType, - $this->Realm, + $this->Username, + $this->Password, + $this->AuthType, + $this->Realm, $this->Workstation ) ) { @@ -1353,6 +1472,7 @@ return true; } catch (phpmailerException $exc) { $lastexception = $exc; + $this->edebug($exc->getMessage()); // We must have connected, but then failed TLS or Auth, so close connection nicely $this->smtp->quit(); } @@ -1411,7 +1531,8 @@ 'signing' => 'Signing Error: ', 'smtp_connect_failed' => 'SMTP connect() failed.', 'smtp_error' => 'SMTP server error: ', - 'variable_set' => 'Cannot set or reset variable: ' + 'variable_set' => 'Cannot set or reset variable: ', + 'extension_missing' => 'Extension missing: ' ); if (empty($lang_path)) { // Calculate an absolute path so it can work if CWD is not here @@ -1419,18 +1540,19 @@ } $foundlang = true; $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php'; - if ($langcode != 'en') { // There is no English translation file + // There is no English translation file + if ($langcode != 'en') { // Make sure language file path is readable if (!is_readable($lang_file)) { $foundlang = false; } else { // Overwrite language-specific strings. - // This way we'll never have missing translations. + // This way we'll never have missing translation keys. $foundlang = include $lang_file; } } $this->language = $PHPMAILER_LANG; - return ($foundlang == true); // Returns false if language not found + return (boolean)$foundlang; // Returns false if language not found } /** @@ -1492,7 +1614,11 @@ */ public function wrapText($message, $length, $qp_mode = false) { - $soft_break = ($qp_mode) ? sprintf(' =%s', $this->LE) : $this->LE; + if ($qp_mode) { + $soft_break = sprintf(' =%s', $this->LE); + } else { + $soft_break = $this->LE; + } // If utf-8 encoding is used, we will need to make sure we don't // split multibyte characters when we wrap $is_utf8 = (strtolower($this->CharSet) == 'utf-8'); @@ -1500,20 +1626,23 @@ $crlflen = strlen(self::CRLF); $message = $this->fixEOL($message); + //Remove a trailing line break if (substr($message, -$lelen) == $this->LE) { $message = substr($message, 0, -$lelen); } - $line = explode($this->LE, $message); // Magic. We know fixEOL uses $LE + //Split message into lines + $lines = explode($this->LE, $message); + //Message will be rebuilt in here $message = ''; - for ($i = 0; $i < count($line); $i++) { - $line_part = explode(' ', $line[$i]); + foreach ($lines as $line) { + $words = explode(' ', $line); $buf = ''; - for ($e = 0; $e < count($line_part); $e++) { - $word = $line_part[$e]; + $firstword = true; + foreach ($words as $word) { if ($qp_mode and (strlen($word) > $length)) { $space_left = $length - strlen($buf) - $crlflen; - if ($e != 0) { + if (!$firstword) { if ($space_left > 20) { $len = $space_left; if ($is_utf8) { @@ -1555,13 +1684,17 @@ } } else { $buf_o = $buf; - $buf .= ($e == 0) ? $word : (' ' . $word); + if (!$firstword) { + $buf .= ' '; + } + $buf .= $word; if (strlen($buf) > $length and $buf_o != '') { $message .= $buf_o . $soft_break; $buf = $word; } } + $firstword = false; } $message .= $buf . self::CRLF; } @@ -1571,11 +1704,11 @@ /** * Find the last character boundary prior to $maxLength in a utf-8 - * quoted (printable) encoded string. + * quoted-printable encoded string. * Original written by Colin Brown. * @access public * @param string $encodedText utf-8 QP text - * @param integer $maxLength find last character boundary prior to this length + * @param integer $maxLength Find the last character boundary prior to this length * @return integer */ public function utf8CharBoundary($encodedText, $maxLength) @@ -1585,22 +1718,26 @@ while (!$foundSplitPos) { $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack); $encodedCharPos = strpos($lastChunk, '='); - if ($encodedCharPos !== false) { + if (false !== $encodedCharPos) { // Found start of encoded character byte within $lookBack block. // Check the encoded byte value (the 2 chars after the '=') $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2); $dec = hexdec($hex); - if ($dec < 128) { // Single byte character. + if ($dec < 128) { + // Single byte character. // If the encoded char was found at pos 0, it will fit // otherwise reduce maxLength to start of the encoded char - $maxLength = ($encodedCharPos == 0) ? $maxLength : - $maxLength - ($lookBack - $encodedCharPos); + if ($encodedCharPos > 0) { + $maxLength = $maxLength - ($lookBack - $encodedCharPos); + } $foundSplitPos = true; - } elseif ($dec >= 192) { // First byte of a multi byte character + } elseif ($dec >= 192) { + // First byte of a multi byte character // Reduce maxLength to split at start of character $maxLength = $maxLength - ($lookBack - $encodedCharPos); $foundSplitPos = true; - } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back + } elseif ($dec < 192) { + // Middle byte of a multi byte character, look further back $lookBack += 3; } } else { @@ -1612,7 +1749,10 @@ } /** - * Set the body wrapping. + * Apply word wrapping to the message body. + * Wraps the message body to the number of chars set in the WordWrap property. + * You should only do this to plain-text bodies as wrapping HTML tags may break them. + * This is called automatically by createBody(), so you don't need to call it yourself. * @access public * @return void */ @@ -1644,12 +1784,6 @@ { $result = ''; - // Set the boundaries - $uniq_id = md5(uniqid(time())); - $this->boundary[1] = 'b1_' . $uniq_id; - $this->boundary[2] = 'b2_' . $uniq_id; - $this->boundary[3] = 'b3_' . $uniq_id; - if ($this->MessageDate == '') { $this->MessageDate = self::rfcDate(); } @@ -1657,7 +1791,7 @@ // To be created automatically by mail() - if ($this->SingleTo === true) { + if ($this->SingleTo) { if ($this->Mailer != 'mail') { foreach ($this->to as $toaddr) { $this->SingleToArray[] = $this->addrFormat($toaddr); @@ -1701,10 +1835,12 @@ if ($this->MessageID != '') { $this->lastMessageID = $this->MessageID; } else { - $this->lastMessageID = sprintf('<%s@%s>', $uniq_id, $this->ServerHostname()); + $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->ServerHostname()); } - $result .= $this->HeaderLine('Message-ID', $this->lastMessageID); - $result .= $this->headerLine('X-Priority', $this->Priority); + $result .= $this->headerLine('Message-ID', $this->lastMessageID); + if (!is_null($this->Priority)) { + $result .= $this->headerLine('X-Priority', $this->Priority); + } if ($this->XMailer == '') { $result .= $this->headerLine( 'X-Mailer', @@ -1722,10 +1858,10 @@ } // Add custom headers - for ($index = 0; $index < count($this->CustomHeader); $index++) { + foreach ($this->CustomHeader as $header) { $result .= $this->headerLine( - trim($this->CustomHeader[$index][0]), - $this->encodeHeader(trim($this->CustomHeader[$index][1])) + trim($header[0]), + $this->encodeHeader(trim($header[1])) ); } if (!$this->sign_key_file) { @@ -1801,7 +1937,6 @@ return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody; } - /** * Assemble the message body. * Returns an empty string on failure. @@ -1812,6 +1947,11 @@ public function createBody() { $body = ''; + //Create unique IDs and preset boundaries + $this->uniqueid = md5(uniqid(time())); + $this->boundary[1] = 'b1_' . $this->uniqueid; + $this->boundary[2] = 'b2_' . $this->uniqueid; + $this->boundary[3] = 'b3_' . $this->uniqueid; if ($this->sign_key_file) { $body .= $this->getMailMIME() . $this->LE; @@ -1821,30 +1961,48 @@ $bodyEncoding = $this->Encoding; $bodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) { $bodyEncoding = '7bit'; $bodyCharSet = 'us-ascii'; } + //If lines are too long, and we're not already using an encoding that will shorten them, + //change to quoted-printable transfer encoding + if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) { + $this->Encoding = 'quoted-printable'; + $bodyEncoding = 'quoted-printable'; + } + $altBodyEncoding = $this->Encoding; $altBodyCharSet = $this->CharSet; + //Can we do a 7-bit downgrade? if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) { $altBodyEncoding = '7bit'; $altBodyCharSet = 'us-ascii'; } + //If lines are too long, change to quoted-printable transfer encoding + if (self::hasLineLongerThanMax($this->AltBody)) { + $altBodyEncoding = 'quoted-printable'; + } + //Use this as a preamble in all multipart message types + $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE; switch ($this->message_type) { case 'inline': + $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('inline', $this->boundary[1]); break; case 'attach': + $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding); $body .= $this->encodeString($this->Body, $bodyEncoding); $body .= $this->LE . $this->LE; $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'inline_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/related;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); @@ -1857,6 +2015,7 @@ $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt': + $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; @@ -1871,6 +2030,7 @@ $body .= $this->endBoundary($this->boundary[1]); break; case 'alt_inline': + $body .= $mimepre; $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding); $body .= $this->encodeString($this->AltBody, $altBodyEncoding); $body .= $this->LE . $this->LE; @@ -1886,6 +2046,7 @@ $body .= $this->endBoundary($this->boundary[1]); break; case 'alt_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); @@ -1901,6 +2062,7 @@ $body .= $this->attachAll('attachment', $this->boundary[1]); break; case 'alt_inline_attach': + $body .= $mimepre; $body .= $this->textLine('--' . $this->boundary[1]); $body .= $this->headerLine('Content-Type', 'multipart/alternative;'); $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"'); @@ -1932,23 +2094,42 @@ } elseif ($this->sign_key_file) { try { if (!defined('PKCS7_TEXT')) { - throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.'); + throw new phpmailerException($this->lang('extension_missing') . 'openssl'); } // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1 $file = tempnam(sys_get_temp_dir(), 'mail'); - file_put_contents($file, $body); // @TODO check this worked + if (false === file_put_contents($file, $body)) { + throw new phpmailerException($this->lang('signing') . ' Could not write temp file'); + } $signed = tempnam(sys_get_temp_dir(), 'signed'); - if (@openssl_pkcs7_sign( - $file, - $signed, - 'file://' . realpath($this->sign_cert_file), - array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), - null - ) - ) { + //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 + if (empty($this->sign_extracerts_file)) { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null + ); + } else { + $sign = @openssl_pkcs7_sign( + $file, + $signed, + 'file://' . realpath($this->sign_cert_file), + array('file://' . realpath($this->sign_key_file), $this->sign_key_pass), + null, + PKCS7_DETACHED, + $this->sign_extracerts_file + ); + } + if ($sign) { @unlink($file); $body = file_get_contents($signed); @unlink($signed); + //The message returned by openssl contains both headers and body, so need to split them up + $parts = explode("\n\n", $body, 2); + $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE; + $body = $parts[1]; } else { @unlink($file); @unlink($signed); @@ -2160,12 +2341,21 @@ $cidUniq[$cid] = true; $mime[] = sprintf('--%s%s', $boundary, $this->LE); - $mime[] = sprintf( - 'Content-Type: %s; name="%s"%s', - $type, - $this->encodeHeader($this->secureHeader($name)), - $this->LE - ); + //Only include a filename property if we have one + if (!empty($name)) { + $mime[] = sprintf( + 'Content-Type: %s; name="%s"%s', + $type, + $this->encodeHeader($this->secureHeader($name)), + $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Type: %s%s', + $type, + $this->LE + ); + } // RFC1341 part 5 says 7bit is assumed if not specified if ($encoding != '7bit') { $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE); @@ -2189,12 +2379,20 @@ $this->LE . $this->LE ); } else { - $mime[] = sprintf( - 'Content-Disposition: %s; filename=%s%s', - $disposition, - $encoded_name, - $this->LE . $this->LE - ); + if (!empty($encoded_name)) { + $mime[] = sprintf( + 'Content-Disposition: %s; filename=%s%s', + $disposition, + $encoded_name, + $this->LE . $this->LE + ); + } else { + $mime[] = sprintf( + 'Content-Disposition: %s%s', + $disposition, + $this->LE . $this->LE + ); + } } } else { $mime[] = $this->LE; @@ -2246,7 +2444,7 @@ //Doesn't exist in PHP 5.4, but we don't need to check because //get_magic_quotes_runtime always returns false in 5.4+ //so it will never get here - ini_set('magic_quotes_runtime', 0); + ini_set('magic_quotes_runtime', false); } } $file_buffer = file_get_contents($path); @@ -2255,7 +2453,7 @@ if (version_compare(PHP_VERSION, '5.3.0', '<')) { set_magic_quotes_runtime($magic_quotes); } else { - ini_set('magic_quotes_runtime', ($magic_quotes?'1':'0')); + ini_set('magic_quotes_runtime', $magic_quotes); } } return $file_buffer; @@ -2335,7 +2533,8 @@ break; } - if ($matchcount == 0) { // There are no chars that need encoding + //There are no chars that need encoding + if ($matchcount == 0) { return ($str); } @@ -2445,8 +2644,9 @@ */ public function encodeQP($string, $line_max = 76) { - if (function_exists('quoted_printable_encode')) { // Use native function if it's available (>= PHP5.3) - return $this->fixEOL(quoted_printable_encode($string)); + // Use native function if it's available (>= PHP5.3) + if (function_exists('quoted_printable_encode')) { + return quoted_printable_encode($string); } // Fall back to a pure PHP implementation $string = str_replace( @@ -2454,8 +2654,7 @@ array(' ', "\r\n=2E", "\r\n", '='), rawurlencode($string) ); - $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); - return $this->fixEOL($string); + return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string); } /** @@ -2512,7 +2711,7 @@ // If the string contains an '=', make sure it's the first thing we replace // so as to avoid double-encoding $eqkey = array_search('=', $matches[0]); - if ($eqkey !== false) { + if (false !== $eqkey) { unset($matches[0][$eqkey]); array_unshift($matches[0], '='); } @@ -2563,7 +2762,7 @@ /** * Add an embedded (inline) attachment from a file. * This can include images, sounds, and just about any other document type. - * These differ from 'regular' attachmants in that they are intended to be + * These differ from 'regular' attachments in that they are intended to be * displayed inline with the message, not just attached for download. * This is used in HTML messages that embed the images * the HTML refers to using the $cid value. @@ -2630,7 +2829,7 @@ $disposition = 'inline' ) { // If a MIME type is not specified, try to work it out from the name - if ($type == '') { + if ($type == '' and !empty($name)) { $type = self::filenameToType($name); } @@ -2772,8 +2971,17 @@ $this->error_count++; if ($this->Mailer == 'smtp' and !is_null($this->smtp)) { $lasterror = $this->smtp->getError(); - if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) { - $msg .= '<p>' . $this->lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n"; + if (!empty($lasterror['error'])) { + $msg .= $this->lang('smtp_error') . $lasterror['error'];... [truncated message content] |
From: <be...@us...> - 2015-10-20 00:07:38
|
Revision: 13163 http://sourceforge.net/p/xoops/svn/13163 Author: beckmi Date: 2015-10-20 00:07:35 +0000 (Tue, 20 Oct 2015) Log Message: ----------- fix profile/search (cesag/slider84) Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-10-17 17:57:30 UTC (rev 13162) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-10-20 00:07:35 UTC (rev 13163) @@ -26,6 +26,7 @@ - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) - add option to set height of Themes block (mamba) - fix: Invalid argument supplied for foreach() (cesagonchu/mamba) +- fix profile/search (cesag/slider84) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php 2015-10-17 17:57:30 UTC (rev 13162) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/profile/search.php 2015-10-20 00:07:35 UTC (rev 13163) @@ -111,7 +111,7 @@ case "date": case "datetime": - $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 15, 0)); + $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 15, 1)); $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_smaller", 15, time())); break; |
From: <be...@us...> - 2015-10-17 17:57:33
|
Revision: 13162 http://sourceforge.net/p/xoops/svn/13162 Author: beckmi Date: 2015-10-17 17:57:30 +0000 (Sat, 17 Oct 2015) Log Message: ----------- add "static" to the example Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2015-10-13 21:07:36 UTC (rev 13161) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/textsanitizer/readme.txt 2015-10-17 17:57:30 UTC (rev 13162) @@ -48,7 +48,7 @@ } // Processing the text - function decode($text) + static function decode($text) { // Load config data if any $config = parent::loadConfig(__DIR__); |
From: <wis...@us...> - 2015-10-13 21:07:40
|
Revision: 13161 http://sourceforge.net/p/xoops/svn/13161 Author: wishcraft Date: 2015-10-13 21:07:36 +0000 (Tue, 13 Oct 2015) Log Message: ----------- PayPal REST API - XPayment Gateway - Not Completely Tested Added Paths: ----------- XoopsModules/xpayment/branches/wishcraft/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Address.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Agreement.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementDetails.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementStateDescriptor.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransaction.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransactions.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AlternatePayment.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Amount.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Authorization.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BankAccount.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BankAccountsList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BankToken.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BaseAddress.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Billing.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BillingAgreementToken.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/BillingInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CancelNotification.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Capture.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CarrierAccount.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CarrierAccountToken.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CartBase.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ChargeModel.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Cost.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CountryCode.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreateProfileResponse.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Credit.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreditCard.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreditCardHistory.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreditCardList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreditCardToken.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CreditFinancingOffered.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Currency.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CurrencyConversion.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/CustomAmount.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Details.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Error.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ErrorDetails.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ExtendedBankAccount.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ExternalFunding.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FlowConfig.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FmfDetails.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FundingDetail.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FundingInstrument.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FundingOption.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FundingSource.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/FuturePayment.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/HyperSchema.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Image.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Incentive.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InputFields.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InstallmentInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InstallmentOption.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Invoice.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InvoiceAddress.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InvoiceItem.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/InvoiceSearchResponse.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Item.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ItemList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Links.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Measurement.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/MerchantInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/MerchantPreferences.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Metadata.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/NameValuePair.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Notification.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OpenIdAddress.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OpenIdError.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OpenIdSession.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OpenIdTokeninfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OpenIdUserinfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Order.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/OverrideChargeModel.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Patch.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PatchRequest.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Payee.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Payer.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayerInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Payment.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentCard.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentCardToken.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentDefinition.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentDetail.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentExecution.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentHistory.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentInstruction.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentOptions.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PaymentTerm.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Payout.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayoutBatch.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayoutBatchHeader.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayoutItem.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayoutItemDetails.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PayoutSenderBatchHeader.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Phone.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Plan.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PlanList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PotentialPayerInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Presentation.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/PrivateLabelCard.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ProcessorResponse.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/RecipientBankingInstruction.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/RedirectUrls.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Refund.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/RefundDetail.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/RelatedResources.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Sale.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Search.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ShippingAddress.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ShippingCost.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/ShippingInfo.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Tax.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Terms.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Transaction.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/TransactionBase.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Transactions.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebProfile.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Webhook.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebhookEvent.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebhookEventList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebhookEventType.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebhookEventTypeList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/WebhookList.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Auth/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Auth/OAuthTokenCredential.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Cache/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Cache/AuthorizationCache.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/ArrayUtil.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/PayPalModel.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/PayPalResourceModel.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/PayPalUserAgent.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Common/ReflectionUtil.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Converter/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Converter/FormatConverter.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalConfigManager.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalConstants.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalCredentialManager.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalHttpConfig.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalHttpConnection.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalLoggingLevel.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/PayPalLoggingManager.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Core/cacert.pem XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Exception/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Exception/PayPalConfigurationException.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Exception/PayPalConnectionException.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Exception/PayPalInvalidCredentialException.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Exception/PayPalMissingCredentialException.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Handler/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Handler/IPayPalHandler.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Handler/OauthHandler.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Handler/RestHandler.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Rest/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Rest/ApiContext.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Rest/IResource.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Security/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Security/Cipher.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Transport/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Transport/PayPalRestCall.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Validation/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Validation/ArgumentValidator.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Validation/JsonValidator.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Validation/NumericValidator.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Validation/UrlValidator.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/common.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/gateway_info.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/index.html XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/paypalapi.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/language/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/language/english/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/language/english/paypalapi.php XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/language/index.html XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/preloads/ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/preloads/paypalapi.php Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Address.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Address.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Address.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,39 @@ +<?php + +namespace PayPal\Api; + +/** + * Class Address + * + * Base Address object used as billing address in a payment or extended for Shipping Address. + * + * @package PayPal\Api + * + * @property string phone + */ +class Address extends BaseAddress +{ + /** + * Phone number in E.123 format. + * + * @param string $phone + * + * @return $this + */ + public function setPhone($phone) + { + $this->phone = $phone; + return $this; + } + + /** + * Phone number in E.123 format. + * + * @return string + */ + public function getPhone() + { + return $this->phone; + } + +} Property changes on: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Address.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Agreement.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Agreement.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Agreement.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,647 @@ +<?php + +namespace PayPal\Api; + +use PayPal\Common\PayPalResourceModel; +use PayPal\Core\PayPalConstants; +use PayPal\Rest\ApiContext; +use PayPal\Transport\PayPalRestCall; +use PayPal\Validation\ArgumentValidator; + +/** + * Class Agreement + * + * A resource representing an agreement. + * + * @package PayPal\Api + * + * @property string id + * @property string state + * @property string name + * @property string description + * @property string start_date + * @property \PayPal\Api\Payer payer + * @property \PayPal\Api\Address shipping_address + * @property \PayPal\Api\MerchantPreferences override_merchant_preferences + * @property \PayPal\Api\OverrideChargeModel[] override_charge_models + * @property \PayPal\Api\Plan plan + * @property string create_time + * @property string update_time + * @property \PayPal\Api\AgreementDetails agreement_details + */ +class Agreement extends PayPalResourceModel +{ + /** + * Identifier of the agreement. + * + * @param string $id + * + * @return $this + */ + public function setId($id) + { + $this->id = $id; + return $this; + } + + /** + * Identifier of the agreement. + * + * @return string + */ + public function getId() + { + return $this->id; + } + + /** + * State of the agreement. + * + * @param string $state + * + * @return $this + */ + public function setState($state) + { + $this->state = $state; + return $this; + } + + /** + * State of the agreement. + * + * @return string + */ + public function getState() + { + return $this->state; + } + + /** + * Name of the agreement. + * + * @param string $name + * + * @return $this + */ + public function setName($name) + { + $this->name = $name; + return $this; + } + + /** + * Name of the agreement. + * + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * Description of the agreement. + * + * @param string $description + * + * @return $this + */ + public function setDescription($description) + { + $this->description = $description; + return $this; + } + + /** + * Description of the agreement. + * + * @return string + */ + public function getDescription() + { + return $this->description; + } + + /** + * Start date of the agreement. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @param string $start_date + * + * @return $this + */ + public function setStartDate($start_date) + { + $this->start_date = $start_date; + return $this; + } + + /** + * Start date of the agreement. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @return string + */ + public function getStartDate() + { + return $this->start_date; + } + + /** + * Details of the buyer who is enrolling in this agreement. This information is gathered from execution of the approval URL. + * + * @param \PayPal\Api\Payer $payer + * + * @return $this + */ + public function setPayer($payer) + { + $this->payer = $payer; + return $this; + } + + /** + * Details of the buyer who is enrolling in this agreement. This information is gathered from execution of the approval URL. + * + * @return \PayPal\Api\Payer + */ + public function getPayer() + { + return $this->payer; + } + + /** + * Shipping address object of the agreement, which should be provided if it is different from the default address. + * + * @param \PayPal\Api\Address $shipping_address + * + * @return $this + */ + public function setShippingAddress($shipping_address) + { + $this->shipping_address = $shipping_address; + return $this; + } + + /** + * Shipping address object of the agreement, which should be provided if it is different from the default address. + * + * @return \PayPal\Api\Address + */ + public function getShippingAddress() + { + return $this->shipping_address; + } + + /** + * Default merchant preferences from the billing plan are used, unless override preferences are provided here. + * + * @param \PayPal\Api\MerchantPreferences $override_merchant_preferences + * + * @return $this + */ + public function setOverrideMerchantPreferences($override_merchant_preferences) + { + $this->override_merchant_preferences = $override_merchant_preferences; + return $this; + } + + /** + * Default merchant preferences from the billing plan are used, unless override preferences are provided here. + * + * @return \PayPal\Api\MerchantPreferences + */ + public function getOverrideMerchantPreferences() + { + return $this->override_merchant_preferences; + } + + /** + * Array of override_charge_model for this agreement if needed to change the default models from the billing plan. + * + * @param \PayPal\Api\OverrideChargeModel[] $override_charge_models + * + * @return $this + */ + public function setOverrideChargeModels($override_charge_models) + { + $this->override_charge_models = $override_charge_models; + return $this; + } + + /** + * Array of override_charge_model for this agreement if needed to change the default models from the billing plan. + * + * @return \PayPal\Api\OverrideChargeModel[] + */ + public function getOverrideChargeModels() + { + return $this->override_charge_models; + } + + /** + * Append OverrideChargeModels to the list. + * + * @param \PayPal\Api\OverrideChargeModel $overrideChargeModel + * @return $this + */ + public function addOverrideChargeModel($overrideChargeModel) + { + if (!$this->getOverrideChargeModels()) { + return $this->setOverrideChargeModels(array($overrideChargeModel)); + } else { + return $this->setOverrideChargeModels( + array_merge($this->getOverrideChargeModels(), array($overrideChargeModel)) + ); + } + } + + /** + * Remove OverrideChargeModels from the list. + * + * @param \PayPal\Api\OverrideChargeModel $overrideChargeModel + * @return $this + */ + public function removeOverrideChargeModel($overrideChargeModel) + { + return $this->setOverrideChargeModels( + array_diff($this->getOverrideChargeModels(), array($overrideChargeModel)) + ); + } + + /** + * Plan details for this agreement. + * + * @param \PayPal\Api\Plan $plan + * + * @return $this + */ + public function setPlan($plan) + { + $this->plan = $plan; + return $this; + } + + /** + * Plan details for this agreement. + * + * @return \PayPal\Api\Plan + */ + public function getPlan() + { + return $this->plan; + } + + /** + * Date and time that this resource was created. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @param string $create_time + * + * @return $this + */ + public function setCreateTime($create_time) + { + $this->create_time = $create_time; + return $this; + } + + /** + * Date and time that this resource was created. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @return string + */ + public function getCreateTime() + { + return $this->create_time; + } + + /** + * Date and time that this resource was updated. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @param string $update_time + * + * @return $this + */ + public function setUpdateTime($update_time) + { + $this->update_time = $update_time; + return $this; + } + + /** + * Date and time that this resource was updated. Date format yyyy-MM-dd z, as defined in [ISO8601](http://tools.ietf.org/html/rfc3339#section-5.6). + * + * @return string + */ + public function getUpdateTime() + { + return $this->update_time; + } + + /** + * Agreement Details + * + * @param \PayPal\Api\AgreementDetails $agreement_details + * + * @return $this + */ + public function setAgreementDetails($agreement_details) + { + $this->agreement_details = $agreement_details; + return $this; + } + + /** + * Agreement Details + * + * @return \PayPal\Api\AgreementDetails + */ + public function getAgreementDetails() + { + return $this->agreement_details; + } + + /** + * Get Approval Link + * + * @return null|string + */ + public function getApprovalLink() + { + return $this->getLink(PayPalConstants::APPROVAL_URL); + } + + /** + * Create a new billing agreement by passing the details for the agreement, including the name, description, start date, payer, and billing plan in the request JSON. + * + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return Agreement + */ + public function create($apiContext = null, $restCall = null) + { + $payLoad = $this->toJSON(); + $json = self::executeCall( + "/v1/payments/billing-agreements/", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + $this->fromJson($json); + return $this; + } + + /** + * Execute a billing agreement after buyer approval by passing the payment token to the request URI. + * + * @param $paymentToken + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return Agreement + */ + public function execute($paymentToken, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($paymentToken, 'paymentToken'); + $payLoad = ""; + $json = self::executeCall( + "/v1/payments/billing-agreements/$paymentToken/agreement-execute", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + $this->fromJson($json); + return $this; + } + + /** + * Retrieve details for a particular billing agreement by passing the ID of the agreement to the request URI. + * + * @param string $agreementId + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return Agreement + */ + public static function get($agreementId, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($agreementId, 'agreementId'); + $payLoad = ""; + $json = self::executeCall( + "/v1/payments/billing-agreements/$agreementId", + "GET", + $payLoad, + null, + $apiContext, + $restCall + ); + $ret = new Agreement(); + $ret->fromJson($json); + return $ret; + } + + /** + * Update details of a billing agreement, such as the description, shipping address, and start date, by passing the ID of the agreement to the request URI. + * + * @param PatchRequest $patchRequest + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function update($patchRequest, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($patchRequest, 'patchRequest'); + $payLoad = $patchRequest->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}", + "PATCH", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * Suspend a particular billing agreement by passing the ID of the agreement to the request URI. + * + * @param AgreementStateDescriptor $agreementStateDescriptor + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function suspend($agreementStateDescriptor, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($agreementStateDescriptor, 'agreementStateDescriptor'); + $payLoad = $agreementStateDescriptor->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}/suspend", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * Reactivate a suspended billing agreement by passing the ID of the agreement to the appropriate URI. In addition, pass an agreement_state_descriptor object in the request JSON that includes a note about the reason for changing the state of the agreement and the amount and currency for the agreement. + * + * @param AgreementStateDescriptor $agreementStateDescriptor + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function reActivate($agreementStateDescriptor, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($agreementStateDescriptor, 'agreementStateDescriptor'); + $payLoad = $agreementStateDescriptor->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}/re-activate", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * Cancel a billing agreement by passing the ID of the agreement to the request URI. In addition, pass an agreement_state_descriptor object in the request JSON that includes a note about the reason for changing the state of the agreement and the amount and currency for the agreement. + * + * @param AgreementStateDescriptor $agreementStateDescriptor + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function cancel($agreementStateDescriptor, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($agreementStateDescriptor, 'agreementStateDescriptor'); + $payLoad = $agreementStateDescriptor->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}/cancel", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * Bill an outstanding amount for an agreement by passing the ID of the agreement to the request URI. In addition, pass an agreement_state_descriptor object in the request JSON that includes a note about the reason for changing the state of the agreement and the amount and currency for the agreement. + * + * @param AgreementStateDescriptor $agreementStateDescriptor + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function billBalance($agreementStateDescriptor, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($agreementStateDescriptor, 'agreementStateDescriptor'); + $payLoad = $agreementStateDescriptor->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}/bill-balance", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * Set the balance for an agreement by passing the ID of the agreement to the request URI. In addition, pass a common_currency object in the request JSON that specifies the currency type and value of the balance. + * + * @param Currency $currency + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return bool + */ + public function setBalance($currency, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($this->getId(), "Id"); + ArgumentValidator::validate($currency, 'currency'); + $payLoad = $currency->toJSON(); + self::executeCall( + "/v1/payments/billing-agreements/{$this->getId()}/set-balance", + "POST", + $payLoad, + null, + $apiContext, + $restCall + ); + return true; + } + + /** + * List transactions for a billing agreement by passing the ID of the agreement, as well as the start and end dates of the range of transactions to list, to the request URI. + * + * @deprecated Please use searchTransactions Instead + * @param string $agreementId + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return AgreementTransactions + */ + public static function transactions($agreementId, $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($agreementId, 'agreementId'); + $payLoad = ""; + $json = self::executeCall( + "/v1/payments/billing-agreements/$agreementId/transactions", + "GET", + $payLoad, + null, + $apiContext, + $restCall + ); + $ret = new AgreementTransactions(); + $ret->fromJson($json); + return $ret; + } + + /** + * List transactions for a billing agreement by passing the ID of the agreement, as well as the start and end dates of the range of transactions to list, to the request URI. + * + * @param string $agreementId + * @param array $params Parameters for search string. Options: start_date, and end_date + * @param ApiContext $apiContext is the APIContext for this call. It can be used to pass dynamic configuration and credentials. + * @param PayPalRestCall $restCall is the Rest Call Service that is used to make rest calls + * @return AgreementTransactions + */ + public static function searchTransactions($agreementId, $params = array(), $apiContext = null, $restCall = null) + { + ArgumentValidator::validate($agreementId, 'agreementId'); + ArgumentValidator::validate($params, 'params'); + + $allowedParams = array( + 'start_date' => 1, + 'end_date' => 1, + ); + + $payLoad = ""; + $json = self::executeCall( + "/v1/payments/billing-agreements/$agreementId/transactions?" . http_build_query(array_intersect_key($params, $allowedParams)), + "GET", + $payLoad, + null, + $apiContext, + $restCall + ); + $ret = new AgreementTransactions(); + $ret->fromJson($json); + return $ret; + } + +} Property changes on: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/Agreement.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementDetails.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementDetails.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementDetails.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,209 @@ +<?php + +namespace PayPal\Api; + +use PayPal\Common\PayPalModel; + +/** + * Class AgreementDetails + * + * A resource representing the agreement details. + * + * @package PayPal\Api + * + * @property \PayPal\Api\Currency outstanding_balance + * @property string cycles_remaining + * @property string cycles_completed + * @property string next_billing_date + * @property string last_payment_date + * @property \PayPal\Api\Currency last_payment_amount + * @property string final_payment_date + * @property string failed_payment_count + */ +class AgreementDetails extends PayPalModel +{ + /** + * The outstanding balance for this agreement. + * + * @param \PayPal\Api\Currency $outstanding_balance + * + * @return $this + */ + public function setOutstandingBalance($outstanding_balance) + { + $this->outstanding_balance = $outstanding_balance; + return $this; + } + + /** + * The outstanding balance for this agreement. + * + * @return \PayPal\Api\Currency + */ + public function getOutstandingBalance() + { + return $this->outstanding_balance; + } + + /** + * Number of cycles remaining for this agreement. + * + * @param string $cycles_remaining + * + * @return $this + */ + public function setCyclesRemaining($cycles_remaining) + { + $this->cycles_remaining = $cycles_remaining; + return $this; + } + + /** + * Number of cycles remaining for this agreement. + * + * @return string + */ + public function getCyclesRemaining() + { + return $this->cycles_remaining; + } + + /** + * Number of cycles completed for this agreement. + * + * @param string $cycles_completed + * + * @return $this + */ + public function setCyclesCompleted($cycles_completed) + { + $this->cycles_completed = $cycles_completed; + return $this; + } + + /** + * Number of cycles completed for this agreement. + * + * @return string + */ + public function getCyclesCompleted() + { + return $this->cycles_completed; + } + + /** + * The next billing date for this agreement, represented as 2014-02-19T10:00:00Z format. + * + * @param string $next_billing_date + * + * @return $this + */ + public function setNextBillingDate($next_billing_date) + { + $this->next_billing_date = $next_billing_date; + return $this; + } + + /** + * The next billing date for this agreement, represented as 2014-02-19T10:00:00Z format. + * + * @return string + */ + public function getNextBillingDate() + { + return $this->next_billing_date; + } + + /** + * Last payment date for this agreement, represented as 2014-06-09T09:42:31Z format. + * + * @param string $last_payment_date + * + * @return $this + */ + public function setLastPaymentDate($last_payment_date) + { + $this->last_payment_date = $last_payment_date; + return $this; + } + + /** + * Last payment date for this agreement, represented as 2014-06-09T09:42:31Z format. + * + * @return string + */ + public function getLastPaymentDate() + { + return $this->last_payment_date; + } + + /** + * Last payment amount for this agreement. + * + * @param \PayPal\Api\Currency $last_payment_amount + * + * @return $this + */ + public function setLastPaymentAmount($last_payment_amount) + { + $this->last_payment_amount = $last_payment_amount; + return $this; + } + + /** + * Last payment amount for this agreement. + * + * @return \PayPal\Api\Currency + */ + public function getLastPaymentAmount() + { + return $this->last_payment_amount; + } + + /** + * Last payment date for this agreement, represented as 2015-02-19T10:00:00Z format. + * + * @param string $final_payment_date + * + * @return $this + */ + public function setFinalPaymentDate($final_payment_date) + { + $this->final_payment_date = $final_payment_date; + return $this; + } + + /** + * Last payment date for this agreement, represented as 2015-02-19T10:00:00Z format. + * + * @return string + */ + public function getFinalPaymentDate() + { + return $this->final_payment_date; + } + + /** + * Total number of failed payments for this agreement. + * + * @param string $failed_payment_count + * + * @return $this + */ + public function setFailedPaymentCount($failed_payment_count) + { + $this->failed_payment_count = $failed_payment_count; + return $this; + } + + /** + * Total number of failed payments for this agreement. + * + * @return string + */ + public function getFailedPaymentCount() + { + return $this->failed_payment_count; + } + +} Property changes on: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementDetails.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementStateDescriptor.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementStateDescriptor.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementStateDescriptor.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,65 @@ +<?php + +namespace PayPal\Api; + +use PayPal\Common\PayPalModel; + +/** + * Class AgreementStateDescriptor + * + * Description of the current state of the agreement. + * + * @package PayPal\Api + * + * @property string note + * @property \PayPal\Api\Currency amount + */ +class AgreementStateDescriptor extends PayPalModel +{ + /** + * Reason for changing the state of the agreement. + * + * @param string $note + * + * @return $this + */ + public function setNote($note) + { + $this->note = $note; + return $this; + } + + /** + * Reason for changing the state of the agreement. + * + * @return string + */ + public function getNote() + { + return $this->note; + } + + /** + * The amount and currency of the agreement. + * + * @param \PayPal\Api\Currency $amount + * + * @return $this + */ + public function setAmount($amount) + { + $this->amount = $amount; + return $this; + } + + /** + * The amount and currency of the agreement. + * + * @return \PayPal\Api\Currency + */ + public function getAmount() + { + return $this->amount; + } + +} Property changes on: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementStateDescriptor.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransaction.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransaction.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransaction.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,257 @@ +<?php + +namespace PayPal\Api; + +use PayPal\Common\PayPalModel; + +/** + * Class AgreementTransaction + * + * A resource representing an agreement_transaction that is returned during a transaction search. + * + * @package PayPal\Api + * + * @property string transaction_id + * @property string status + * @property string transaction_type + * @property \PayPal\Api\Currency amount + * @property \PayPal\Api\Currency fee_amount + * @property \PayPal\Api\Currency net_amount + * @property string payer_email + * @property string payer_name + * @property string time_stamp + * @property string time_zone + */ +class AgreementTransaction extends PayPalModel +{ + /** + * Id corresponding to this transaction. + * + * @param string $transaction_id + * + * @return $this + */ + public function setTransactionId($transaction_id) + { + $this->transaction_id = $transaction_id; + return $this; + } + + /** + * Id corresponding to this transaction. + * + * @return string + */ + public function getTransactionId() + { + return $this->transaction_id; + } + + /** + * State of the subscription at this time. + * + * @param string $status + * + * @return $this + */ + public function setStatus($status) + { + $this->status = $status; + return $this; + } + + /** + * State of the subscription at this time. + * + * @return string + */ + public function getStatus() + { + return $this->status; + } + + /** + * Type of transaction, usually Recurring Payment. + * + * @param string $transaction_type + * + * @return $this + */ + public function setTransactionType($transaction_type) + { + $this->transaction_type = $transaction_type; + return $this; + } + + /** + * Type of transaction, usually Recurring Payment. + * + * @return string + */ + public function getTransactionType() + { + return $this->transaction_type; + } + + /** + * Amount for this transaction. + * + * @param \PayPal\Api\Currency $amount + * + * @return $this + */ + public function setAmount($amount) + { + $this->amount = $amount; + return $this; + } + + /** + * Amount for this transaction. + * + * @return \PayPal\Api\Currency + */ + public function getAmount() + { + return $this->amount; + } + + /** + * Fee amount for this transaction. + * + * @param \PayPal\Api\Currency $fee_amount + * + * @return $this + */ + public function setFeeAmount($fee_amount) + { + $this->fee_amount = $fee_amount; + return $this; + } + + /** + * Fee amount for this transaction. + * + * @return \PayPal\Api\Currency + */ + public function getFeeAmount() + { + return $this->fee_amount; + } + + /** + * Net amount for this transaction. + * + * @param \PayPal\Api\Currency $net_amount + * + * @return $this + */ + public function setNetAmount($net_amount) + { + $this->net_amount = $net_amount; + return $this; + } + + /** + * Net amount for this transaction. + * + * @return \PayPal\Api\Currency + */ + public function getNetAmount() + { + return $this->net_amount; + } + + /** + * Email id of payer. + * + * @param string $payer_email + * + * @return $this + */ + public function setPayerEmail($payer_email) + { + $this->payer_email = $payer_email; + return $this; + } + + /** + * Email id of payer. + * + * @return string + */ + public function getPayerEmail() + { + return $this->payer_email; + } + + /** + * Business name of payer. + * + * @param string $payer_name + * + * @return $this + */ + public function setPayerName($payer_name) + { + $this->payer_name = $payer_name; + return $this; + } + + /** + * Business name of payer. + * + * @return string + */ + public function getPayerName() + { + return $this->payer_name; + } + + /** + * Time at which this transaction happened. + * + * @param string $time_stamp + * + * @return $this + */ + public function setTimeStamp($time_stamp) + { + $this->time_stamp = $time_stamp; + return $this; + } + + /** + * Time at which this transaction happened. + * + * @return string + */ + public function getTimeStamp() + { + return $this->time_stamp; + } + + /** + * Time zone of time_updated field. + * + * @param string $time_zone + * + * @return $this + */ + public function setTimeZone($time_zone) + { + $this->time_zone = $time_zone; + return $this; + } + + /** + * Time zone of time_updated field. + * + * @return string + */ + public function getTimeZone() + { + return $this->time_zone; + } + +} Property changes on: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransaction.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransactions.php =================================================================== --- XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransactions.php (rev 0) +++ XoopsModules/xpayment/branches/wishcraft/paypal-rest-api/xpayment/class/gateway/paypalapi/PayPal/Api/AgreementTransactions.php 2015-10-13 21:07:36 UTC (rev 13161) @@ -0,0 +1,71 @@ +<?php + +namespace PayPal\Api; + +use PayPal\Common\PayPalModel; + +/** + * Class AgreementTransactions + * + * A resource representing agreement_transactions that is returned during a transaction search. + * + * @package PayPal\Api + * + * @property \PayPal\Api\AgreementTransaction[] agreement_transaction_list + */ +class AgreementTransactions extends PayPalModel +{ + /** + * Array of agreement_transaction object. + * + * @param \PayPal\Api\AgreementTransaction[] $agreement_transaction_list + * + * @return $this + */ + public function setAgreementTransactionList($agreement_transaction_list) + { + $this->agreement_transaction_list = $agreement_transaction_list; + return $this; + } + + /** + * Array of agreement_transaction object. + * + * @return \PayPal\Api\AgreementTransaction[] + */ + public function getAgreementT... [truncated message content] |
From: <be...@us...> - 2015-10-08 04:01:16
|
Revision: 13160 http://sourceforge.net/p/xoops/svn/13160 Author: beckmi Date: 2015-10-08 04:01:14 +0000 (Thu, 08 Oct 2015) Log Message: ----------- 1.20 Added Paths: ----------- XoopsModules/xtransam/trunk/xtransam/admin/ XoopsModules/xtransam/trunk/xtransam/admin/about.php XoopsModules/xtransam/trunk/xtransam/admin/admin_footer.php XoopsModules/xtransam/trunk/xtransam/admin/admin_header.php XoopsModules/xtransam/trunk/xtransam/admin/index.html XoopsModules/xtransam/trunk/xtransam/admin/index.php XoopsModules/xtransam/trunk/xtransam/admin/menu.php XoopsModules/xtransam/trunk/xtransam/class/ XoopsModules/xtransam/trunk/xtransam/class/files.php XoopsModules/xtransam/trunk/xtransam/class/index.html XoopsModules/xtransam/trunk/xtransam/class/iobase.php XoopsModules/xtransam/trunk/xtransam/class/languages.php XoopsModules/xtransam/trunk/xtransam/class/provider.php XoopsModules/xtransam/trunk/xtransam/class/translator.php XoopsModules/xtransam/trunk/xtransam/docs/ XoopsModules/xtransam/trunk/xtransam/docs/changelog.txt XoopsModules/xtransam/trunk/xtransam/docs/credits.txt XoopsModules/xtransam/trunk/xtransam/docs/index.html XoopsModules/xtransam/trunk/xtransam/docs/install.txt XoopsModules/xtransam/trunk/xtransam/docs/lang_diff.txt XoopsModules/xtransam/trunk/xtransam/docs/licence.txt XoopsModules/xtransam/trunk/xtransam/docs/readme.txt XoopsModules/xtransam/trunk/xtransam/images/ XoopsModules/xtransam/trunk/xtransam/images/index.html XoopsModules/xtransam/trunk/xtransam/images/left_both.gif XoopsModules/xtransam/trunk/xtransam/images/right_both.gif XoopsModules/xtransam/trunk/xtransam/images/xtransam_slogo.png XoopsModules/xtransam/trunk/xtransam/include/ XoopsModules/xtransam/trunk/xtransam/include/JSON.php XoopsModules/xtransam/trunk/xtransam/include/charset_utf-8.php XoopsModules/xtransam/trunk/xtransam/include/forms.php XoopsModules/xtransam/trunk/xtransam/include/functions.php XoopsModules/xtransam/trunk/xtransam/include/index.html XoopsModules/xtransam/trunk/xtransam/include/update.php XoopsModules/xtransam/trunk/xtransam/language/ XoopsModules/xtransam/trunk/xtransam/language/english/ XoopsModules/xtransam/trunk/xtransam/language/english/admin.php XoopsModules/xtransam/trunk/xtransam/language/english/google.php XoopsModules/xtransam/trunk/xtransam/language/english/help/ XoopsModules/xtransam/trunk/xtransam/language/english/help/help.html XoopsModules/xtransam/trunk/xtransam/language/english/help/index.html XoopsModules/xtransam/trunk/xtransam/language/english/index.html XoopsModules/xtransam/trunk/xtransam/language/english/modinfo.php XoopsModules/xtransam/trunk/xtransam/language/index.html XoopsModules/xtransam/trunk/xtransam/language/italian/ XoopsModules/xtransam/trunk/xtransam/language/italian/admin.php XoopsModules/xtransam/trunk/xtransam/language/italian/google.php XoopsModules/xtransam/trunk/xtransam/language/italian/help/ XoopsModules/xtransam/trunk/xtransam/language/italian/help/help.html XoopsModules/xtransam/trunk/xtransam/language/italian/help/index.html XoopsModules/xtransam/trunk/xtransam/language/italian/index.html XoopsModules/xtransam/trunk/xtransam/language/italian/modinfo.php XoopsModules/xtransam/trunk/xtransam/providers/ XoopsModules/xtransam/trunk/xtransam/providers/bing.php XoopsModules/xtransam/trunk/xtransam/providers/google.php XoopsModules/xtransam/trunk/xtransam/providers/index.html XoopsModules/xtransam/trunk/xtransam/providers/mymemory.php XoopsModules/xtransam/trunk/xtransam/sql/ XoopsModules/xtransam/trunk/xtransam/sql/index.html XoopsModules/xtransam/trunk/xtransam/sql/mysql.sql XoopsModules/xtransam/trunk/xtransam/xoops_version.php Added: XoopsModules/xtransam/trunk/xtransam/admin/about.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/about.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/about.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,28 @@ +<?php +/** + * XTransam module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) + * @package Contact + * @since 2.5.0 + * @author Mage, Mamba, Timgno + * @version $Id $ + **/ + +include 'admin_header.php'; +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); + +include 'admin_footer.php'; +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/admin/admin_footer.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/admin_footer.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/admin_footer.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,23 @@ +<?php +/** + * XoopsPoll module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package XoopsPoll + * @since 2.5.0 + * @author Mamba (www.xoops.org) + * @version $Id $ +**/ + +echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL .'/' . $GLOBALS['xtransamImageAdmin'].'/xoopsmicrobutton.gif'.' '." alt='XOOPS' title='XOOPS'></a></div>"; +echo "<div class='center smallsmall italic pad5'><strong>" . $GLOBALS['xtransamModule']->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"; + +xoops_cp_footer(); \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/admin/admin_header.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/admin_header.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/admin_header.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,101 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// -- Author: Simon Roberts (si...@ch...) -- // +// ------------------------------------------------------------------------ // + +include_once(dirname(dirname(dirname(dirname(__FILE__)))).DIRECTORY_SEPARATOR.'mainfile.php'); +include_once(dirname(dirname(dirname(dirname(__FILE__)))).DS.'include'.DS.'cp_header.php'); + +if (!defined('_CHARSET')) + define("_CHARSET","UTF-8"); +if (!defined('_CHARSET_ISO')) + define("_CHARSET_ISO","ISO-8859-1"); + +$GLOBALS['myts'] = MyTextSanitizer::getInstance(); + +$module_handler = xoops_gethandler('module'); +$config_handler = xoops_gethandler('config'); +$GLOBALS['xtransamModule'] = $module_handler->getByDirname('xtransam'); +$GLOBALS['xtransamModuleConfig'] = $config_handler->getConfigList($GLOBALS['xtransamModule']->getVar('mid')); + +set_time_limit($GLOBALS['xtransamModuleConfig']['php_execute_for']); + +xoops_load('pagenav'); +xoops_load('xoopslists'); +xoops_load('xoopsformloader'); + +include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php'); +include_once $GLOBALS['xoops']->path('class'.DS.'xoopstree.php'); +include_once $GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'include'.DS.'functions.php'); +include_once $GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'include'.DS.'forms.php'); + +if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); + //return true; + }else{ + echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks"); + //return false; + } +$pathImageIcon = XOOPS_URL .'/'. $GLOBALS['xtransamModule']->getInfo('icons16'); +$pathImageAdmin = XOOPS_URL .'/'. $GLOBALS['xtransamModule']->getInfo('icons32'); + +$myts =& MyTextSanitizer::getInstance(); + +if ($xoopsUser) { + $moduleperm_handler =& xoops_gethandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xtransamModule']->getVar( 'mid' ), $xoopsUser->getGroups())) { + redirect_header(XOOPS_URL, 1, _NOPERM); + exit(); + } +} else { + redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); +} + +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); +} + +$xoopsTpl->assign('pathImageIcon', $pathImageIcon); +//xoops_cp_header(); + +$traslactionsHandler =& xoops_getModuleHandler('iobase', 'xtransam'); + +if (isset($_GET)) { + foreach ($_GET as $k => $v) { + ${$k} = $v; + } +} + +if (isset($_POST)) { + foreach ($_POST as $k => $v) { + ${$k} = $v; + } +} + +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/admin/index.html =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/index.html (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/index.html 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/admin/index.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/index.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/index.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,277 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// -- Author: Simon Roberts (si...@ch...) -- // +// ------------------------------------------------------------------------ // +include 'admin_header.php'; + +error_reporting(E_ALL); +global $xoopsDB, $xoopsModuleConfig; + +$op = isset($_REQUEST['op'])?$_REQUEST['op']:'dashboard'; + +switch ($op){ +case "deletebuffer": + $sql[0] = "DELETE FROM ".$xoopsDB->prefix('xtransam_files')." WHERE ioid = $id"; + $sql[1] = "DELETE FROM ".$xoopsDB->prefix('xtransam_translator')." WHERE ioid = $id"; + $sql[2] = "DELETE FROM ".$xoopsDB->prefix('xtransam_iobase')." WHERE id = $id"; + + foreach($sql as $fquestion) + $xoopsDB->queryF($fquestion); + + redirect_header("index.php", 4, _AM_XTRANSAM_IODELETED); + break; +case "save-languages": + $lang_handler = xoops_getmodulehandler('languages', 'xtransam'); + foreach($id as $key => $value) + { + switch($value){ + case "new": + $lang = $lang_handler->create(); + break; + default: + $lang = $lang_handler->get($value); + } + + if (!empty($name[$key])&&!empty($code[$key])) { + $lang->setVar('name', $name[$key]); + $lang->setVar('code', $code[$key]); + $lang->setVar('foldername', $folder[$key]); + $lang->setVar('providers', $providers[$key]); + @$lang_handler->insert($lang); + } + } + redirect_header("index.php?op=languages",2,_AM_XTRANSAM_LANGSAVEOK); + break; +case "languages": + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation('index.php?op=languages'); + languagesForm_display(); + include "admin_footer.php"; + + break; +case "export": + global $xoopsUser; + + $io_handler = xoops_getmodulehandler('iobase', 'xtransam'); + $io = $io_handler->get($id); + $trans_handler = xoops_getmodulehandler('translator', 'xtransam'); + $lang_handler = xoops_getmodulehandler('languages', 'xtransam'); + $files_handler = xoops_getmodulehandler('files', 'xtransam'); + $criteria = new CriteriaCompo(new Criteria('ioid', $io->getVar('id'))); + $files = $files_handler->getObjects($criteria); + + $from_folder = $lang_handler->folder($io->getvar('languagefrom')); + $to_folder = $lang_handler->folder($io->getvar('languageto')); + + // Changed by Chronolabs - Removed Code by Timgo - ansi conversion - 08/11/2011 + //include($GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'include'.DS.'charset_utf-8.php')); + + foreach($files as $file) { + $path = array(); + foreach(explode('\\', $file->getVar('path')) as $nodea) + foreach(explode('/', $nodea) as $nodeb) + $path[] = $nodeb; + foreach($path as $key => $value) { + if (strtolower($value) == strtolower($from_folder)) { + $path[$key] = $to_folder; + } + $pdir = DS.$path[$key]; + mkdir($pdir, 0777); + } + $wpath = implode(DS, $path); + if($wpath!=$file->getVar('path')){ + $bfile = file($file->getVar('path').$file->getVar('filename')); + $criteria = new CriteriaCompo(new Criteria('ioid', $io->getVar('id'))); + $criteria->add(new Criteria('fileid', $file->getVar('id'))); + $trans = $trans_handler->getObjects($criteria); + foreach($trans as $tran) { + $search = xtransam_convert_decode($tran->getVar('replacestr'), $tran->getVar('sm')); + $name = xtransam_convert_decode($tran->getVar('name'), $tran->getVar('sm')); + $translation = xtransam_convert_decode($tran->getVar('translation'), $tran->getVar('sm')); + // Changed by Chronolabs - Removed Code by Timgo - ansi conversion - 08/11/2011 + // foreach($GLOBALS['charset_utf8'] as $search => $replace) + // $translation = str_replace($search, $replace, $translation); + $replace = 'define("'.$name.'", "'.$translation.'");'."\n"; + $bfile[$tran->getVar('line')] = $replace; + } + // Changed by Chronolabs back to Footer + $bfile[] = "<?php\n\n// Translation done by XTransam & ".$GLOBALS['xoopsUser']->getVar('uname')." (".$GLOBALS['xoopsUser']->getVar('email').")\n// XTransam ".($GLOBALS['xtransamModule']->getVar('version')/100)." is written by Chronolabs Co-op & The XOOPS Project - File Dumped on ".date('Y-m-d H:i')."\n\n?>"; + @makeWritable($wpath, true); + if (file_exists($wpath.$file->getVar('filename'))) + unlink($wpath.$file->getVar('filename')); + $file = @fopen($wpath.$file->getVar('filename'), 'w'); + $buffer = implode("", $bfile); + fwrite($file, $buffer, strlen($buffer)); + fclose($file); + } + // Changed by Chronolabs to be recursive + if (file_exists($indexFile = XOOPS_ROOT_PATH."modules".DS."xtransam".DS."language".DS."index.html")) + copy($indexFile, $wpath.DS."index.html"); + } + redirect_header("index.php?op=bbs",2,_AM_XTRANSAM_EXPORTCOMPLETE); + break; +case "save": + $trans_handler = xoops_getmodulehandler('translator', 'xtransam'); + foreach($trans as $key => $value) { + $tran = $trans_handler->get($key); + $tran->setVar('translation', xtransam_convert_encode($value, $tran->getVar('sm'))); + $trans_handler->insert($tran); + } + redirect_header("index.php?op=manage&id=$id&fileid=$fileid",2,_AM_XTRANSAM_SAVECOMPLETE); + break; +case "manage": + + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('index.php?op=manage'); + //echo $indexAdmin->renderIndex(); + managerForm_display($id, $fileid); + + include "admin_footer.php"; + break; + +case "analysis": + $io_handler = xoops_getmodulehandler('iobase', 'xtransam'); + $files_handler = xoops_getmodulehandler('files', 'xtransam'); + $io = $io_handler->get($id); + @$files_handler->analysepath($io); + redirect_header("index.php?op=bbs",2,_AM_XTRANSAM_ANLYSISCOMPLETE); + break; + +case "import": + $io_handler = xoops_getmodulehandler('iobase', 'xtransam'); + $files_handler = xoops_getmodulehandler('files', 'xtransam'); + $io = $io_handler->get($id); + @$files_handler->importfiles($io); + redirect_header("index.php?op=bbs",2,_AM_XTRANSAM_IMPORTCOMPLETE); + break; + +case "translate": + xoops_cp_header(); + echo sprintf(_AM_XTRANSAM_TRANSLATION_IN_PROCESS, $GLOBALS['xtransamModuleConfig']['php_execute_for'], isset($restart)?$restart:1); + include "admin_footer.php"; + $io_handler = xoops_getmodulehandler('iobase', 'xtransam'); + $io = $io_handler->get($id); + $trans_handler = xoops_getmodulehandler('translator', 'xtransam'); + $lang_handler = xoops_getmodulehandler('languages', 'xtransam'); + $criteria = new CriteriaCompo(new Criteria('ioid', $io->getVar('id'))); + if ($trans_handler->getCount($criteria)>0) { + $trans = $trans_handler->getObjects($criteria); + $start = time(); + foreach($trans as $tran) { + if ($tran->isempty()){ + $from = $lang_handler->code($io->getVar('languagefrom')); + $to = $lang_handler->code($io->getVar('languageto')); + $GLOBALS['provider'] = $lang_handler->provider($tran->getVar('toid')); + if (strlen($GLOBALS['provider'])>0) { + $provider_handler = xoops_getmodulehandler('provider', 'xtransam'); + $translation = $provider_handler->provider->translate($from,$to, xtransam_convert_decode($tran->getVar('orginal'), $tran->getVar('sm'))); + $tran->setVar('translation', xtransam_convert_encode($translation, $tran->getVar('sm'))); + if (strlen($translation)>0) + $tran->setVar('auto', 1); + else + $tran->setVar('auto', 0); + + $trans_handler->insert($tran); + } + if ($start+$GLOBALS['xtransamModuleConfig']['php_execute_for']-3<time()) + { + $restart++; + redirect_header("index.php?op=translate&id=$id&restart=$restart"); + exit(0); + } + } + } + } + redirect_header("index.php?op=bbs",2,_AM_XTRANSAM_TRANSLATIONCOMPLETE); + break; + +case "bbs": + + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('index.php?op=bbs'); + //echo $indexAdmin->renderIndex(); + translationForm_display(false); + include "admin_footer.php"; + + break; + +case "wizard": + xoops_cp_header(); + $indexAdmin = new ModuleAdmin(); + echo $indexAdmin->addNavigation('index.php?op=wizard'); + //echo $indexAdmin->renderIndex(); + wizardForm_display($step); + translationForm_display(true); + include "admin_footer.php"; + break; +case "dashboard": +default: + + xoops_cp_header(); + + $trans_handler = xoops_getmodulehandler('translator', 'xtransam'); + $lang_handler = xoops_getmodulehandler('languages', 'xtransam'); + $files_handler = xoops_getmodulehandler('files', 'xtransam'); + $iobase_handler = xoops_getmodulehandler('iobase', 'xtransam'); + + $indexAdmin = new ModuleAdmin(); + + $indexAdmin->addInfoBox(_AM_XTRANSAM_ADMIN_NUMTRASL); + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_NUMFILES."</label>", $files_handler->getCount(NULL), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_NUMLINES."</label>", $trans_handler->getCount(NULL), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_NUMPROJECTS."</label>", $iobase_handler->getCount(NULL), 'Green'); + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_NUMLANG."</label>", $lang_handler->getCount(NULL), 'Green'); + + xoops_load('xoopscache'); + if (!class_exists('XoopsCache')) { + // XOOPS 2.4 Compliance + xoops_load('cache'); + if (!class_exists('XoopsCache')) { + include_once XOOPS_ROOT_PATH.DS.'class'.DS.'cache'.DS.'xoopscache.php'; + } + } + + if ($googlecodes = XoopsCache::read('xtransam_google_pause')) { + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_GOOGLEAVAILABLE."</label>", _YES, 'Green'); + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>".sprintf(_AM_XTRANSAM_THEREARE_GOOGLEERROR, $googlecodes['code'], $googlecodes['message'])."</label>", '', 'Green'); + } else { + $indexAdmin->addInfoBoxLine(_AM_XTRANSAM_ADMIN_NUMTRASL, "<label>"._AM_XTRANSAM_THEREARE_GOOGLEAVAILABLE."</label>", _NO, 'Green'); + } + + echo $indexAdmin->addNavigation("index.php") ; + echo $indexAdmin->renderIndex(); + + include "admin_footer.php"; + + break; +} +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/admin/menu.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/admin/menu.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/admin/menu.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,58 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// -- Author: Simon Roberts (si...@ch...) -- // +// ------------------------------------------------------------------------ // +$module_handler =& xoops_gethandler('module'); +$GLOBALS['xtransamModule'] =& XoopsModule::getByDirname('xtransam'); +$moduleInfo =& $module_handler->get($GLOBALS['xtransamModule']->getVar('mid')); +//$GLOBALS['xtransamImageAdmin'] = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +$GLOBALS['xtransamImageAdmin'] = $moduleInfo->getInfo('icons32'); + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]["title"] = _MI_XTRANSAM_ADMENU1; +$adminmenu[$i]["link"] = 'admin/index.php'; +$adminmenu[$i]["icon"] = '../../'.$GLOBALS['xtransamImageAdmin'].'/home.png'; +$i++; +$adminmenu[$i]["title"] = _MI_XTRANSAM_ADMENU2; +$adminmenu[$i]["link"] = 'admin/index.php?op=wizard'; +$adminmenu[$i]["icon"] = '../../'.$GLOBALS['xtransamImageAdmin'].'/wizard.png'; +$i++; +$adminmenu[$i]["title"] = _MI_XTRANSAM_ADMENU3; +$adminmenu[$i]["link"] = 'admin/index.php?op=bbs'; +$adminmenu[$i]["icon"] = '../../'.$GLOBALS['xtransamImageAdmin'].'/translations.png'; +$i++; +$adminmenu[$i]["title"] = _MI_XTRANSAM_ADMENU4; +$adminmenu[$i]["link"] = 'admin/index.php?op=languages'; +$adminmenu[$i]["icon"] = '../../'.$GLOBALS['xtransamImageAdmin'].'/languages.png'; +$i++; +$adminmenu[$i]["title"] = _MI_XTRANSAM_ADMENU5; +$adminmenu[$i]["link"] = 'admin/about.php'; +$adminmenu[$i]["icon"] = '../../'.$GLOBALS['xtransamImageAdmin'].'/about.png'; + +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/files.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/files.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/files.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,210 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// -- Author: Simon Roberts (si...@ch...) -- // +// ------------------------------------------------------------------------ // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} +/** + * Class for policies + * @author Simon Roberts <on...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class XtransamFiles extends XoopsObject +{ + + function XtransamFiles($id = null) + { + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('ioid', XOBJ_DTYPE_INT); + $this->initVar('filename', XOBJ_DTYPE_TXTBOX, null, true, 255); + $this->initVar('path', XOBJ_DTYPE_TXTBOX, null, true, 255); + $this->initVar('imported', XOBJ_DTYPE_INT, 0); + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class XtransamFilesHandler extends XoopsPersistableObjectHandler +{ + + var $db; + var $regex = '/define\((.*) \);|define \((.*) \);|define \((.*) \);|define \( ([\"\', \ta-zA-Z0-9_]+)\);|define\( (.*) \);|define\((.*)\);|define \((.*)\);|define \((.*)\);|define \( ([\"\', \ta-zA-Z0-9_]+)\);|define\( (.*)\);|define\((.*) \);|define \((.*) \);|define \((.*) \);|define \( (.*) \);|define\( (.*) \);/'; + var $seperator = array('", "', '","', '" , "', '" , "', '", "', '" , "', + '", \'', '",\'', '" , \'', '" , \'', '", \'', '" , \'' , + '\', \'', '\',\'', '\' , \'', '\' , \'', '\', \'', '\' , \'', + '\', "', '\',"', '\' , "', '\' , "', '\', "', '\' , "'); + + function __construct(&$db) + { + $this->db = $db; + parent::__construct($db, "xtransam_files", 'XtransamFiles', "id", "path"); + } + + function importfiles($io) + { + if (!is_a($io, 'XtransamIobase')) + return false; + + global $xoopsModuleConfig; + + $trans_handler = xoops_getmodulehandler('translator', 'xtransam'); + + $criteria = new CriteriaCompo(new Criteria('`ioid`', $io->getVar('id')), 'AND'); + $criteria->add(new Criteria('`imported`', 0), 'AND'); + $files = $this->getObjects($criteria); + + foreach ($files as $file) { + $content = file_get_contents($file->getVar('path').DS.$file->getVar('filename')); + $lines = explode("\n", $content); + foreach($lines as $key => $line) { + if (strpos(' '.$line,'define')>0) { + @preg_match_all($this->regex, $line, $matches); + + $def = array(); + foreach($matches as $match) + foreach($match as $result) { + if (!empty($result)&&substr($result,0,6)!='define') { + foreach($this->seperator as $sep) + if (strpos($result, $sep)>0) + if (count(explode($sep, $result))==2) + $result = explode($sep, $result); + + $def[0] = substr(trim($result[0]),1); + $def[1] = substr(trim($result[1]),0, strlen(trim($result[1]))-1); + } elseif (substr($result,0,6)=='define') { + $def[3] = $result; + } + } + + + if (!empty($def[0])&&!empty($def[1])) { + $trans = $trans_handler->create(); + $trans->setVar('ioid',$io->getVar('id')); + $trans->setVar('fromid',$io->getVar('languagefrom')); + $trans->setVar('toid',$io->getVar('languageto')); + $trans->setVar('fileid',$file->getVar('id')); + $trans->setVar('linetype','define'); + $trans->setVar('line', $key); + $trans->setVar('name',xtransam_convert_encode($def[0], $xoopsModuleConfig['store_method'])); + $trans->setVar('orginal',xtransam_convert_encode($def[1], $xoopsModuleConfig['store_method'])); + $trans->setVar('replacestr',xtransam_convert_encode($def[3], $xoopsModuleConfig['store_method'])); + $trans->setVar('sm', $xoopsModuleConfig['store_method']); + if (!$trans_handler->exists($trans)) + $trans_handler->insert($trans); + } + } + } + + $file->setVar('imported', '1'); + $this->insert($file); + + } + } + + + function analysepath($io) + { + if (!is_a($io, 'XtransamIobase')) + return false; + + switch ($io->getVar('point')) + { + case "core": + $files = $this->dirToArray(XOOPS_ROOT_PATH.DS.'language'.DS.$io->getVar('path'), true); + $path = XOOPS_ROOT_PATH.DS.'language'.DS.$io->getVar('path'); + break; + case "module": + $files = $this->dirToArray(XOOPS_ROOT_PATH.DS.'modules'.DS.$io->getVar('path'), true); + $path = XOOPS_ROOT_PATH.DS.'modules'.DS.$io->getVar('path'); + break; + } + + foreach($files as $key => $file) + { + if (file_exists($file)) { + $tfile = $this->create(); + $tfile->setVar('filename', basename($file)); + $tfile->setVar('path', str_replace(basename($file),'',$file)); + $tfile->setVar('ioid', $io->getVar('id')); + if (!$this->exists($tfile)) + @$this->insert($tfile); + } + } + + } + + private function dirToArray($directory, $recursive, $fileext = 'php') { + $array_items = array(); + if ($handle = opendir($directory)) { + while (false !== ($file = readdir($handle))) { + $filecomp = explode('.', $file); + if ($file != "." && $file != "..") { + if (is_dir($directory. "/" . $file)) { + if($recursive) { + $array_items = array_merge($array_items, $this->dirToArray($directory. "/" . $file, $recursive)); + } + $file = $directory . "/" . $file; + if (in_array($fileext, $filecomp)) + $array_items[] = preg_replace("/\/\//si", "/", $file); + } else { + $file = $directory . "/" . $file; + if (in_array($fileext, $filecomp)) + $array_items[] = preg_replace("/\/\//si", "/", $file); + } + } + } + closedir($handle); + } + return $array_items; + } + + function exists($file) + { + if (!is_a($file, 'XtransamFiles')) + return true; + + $criteria = new CriteriaCompo(new Criteria('`ioid`', $file->getVar('ioid')), 'AND'); + $criteria->add(new Criteria('`path`', $file->getVar('path')), 'AND'); + $criteria->add(new Criteria('`filename`', $file->getVar('filename')), 'AND'); + if ($this->getCount($criteria)>0) + return true; + else + return false; + } +} +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/index.html =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/index.html (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/index.html 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/iobase.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/iobase.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/iobase.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,155 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} +/** + * Class for policies + * @author Simon Roberts <on...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class XtransamIobase extends XoopsObject +{ + + function XtransamIobase($id = null) + { + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('point', XOBJ_DTYPE_OTHER, null, false, 20); + $this->initVar('path', XOBJ_DTYPE_TXTBOX, null, true, 255); + $this->initVar('languagefrom', XOBJ_DTYPE_INT, null); + $this->initVar('languageto', XOBJ_DTYPE_INT, null); + $this->initVar('done', XOBJ_DTYPE_INT, null); + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class XtransamIobaseHandler extends XoopsPersistableObjectHandler +{ + + var $db; + + function __construct(&$db) + { + $this->db = $db; + parent::__construct($db, "xtransam_iobase", 'XtransamIobase', "id", "path"); + } + + function insert($io) + { + if (!is_a($io, 'XtransamIobase')) + return false; + + if (!$this->exists($io)) + $sql = "INSERT INTO ".$this->db->prefix('xtransam_iobase')." (`point`, `path`, `languagefrom`, `languageto`) VALUES ('".$io->getVar('point')."', '".$io->getVar('path')."', '".$io->getVar('languagefrom')."', '".$io->getVar('languageto')."')"; + else + $sql = "UPDATE ".$this->db->prefix('xtransam_iobase')." SET `point` = '".$io->getVar('point')."', `path` = '".$io->getVar('path')."', `languagefrom` = '".$io->getVar('languagefrom')."', `languageto` = '".$io->getVar('languageto')."', `total` = '".$io->getVar('total')."', `done` = '".$io->getVar('done')."' where `id` = ".$io->getVar('id'); + + return $this->db->queryF($sql); + + } + + function &getObjects($criteria = null, $fields = null, $asObject = true, $id_as_key = true) + { + if (is_array($fields) && count($fields) > 0) { + if (! in_array($this->handler->keyName, $fields)) { + $fields[] = $this->handler->keyName; + } + $select = "`" . implode("`, `", $fields) . "`"; + } else { + $select = "*"; + } + $limit = null; + $start = null; + $sql = "SELECT {$select} FROM `".$this->db->prefix('xtransam_iobase')."`"; + if (isset($criteria) && is_subclass_of($criteria, "criteriaelement")) { + $sql .= " " . $criteria->renderWhere(); + if ($sort = $criteria->getSort()) { + $sql .= " ORDER BY {$sort} " . $criteria->getOrder(); + $orderSet = true; + } + $limit = $criteria->getLimit(); + $start = $criteria->getStart(); + } + if (empty($orderSet)) { + // $sql .= " ORDER BY `{$this->handler->keyName}` DESC"; + } + $result = $this->db->query($sql, $limit, $start); + $ret = array(); + if ($asObject) { + while ($myrow = $this->db->fetchArray($result)) { + $object = &$this->create(false); + $object->assignVars($myrow); + if ($id_as_key) { + $ret[$myrow['id']] = $object; + } else { + $ret[] = $object; + } + unset($object); + } + } else { + $object = &$this->create(false); + while ($myrow = $this->db->fetchArray($result)) { + $object->assignVars($myrow); + if ($id_as_key) { + $ret[$myrow['id']] = $object->getValues(array_keys($myrow)); + } else { + $ret[] = $object->getValues(array_keys($myrow)); + } + } + unset($object); + } + return $ret; + } + + function exists($io) + { + if (!is_a($io, 'XtransamIobase')) + return true; + + include_once(XOOPS_ROOT_PATH.'/class/criteria.php'); + $criteria = new CriteriaCompo(new Criteria('`point`', $io->getVar('point')), 'AND'); + $criteria->add(new Criteria('`path`', $io->getVar('path')), 'AND'); + $criteria->add(new Criteria('`languagefrom`', $io->getVar('languagefrom')), 'AND'); + $criteria->add(new Criteria('`languageto`', $io->getVar('languageto')), 'AND'); + if ($this->getCount($criteria)>0) + return true; + else + return false; + } +} +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/languages.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/languages.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/languages.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,143 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} +/** + * Class for policies + * @author Simon Roberts <on...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class XtransamLanguages extends XoopsObject +{ + + function XtransamLanguages($id = null) + { + $this->initVar('lang_id', XOBJ_DTYPE_INT, null, false); + $this->initVar('providers', XOBJ_DTYPE_ARRAY, null, false, 255); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, null, true, 255); + $this->initVar('code', XOBJ_DTYPE_TXTBOX, null, true, 6); + $this->initVar('foldername', XOBJ_DTYPE_TXTBOX, null, false, 255); + + } + +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class XtransamLanguagesHandler extends XoopsPersistableObjectHandler +{ + function __construct(&$db) + { + parent::__construct($db, "xtransam_languages", 'XtransamLanguages', "lang_id", "name"); + } + + function name($id) + { + if ($this->getCount(new Criteria('lang_id', $id))>0) + { + $objs = $this->getObjects(new Criteria('lang_id', $id), false, false ); + return $objs[0]['name']; + } else { + return false; + } + } + + function provider($id) + { + if ($this->getCount(new Criteria('lang_id', $id))>0) + { + $objs = $this->getObjects(new Criteria('lang_id', $id), false, false ); + if (in_array($GLOBALS['xoopsModuleConfig']['provider'], $objs[0]['providers'])) { + return $GLOBALS['xoopsModuleConfig']['provider']; + } + switch ($GLOBALS['xoopsModuleConfig']['provider']) { + case 'google': + return 'bing'; + break; + case 'mymemory': + return 'google'; + break; + case 'bing': + return 'google'; + break; + } + } else { + return array($GLOBALS['xoopsModuleConfig']['provider']); + } + } + + function folder($id) + { + if ($this->getCount(new Criteria('lang_id', $id))>0) + { + $objs = $this->getObjects(new Criteria('lang_id', $id), false, false ); + if (empty($objs[0]['foldername'])) + return strtolower($objs[0]['name']); + else + return strtolower($objs[0]['foldername']); + + } else { + return false; + } + } + + function code($id) + { + if ($this->getCount(new Criteria('lang_id', $id))>0) + { + $objs = $this->getObjects(new Criteria('lang_id', $id), false, false); + return $objs[0]['code']; + } else { + return false; + } + } + + function validlanguage($name) + { + include_once(XOOPS_ROOT_PATH.'/class/criteria.php'); + $criteria = new CriteriaCompo(new Criteria('`name`', $name, 'LIKE'), 'OR'); + $criteria->add(new Criteria('`foldername`', $name, 'LIKE'), 'OR'); + if ($this->getCount($criteria)>0) + { + $objs = $this->getObjects($criteria); + return $objs[0]->getVar('lang_id'); + } else { + return false; + } + } +} +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/provider.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/provider.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/provider.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,90 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// -- Author: Simon Roberts (si...@ch...) -- // +// ------------------------------------------------------------------------ // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} + +include_once $GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'include'.DS.'functions.php'); + +/** +* XOOPS translation provider master class. +* This class is responsible for providing data access mechanisms to the data source +* of Translation API not based in user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package xtransam +*/ +class XtransamProviderHandler extends XoopsPersistableObjectHandler { + + var $db = ''; + var $provider = ''; + + function __construct(&$db) { + if (is_object($db)) + $this->db = $db; + else + $this->db = $GLOBALS['xoopsDB']; + if (isset($GLOBALS['provider'])) + $this->provider = $this->createInstance($GLOBALS['provider']); + else + $this->provider = $this->createInstance($GLOBALS['xoopsModuleConfig']['provider']); + } + + function createInstance($provider = '') { + if (empty($provider)) + $provider = $GLOBALS['xoopsModuleConfig']['provider']; + include_once $GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'providers'.DS.$provider.'.php'); + $class = 'Xtransam'.ucfirst($provider).'Provider'; + if (class_exists($class)) + return new $class($this->db); + return false; + } + + function json_decode($data) { + if (!function_exists('json_decode')) { + if (!class_exists('Services_JSON')) + include_once $GLOBALS['xoops']->path('modules'.DS.'xtransam'.DS.'include'.DS.'JSON.php'); + $json = new Services_JSON(); + return xtransam_obj2array($json->decode($data)); + } else { + return xtransam_obj2array(json_decode($data)); + } + } + + function _unescapeUTF8EscapeSeq($str) { + return preg_replace_callback("/\\\u([0-9a-f]{4})/i", create_function('$matches', 'return html_entity_decode(\'&#x\'.$matches[1].\';\', ENT_NOQUOTES, \'UTF-8\');'), $str); + } + + function clean($var) + { + $var = htmlspecialchars_decode($var); + return $var; + } +} \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/class/translator.php =================================================================== --- XoopsModules/xtransam/trunk/xtransam/class/translator.php (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/class/translator.php 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,128 @@ +<?php +// $Autho: wishcraft $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2009 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // + +if (!defined('XOOPS_ROOT_PATH')) { + exit(); +} +/** + * Class for policies + * @author Simon Roberts <on...@xo...> + * @copyright copyright (c) 2009-2003 XOOPS.org + * @package kernel + */ +class XtransamTranslator extends XoopsObject +{ + + function XtransamTranslator($id = null) + { + $this->initVar('id', XOBJ_DTYPE_INT, null, false); + $this->initVar('ioid', XOBJ_DTYPE_INT, null, false); + $this->initVar('fromid', XOBJ_DTYPE_INT, null, false); + $this->initVar('toid', XOBJ_DTYPE_INT, null, false); + $this->initVar('fileid', XOBJ_DTYPE_INT, null, false); + $this->initVar('linetype', XOBJ_DTYPE_OTHER, null, false, 20); + $this->initVar('name', XOBJ_DTYPE_OTHER); + $this->initVar('orginal', XOBJ_DTYPE_OTHER); + $this->initVar('translation', XOBJ_DTYPE_OTHER); + $this->initVar('replacestr', XOBJ_DTYPE_OTHER, null); + $this->initVar('out', XOBJ_DTYPE_INT, null, false); + $this->initVar('line', XOBJ_DTYPE_INT, null, false); + $this->initVar('auto', XOBJ_DTYPE_INT, null, false); + $this->initVar('sm', XOBJ_DTYPE_OTHER, 'urlcode', false); + } + + function isempty() + { + $translation = $this->getVar('translation'); + return empty($translation); + } +} + + +/** +* XOOPS policies handler class. +* This class is responsible for providing data access mechanisms to the data source +* of XOOPS user class objects. +* +* @author Simon Roberts <si...@ch...> +* @package kernel +*/ +class XtransamTranslatorHandler extends XoopsPersistableObjectHandler +{ + + var $db; + + function __construct(&$db) + { + $this->db = $db; + parent::__construct($db, "xtransam_translator", 'XtransamTranslator', "id", "name"); + } + + function change_charset($text, $charset_output = 'UTF-8', $charset_input = 'ISO-8859-1') + { + // Values can be : UTF-8 ; ASCII + //$detected_encoding = mb_detect_encoding($text); + // if ($charset_output == $detected_encoding) { + if ($charset_output == $charset_input) { + // Encoding is already good + return $text; + } elseif ($charset_output == 'UTF-8' && $charset_input == 'ISO-8859-1') { + // ISO-8859-1 -> UTF8 + return utf8_encode($text); + } elseif ($charset_output == 'ISO-8859-1' && $charset_input == 'UTF-8') { + // UTF8 -> ISO-8859-1 + return utf8_decode($text); + } else { + // * -> UTF8 + if (function_exists("mb_convert_encoding")) { + return mb_convert_encoding($text, $charset_output, $charset_input); + }else{ + return $text; + } + + } + } + + function exists($trans) + { + if (!is_a($trans, 'XtransamTranslator')) + return true; + + $criteria = new CriteriaCompo(new Criteria('`ioid`', $trans->getVar('ioid')), 'AND'); + $criteria->add(new Criteria('`fromid`', $trans->getVar('fromid')), 'AND'); + $criteria->add(new Criteria('`toid`', $trans->getVar('toid')), 'AND'); + $criteria->add(new Criteria('`fileid`', $trans->getVar('fileid')), 'AND'); + $criteria->add(new Criteria('`linetype`', $trans->getVar('linetype')), 'AND'); + $criteria->add(new Criteria('`name`', $trans->getVar('name')), 'AND'); + + if ($this->getCount($criteria)>0) + return true; + else + return false; + } +} +?> \ No newline at end of file Added: XoopsModules/xtransam/trunk/xtransam/docs/changelog.txt =================================================================== --- XoopsModules/xtransam/trunk/xtransam/docs/changelog.txt (rev 0) +++ XoopsModules/xtransam/trunk/xtransam/docs/changelog.txt 2015-10-08 04:01:14 UTC (rev 13160) @@ -0,0 +1,74 @@ +======================================== + 2011/11/08 03:50:00 Version 1.20 STABLE +======================================== + - Changed $pathImageAdmin renamed to $GLOBALS['xtransamImageAdmin'] (Wishcraft) + - Changed $GLOBALS['xoopsModule'] in module renamed to $GLOBALS['xtransamModule'] (Wishcraft) + - Changed $GLOBALS['xoopsModuleConfig'] in module renamed to $GLOBALS['xtransamModuleConfig'] (Wishcraft) + - Changed timgo ansi converterter line 91 and 151-152 remmed out admin/index.php (Wishcraft) + +======================================== + 2011/11/03 07:20:00 Version 1.19 STABLE +======================... [truncated message content] |
From: <be...@us...> - 2015-10-08 03:36:30
|
Revision: 13159 http://sourceforge.net/p/xoops/svn/13159 Author: beckmi Date: 2015-10-08 03:36:29 +0000 (Thu, 08 Oct 2015) Log Message: ----------- folder name change Added Paths: ----------- XoopsModules/tdmmp/ Removed Paths: ------------- XoopsModules/TDMMp/ |
From: <be...@us...> - 2015-10-08 03:24:21
|
Revision: 13158 http://sourceforge.net/p/xoops/svn/13158 Author: beckmi Date: 2015-10-08 03:24:20 +0000 (Thu, 08 Oct 2015) Log Message: ----------- folder name change Added Paths: ----------- XoopsModules/TDMMp/trunk/tdmmp/ Removed Paths: ------------- XoopsModules/TDMMp/trunk/TDMMp/ |
From: <be...@us...> - 2015-10-08 03:04:17
|
Revision: 13157 http://sourceforge.net/p/xoops/svn/13157 Author: beckmi Date: 2015-10-08 03:04:13 +0000 (Thu, 08 Oct 2015) Log Message: ----------- folder name change Added Paths: ----------- XoopsModules/APCal/trunk/modules/apcal/ XoopsModules/APCal/trunk/modules/apcal/docs/ XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt XoopsModules/APCal/trunk/modules/apcal/docs/LANG TRANS.txt XoopsModules/APCal/trunk/modules/apcal/docs/LICENCE.txt XoopsModules/APCal/trunk/modules/apcal/docs/README.txt XoopsModules/APCal/trunk/modules/apcal/docs/UPGRADE.txt Removed Paths: ------------- XoopsModules/APCal/trunk/CHANGELOG.txt XoopsModules/APCal/trunk/INSTALL.txt XoopsModules/APCal/trunk/LANG DIFF.txt XoopsModules/APCal/trunk/LANG TRANS.txt XoopsModules/APCal/trunk/LICENCE.txt XoopsModules/APCal/trunk/README.txt XoopsModules/APCal/trunk/UPGRADE.txt XoopsModules/APCal/trunk/modules/APCal/ Deleted: XoopsModules/APCal/trunk/CHANGELOG.txt =================================================================== --- XoopsModules/APCal/trunk/CHANGELOG.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/CHANGELOG.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,97 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -Version 2.2.0 -- Fixed Timezones issue which was adding or removing days to an event. -- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. -- Updated All language files and variables to make the module clonable with SmartClone. - -Version 2.1.3 -- Fixed Events which need to be admitted don't create doubles of active events and an error message when clicked.. -- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. - -Version 2.1.2 -- Fixed When inserting a new event, pictures are saved. -- Fixed The module now comes with its own datepicker because of some Xoops version bug. -- Fixed The map displays correclty when the contact is a user from the website. - -Version 2.1.1 -- Fixed When inserting a new event, pictures are saved. -- Updated Empty fields doesn't show in the event view. - -Version 2.1.0 -- Added Online registration feature with option to turn it on/off. (Uers can subscribe to an event and receive notifications for it) (Thanks to Goffy) -- Updated New way to make thumbs for better support on every servers. (Needs GD library) -- Updated When you save an event, the redirection is where you were before (Instead of current month) -- Fixed Links on events in the map for Yearly view and List view -- Fixed Some minor bug fixes -- New features are translated in English, French and German. - -Version 2.0.4 -- Updated Spanish and German translation. -- Fixed The link to add an event from the monthly view. - -Version 2.0.3 -- Minor bug fix on events insertion. -- The box in monthly view will not expand more than the screen width and height. - -Version 2.0.2 -- Fixed Shift for events in the first week of the month. -- Updated Language of social networks buttons in module language files. -- Updated Full event summary show in monthly view to take all available space. -- Updated In event view, event summary as title. - -Version 2.0.0 -- Updated Monthly view with linear view for one event (instead of repeating over and over) -- Added Possibility to Add Pictures to an event including a separate main picture. -- Added Thumbnail pictures with viewer in event view. -- Added Seperate field for website and e-mail. -- Added Optional main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. -- Added Each category have its own color. -- Added Legend of categories with categories colors. -- Added Possibility to choose which category to be used for an event (as we keep multi-category feature). -- Added Possibility to choose different hours for the same event (if multiple days are selected). -- Updated More neutral theme colors for images, should be a better fit with most website. -- Updated Reorganisation of admin preferences. -- Added Tell a friend feature. -- Added New sharing button (LindedIn and Delicious). -- Some minor bug fixes. - -Version 1.0.6 -- Added links to social networks (Facebook, Twitter, Google+) - -Version 1.0.5 -- Updated Admin menu to fit XOOPS 2.4 and 2.5. -- Some functions updates to fit php 5.3. - -Version 1.0.4 -- Updated admin menu. -- Fixed the bug caused by the .htaccess file generating an "Internal server error". -- Some minor bug fixes. - -Version 1.0.3 -- Some minor bug fixes. - -Version 1.0.2 -- Updated Google Optimization. -- Added onUpdate action to add the new DB fields. -- Updated onInstall action. -- Added navigation menu in event view and option to enable/disable it. -- Updated option to have bigger columns for every day (Select the ones bigger). -- Updated the "share this calendar" example to fit with Internet Explorer (IE7+) - -Version 1.0.1 -- Updated URLRewriting. -- Updated Google Optimization. - -Version 1.0.0 -- Added a map showing all events location. -- Added markers with number representing the date of event with next event first. -- Added individual map showing event location. -- Added optimization for Google. -- Added possibility to add a description in HTML for each categories. -- Added an API that allows webmasters to show easily your calendar on their website (linking back to your site). -- Updated customizable theme. -- Added option for bigger columns for week-ends. -- Updated calendar of holidays for United States, Canada and France. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/INSTALL.txt =================================================================== --- XoopsModules/APCal/trunk/INSTALL.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/INSTALL.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,9 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -INSTALL INSTRUCTIONS -1. Upload the APCal directory to XOOPS_URL/modules/ -2. Log in to your site as administrator. -3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. - If you already have the piCal module, all your categories and events will be automatically transfered. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/LANG DIFF.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LANG DIFF.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,244 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -Feel free to translate to your own language and send us your changes. - -Done for: -up to v2.1.0: English, French, German -up to v2.0.4: English, French, German, Spanish -before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese - - -Version 2.1.0 -- modinfo.php - - added _MI_APCAL_ENABLEREGISTRATION -- apcal_constants.php - - added _APCAL_RO_CANCEL - - added _APCAL_RO_RADIO_YES - - added _APCAL_RO_RADIO_NO - - added _APCAL_RO_ONLINE_POSS - - added _APCAL_RO_ONLINE_POSS_2 - - added _APCAL_RO_ONLY_MEMBERS - - added _APCAL_RO_ONLINE_NO - - added _APCAL_RO_ONLINE_YES - - added _APCAL_RO_ONLINE_ACTIVATE - - added _APCAL_RO_ONLINE_DEACTIVATE - - added _APCAL_RO_ONLINE - - added _APCAL_RO_BTN_ADD - - added _APCAL_RO_BTN_ADDMORE - - added _APCAL_RO_BTN_REMOVE - - added _APCAL_RO_ENABLE_ONLINE - - added _APCAL_RO_NOMEMBERS - - added _APCAL_RO_BTN_LISTMEMBERS - - added _APCAL_RO_SUCCESS_ADD - - added _APCAL_RO_SUCCESS_REMOVE - - added _APCAL_RO_UNAME - - added _APCAL_RO_FIRSTNAME - - added _APCAL_RO_LASTNAME - - added _APCAL_RO_EMAIL - - added _APCAL_RO_EXTRAINFO1 - - added _APCAL_RO_EXTRAINFO2 - - added _APCAL_RO_EXTRAINFO3 - - added _APCAL_RO_EXTRAINFO4 - - added _APCAL_RO_EXTRAINFO5 - - added _APCAL_RO_BTN_CONF_ADD - - added _APCAL_RO_BTN_CONF_ADD_MORE - - added _APCAL_RO_BTN_CONF_REMOVE - - added _APCAL_RO_BTN_CANCEL - - added _APCAL_RO_EVENT - - added _APCAL_RO_TITLE1 - - added _APCAL_RO_OBLIGATORY - - added _APCAL_RO_ERROR_REMOVE - - added _APCAL_RO_ERROR_ADD - - added _APCAL_RO_BTN_BACK - - added _APCAL_RO_BACK - - added _APCAL_RO_ONLINE2 - - added _APCAL_RO_ACTION - - added _APCAL_RO_TITLE2 - - added _APCAL_RO_BTN_RO_EDIT - - added _APCAL_RO_BTN_RO_DEACTIVATE - - added _APCAL_RO_BTN_RO_ACTIVATE - - added _APCAL_RO_QUANTITY - - added _APCAL_RO_QUANTITY2 - - added _APCAL_RO_DATELIMIT - - added _APCAL_RO_EMAIL_NOTIFY - - added _APCAL_RO_BTN_CONF_ACTIVATE - - added _APCAL_RO_ERROR_RO_ACTIVATE - - added _APCAL_RO_SUCCESS_RO_ACTIVATE - - added _APCAL_RO_ERROR_RO_DEACTIVATE - - added _APCAL_RO_SUCCESS_RO_DEACTIVATE - - added _APCAL_RO_ERROR_FULL - - added _APCAL_RO_ERROR_TIMEOUT - - added _APCAL_RO_ERROR_OBLIGATORY - - added _APCAL_RO_BTN_CONF_SAVE - - added _APCAL_RO_BTN_CONF_EDIT - - added _APCAL_RO_MAIL_SUBJ_ADD - - added _APCAL_RO_MAIL_SUBJ_REMOVE - - added _APCAL_RO_MAIL_SUBJ_TEXT - - added _APCAL_RO_DATE - - added _APCAL_RO_LOCATION - - added _APCAL_RO_LINK - - added _APCAL_RO_TITLE3 - - added _APCAL_RO_TITLE4 - - added _APCAL_RO_MAIL_SENDER - - added _APCAL_RO_MAIL_SUBJ - - added _APCAL_RO_MAIL_BODY1 - - added _APCAL_RO_MAIL_BODY2 - - added _APCAL_RO_BTN_SEND - - added _APCAL_RO_MAILSENT - - added _APCAL_RO_TITLE5 - - added _APCAL_RO_BTN_EDIT - - added _APCAL_RO_SUCCESS_EDIT - - added _APCAL_RO_ERROR_EDIT - - added _APCAL_RO_SEND_CONF1 - - added _APCAL_RO_SEND_CONF2 - - added _APCAL_RO_SEND_CONF3 - - added _APCAL_RO_REDIRECT - - added _APCAL_RO_SUCCESS_NEW_EVENT - - added _APCAL_RO_SUCCESS_DELETE_EVENT - - added _APCAL_RO_SUCCESS_UPDATE_EVENT - - added _APCAL_RO_SUCCESS_COPY_EVENT - -Version 2.0.4 -- main.php - - added _APCAL_FB_LNG - - added _APCAL_GPLUS_LNG - -Version 2.0.0 -- modinfo.php - - updated _MI_APCAL_DISPLAYCATTITLE - - added _MI_APCAL_ENABLESOCIAL - - added _MI_APCAL_NBPICS - - added _MI_APCAL_PICSWIDTH - - added _MI_APCAL_PICSHEIGHT - - added _MI_APCAL_SHOWPICMONTHLY - - added _MI_APCAL_SHOWPICWEEKLY - - added _MI_APCAL_SHOWPICDAILY - - added _MI_APCAL_SHOWPICLIST - - added _MI_APCAL_EVENTBGCOLOR - - added _MI_APCAL_EVENTCOLOR - - added _MI_APCAL_ALLCATSCOLOR - - added _MI_APCAL_DISPLAYTIMEZONE - - added _MI_APCAL_USERS - - added _MI_APCAL_COLORS - - added _MI_APCAL_SETTINGS - - added _MI_APCAL_CALSETTINGS - - added _MI_APCAL_CALDISPLAY - - added _MI_APCAL_EVENTS - - added _MI_APCAL_PICTURES - - added _MI_APCAL_MAP - - added _MI_APCAL_COMMENTSNOT - - updated _MI_APCAL_THMORDEFAULTDESC - - added _MI_APCAL_OPT_DEFAULT - - added _MI_APCAL_OPT_NONE - - added _MI_APCAL_SUNDAY - - added _MI_APCAL_MONDAY - - added _MI_APCAL_TUESDAY - - added _MI_APCAL_WEDNESDAY - - added _MI_APCAL_THURSDAY - - added _MI_APCAL_FRIDAY - - added _MI_APCAL_SATURDAY -- main.php - - added _APCAL_TH_EMAIL - - added _APCAL_TH_URL - - added _APCAL_MAINPICTURE - - added _APCAL_PICTURES - - added _APCAL_TH_MAINCATEGORY - - added _APCAL_NONE - - added _APCAL_DAY - - added _APCAL_DIFFERENTHOURS - - added _APCAL_SAMEHOURS - - added _APCAL_CLICKFORDETAILS - - added _APCAL_BEGIN - - added _APCAL_END - - added _APCAL_LOCATION - - added _APCAL_TELLAFRIEND - - added _APCAL_FROM - - added _APCAL_TO - - added _APCAL_SUBJECT - - added _APCAL_MESSAGE - - added _APCAL_TELLAFRIENDTEXT -- admin.php - - added _AM_APCAL_PREFS - - added _AM_APCAL_UPDATE - - added _AM_APCAL_BLOCKS - - added _AM_APCAL_GOTOMODULE - - added _AM_APCAL_CANBEMAIN - - added _AM_APCAL_COLOR - - -Version 1.0.5 -- modinfo.php - - added _MI_APCAL_BNAME_MAP - - added _MI_APCAL_BNAME_MAP_DESC - - added _APCAL_TH_GETCOORDS - - added _APCAL_TH_LATITUDE - - added _APCAL_TH_LONGITUDE - - added _APCAL_TH_ZOOM - - added _APCAL_PROVIDEDBY - - added _APCAL_X - - added _APCAL_AP - - added _APCAL_CALENDAROF - - added _APCAL_SHARECALENDARFORM - - added _APCAL_SHOWALLCAT - - added _APCAL_GENERATE - - added _APCAL_GENERATEHINT - - added _APCAL_CATEGORIES - - added _APCAL_NBEVENTS - - added _APCAL_WIDTH - - added _APCAL_STYLE - - added _APCAL_IFCUSTOM - - added _APCAL_BORDER - - added _APCAL_TITLE - - added _APCAL_TEXT - - added _APCAL_LINK - - added _APCAL_EVEN - - added _APCAL_ODD - - added _APCAL_DEFAULT - - added _APCAL_CUSTOM - - added _APCAL_THEME - - added _APCAL_SHAREINFO - - added _APCAL_SHARECALENDAR - - added _APCAL_PREVEVENT - - added _APCAL_NEXTEVENT - - added _APCAL_BACKTOCAL - - added _MI_APCAL_INDEX -- main.php - - added _APCAL_APURL - - added _APCAL_APURL2 - - added _MI_APCAL_GMLAT - - added _MI_APCAL_GMLNG - - added _MI_APCAL_GMZOOM - - added _MI_APCAL_GMHEIGHT - - added _MI_APCAL_USEURLREWRITE - - added _MI_APCAL_DESCUSEURLREWRITE - - added _MI_APCAL_WIDERWEEKEND - - added _MI_APCAL_WIDERWEEKENDDESC - - added _MI_APCAL_GETTHMCOLOR - - added _MI_APCAL_OPT_THM - - added _MI_APCAL_OPT_CUSTOM - - added _MI_APCAL_THMORDEFAULT - - added _MI_APCAL_THMORDEFAULTDESC - - added _MI_APCAL_ENABLECALMAP - - added _MI_APCAL_ENABLEEVENTMAP - - added _MI_APCAL_ENABLESHARING - - added _MI_APCAL_EVENTNAVENABLED - - added _MI_APCAL_DISPLAYCATTITLE -- admin.php - - added _AM_APCAL_TIMEZONE - - added _AM_APCAL_MODULEADMIN_CONFIG - - added _AM_APCAL_NBWAITINGEVENTS - - added _AM_APCAL_NBEVENTS - - added _AM_APCAL_NBCATS - - added _AM_APCAL_MODULEADMIN_CONFIG_PHP - - added _AM_APCAL_MODULEADMIN_CONFIG_XOOPS - - added _AM_APCAL_TITLE - - added _AM_APCAL_SIDE - - added _AM_APCAL_WEIGHT - - added _AM_APCAL_VISIBLEIN - - added _AM_APCAL_BCACHETIME - - added _AM_APCAL_ACTION - - added _AM_APCAL_ACTIVERIGHTS - - added _AM_APCAL_ACCESSRIGHTS - - added _AM_APCAL_BADMIN \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LANG TRANS.txt =================================================================== --- XoopsModules/APCal/trunk/LANG TRANS.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LANG TRANS.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,273 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - - -modinfo.php (line 35) -define("_MI_APCAL_BNAME_MAP", 'Map of events for this month'); -define("_MI_APCAL_BNAME_MAP_DESC", ''); - -modinfo.php (line 73) -define("_MI_APCAL_GMLAT" , "\"Google Map\" default latitude" ) ; -define("_MI_APCAL_GMLNG" , "\"Google Map\" default longitude" ) ; -define("_MI_APCAL_GMZOOM" , "\"Google Map\" default zoom level" ) ; -define("_MI_APCAL_GMHEIGHT" , "\"Google Map\" height (in pixels)" ) ; -define("_MI_APCAL_USEURLREWRITE" , "Use URL rewriting" ) ; -define("_MI_APCAL_WIDERWEEKEND" , "Wider columns in month view for:" ) ; -define('_MI_APCAL_GETTHMCOLOR', 'Main css filename in your theme folder'); -define('_MI_APCAL_THMORDEFAULT', 'Colors from:'); -define('_MI_APCAL_ENABLECALMAP', 'Show google map in calendar view'); -define('_MI_APCAL_ENABLEEVENTMAP', 'Show google map in event view'); -define('_MI_APCAL_ENABLESHARING', 'Enable users to share your calendar on their website'); -define('_MI_APCAL_EVENTNAVENABLED', 'Enable navigation menu in event view'); -define('_MI_APCAL_DISPLAYCATTITLE', 'Display category tilte as module page title'); -define('_MI_APCAL_ENABLESOCIAL', 'Enable social networks links'); -define('_MI_APCAL_NBPICS', 'Maximum number of pictures allowed (0 if you don\'t want any)'); -define('_MI_APCAL_PICSWIDTH', 'Maximum width of pictures for display in event view'); -define('_MI_APCAL_PICSHEIGHT', 'Maximum height of pictures for display in event view'); -define('_MI_APCAL_SHOWPICMONTHLY', 'Show main picture in monthly view'); -define('_MI_APCAL_SHOWPICWEEKLY', 'Show main picture in weekly view'); -define('_MI_APCAL_SHOWPICDAILY', 'Show main picture in daily view'); -define('_MI_APCAL_SHOWPICLIST', 'Show main picture in list view'); -define('_MI_APCAL_EVENTBGCOLOR', ' Bgcolor of event\'s row'); -define('_MI_APCAL_EVENTCOLOR', 'Color of event\'s row'); -define('_MI_APCAL_ALLCATSCOLOR', 'Color for the default category'); -define('_MI_APCAL_DISPLAYTIMEZONE', 'Display Timezone when showing time'); -define('_MI_APCAL_ICSNEWCAL', 'Create a new calendar for ical exportation'); -define('_MI_APCAL_ENABLEREGISTRATION', 'Enable online registration'); - -modinfo.php (line 101) -define('_MI_APCAL_USERS', 'Users'); -define('_MI_APCAL_COLORS', 'Colors'); -define('_MI_APCAL_SETTINGS', 'General Settings'); -define('_MI_APCAL_CALSETTINGS', 'Calendar Settings'); -define('_MI_APCAL_CALDISPLAY', 'Calendar Display'); -define('_MI_APCAL_EVENTS', 'Events'); -define('_MI_APCAL_PICTURES', 'Pictures'); -define('_MI_APCAL_MAP', 'Google Map'); -define('_MI_APCAL_COMMENTSNOT', 'Comments & Notifications'); - -modinfo.php (line 115) -define("_MI_APCAL_DESCUSEURLREWRITE" , "<b>In order to make it works, copy /modules/APCal/doc/.htaccess to /modules/APCal/.</b><br /><br />N.B.: If you don't have the apache \"mod_rewrite\" installed on your server, it might not work. Please contact your system admin for details." ) ; -define("_MI_APCAL_WIDERWEEKENDDESC" , "Hold down the \"Ctrl\" key on your keyboard while you click to select more than one day." ); -define('_MI_APCAL_THMORDEFAULTDESC', 'Theme: Give your main css filename in the next field. (Recommended)<br />Custom: Fill up the next 13 fields.<br />Default: Use the default colors.'); - -modinfo.php (line 140) -define('_MI_APCAL_OPT_THM', 'Theme'); -define('_MI_APCAL_OPT_CUSTOM', 'Custom'); -define('_MI_APCAL_OPT_DEFAULT', 'Default'); -define("_MI_APCAL_OPT_NONE", "None"); -define('_MI_APCAL_SUNDAY', 'Sunday'); -define('_MI_APCAL_MONDAY', 'Monday'); -define('_MI_APCAL_TUESDAY', 'Tuesday'); -define('_MI_APCAL_WEDNESDAY', 'Wednesday'); -define('_MI_APCAL_THURSDAY', 'Thursday'); -define('_MI_APCAL_FRIDAY', 'Friday'); -define('_MI_APCAL_SATURDAY', 'Saturday'); - -modinfo.php (line 153) -define('_MI_APCAL_INDEX', 'Index'); - - -main.php (line 9) -define('_APCAL_APURL', 'http://xoops.antiquespromotion.ca'); -define('_APCAL_APURL2', 'http://www.antiquespromotion.ca'); - -main.php (line 20) -// edit event -define('_APCAL_TH_GETCOORDS', 'Find position'); -define('_APCAL_TH_LATITUDE', 'Latitude'); -define('_APCAL_TH_LONGITUDE', 'Longitude'); -define('_APCAL_TH_ZOOM', 'Zoom level'); -define('_APCAL_TH_EMAIL', 'Email'); -define('_APCAL_TH_URL', 'URL'); -define('_APCAL_MAINPICTURE', 'Main picture'); -define('_APCAL_PICTURES', 'Other pictures'); -define('_APCAL_TH_MAINCATEGORY', 'Main Category'); -define('_APCAL_NONE', 'None'); -define('_APCAL_DAY', 'Day'); -define('_APCAL_DIFFERENTHOURS', 'Different hours for each days'); -define('_APCAL_SAMEHOURS', 'Use same hours for each day'); - -main.php (line 35) -// API texts -define('_APCAL_PROVIDEDBY', 'Results provided by'); -define('_APCAL_X', 'by'); -define('_APCAL_AP', 'Antiques Promotion Canada'); -define('_APCAL_CALENDAROF', 'Calendar of'); - -main.php (line 41) -// Share admin -define('_APCAL_SHARECALENDARFORM', 'Fill up that form to show the calendar on your website.'); -define('_APCAL_SHOWALLCAT', 'All categories'); -define('_APCAL_GENERATE', 'Generate'); -define('_APCAL_GENERATEHINT', 'You might have to click generate two times on certain browsers.'); -define('_APCAL_CATEGORIES', 'categories'); -define('_APCAL_NBEVENTS', 'Number of events displayed'); -define('_APCAL_WIDTH', 'Block width'); -define('_APCAL_STYLE', 'Style and colors'); -define('_APCAL_IFCUSTOM', 'If you chose "custom", fill the section below (in CSS).'); -define('_APCAL_BORDER', 'Block border'); -define('_APCAL_TITLE', 'Calendar title'); -define('_APCAL_TEXT', 'Calendar text'); -define('_APCAL_LINK', 'Event links'); -define('_APCAL_EVEN', 'Even rows'); -define('_APCAL_ODD', 'Odd rows'); -define('_APCAL_DEFAULT', 'Default'); -define('_APCAL_CUSTOM', 'Custom'); -define('_APCAL_THEME', 'From your theme'); -define('_APCAL_SHAREINFO', 'In order to display the calendar on your website, you must copy & paste this HTML code on your desired webpage.'); -define('_APCAL_SHARECALENDAR', 'Display this calendar on your website'); - -main.php (line 63) -// Event view -define('_APCAL_PREVEVENT', 'Previous event'); -define('_APCAL_NEXTEVENT', 'Next event'); -define('_APCAL_BACKTOCAL', 'Back to calendar'); - -main.php (line 68) -// Tooltip -define('_APCAL_CLICKFORDETAILS', 'Click to open event'); -define('_APCAL_BEGIN', 'From'); -define('_APCAL_END', 'To'); -define('_APCAL_LOCATION', 'Location'); - -main.php (line 74) -// Tell a friend -define('_APCAL_TELLAFRIEND', 'Tell a friend'); -define('_APCAL_FROM', 'From'); -define('_APCAL_TO', 'To'); -define('_APCAL_SUBJECT', 'Subject'); -define('_APCAL_MESSAGE', 'Message'); -define('_APCAL_TELLAFRIENDTEXT', 'You should visit this fabulous calendar at'); - -main.php (line 82) -// Share -define('_APCAL_FB_LNG', 'en_US'); -define('_APCAL_GPLUS_LNG', 'en'); - - -admin.php (line 8) -// Index -define('_AM_APCAL_TIMEZONE', 'Timezones'); -define('_AM_APCAL_MODULEADMIN_CONFIG', 'Configurations'); -define('_AM_APCAL_NBWAITINGEVENTS', 'There are %s events waiting for approval.'); -define('_AM_APCAL_NBEVENTS', 'There are %s upcomming events.'); -define('_AM_APCAL_NBCATS', 'There are %s categories.'); -define('_AM_APCAL_MODULEADMIN_CONFIG_PHP', 'You must have at least php version %s (your current version is %s)'); -define('_AM_APCAL_MODULEADMIN_CONFIG_XOOPS', 'You must have at least xoops version %s (your current version is %s)'); -define('_AM_APCAL_PREFS', 'Preferences'); -define('_AM_APCAL_UPDATE', 'Update'); -define('_AM_APCAL_BLOCKS', 'Blocks'); -define('_AM_APCAL_GOTOMODULE', 'Go to module'); - -admin.php (line 125) -define('_AM_APCAL_CANBEMAIN', 'Can be a main category'); -define('_AM_APCAL_COLOR', 'Color'); - -admin.php (line 145) -// Blocks & Groups Admin -define('_AM_APCAL_TITLE', 'Title'); -define('_AM_APCAL_SIDE', 'Location'); -define('_AM_APCAL_WEIGHT', 'Weight'); -define('_AM_APCAL_VISIBLEIN', 'Visible in'); -define('_AM_APCAL_BCACHETIME', 'Cache time'); -define('_AM_APCAL_ACTION', 'Action'); -define('_AM_APCAL_ACTIVERIGHTS', 'Module administration rights'); -define('_AM_APCAL_ACCESSRIGHTS', 'Module access rights'); -define('_AM_APCAL_BADMIN', 'Blocks administration'); - - -apcal_constants.php (line 178) -define('_APCAL_RO_CANCEL','Action canceled'); -define('_APCAL_RO_RADIO_YES','Yes'); -define('_APCAL_RO_RADIO_NO','No'); - -define('_APCAL_RO_ONLINE_POSS','For these events online registration is possible. '); -define('_APCAL_RO_ONLINE_POSS_2','For this event online registration is possible. '); -define('_APCAL_RO_ONLY_MEMBERS','Online registration is only possible for registrated users. '); -define('_APCAL_RO_ONLINE_NO','Online registration is not activated for this event'); -define('_APCAL_RO_ONLINE_YES','Online registration is activated for this event'); -define('_APCAL_RO_ONLINE_ACTIVATE','Activate online registration for this event'); -define('_APCAL_RO_ONLINE_DEACTIVATE','Do not use online registration for this event'); -define('_APCAL_RO_ONLINE','Registrations'); -define('_APCAL_RO_BTN_ADD','registrate'); -define('_APCAL_RO_BTN_ADDMORE','Edit or add further registrations'); -define('_APCAL_RO_BTN_REMOVE','deregistrate'); -define('_APCAL_RO_ENABLE_ONLINE','Online registration'); -define('_APCAL_RO_NOMEMBERS','There are no registrations for this event'); -define('_APCAL_RO_BTN_LISTMEMBERS','List of participants'); -define('_APCAL_RO_SUCCESS_ADD','The registration for this event was successful'); -define('_APCAL_RO_SUCCESS_REMOVE','The de-registration for this event was successful'); -define('_APCAL_RO_UNAME','Registrating person'); -define('_APCAL_RO_FIRSTNAME','first name'); -define('_APCAL_RO_LASTNAME','last name'); -define('_APCAL_RO_EMAIL','E-mail-address'); -define('_APCAL_RO_EXTRAINFO1','Telephone'); //use it as you want; if you keep it blank, it will be invisible; if you change later, it has no effect on the data himself -define('_APCAL_RO_EXTRAINFO2','Remarks'); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO3',''); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO4',''); //use it as you want, if you keep it blank, it will be invisible -define('_APCAL_RO_EXTRAINFO5',''); //use it as you want, if you keep it blank, it will be invisible - -define('_APCAL_RO_BTN_CONF_ADD','Confirm registration'); -define('_APCAL_RO_BTN_CONF_ADD_MORE','Confirm registration and registrate further persons'); -define('_APCAL_RO_BTN_CONF_REMOVE','Confirm de-registration'); -define('_APCAL_RO_BTN_CANCEL','Cancel'); -define('_APCAL_RO_EVENT','Event'); -define('_APCAL_RO_TITLE1','Registration for an event'); -define('_APCAL_RO_OBLIGATORY','This fields are obligatory!'); - -define('_APCAL_RO_ERROR_REMOVE','Unexepted error when deleting registration'); -define('_APCAL_RO_ERROR_ADD','Unexepted error when creating registration'); -define('_APCAL_RO_BTN_BACK','Go back'); -define('_APCAL_RO_BACK','You will be redirected to last page'); -define('_APCAL_RO_ONLINE2','Online registrations'); -define('_APCAL_RO_ACTION','Action'); - -define('_APCAL_RO_TITLE2','Activate online registration for this event'); -define('_APCAL_RO_BTN_RO_EDIT','Edit online registration'); -define('_APCAL_RO_BTN_RO_DEACTIVATE','Delete online registration'); -define('_APCAL_RO_BTN_RO_ACTIVATE','Activate'); -define('_APCAL_RO_QUANTITY','Maximum number of participants<br/>(0 means: no limit)'); -define('_APCAL_RO_QUANTITY2','Maximum number of participants'); -define('_APCAL_RO_DATELIMIT','Deadline for online registration'); -define('_APCAL_RO_EMAIL_NOTIFY','E-mail-address, which should be notified in case of (de-)registrations (keep blank, if you want no notifications)'); -define('_APCAL_RO_BTN_CONF_ACTIVATE','Confirm'); -define('_APCAL_RO_ERROR_RO_ACTIVATE','Unexpected error while activating online registration'); -define('_APCAL_RO_SUCCESS_RO_ACTIVATE','Activating/editing online registration was successful'); -define('_APCAL_RO_ERROR_RO_DEACTIVATE','Unexpected error while deactivating online registration'); -define('_APCAL_RO_SUCCESS_RO_DEACTIVATE','Deactivating online registration was successful'); -define('_APCAL_RO_ERROR_FULL','Sorry, but there are no more places available for this event'); -define('_APCAL_RO_ERROR_TIMEOUT','Sorry, but you have exceeded the deadline of this event'); -define('_APCAL_RO_ERROR_OBLIGATORY','Please fill in obligatory field \"%f\"'); -define('_APCAL_RO_BTN_CONF_SAVE','Save'); -define('_APCAL_RO_BTN_CONF_EDIT','Save changes'); - -define('_APCAL_RO_MAIL_SUBJ_ADD','Info registration'); -define('_APCAL_RO_MAIL_SUBJ_REMOVE','Info de-registration'); -define('_APCAL_RO_MAIL_SUBJ_TEXT','Information about the event'); -define('_APCAL_RO_DATE','Date'); -define('_APCAL_RO_LOCATION','Location'); -define('_APCAL_RO_LINK','Link to event'); -define('_APCAL_RO_TITLE3','List of existing registrations'); -define('_APCAL_RO_TITLE4','Send an email to all participant, which have entered an email-address'); -define('_APCAL_RO_MAIL_SENDER','Sender'); -define('_APCAL_RO_MAIL_SUBJ','Subject'); -define('_APCAL_RO_MAIL_BODY1','Mailtext'); -define('_APCAL_RO_MAIL_BODY2','The expressions in curly brackets will be replaced (z.B. {NAME} will be replace by first name and last name)'); -define('_APCAL_RO_BTN_SEND','Send'); -define('_APCAL_RO_MAILSENT',' message(s) sent'); - -define('_APCAL_RO_TITLE5','Change registrations'); -define('_APCAL_RO_BTN_EDIT','Edit'); -define('_APCAL_RO_SUCCESS_EDIT','Change of registration data successful'); -define('_APCAL_RO_ERROR_EDIT','Unexpected error while changing registration'); -define('_APCAL_RO_SEND_CONF1','E-Mail confirmation'); -define('_APCAL_RO_SEND_CONF2','send to'); -define('_APCAL_RO_SEND_CONF3','Send E-Mail-confirmation: '); - -define('_APCAL_RO_REDIRECT','You will be redirected to activation of online registration'); -define('_APCAL_RO_SUCCESS_NEW_EVENT','Event succesfully created'); -define('_APCAL_RO_SUCCESS_DELETE_EVENT','Event succesfully deleted'); -define('_APCAL_RO_SUCCESS_UPDATE_EVENT','Event succesfully changed'); -define('_APCAL_RO_SUCCESS_COPY_EVENT','Event succesfully copied'); \ No newline at end of file Deleted: XoopsModules/APCal/trunk/LICENCE.txt =================================================================== --- XoopsModules/APCal/trunk/LICENCE.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/LICENCE.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,284 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS Deleted: XoopsModules/APCal/trunk/README.txt =================================================================== --- XoopsModules/APCal/trunk/README.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/README.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,100 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -MODULE DESCRIPTION -APCal is a powerful calendar module for Xoops. - -There is no update since 2006 on the piCal module and the developer doesn't seem to work on it, -so we decided to upgrade it. - -NEW FEATURES: -- Some bug fixes. See CHANGELOG.txt for details. - -ORIGINAL FEATURES: -- User Registration (Thanks to Goffy) - - Users can subcribe to events and receive notifications. - - Manage wich events can take subscriptions. - - Option: Turn it on and off. - - Option: Set the maximum number of subscribers. - - Option: Set the deadline to subscribe. -- Pictures - - Thumbnail pictures with viewer in event view. - - Option : Add pictures to an event including a separated main picture. - - Option : Main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. -- Monthly view - - Monthly view with linear view for one event. (instead of repeating over and over) - - Each category have its own color. - - Legend of categories with categories colors. - - Option : bigger columns for chosen days. -- Display - - Seperate field for website and e-mail. - - More neutral colors for theme images, should be a better fit with most website. - - Reorganisation of admin preferences. - - Improved customizable theme. -- Sharing - - Tell a friend feature. - - New sharing buttons (LindedIn and Delicious). - - Option : display the share this calendar link. - - Option : API that allows webmasters to show easily your calendar on their website (linking back to your site). -- Map - - Markers with number representing the date of event with next event first. - - Option : Enable/disable map showing all events location. - - Option : Individual map showing event location. -- SEO - - Optimised for Google (Title and Description). - - Option : URL Rewrite if allowed by server. - - Option : Add a description in HTML for each categories. - - Option : Display title of categories in H1. -- Events - - Empty fields doesn't display in the event view. - - Option : Choose which category will be used for an event (as we keep multi-category feature). - - Option : Choose different hours for the same event (if multiple days are selected). - - Option : Navigation menu to see previous and next event. - -- Option : Perpetual holidays for USA (En), Canada (En), Quebec (Fr), France (Fr). - - -ORIGINAL PICAL FEATURES -- 4 Different views (Daily, Weekly, Monthly, Yearly). -- Users can add events if permission is granted. -- Export to ICS format. - -LICENSE -This module is released under the GPL license. See LICENSE.txt for details. - -LANGUAGES -up to v2.1.1: English, French, German -up to v2.0.4: English, French, German, Spanish -before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese - -CREDITS -This module is based on piCal, originally developed by GIJ=CHECKMATE <gi...@pe...>. -Sources created by Antiques Promotion, Goffy, GIJ=CHECKMATE, Ryuji. -Templates created by Antiques Promotion, GIJ=CHECKMATE. -Documentation by Antiques Promotion. -Testing by Antiques Promotion. -Translation by: - Antiques Promotion English (up to v2.1.1) - Antiques Promotion French (up to v2.1.1) - Goffy German (up to v2.1.1) - marpe Spanish (up to v2.0.4) - Chimpel Nederlands (before v1.0.0) - FrenchmaN Russian (before v1.0.0) - Xoobs TChinese (before v1.0.0) - Leif Madsen Swedish (before v1.0.0) - Olivier Portuguese (before v1.0.0) - Marcelo Yuji Himoro Brasil Portuguese (before v1.0.0) - Cubiq Italian (before v1.0.0) - kurak_bu Polish (before v1.0.0) - -REFERENCES -phpicalendar http://phpicalendar.sourceforge.net -PiCal http://xoops.peak.ne.jp - -FEEDBACK -For any suggestions, comments, bug reports and feature requests visit the development site at: http://xoops.antiquespromotion.ca - -FAQ -Q) The Displayed time is different from the time input time -A) This is caused the wrong setting of Time Zones in your XOOPS. Check Time Zones of your account, default account, or server. \ No newline at end of file Deleted: XoopsModules/APCal/trunk/UPGRADE.txt =================================================================== --- XoopsModules/APCal/trunk/UPGRADE.txt 2015-10-08 02:59:03 UTC (rev 13156) +++ XoopsModules/APCal/trunk/UPGRADE.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -1,20 +0,0 @@ -Module Name : APCal -Version Number : 2.2.0 -Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> - -UPGRADE FROM PICAL MODULE -1. Upload all files in this package to XOOPS_URL/modules/APCal/ -2. Log in to your site as administrator. -3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. - All your piCal categories and events will be transfered to APCal module. - -P.S.: Before upgrading, we recommend you to backup your database. - -================================================================================== - -UPGRADE INSTRUCTIONS -1. Upload all files in this package to XOOPS_URL/modules/APCal/, overwriting the existing files. -2. Log in to your site as administrator. -3. Update the module using the XOOPS module administration panel at 'System Admin Modules'. - -P.S.: Before upgrading, we recommend you to backup your database, customized templates and module files. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/CHANGELOG.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,97 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +Version 2.2.0 +- Fixed Timezones issue which was adding or removing days to an event. +- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. +- Updated All language files and variables to make the module clonable with SmartClone. + +Version 2.1.3 +- Fixed Events which need to be admitted don't create doubles of active events and an error message when clicked.. +- Fixed All day events set on the first day of a month don't appear on everyday of the previous month. + +Version 2.1.2 +- Fixed When inserting a new event, pictures are saved. +- Fixed The module now comes with its own datepicker because of some Xoops version bug. +- Fixed The map displays correclty when the contact is a user from the website. + +Version 2.1.1 +- Fixed When inserting a new event, pictures are saved. +- Updated Empty fields doesn't show in the event view. + +Version 2.1.0 +- Added Online registration feature with option to turn it on/off. (Uers can subscribe to an event and receive notifications for it) (Thanks to Goffy) +- Updated New way to make thumbs for better support on every servers. (Needs GD library) +- Updated When you save an event, the redirection is where you were before (Instead of current month) +- Fixed Links on events in the map for Yearly view and List view +- Fixed Some minor bug fixes +- New features are translated in English, French and German. + +Version 2.0.4 +- Updated Spanish and German translation. +- Fixed The link to add an event from the monthly view. + +Version 2.0.3 +- Minor bug fix on events insertion. +- The box in monthly view will not expand more than the screen width and height. + +Version 2.0.2 +- Fixed Shift for events in the first week of the month. +- Updated Language of social networks buttons in module language files. +- Updated Full event summary show in monthly view to take all available space. +- Updated In event view, event summary as title. + +Version 2.0.0 +- Updated Monthly view with linear view for one event (instead of repeating over and over) +- Added Possibility to Add Pictures to an event including a separate main picture. +- Added Thumbnail pictures with viewer in event view. +- Added Seperate field for website and e-mail. +- Added Optional main picture display in Monthly View (on mouse over), List View, Daily View and Weekly View. +- Added Each category have its own color. +- Added Legend of categories with categories colors. +- Added Possibility to choose which category to be used for an event (as we keep multi-category feature). +- Added Possibility to choose different hours for the same event (if multiple days are selected). +- Updated More neutral theme colors for images, should be a better fit with most website. +- Updated Reorganisation of admin preferences. +- Added Tell a friend feature. +- Added New sharing button (LindedIn and Delicious). +- Some minor bug fixes. + +Version 1.0.6 +- Added links to social networks (Facebook, Twitter, Google+) + +Version 1.0.5 +- Updated Admin menu to fit XOOPS 2.4 and 2.5. +- Some functions updates to fit php 5.3. + +Version 1.0.4 +- Updated admin menu. +- Fixed the bug caused by the .htaccess file generating an "Internal server error". +- Some minor bug fixes. + +Version 1.0.3 +- Some minor bug fixes. + +Version 1.0.2 +- Updated Google Optimization. +- Added onUpdate action to add the new DB fields. +- Updated onInstall action. +- Added navigation menu in event view and option to enable/disable it. +- Updated option to have bigger columns for every day (Select the ones bigger). +- Updated the "share this calendar" example to fit with Internet Explorer (IE7+) + +Version 1.0.1 +- Updated URLRewriting. +- Updated Google Optimization. + +Version 1.0.0 +- Added a map showing all events location. +- Added markers with number representing the date of event with next event first. +- Added individual map showing event location. +- Added optimization for Google. +- Added possibility to add a description in HTML for each categories. +- Added an API that allows webmasters to show easily your calendar on their website (linking back to your site). +- Updated customizable theme. +- Added option for bigger columns for week-ends. +- Updated calendar of holidays for United States, Canada and France. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/INSTALL.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,9 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +INSTALL INSTRUCTIONS +1. Upload the APCal directory to XOOPS_URL/modules/ +2. Log in to your site as administrator. +3. Install the module using the XOOPS module administration panel at 'System Admin Modules'. + If you already have the piCal module, all your categories and events will be automatically transfered. \ No newline at end of file Added: XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt =================================================================== --- XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt (rev 0) +++ XoopsModules/APCal/trunk/modules/apcal/docs/LANG DIFF.txt 2015-10-08 03:04:13 UTC (rev 13157) @@ -0,0 +1,244 @@ +Module Name : APCal +Version Number : 2.2.0 +Module developer : Antiques Promotion <http://xoops.antiquespromotion.ca> + +Feel free to translate to your own language and send us your changes. + +Done for: +up to v2.1.0: English, French, German +up to v2.0.4: English, French, German, Spanish +before v1.0.0: English, French, German, Spanish, Japanese, Dutch, Russian, Tchinese, Swedish, Portuguese, BrasilPortuguese + + +Version 2.1.0 +- modinfo.php + - added _MI_APCAL_ENABLEREGISTRATION +- apcal_constants.php + - added _APCAL_RO_CANCEL + - added _APCAL_RO_RADIO_YES + - added _APCAL_RO_RADIO_NO + - added _APCAL_RO_ONLINE_POSS + - added _APCAL_RO_ONLINE_POSS_2 + - added _APCAL_RO_ONLY_MEMBERS + - added _APCAL_RO_ONLINE_NO + - added _APCAL_RO_ONLINE_YES + - added _APCAL_RO_ONLINE_ACTIVATE + - added _APCAL_RO_ONLINE_DEACTIVATE + - added _APCAL_RO_ONLINE + - added _APCAL_RO_BTN_ADD + - added _APCAL_RO_BTN_ADDMORE + - added _APCAL_RO_BTN_REMOVE + - added _APCAL_RO_ENABLE_ONLINE + - added _APCAL_RO_NOMEMBERS + - added _APCAL_RO_BTN_LISTMEMBERS + - added _APCAL_RO_SUCCESS_ADD + - added _APCAL_RO_SUCCESS_REMOVE + - added _APCAL_RO_UNAME + - added _APCAL_RO_FIRSTNAME + - added _APCAL_RO_LASTNAME + - added _APCAL_RO_EMAIL + - added _APCAL_RO_EXTRAINFO1 + - added _APCAL_RO_EXTRAINFO2 + - added _APCAL_RO_EXTRAINFO3 + - added _APCAL_RO_EXTRAINFO4 + - added _APCAL_RO_EXTRAINFO5 + - added _APCAL_RO_BTN_CONF_ADD + - added _APCAL_RO_BTN_CONF_ADD_MORE + - added _APCAL_RO_BTN_CONF_REMOVE + - added _APCAL_RO_BTN_CANCEL + - added _APCAL_RO_EVENT + - added _APCAL_RO_TITLE1 + - added _APCAL_RO_OBLIGATORY + - added _APCAL_RO_ERROR_REMOVE + - added _APCAL_RO_ERROR_ADD + - added _APCAL_RO_BTN_BACK + - added _APCAL_RO_BACK + - added _APCAL_RO_ONLINE2 + - added _APCAL_RO_ACTION + - added _APCAL_RO_TITLE2 + - added _APCAL_RO_BTN_RO_EDIT + - added _APCAL_RO_BTN_RO_DEACTIVATE + - added _APCAL_RO_BTN_RO_ACTIVATE + - added _APCAL_RO_QUANTITY + - added _APCAL_RO_QUANTITY2 + - added _APCAL_RO_DATELIMIT + - added _APCAL_RO_EMAIL_NOTIFY + - added _APCAL_RO_BTN_CONF_ACTIVATE + - added _APCAL_RO_ERROR_RO_ACTIVATE + - added _APCAL_RO_SUCCESS_RO_ACTIVATE + - added _APCAL_RO_ERROR_RO_DEACTIVATE + - added _APCAL_RO_SUCCESS_RO_DEACTIVATE + - added _APCAL_RO_ERROR_FULL + - added _APCAL_RO_ERROR_TIMEOUT + - added _APCAL_RO_ERROR_OBLIGATORY + - added _APCAL_RO_BTN_CONF_SAVE + - added _APCAL_RO_BTN_CONF_EDIT + - added _APCAL_RO_MAIL_SUBJ_ADD + - added _APCAL_RO_MAIL_SUBJ_REMOVE + - added _APCAL_RO_MAIL_SUBJ_TEXT + - added _APCAL_RO_DATE + - added _APCAL_RO_LOCATION + - added _APCAL_RO_LINK + - added _APCAL_RO_TITLE3 + - added _APCAL_RO_TITLE4 + - added _APCAL_RO_MAIL_SENDER + - added _APCAL_RO_MAIL_SUBJ + - added _APCAL_RO_MAIL_BODY1 + - added _APCAL_RO_MAIL_BODY2 + - added _APCAL_RO_BTN_SEND + - added _APCAL_RO_MAILSENT + - added _APCAL_RO_TITLE5 + - added _APCAL_RO_BTN_EDIT + - added _APCAL_RO_SUCCESS_EDIT + - added _APCAL_RO_ERROR_EDIT + - added _APCAL_RO_SEND_CONF1 + - added _APCAL_RO_SEND_CONF2 + - added _APCAL_RO_SEND_CONF3 + - added _APCAL_RO_REDIRECT + - added _APCAL_RO_SUCCESS_NEW_EVENT + - added _APCAL_RO_SUCCESS_DELETE_EVENT + - added _APCAL_RO_SUCCESS_UPDATE_EVENT + - added _APCAL_RO_SUCCESS_COPY_EVENT + +Version 2.0.4 +- main.php + - added _APCAL_FB_LNG + - added _APCAL_GPLUS_LNG + +Version 2.0.0 +- modinfo.php + - updated _MI_APCAL_DISPLAYCATTITLE + - added _MI_APCAL_ENABLESOCIAL + - added _MI_APCAL_NBPICS + - added _MI_APCAL_PICSWIDTH + - added _MI_APCAL_PICSHEIGHT + - added _MI_APCAL_SHOWPICMONTHLY + - added _MI_AP... [truncated message content] |
From: <be...@us...> - 2015-10-08 02:59:05
|
Revision: 13156 http://sourceforge.net/p/xoops/svn/13156 Author: beckmi Date: 2015-10-08 02:59:03 +0000 (Thu, 08 Oct 2015) Log Message: ----------- folder name change Added Paths: ----------- XoopsModules/ams/ Removed Paths: ------------- XoopsModules/AMS - Article Management System/ |
From: <wis...@us...> - 2015-10-06 20:43:30
|
Revision: 13155 http://sourceforge.net/p/xoops/svn/13155 Author: wishcraft Date: 2015-10-06 20:43:27 +0000 (Tue, 06 Oct 2015) Log Message: ----------- FOIP/FAX/PBX Module Prealpah 0.00.01 Added Paths: ----------- XoopsModules/ICTPBX/ XoopsModules/ICTPBX/trunk/ XoopsModules/ICTPBX/trunk/modules/ XoopsModules/ICTPBX/trunk/modules/ict/ XoopsModules/ICTPBX/trunk/modules/ict/admin/ XoopsModules/ICTPBX/trunk/modules/ict/class/ XoopsModules/ICTPBX/trunk/modules/ict/class/coredb.php XoopsModules/ICTPBX/trunk/modules/ict/class/did.php XoopsModules/ICTPBX/trunk/modules/ict/class/gateway.php XoopsModules/ICTPBX/trunk/modules/ict/class/service.php XoopsModules/ICTPBX/trunk/modules/ict/class/technology.php XoopsModules/ICTPBX/trunk/modules/ict/class/trunk.php XoopsModules/ICTPBX/trunk/modules/ict/class/user.php XoopsModules/ICTPBX/trunk/modules/ict/images/ XoopsModules/ICTPBX/trunk/modules/ict/images/icons/ XoopsModules/ICTPBX/trunk/modules/ict/images/icons/16/ XoopsModules/ICTPBX/trunk/modules/ict/images/icons/24/ XoopsModules/ICTPBX/trunk/modules/ict/images/icons/32/ XoopsModules/ICTPBX/trunk/modules/ict/include/ XoopsModules/ICTPBX/trunk/modules/ict/include/constants.php XoopsModules/ICTPBX/trunk/modules/ict/include/forms.php XoopsModules/ICTPBX/trunk/modules/ict/include/formselectcountry.php XoopsModules/ICTPBX/trunk/modules/ict/include/functions.php XoopsModules/ICTPBX/trunk/modules/ict/include/places-api.uris XoopsModules/ICTPBX/trunk/modules/ict/language/ XoopsModules/ICTPBX/trunk/modules/ict/language/english/ XoopsModules/ICTPBX/trunk/modules/ict/language/english/css/ XoopsModules/ICTPBX/trunk/modules/ict/language/english/emails.php XoopsModules/ICTPBX/trunk/modules/ict/language/english/errors.php XoopsModules/ICTPBX/trunk/modules/ict/language/english/forms.php XoopsModules/ICTPBX/trunk/modules/ict/language/english/images.php XoopsModules/ICTPBX/trunk/modules/ict/language/english/mail_template/ XoopsModules/ICTPBX/trunk/modules/ict/language/english/mail_template/existing-user-password-changed.html XoopsModules/ICTPBX/trunk/modules/ict/language/english/mail_template/new-ictpbx-user-created.html XoopsModules/ICTPBX/trunk/modules/ict/preloads/ XoopsModules/ICTPBX/trunk/modules/ict/sql/ XoopsModules/ICTPBX/trunk/modules/ict/sql/mysql.sql XoopsModules/ICTPBX/trunk/modules/ict/templates/ XoopsModules/ICTPBX/trunk/modules/ict/xoops_version.php XoopsModules/ICTPBX/trunk/uploads/ XoopsModules/ICTPBX/trunk/uploads/ictpbx/ Added: XoopsModules/ICTPBX/trunk/modules/ict/class/coredb.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/coredb.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/coredb.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,41 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + + +class CoreDB extends XoopsDatabase +{ + public function __call($name, $arguments) { + return self::_callStatic($name, $arguments); + } + + /** As of PHP 5.3.0 */ + public static function __callStatic($name, $arguments) { + $db = db_set_active('ictcore'); + $result = call_user_func_array($name, $arguments); + db_set_active(); + return $result; + } +} Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/coredb.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/did.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/did.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/did.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,116 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctDid extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_did_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('did', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('description', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('assigned_to', XOBJ_DTYPE_INT, 0, false); + $this->initVar('forward_to', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('trunk_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctDidUserList extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct($row = array()) + { + $this->initVar('ictpbx_did_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('ictpbx_user_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('account_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('did', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('description', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('assigned_to', XOBJ_DTYPE_INT, 0, false); + $this->initVar('forward_to', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('first_name', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('last_name', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('phone_number', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('mobile_number', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('fax_number', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('mail', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('uid', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('user_created', XOBJ_DTYPE_INT, 0, false); + $this->assignVars($row); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctDidHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_did", "IctDid", "ictpbx_did_id", 'did'); + } + + function getDidByUserList($criteria = NULL) + { + $rows = array(); + $sql = "SELECT `ictpbx_did_id`, `ictpbx_user_id`, `did`, `description`, `assigned_to`, `forward_to`, `b`.`name` as `name`, `b`.`first_name` as `first_name`, `b`.`last_name` as `last_name`, `b`.`phone_number` as `phone_number`, `b`.`mobile_number` as `mobile_number`, `b`.`fax_number` as `fax_number`,`b`.`mail` as `mail`, `b`.`uid` as `uid`, `created`, `b`.`created` as `user_created` "; + $sql .= "FROM " . CoreDB::prefix("ictpbx_did") . " a LEFT JOIN " . CoreDB::prefix("ictpbx_user") . " b ON a.created_by = b.uid "; + if (!is_null($criteria)) + $sql .= $criteria->renderWhere(); + $result = CoreDB::queryF($sql); + while($row = CoreDB::fetchArray($result)) + { + $row['account_id'] = $row['ictpbx_did_id'] * $row['ictpbx_user_id'] + $row['uid']; + $rows[] = new IctDidUserList($row); + } + return $rows; + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/did.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/gateway.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/gateway.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/gateway.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,65 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctGateway extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_gateway_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('type', XOBJ_DTYPE_INT, 0, false); + $this->initVar('active', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctGatewayHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_gateway", "IctGateway", "ictpbx_gateway_id", 'name'); + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/gateway.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/service.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/service.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/service.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,64 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctService extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_service_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('active', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctServiceHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_service", "IctService", "ictpbx_service_id", 'name'); + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/service.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/technology.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/technology.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/technology.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,65 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctTechnology extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_technology_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, '', false, 32); + $this->initVar('type', XOBJ_DTYPE_INT, 0, false); + $this->initVar('active', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctTechnologyHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_technology", "IctTechnology", "ictpbx_technology_id", 'name'); + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/technology.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/trunk.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/trunk.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/trunk.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,77 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctTrunk extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_trunk_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('type', XOBJ_DTYPE_INT, 0, false); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('host', XOBJ_DTYPE_OTHER, '', false); + $this->initVar('username', XOBJ_DTYPE_OTHER, 0, false); + $this->initVar('password', XOBJ_DTYPE_OTHER, 0, false); + $this->initVar('port', XOBJ_DTYPE_OTHER, 0, false); + $this->initVar('channel', XOBJ_DTYPE_INT, 0, false); + $this->initVar('prefix', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('dial_string', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('register_string', XOBJ_DTYPE_TXTBOX, '', false, 255); + $this->initVar('gateway_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('service_flag', XOBJ_DTYPE_INT, 0, false); + $this->initVar('technology_id', XOBJ_DTYPE_INT, 0, false); + $this->initVar('weight', XOBJ_DTYPE_INT, 0, false); + $this->initVar('active', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctTrunkHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_trunk", "IctTrunk", "ictpbx_trunk_id", 'name'); + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/trunk.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/class/user.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/class/user.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/class/user.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,182 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctUser extends XoopsObject +{ + /** + * Class Constructor + */ + function __construct() + { + $this->initVar('ictpbx_user_id', XOBJ_DTYPE_INT, null, true); + $this->initVar('name', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('first_name', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('last_name', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('mail', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('phone_number', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('mobile_number', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('fax_number', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('address', XOBJ_DTYPE_TXTAREA, '', false); + $this->initVar('country', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('company', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('website', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('uid', XOBJ_DTYPE_INT, 0, false); + $this->initVar('active', XOBJ_DTYPE_INT, 0, false); + $this->initVar('credit', XOBJ_DTYPE_FLOAT, 0, false); + $this->initVar('free_bundle', XOBJ_DTYPE_INT, 0, false); + $this->initVar('reserved_credit', XOBJ_DTYPE_FLOAT, 0, false); + $this->initVar('reserved_free_bundle', XOBJ_DTYPE_INT, 0, false); + $this->initVar('package', XOBJ_DTYPE_TXTBOX, 0, false, 32); + $this->initVar('created', XOBJ_DTYPE_INT, 0, false); + $this->initVar('created_by', XOBJ_DTYPE_INT, 0, false); + } + +} + +/** + * @copyright copyright © 2015 labs.coop + */ +class IctUserHandler extends XoopsPersistableObjectHandler +{ + + /** + * Class Constructor + * + * @param unknown_type $db + */ + function __construct(&$db) + { + parent::__construct($db, "ictpbx_user", "IctUser", "ictpbx_user_id", 'name'); + } + + /** + * Handles Record Submition from Form Designations + * + * @param IctUser $user + * @param boolean $force + * @param array $formvalues + */ + function insertFromForm(IctUser $user, $force = true, $formvalues = array()) + { + if ($user->isNew()) + { + $isnew = true; + $mailpasswd = false; + if (isset($formvalues['passwd']) && empty($formvalues['passwd'])) + { + $formvalues['vpasswd'] = $formvalues['passwd'] = xoops_makepass(); + $mailpasswd = true; + } elseif (isset($formvalues['passwd']) && !empty($formvalues['passwd']) && isset($formvalues['vpasswd']) && !empty($formvalues['vpasswd']) && $formvalues['vpasswd'] != $formvalues['passwd']) + { + xoops_loadLanguages('errors'); + $GLOBALS['errors'][] = _ICTPBX_ERRORS_PASSWORD_MISMATCH; + return false; + } + $user_handler = xoops_gethandler('user'); + $xoopsuser = $user_handler->create(); + $xoopsuser->setVar('email', $user->getVar('mail')); + $xoopsuser->setVar('uname', $user->getVar('name')); + $xoopsuser->setVar('name', $user->getVar('first_name') . " " . $user->getVar('last_name')); + $xoopsuser->setVar('pass', md5($formvalues['passwd'])); + $xoopsuser->setVar('user_avatar', "ictpbx/blank.gif"); + $xoopsuser->setVar('user_from', $user->getVar('country')); + $xoopsuser->setVar('user_regdate', time()); + $xoopsuser->setVar('user_viewemail', $GLOBALS['ictModuleConfig']['newuser_user_viewmail']); + $xoopsuser->setVar('user_mailok', $GLOBALS['ictModuleConfig']['newuser_user_mailok']); + $user->setVar('uid', $user_handler->insert($xoopsuser, $force)); + $member_handler = xoops_gethandler('member'); + $member_handler->addUserToGroup(XOOPS_GROUP_USERS, $user->getVar('uid')); + if ($GLOBALS['ictModuleConfig']['newuser_group']!=XOOPS_GROUP_USERS) + $member_handler->addUserToGroup($GLOBALS['ictModuleConfig']['newuser_group'], $user->getVar('uid')); + $user->setVar('active', $GLOBALS['ictModuleConfig']['newuser_active']); + $user->setVar('credit', $GLOBALS['ictModuleConfig']['newuser_credit']); + $user->setVar('free_bundle', $GLOBALS['ictModuleConfig']['newuser_bundle']); + $user->setVar('reserved_credit', $GLOBALS['ictModuleConfig']['newuser_reserved_credit']); + $user->setVar('reserved_free_bundle', $GLOBALS['ictModuleConfig']['newuser_reserved_bundle']); + $user->setVar('package', $GLOBALS['ictModuleConfig']['newuser_package']); + $user->setVar('created', time()); + if (is_a($GLOBALS["xoopsUser"], "XoopsUser")) + $user->setVar('created_by', $GLOBALS["xoopsUser"]->getVar('uid')); + } else { + $isnew = false; + if (isset($formvalues['passwd']) && !empty($formvalues['passwd']) && isset($formvalues['vpasswd']) && !empty($formvalues['vpasswd']) && $formvalues['vpasswd'] != $formvalues['passwd']) + { + xoops_loadLanguages('errors'); + $GLOBALS['errors'][] = _ICTPBX_ERRORS_PASSWORD_MISMATCH; + return false; + } + if ($user->getVar('uid')!=0) + { + $user_handler = xoops_gethandler('user'); + $xoopsuser = $user_handler->get($user->getVar('uid')); + $xoopsuser->setVar('email', $user->getVar('mail')); + $xoopsuser->setVar('uname', $user->getVar('name')); + $xoopsuser->setVar('name', $user->getVar('first_name') . " " . $user->getVar('last_name')); + if (!empty($formvalues['passwd'])) + { + $xoopsuser->setVar('pass', md5($formvalues['passwd'])); + $mailpasswd = true; + } + $user_handler->insert($xoopsuser, $force); + + } + } + $id = parent::insert($user, $force); + if ($mailpasswd == true && is_a($xoopsuser, "XoopsUser")) + { + xoops_loadLanguages('emails'); + xoops_load("XoopsMailer"); + $xoopsMailer =& xoops_getMailer(); + $xoopsMailer->reset(); + $xoopsMailer->useMail(); + $xoopsMailer->setHTML(true); + $xoopsMailer->setTemplate(_ICTPBX_MAILTEMPLATE_PATH . DIRECTORY_SEPARATOR . ($isnew==true?'new-ictpbx-user-created.html':'existing-user-password-changed.html')); + $xoopsMailer->assign('FIRSTNAME', $user->getVar('first_name')); + $xoopsMailer->assign('LASTNAME', $user->getVar('last_name')); + $xoopsMailer->assign('USERNAME', $user->getVar('name')); + $xoopsMailer->assign('USEREMAIL', $user->getVar('mail')); + $xoopsMailer->assign('PASSWORD', $user->getVar('passwd')); + $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->assign('SITEURL', XOOPS_URL . "/"); + $xoopsMailer->setToUser($xoopsuser); + $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->setSubject(sprintf(($isnew==true?_ICTPBX_EMAIL_SUBJECT_NEWUSER:_ICTPBX_EMAIL_SUBJECT_PASSCHANGE), $GLOBALS['xoopsConfig']['sitename'])); + if (!$xoopsMailer->send()) { + xoops_loadLanguages('errors'); + $GLOBALS['errors'][] = sprintf(_ICTPBX_ERRORS_EMAIL_NOTSENT, $user->getVar('mail')); + } + } + return $id; + } +} +?> \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/class/user.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/include/constants.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/include/constants.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/include/constants.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,31 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +defined('XOOPS_ROOT_PATH') or die("XOOPS root path not defined"); + +define("_ICTPBX_DIRNAME", basename(dirname(__DIR__))); +define('_ICTPBX_MAILTEMPLATE_PATH', dirname(__DIR__) . DIRECTORY_SEPARATOR . "language" . DIRECTORY_SEPARATOR . $GLOBALS["xoopsConfig"]["language"] . DIRECTORY_SEPARATOR . "mail_template"); +define('_ICTPBX_CSS_URI', XOOPS_URL . "/modules/" . _ICTPBX_DIRNAME . "/language/" . $GLOBALS["xoopsConfig"]["language"] . "/css"); \ No newline at end of file Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/include/constants.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/include/forms.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/include/forms.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/include/forms.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,700 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +require_once dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'xoopsformloader.php'; +require_once __DIR__ . DIRECTORY_SEPARATOR . 'formselectcountry.php'; + +/** + * Build the ictcore editing form. + * + * @ingroup forms + * @see ictcore_form_submit() + */ +function ictcore_form_user_register_form_alter(&$form, &$form_state) { + + xoops_loadLanguage('forms', _ICTFAX_DIRNAME); + + $frm = array(); + $frm['name']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_USERNAME, 'name', 32, $form_state['values']['name']); + $frm['name']['form']->addDescription(_ICTPBX_MN_FORM_USERNAME_DESC); + $frm['name']['require'] = true; + $frm['passwd']['form'] = new XoopsFormPassword(_ICTPBX_MN_FORM_PASSWD, 'passwd', 32, ''); + $frm['passwd']['form']->addDescription(_ICTPBX_MN_FORM_PASSWD_DESC); + $frm['passwd']['require'] = false; + $frm['vpasswd']['form'] = new XoopsFormPassword(_ICTPBX_MN_FORM_VPASSWD, 'vpasswd', 32, ''); + $frm['vpasswd']['form']->addDescription(_ICTPBX_MN_FORM_VPASSWD_DESC); + $frm['vpasswd']['require'] = false; + $frm['first_name']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_FIRSTNAME, 'first_name', 32, $form_state['values']['first_name']); + $frm['first_name']['form']->addDescription(_ICTPBX_MN_FORM_FIRSTNAME_DESC); + $frm['first_name']['require'] = true; + $frm['last_name']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_LASTNAME, 'last_name', 32, $form_state['values']['last_name']); + $frm['last_name']['form']->addDescription(_ICTPBX_MN_FORM_LASTNAME_DESC); + $frm['last_name']['require'] = true; + $frm['mail']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_EMAIL, 'mail', 32, $form_state['values']['mail']); + $frm['mail']['form']->addDescription(_ICTPBX_MN_FORM_EMAIL_DESC); + $frm['mail']['require'] = false; + $frm['company']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_COMPANY, 'company', 32, $form_state['values']['company']); + $frm['company']['form']->addDescription(_ICTPBX_MN_FORM_COMPANY_DESC); + $frm['company']['require'] = false; + $frm['website']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_WEBSITE, 'website', 32, $form_state['values']['website']); + $frm['website']['form']->addDescription(_ICTPBX_MN_FORM_WEBSITE_DESC); + $frm['website']['require'] = false; + $frm['phone_number']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_PHONE, 'phone_number', 32, $form_state['values']['phone_number']); + $frm['phone_number']['form']->addDescription(_ICTPBX_MN_FORM_PHONE_DESC); + $frm['phone_number']['require'] = true; + $frm['mobile_number']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_MOBILE, 'mobile_number', 32, $form_state['values']['mobile_number']); + $frm['mobile_number']['form']->addDescription(_ICTPBX_MN_FORM_MOBILE_DESC); + $frm['mobile_number']['require'] = false; + $frm['fax_number']['form'] = new XoopsFormText(_ICTPBX_MN_FORM_FAX, 'fax_number', 32, $form_state['values']['fax_number']); + $frm['fax_number']['form']->addDescription(_ICTPBX_MN_FORM_FAX_DESC); + $frm['fax_number']['require'] = false; + $frm['address']['form'] = new XoopsFormTextArea(_ICTPBX_MN_FORM_ADDRESS, 'address', $form_state['values']['address'], 5, 39); + $frm['address']['form']->addDescription(_ICTPBX_MN_FORM_ADDRESS_DESC); + $frm['address']['require'] = true; + $frm['country']['form'] = new IctpbxFormSelectCountry(_ICTPBX_MN_FORM_COUNTRY, 'country', $form_state['values']['country'], 1, true); + $frm['country']['form']->addDescription(_ICTPBX_MN_FORM_COUNTRY_DESC); + $frm['country']['require'] = true; + $frm['ictpbx_user_id']['form'] = new XoopsFormHidden('ictpbx_user_id', !isset($form_state['values']['ictpbx_user_id'])?'0':$form_state['values']['ictpbx_user_id']); + $frm['ictpbx_user_id']['require'] = false; + + $form = new XoopsTableForm(_ICTPBX_MN_FORM_TITLE_USERREGO, _ICTPBX_MN_FORM_IDENTITY_USERREGO, $_SERVER["REQUEST_URI"]); + foreach($frm as $key => $values) + $form->addElement($values['form'], $values['require']); + + return $form->render(); +} + +/** + * Build the did form. + */ +function ictpbx_did_form($form, &$form_state, $edit = array()) { + // It's safe to use on both an empty array, and an incoming array with full or partial data. + $edit += array( + 'account_id' => '', + 'phone' => '', + 'first_name' => '', + 'email' => '', + ); + + // If we're editing an existing fax, we'll add a value field to the form + // containing the fax's unique ID. + if (!empty($edit['account_id'])) { + $form['account_id'] = array( + '#type' => 'value', + '#value' => $edit['account_id'], + ); + } + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('did Information'), + ); + + $form['info']['phone'] = array( + '#type' => 'textfield', + '#title' => t('DID Number'), + '#required' => TRUE, + '#default_value' => $edit['phone'], + ); + + $form['info']['first_name'] = array( + '#type' => 'textfield', + '#title' => t('Title'), + '#default_value' => $edit['first_name'], + ); + + $form['info']['email'] = array( + '#type' => 'textfield', + '#title' => t('Email'), + '#default_value' => $edit['email'], + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + + + +/** + * Validate + * + */ +function ictpbx_did_form_validate($form, &$form_state) { + $did = $form_state['values']; + $query = "SELECT account_id FROM account WHERE phone = :phone"; + $result = CoreDB::db_query($query, array(':phone'=>$did['phone'])); + if ($res = $result->fetchAssoc()) { + form_set_error('phone', t('DID already exist!')); + } +} + + + + +/** + * Build the did batch form. + */ +function ictpbx_did_batch($form, &$form_state, $edit = array()) { + $edit += array( + 'from' => '', + 'to' => '', + 'first_name' => '', + 'email' => '', + ); + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('DID Information'), + ); + + $form['info']['from'] = array( + '#type' => 'textfield', + '#title' => t('Range From'), + '#required' => TRUE, + '#default_value' => $edit['from'], + ); + + $form['info']['to'] = array( + '#type' => 'textfield', + '#title' => t('Range To'), + '#required' => TRUE, + '#default_value' => $edit['to'], + ); + + $form['info']['first_name'] = array( + '#type' => 'textfield', + '#title' => t('Title'), + '#default_value' => $edit['first_name'], + ); + + $form['info']['email'] = array( + '#type' => 'textfield', + '#title' => t('Email'), + '#default_value' => $edit['email'], + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + +/** + * Validates did batch insert + */ +function ictpbx_did_batch_validate($form, &$form_state) { + $did = $form_state['values']; + + // validation in case of batch insert + if ($did['from'] == '' || $did['to'] == '') { + form_set_error('from', t('Both fileds in DID Range cannot be empty')); + } else { + if (!is_numeric($did['from']) || !is_numeric($did['to'])) { + form_set_error('from', t('Please enter a valid DID range only numbers are allowed!')); + } else { + $query = "SELECT count(account_id) as num FROM account WHERE phone >= :from AND phone<= :to"; + $result = CoreDB::db_query($query, array(':from'=>$did['from'], ':to'=>$did['to'])); + $count = $result->fetchField(); + } + } +} + + + +/** + * Build the did import form. + */ +function ictpbx_did_import($form, &$form_state, $edit = array()) { + $edit += array( + 'upload' => '', + 'to' => '', + 'first_name' => '', + 'email' => '', + ); + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('did Information'), + ); + + // helper field for file upload + $form['#attributes'] = array('enctype' => "multipart/form-data"); + $form['info']['upload'] = array( + '#type' => 'file', + '#title' => t('Upload DID List'), + '#default_value' => $edit['upload'], + ); + $module_path = base_path() . drupal_get_path('module', 'ictpbx_did'); + $form['info']['example'] = array( + '#type' => 'markup', + '#markup' => t("Example File: <a href='$module_path/did_sample.csv'>did_sample.csv</a>"), + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + +/** + * Validates did import insert + */ +function ictpbx_did_import_validate($form, &$form_state) { + +} + + +/** + * Build the did form. + */ +function ictpbx_did_assign($form, &$form_state, $edit = array()) { + $edit += array( + 'phone' => '', + 'first_name' => '', + 'email' => '', + ); + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('DID Information'), + ); + + // containing the DID's unique ID. + if (!empty($edit['account_id'])) { + $form['info']['account_id'] = array( + '#type' => 'value', + '#value' => $edit['account_id'], + ); + } + + $form['info']['phone'] = array( + '#type' => 'textfield', + '#title' => t('DID Number'), + '#default_value' => $edit['phone'], + ); + + $form['info']['first_name'] = array( + '#type' => 'textfield', + '#title' => t('First_Name'), + '#default_value' => $edit['first_name'], + ); + + $form['setting'] = array( + '#type' => 'fieldset', + '#title' => t('User Information'), + ); + + $form['setting']['created_by'] = array( + '#type' => 'select', + '#title' => t('Assign to User'), + '#options' => array(0 => 'None') + ictcore_user_option(), + '#default_value' => $edit['created_by'], + ); + + $form['setting']['email'] = array( + '#type' => 'textfield', + '#title' => t('E-mail to Forward DID'), + '#default_value' => $edit['email'], + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + + +/** + * Crates a input form + */ +function ictfax_form($form, &$form_state, $edit = array()) { + $edit += array( + 'send_to' => '', + 'send_from' => '', + 'text' => '', + 'file_name' => '', + 'try_max' => 1, + ); + + // Include the CTools tools that we need. + ctools_include('ajax'); + ctools_include('modal'); + // Add CTools' javascript to the page. + ctools_modal_add_js(); + // drupal_add_js(drupal_get_path('module', 'ictfax') . '/fax_answer.js'); + // If we're editing an existing fax, we'll add a value field to the form + // containing the fax's unique ID. + if (!empty($edit['cid'])) { + $form['cid'] = array( + '#type' => 'value', + '#value' => $edit['cid'], + ); + } + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('Fax Information'), + ); + + $form['info']['send_to'] = array( + '#type' => 'textfield', + '#title' => t('Send To'), + '#required' => TRUE, + '#size' => 60, + '#maxlength' => 128, + '#description' => t('Click \'Phonebook\' to select fax #. where to send fax'), + '#default_value' => $edit['send_to'], + ); + + $form['info']['url'] = array( + '#type' => 'hidden', + // The name of the class is the #id of $form['ajax_button'] with "-url" + // suffix. + '#attributes' => array('class' => array('contact-button-url')), + '#value' => url('ictfax/phonebookpopup'), + ); + + $form['info']['ajax_button'] = array( + '#type' => 'button', + '#value' => 'Phonebook', + '#attributes' => array('class' => array('ctools-use-modal')), + '#id' => 'contact-button', + ); + + $form['info']['text'] = array( + '#type' => 'hidden', + '#title' => t('Message'), + '#required' => FALSE, + '#cols' => 60, + '#rows' => 10, + '#default_value' => $edit['text'], + ); + + // helper field for file upload + $form['#attributes'] = array('enctype' => "multipart/form-data"); + $form['info']['file_name'] = array( + '#type' => 'file', + '#title' => t('Fax file'), + '#required' => FALSE, + '#description' => t('Select a file to send as fax, please use only tif, pdf, jpg, png, gif or txt file'), + ); + + $form['info']['try_max'] = array( + '#type' => 'select', + '#title' => t('No. of Retries'), + '#options' => array( + 1 => t('[None]'), // no retry = 1 try + 2 => t('1'), // 1 retry = 2 tries and so on ... + 3 => t('2'), + 4 => t('3')), + '#description' => t('No. of tries if call failed'), + '#default_value' => $edit['try_max'], + ); + + $form['submit'] = array( + '#type' => 'submit', + '#value' => t('Create new Fax'), + ); + + return $form; +} + +/** + * Performs validation. + * + */ +function ictfax_form_validate($form, &$form_state) { + $transmission = $form_state['values']; + if (isset($transmission['transmission_id'])) { + // we are editing an existing record + $existing_record = $transmission['transmission_id']; + } + if ($transmission['send_to'] == '') { + form_set_error('send_to', t('Recipient cannot be empty')); + } + if (empty($transmission['send_to'])) { + form_set_error('send_to', t('Fax Number is required.')); + } else { + if (!ctype_digit(str_replace(array('+', ','), '',$transmission['send_to']))) { + form_set_error('send_to', t('Fax Number is not valid.')); + } + } + // Validate file + $allowedTypes = array( + 1=>'odt', 2=>'ott', 3=>'sxw', 4=>'stw', 5=>'doc', 6=>'dot', 7=>'sdw', 8=>'vor', 9=>'htm', 10=>'sdd', + 11=>'sdp', 12=>'wpd', 13=>'ods', 14=>'ots', 15=>'sxc', 16=>'stc', 17=>'xls', 18=>'xlw', 19=>'xlt', 20=>'sdc', + 21=>'csv', 22=>'odp', 23=>'otp', 24=>'sxi', 25=>'sti', 26=>'ppt', 27=>'pps', 28=>'pot', 29=>'sxd', 30=>'odt', + 31=>'ott', 32=>'sxw', 33=>'stw', 34=>'doc', 35=>'dot', 36=>'sdw', 37=>'vor', 38=>'htm', 39=>'sdd', 40=>'sdp', + 41=>'wpd', 42=>'ods', 43=>'ots', 44=>'sxc', 45=>'stc', 46=>'xls', 47=>'xlw', 48=>'xlt', 49=>'sdc', 50=>'csv', + 51=>'odp', 52=>'otp', 53=>'sxi', 54=>'sti', 55=>'ppt', 56=>'pps', 57=>'pot', 58=>'sxd', 59=>'txt', 60=>'tif', + 61=>'jpg', 62=>'pdf', 63=>'png', 64=>'gif', + ); + $validators = array('file_validate_extensions' => $allowedTypes); + $file = file_save_upload('file_name', $validators); + if ($file) { + $form_state['values']['file_name'] = $file; // drupal file object + } else { + form_set_error('file_name', "File is required"); + } +} + + +function ictfax_list_contacts($form, &$form_state, $edit = array()) { + $edit += array( + 'table' => '', + 'phone_list' => '', + ); + global $user; + + $header = array( + 'first_name' => t('First Name'), + 'last_name' => t('Last Name'), + 'phone' => t('phone'), + 'email' => t('E-Mail'), + ); + + $query = CoreDB::db_select('contact', 'c')->extend('PagerDefault'); + $query->fields('c', array('contact_id', 'first_name','last_name', 'phone', 'email')); + $query->condition('c.created_by', $user->uid,'='); + $result = $query->limit(10) + ->extend('TableSort') + ->orderByHeader($header) + ->execute(); + + $options = array(); + while ($contact = $result->fetchAssoc()) { + $options[$contact['contact_id']] = array( + 'first_name' => check_plain($contact['first_name']), + 'last_name' => check_plain($contact['last_name']), + 'phone' => check_plain($contact['phone']), + 'email' => check_plain($contact['email']), + ); + } + + $form['info']['table'] = array( + '#type' => 'tableselect', + '#header' => $header, + '#options' => $options, + '#multiple' => FALSE, + // '#input'=>true, + '#empty' => t('No record available'), + // '#advanced_select'=>false, + '#attributes' => '', + // '#default_value'=> $edit['table'], + ); + + $form['info']['pager'] = array( + '#type' => 'item', + '#markup' => theme('pager'), + ); + + $form['phone_list'] = array( + '#type' => 'hidden', + // '#value' => $edit['phone_list'], + ); + + $form['info']['submit'] = array( + '#type' => 'submit', + '#value' => t('Select'), + ); + + return $form; +} + + +/** + * Build the did form. + */ +function ictpbx_did_forward($form, &$form_state, $edit = array()) { + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('DID Information'), + ); + + // containing the DID's unique ID. + if (!empty($edit['account_id'])) { + $form['info']['account_id'] = array( + '#type' => 'value', + '#value' => $edit['account_id'], + ); + } + + $form['info']['phone'] = array( + '#type' => 'textfield', + '#title' => t('DID Number'), + '#value' => $edit['phone'], + ); + + $form['setting'] = array( + '#type' => 'fieldset', + '#title' => t('User Information'), + ); + + $form['setting']['email'] = array( + '#type' => 'textfield', + '#title' => t('E-mail to Forward DID'), + '#default_value' => $edit['email'], + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + + +/** + * Build the trunk form. + */ +function ictpbx_trunk_form($form, &$form_state, $edit = array()) { + // It's safe to use on both an empty array, and an incoming array with full or partial data. + $edit += array( + 'technology_id' => '', + 'name' => '', + 'description' => '', + 'username' => '', + 'password' => '', + 'host' => '', + 'port' => '', + // 'channel' => '1', + 'prefix' => '00', + 'dialstring' => 'sofia/gateway/%trunk/%phone', + 'register' => '', + 'active' => '', + + ); + + // If we're editing an existing fax, we'll add a value field to the form + // containing the fax's unique ID. + if (!empty($edit['provider_id'])) { + $form['provider_id'] = array( + '#type' => 'value', + '#value' => $edit['provider_id'], + ); + } + + $form['info'] = array( + '#type' => 'fieldset', + '#title' => t('Trunk Information'), + ); + + $form['info']['technology_id'] = array( + '#type' => 'select', + '#title' => t('Choose Provider Trunk Type'), + '#options' => ictcore_technology_option(), + '#default_value' => $edit['technology_id'], + ); + + $form['info']['name'] = array( + '#type' => 'textfield', + '#title' => t('Trunk Name'), + '#required' => TRUE, + '#default_value' => $edit['name'], + '#description' => t('Trunk name must match with gateway name that you created in freeswitch.'), + ); + + $form['info']['description'] = array( + '#type' => 'textarea', + '#title' => t('Trunk Description'), + '#default_value' => $edit['description'], + ); + + $form['info']['active'] = array( + '#type' => 'radios', + '#title' => t('Choose Status'), + '#options' => array(0 => 'Blocked', 1 => 'Active'), + '#default_value' => $edit['active'], + '#description' => t('Trunk name must match with gateway name that you created in freeswitch.'), + ); + + $form['setting'] = array( + '#type' => 'fieldset', + '#title' => t('Trunk Settings'), + ); + + $form['setting']['username'] = array( + '#type' => 'textfield', + '#title' => t('Username'), + '#default_value' => $edit['username'], + ); + + $form['setting']['password'] = array( + '#type' => 'textfield', + '#title' => t('Password'), + '#default_value' => $edit['password'], + ); + + $form['setting']['host'] = array( + '#type' => 'textfield', + '#title' => t('Host'), + '#default_value' => $edit['host'], + ); + + $form['setting']['port'] = array( + '#type' => 'textfield', + '#title' => t('Port'), + '#default_value' => $edit['port'], + ); + + $form['setting']['prefix'] = array( + '#type' => 'textfield', + '#title' => t('Add Prefix'), + '#default_value' => $edit['prefix'], + ); + + $form['setting']['dialstring'] = array( + '#type' => 'textfield', + '#title' => t('Dial String'), + '#default_value' => $edit['dialstring'], + ); + + $form['setting']['register'] = array( + '#type' => 'textfield', + '#title' => t('Register'), + '#default_value' => $edit['register'], + ); + + $form['buttons']['submit'] = array( + '#type' => 'submit', + '#value' => t('Submit'), + ); + + return $form; +} + Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/include/forms.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/include/formselectcountry.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/include/formselectcountry.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/include/formselectcountry.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,46 @@ +<?php +/** + * XOOPS form element + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage form + * @since 2.0.0 + * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/ + * @version $Id: formselectcountry.php 12537 2014-05-19 14:19:33Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') || die('Restricted access'); + +xoops_load('XoopsLists'); +xoops_load('XoopsFormSelect'); + +/** + * A select field with countries + */ +class IctpbxFormSelectCountry extends XoopsFormSelect +{ + /** + * Constructor + * + * @param string $caption Caption + * @param string $name "name" attribute + * @param mixed $value Pre-selected value (or array of them). + * Legal are all 2-letter country codes (in capitals). + * @param int $size Number or rows. "1" makes a drop-down-list + * @param bool $envalued false is a hash key index with true being a named key index + */ + function IctpbxFormSelectCountry($caption, $name, $value = null, $size = 1, $envalued = false) + { + $this->XoopsFormSelect($caption, $name, $value, $size); + $this->addOptionArray(array_merge(array(""=>_ICTPBX_FORM_SELECT_CHOOSEOPTION),ictpbx_country_list_api($envalued))); + } +} Property changes on: XoopsModules/ICTPBX/trunk/modules/ict/include/formselectcountry.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: XoopsModules/ICTPBX/trunk/modules/ict/include/functions.php =================================================================== --- XoopsModules/ICTPBX/trunk/modules/ict/include/functions.php (rev 0) +++ XoopsModules/ICTPBX/trunk/modules/ict/include/functions.php 2015-10-06 20:43:27 UTC (rev 13155) @@ -0,0 +1,1226 @@ +<?php +/** + * ICT-FAX Open Source Fax system based on ICT Innovations drupal modules + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright © 2012 ICT Innovations, All Rights Reserved + * @copyright © 2015 Chronolabs Cooperative, All Rights Reserved + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @subpackage ictfax + * @category foip/fax + * @since 1.0.1 + * @author Simon A. Roberts <wis...@us...> + * @author Falak Nawaz <su...@ic...> + * @author Nasir Iqbal <su...@ic...> + * @author Tahir Almas <su...@ic...> + * @see http://www.ictinnovations.com/ + * @see http://labs.coop/ + * @link mailto:in...@ic... + */ + +require_once __DIR__ . DIRECTORY_SEPARATOR . 'constants.php'; +require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'coredb.php'; + +function ictpbx_country_list_api($envalued = false) +{ + static $countries = array(); + if (!isset($countries[$envalued]) || empty($countries[$envalued])) + { + xoops_load("XoopsCache"); + if (!$countries[$envalued] = XoopsCache::read($cache = "ictpbx_countries".($envalued==false?"_hashed":"_named"))) + { + $placesapi = ictpbx_getFileContents(__DIR__ . DIRECTORY_SEPARATOR . "places-api.uris"); + $tries=-1; + while($tries < 9) + { + $tries++; + shuffle($placesapi); + $data = json_decode(ictpbx_getURL($placesapi[mt_rand(0, count($placesapi)-1)] . "/v1/list/list/json.api", 60, 60), true); + if (isset($data['countries']) && !empty($data['countries'])) + { + $tries = 9; + if ($envalued==0) + { + $countries[$envalued] = array(); + foreach($data['countries'] as $key => $values) + $countries[$envalued][$values['key']] = $values['Country']; + } else { + $countries[$envalued] = array()... [truncated message content] |
From: <be...@us...> - 2015-09-29 10:22:39
|
Revision: 13154 http://sourceforge.net/p/xoops/svn/13154 Author: beckmi Date: 2015-09-29 10:22:37 +0000 (Tue, 29 Sep 2015) Log Message: ----------- Invalid argument supplied for foreach Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-25 10:12:26 UTC (rev 13153) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-29 10:22:37 UTC (rev 13154) @@ -24,7 +24,8 @@ - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) -- add option to set height of Themes block (mamba) +- add option to set height of Themes block (mamba) +- fix: Invalid argument supplied for foreach() (cesagonchu/mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php 2015-09-25 10:12:26 UTC (rev 13153) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/notification_functions.php 2015-09-29 10:22:37 UTC (rev 13154) @@ -10,14 +10,14 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @copyright (c) 2000-2015 XOOPS Project (www.xoops.org) - * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) - * @package kernel - * @subpackage Xoop Notifications Functions - * @since 2.0.0 - * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/ - * @version $Id$ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @subpackage Xoop Notifications Functions + * @since 2.0.0 + * @author Kazumi Ono (AKA onokazu) http://www.myweb.ne.jp/, http://jp.xoops.org/ + * @version $Id$ */ -defined('XOOPS_ROOT_PATH') || die('Restricted access'); +defined('XOOPS_ROOT_PATH') || exit('Restricted access'); // RMV-NOTIFY @@ -27,8 +27,8 @@ /** * Determine if notification is enabled for the selected module. * - * @param string $style Subscription style: 'block' or 'inline' - * @param int $module_id ID of the module (default current module) + * @param string $style Subscription style: 'block' or 'inline' + * @param int $module_id ID of the module (default current module) * @return bool */ function notificationEnabled($style, $module_id = null) @@ -36,28 +36,28 @@ if (isset($GLOBALS['xoopsModuleConfig']['notification_enabled'])) { $status = $GLOBALS['xoopsModuleConfig']['notification_enabled']; } else { - if (! isset($module_id)) { + if (!isset($module_id)) { return false; } - $module_handler =& xoops_gethandler('module'); - $module =& $module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module =& $module_handler->get($module_id); if (!empty($module) && $module->getVar('hasnotification') == 1) { - $config_handler =& xoops_gethandler('config'); - $config = $config_handler->getConfigsByCat(0, $module_id); - $status = $config['notification_enabled']; + $config_handler =& xoops_getHandler('config'); + $config = $config_handler->getConfigsByCat(0, $module_id); + $status = $config['notification_enabled']; } else { return false; } } include_once $GLOBALS['xoops']->path('include/notification_constants.php'); - if (($style == 'block') && ($status == XOOPS_NOTIFICATION_ENABLEBLOCK || $status == XOOPS_NOTIFICATION_ENABLEBOTH)) { + if (($style === 'block') && ($status === XOOPS_NOTIFICATION_ENABLEBLOCK || $status === XOOPS_NOTIFICATION_ENABLEBOTH)) { return true; } - if (($style == 'inline') && ($status == XOOPS_NOTIFICATION_ENABLEINLINE || $status == XOOPS_NOTIFICATION_ENABLEBOTH)) { + if (($style === 'inline') && ($status === XOOPS_NOTIFICATION_ENABLEINLINE || $status === XOOPS_NOTIFICATION_ENABLEBOTH)) { return true; } // if ($status != XOOPS_NOTIFICATION_DISABLE) { - // return true; + // return true; // } return false; } @@ -78,12 +78,12 @@ if (!isset($module_id)) { global $xoopsModule; $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0; - $module =& $xoopsModule; + $module =& $xoopsModule; } else { - $module_handler =& xoops_gethandler('module'); - $module = &$module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module = &$module_handler->get($module_id); } - $not_config = & $module->getInfo('notification'); + $not_config = &$module->getInfo('notification'); if (empty($category_name)) { return $not_config['category']; } @@ -107,12 +107,12 @@ * of comments, and also remove the restriction that * all notification categories must have unique item_name. (TODO) * - * @param int $module_id ID of the module (default current module) + * @param int $module_id ID of the module (default current module) * @return mixed Associative array of category info */ function ¬ificationCommentCategoryInfo($module_id = null) { - $ret = false; + $ret = false; $all_categories =& notificationCategoryInfo('', $module_id); if (empty($all_categories)) { return $ret; @@ -123,7 +123,7 @@ continue; } foreach ($all_events as $event) { - if ($event['name'] == 'comment') { + if ($event['name'] === 'comment') { return $category; } } @@ -138,9 +138,9 @@ * Get an array of info for all events (each event has associative array) * in the selected category of the selected module. * - * @param string $category_name Category name - * @param bool $enabled_only If true, return only enabled events - * @param int $module_id ID of the module (default current module) + * @param string $category_name Category name + * @param bool $enabled_only If true, return only enabled events + * @param int $module_id ID of the module (default current module) * @return mixed */ function ¬ificationEvents($category_name, $enabled_only, $module_id = null) @@ -148,23 +148,23 @@ if (!isset($module_id)) { global $xoopsModule; $module_id = !empty($xoopsModule) ? $xoopsModule->getVar('mid') : 0; - $module =& $xoopsModule; + $module =& $xoopsModule; } else { - $module_handler =& xoops_gethandler('module'); - $module = $module_handler->get($module_id); + $module_handler =& xoops_getHandler('module'); + $module = $module_handler->get($module_id); } - $not_config = $module->getInfo('notification'); - $config_handler = & xoops_gethandler('config'); - $mod_config = $config_handler->getConfigsByCat(0, $module_id); + $not_config = $module->getInfo('notification'); + $config_handler = &xoops_getHandler('config'); + $mod_config = $config_handler->getConfigsByCat(0, $module_id); $category = notificationCategoryInfo($category_name, $module_id); global $xoopsConfig; $event_array = array(); - $override_comment = false; + $override_comment = false; $override_commentsubmit = false; - $override_bookmark = false; + $override_bookmark = false; foreach ($not_config['event'] as $event) { if ($event['category'] == $category_name) { @@ -175,13 +175,13 @@ if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } - if ($event['name'] == 'comment') { + if ($event['name'] === 'comment') { $override_comment = true; } - if ($event['name'] == 'comment_submit') { + if ($event['name'] === 'comment_submit') { $override_commentsubmit = true; } - if ($event['name'] == 'bookmark') { + if ($event['name'] === 'bookmark') { $override_bookmark = true; } } @@ -199,14 +199,14 @@ $mail_template_dir = $dir; include_once $GLOBALS['xoops']->path('include/comment_constants.php'); - $config_handler =& xoops_gethandler('config'); - $com_config = $config_handler->getConfigsByCat(0, $module_id); + $config_handler =& xoops_getHandler('config'); + $com_config = $config_handler->getConfigsByCat(0, $module_id); if (!$enabled_only) { $insert_comment = true; - $insert_submit = true; + $insert_submit = true; } else { $insert_comment = false; - $insert_submit = false; + $insert_submit = false; switch ($com_config['com_rule']) { case XOOPS_COMMENT_APPROVENONE: // comments disabled, no comment events @@ -231,47 +231,45 @@ } if ($insert_comment) { $event = array( - 'name' => 'comment' , - 'category' => $category['name'] , - 'title' => _NOT_COMMENT_NOTIFY , - 'caption' => _NOT_COMMENT_NOTIFYCAP , - 'description' => _NOT_COMMENT_NOTIFYDSC , - 'mail_template_dir' => $mail_template_dir , - 'mail_template' => 'comment_notify' , - 'mail_subject' => _NOT_COMMENT_NOTIFYSBJ); + 'name' => 'comment', + 'category' => $category['name'], + 'title' => _NOT_COMMENT_NOTIFY, + 'caption' => _NOT_COMMENT_NOTIFYCAP, + 'description' => _NOT_COMMENT_NOTIFYDSC, + 'mail_template_dir' => $mail_template_dir, + 'mail_template' => 'comment_notify', + 'mail_subject' => _NOT_COMMENT_NOTIFYSBJ); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } } if ($insert_submit) { $event = array( - 'name' => 'comment_submit' , - 'category' => $category['name'] , - 'title' => _NOT_COMMENTSUBMIT_NOTIFY , - 'caption' => _NOT_COMMENTSUBMIT_NOTIFYCAP , - 'description' => _NOT_COMMENTSUBMIT_NOTIFYDSC , - 'mail_template_dir' => $mail_template_dir , - 'mail_template' => 'commentsubmit_notify' , - 'mail_subject' => _NOT_COMMENTSUBMIT_NOTIFYSBJ , - 'admin_only' => 1); + 'name' => 'comment_submit', + 'category' => $category['name'], + 'title' => _NOT_COMMENTSUBMIT_NOTIFY, + 'caption' => _NOT_COMMENTSUBMIT_NOTIFYCAP, + 'description' => _NOT_COMMENTSUBMIT_NOTIFYDSC, + 'mail_template_dir' => $mail_template_dir, + 'mail_template' => 'commentsubmit_notify', + 'mail_subject' => _NOT_COMMENTSUBMIT_NOTIFYSBJ, + 'admin_only' => 1); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; } } - } } // Insert bookmark info if appropriate - if (!empty($category['allow_bookmark'])) { if (!$override_bookmark) { $event = array( - 'name' => 'bookmark' , - 'category' => $category['name'] , - 'title' => _NOT_BOOKMARK_NOTIFY , - 'caption' => _NOT_BOOKMARK_NOTIFYCAP , + 'name' => 'bookmark', + 'category' => $category['name'], + 'title' => _NOT_BOOKMARK_NOTIFY, + 'caption' => _NOT_BOOKMARK_NOTIFYCAP, 'description' => _NOT_BOOKMARK_NOTIFYDSC); if (!$enabled_only || notificationEventEnabled($category, $event, $module)) { $event_array[] = $event; @@ -280,7 +278,6 @@ } return $event_array; - } /** @@ -290,22 +287,22 @@ * @todo Check that this works correctly for comment and other * events which depend on additional config options... * - * @param array $category Category info array - * @param array $event Event info array - * @param object $module Module + * @param array $category Category info array + * @param array $event Event info array + * @param object $module Module * @return bool **/ function notificationEventEnabled(&$category, &$event, &$module) { - $config_handler =& xoops_gethandler('config'); - $mod_config = $config_handler->getConfigsByCat(0, $module->getVar('mid')); + $config_handler =& xoops_getHandler('config'); + $mod_config = $config_handler->getConfigsByCat(0, $module->getVar('mid')); if (is_array($mod_config['notification_events']) && $mod_config['notification_events'] != array()) { $option_name = notificationGenerateConfig($category, $event, 'option_name'); if (in_array($option_name, $mod_config['notification_events'])) { return true; } - $notification_handler = & xoops_gethandler('notification'); + $notification_handler = &xoops_getHandler('notification'); } return false; @@ -315,9 +312,9 @@ * Get associative array of info for the selected event in the selected * category (for the selected module). * - * @param string $category_name Notification category - * @param string $event_name Notification event - * @param int $module_id ID of the module (default current module) + * @param string $category_name Notification category + * @param string $event_name Notification event + * @param int $module_id ID of the module (default current module) * @return mixed */ function ¬ificationEventInfo($category_name, $event_name, $module_id = null) @@ -337,7 +334,7 @@ * Get an array of associative info arrays for subscribable categories * for the selected module. * - * @param int $module_id ID of the module + * @param int $module_id ID of the module * @return mixed */ @@ -346,15 +343,16 @@ $all_categories = notificationCategoryInfo('', $module_id); // FIXME: better or more standardized way to do this? - $script_url = explode('/', $_SERVER['PHP_SELF']); + $script_url = explode('/', $_SERVER['PHP_SELF']); $script_name = $script_url[count($script_url) - 1]; $sub_categories = array(); + if (null != $all_categories) { foreach ($all_categories as $category) { // Check the script name $subscribe_from = $category['subscribe_from']; if (!is_array($subscribe_from)) { - if ($subscribe_from == '*') { + if ($subscribe_from === '*') { $subscribe_from = array( $script_name); // FIXME: this is just a hack: force a match @@ -370,20 +368,19 @@ // check if that argument exists... if (empty($category['item_name'])) { $category['item_name'] = ''; - $category['item_id'] = 0; - $sub_categories[] = $category; + $category['item_id'] = 0; + $sub_categories[] = $category; } else { $item_name = $category['item_name']; - $id = ($item_name != '' && isset($_GET[$item_name])) ? (int)($_GET[$item_name]) : 0; + $id = ($item_name != '' && isset($_GET[$item_name])) ? (int)($_GET[$item_name]) : 0; if ($id > 0) { $category['item_id'] = $id; - $sub_categories[] = $category; + $sub_categories[] = $category; } } } - + } return $sub_categories; - } /** |
From: <be...@us...> - 2015-09-25 10:12:30
|
Revision: 13153 http://sourceforge.net/p/xoops/svn/13153 Author: beckmi Date: 2015-09-25 10:12:26 +0000 (Fri, 25 Sep 2015) Log Message: ----------- add /assets Modified Paths: -------------- XoopsModules/xlanguage/trunk/xlanguage/admin/about.php XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php XoopsModules/xlanguage/trunk/xlanguage/admin/index.php XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php XoopsModules/xlanguage/trunk/xlanguage/admin/main.php XoopsModules/xlanguage/trunk/xlanguage/admin/menu.php XoopsModules/xlanguage/trunk/xlanguage/api.php XoopsModules/xlanguage/trunk/xlanguage/blocks/xlanguage_blocks.php XoopsModules/xlanguage/trunk/xlanguage/class/language.php XoopsModules/xlanguage/trunk/xlanguage/docs/changelog.txt XoopsModules/xlanguage/trunk/xlanguage/docs/credits.txt XoopsModules/xlanguage/trunk/xlanguage/docs/install.txt XoopsModules/xlanguage/trunk/xlanguage/docs/readme.txt XoopsModules/xlanguage/trunk/xlanguage/include/functions.php XoopsModules/xlanguage/trunk/xlanguage/include/vars.php XoopsModules/xlanguage/trunk/xlanguage/language/english/admin.php XoopsModules/xlanguage/trunk/xlanguage/language/english/help/help.html XoopsModules/xlanguage/trunk/xlanguage/language/english/help/index.html XoopsModules/xlanguage/trunk/xlanguage/language/english/index.html XoopsModules/xlanguage/trunk/xlanguage/language/index.html XoopsModules/xlanguage/trunk/xlanguage/preloads/core.php XoopsModules/xlanguage/trunk/xlanguage/preloads/index.html XoopsModules/xlanguage/trunk/xlanguage/sql/index.html XoopsModules/xlanguage/trunk/xlanguage/sql/mysql.sql XoopsModules/xlanguage/trunk/xlanguage/xoops_version.php Added Paths: ----------- XoopsModules/xlanguage/trunk/xlanguage/assets/ XoopsModules/xlanguage/trunk/xlanguage/assets/css/ XoopsModules/xlanguage/trunk/xlanguage/assets/css/index.html XoopsModules/xlanguage/trunk/xlanguage/assets/images/ XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/canada.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/china.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/cyprus.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/czech.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/danish.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/english.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/french.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/german.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/greece.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/index.html XoopsModules/xlanguage/trunk/xlanguage/assets/images/ireland.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/italian.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/japan.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/korea.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/lebanon.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/luxemburg.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/malta.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/mexico.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/nederlands.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/noflag.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/norway.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/poland.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/russia.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/slovakia.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/spanish.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/sweden.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/swiss.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/taiwan(Chinese Taipei).gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/taiwan(Republic of China).gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/turkey.gif XoopsModules/xlanguage/trunk/xlanguage/assets/images/usa.gif XoopsModules/xlanguage/trunk/xlanguage/assets/index.html XoopsModules/xlanguage/trunk/xlanguage/assets/js/ XoopsModules/xlanguage/trunk/xlanguage/assets/js/index.html XoopsModules/xlanguage/trunk/xlanguage/templates/blocks/index.html XoopsModules/xlanguage/trunk/xlanguage/templates/blocks/xlanguage_block.tpl Removed Paths: ------------- XoopsModules/xlanguage/trunk/xlanguage/images/ XoopsModules/xlanguage/trunk/xlanguage/templates/blocks/xlanguage_block.html Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/about.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/about.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/about.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -9,7 +9,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright The XOOPS Project (http://www.xoops.org) + * @copyright XOOPS Project (http://xoops.org) * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package xlanguage * @since 2.0 @@ -17,7 +17,7 @@ * @version $Id $ **/ -include_once dirname(__FILE__) . '/admin_header.php'; +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); @@ -26,4 +26,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,33 +1,23 @@ <?php -// $Id: about2.php 8203 2011-11-07 03:55:46Z beckmi $ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // -include '../../../include/cp_header.php'; +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author D.J.(phppp) ph...@ho... + * @version $Id $ + **/ + +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; xoops_cp_header(); $myts = &MyTextSanitizer::getInstance(); @@ -37,20 +27,22 @@ // Left headings... echo "<a href='index.php'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/" . $versioninfo -> getInfo('image') . "' alt='' hspace='10' vspace='0' align='left'></a>"; -echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " ver " . $versioninfo->getInfo('version') . "</div>"; +echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " ver " + . $versioninfo->getInfo('version') . "</div>"; echo "</div>"; echo "<div>" . _MI_XLANG_RELEASE . ": " . $versioninfo -> getInfo('releasedate') . "</div>"; // Author Information $sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_INFO, "", ""); -if ( $versioninfo->getInfo('author_realname')) +if ($versioninfo->getInfo('author_realname')) { $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")"; -else +} else { $author_name = $versioninfo->getInfo('author'); +} $sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_NAME, $author_name)); $author_sites = $versioninfo -> getInfo('author_website'); $author_site_info = ""; -foreach($author_sites as $site){ +foreach ($author_sites as $site) { $author_site_info .= "<a href='" . $site['url'] . "' target='blank'>" . $site['name'] . "</a>; "; } $sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_WEBSITE, $author_site_info)); @@ -66,8 +58,7 @@ $sform -> display(); $file = "../bugfixlist.txt"; -if (@file_exists($file)) -{ +if (@file_exists($file)) { $fp = @fopen($file, "r"); $bugtext = @fread($fp, filesize($file)); @fclose($file); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -2,7 +2,7 @@ echo "<div class='adminfooter'>\n" ." <div style='text-align: center;'>\n" - ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." <a href='http://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" ." </div>\n" ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" ."</div>"; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,6 +1,6 @@ <?php /** - * XoopsPartners module + * xLanguage module (eXtensible Language Management For XOOPS) * * You may not change or alter any portion of this comment or credits * of supporting developers from this source code or any supporting source code @@ -9,38 +9,33 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} - * @package:: XoopsPartners - * @subpackage:: admin - * @since:: 2.5.0 - * @author:: XOOPS Team - * @version:: $Id $ -**/ + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author XOOPS Development Team + * @version $Id $ + **/ -$path = dirname(dirname(dirname(dirname(__FILE__)))); +$path = dirname(dirname(dirname(__DIR__))); include_once $path . '/mainfile.php'; include_once $path . '/include/cp_functions.php'; require_once $path . '/include/cp_header.php'; global $xoopsModule; -$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); +$moduleDirName = $GLOBALS['xoopsModule']->getVar('dirname'); //if functions.php file exist -require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +require_once dirname(__DIR__) . '/include/functions.php'; // Load language files -xoops_loadLanguage('admin', $thisModuleDir); -xoops_loadLanguage('modinfo', $thisModuleDir); -xoops_loadLanguage('main', $thisModuleDir); +xoops_loadLanguage('admin', $moduleDirName); +xoops_loadLanguage('modinfo', $moduleDirName); +xoops_loadLanguage('main', $moduleDirName); $pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); $pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); -if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ - include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); - }else{ - redirect_header("../../../admin.php", 5, _AM_XLANG_MODULEADMIN_MISSING, false); - } +include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/index.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/index.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/index.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,32 +1,25 @@ <?php -// $Id$ -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -include '../../../include/cp_header.php'; +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author XOOPS Team + * @version $Id $ + **/ -include 'admin_header.php'; +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; + +include_once __DIR__ . '/admin_header.php'; xoops_cp_header(); $indexAdmin = new ModuleAdmin(); @@ -34,4 +27,4 @@ echo $indexAdmin->addNavigation('index.php'); echo $indexAdmin->renderIndex(); -include "admin_footer.php"; +include_once __DIR__ . '/admin_footer.php'; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,41 +1,30 @@ <?php -// $Id$ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author D.J.(phppp) ph...@ho... + * @version $Id $ + **/ include XOOPS_ROOT_PATH."/class/xoopsformloader.php"; $sform = new XoopsThemeForm(_AM_XLANG_EDITLANG, "langform", xoops_getenv('PHP_SELF')); -if($isBase){ +if ($isBase) { $lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name); $lang_select->addOptionArray($xlanguage_handler->getXoopsLangList()); $sform->addElement($lang_select, true); -}else{ +} else { $sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true); } @@ -51,13 +40,13 @@ $lang_charset->setDescription(_AM_XLANG_CHARSET_DESC); $sform->addElement($lang_charset, true); -if(!$isBase){ +if (!$isBase) { $baseList =& $xlanguage_handler->getAll(); $base_list = array(); - foreach($baseList as $base => $baselang){ + foreach ($baseList as $base => $baselang) { $base_list[$base] = $base; } - + $base_select = new XoopsFormSelect(_AM_XLANG_BASE, 'lang_base', $lang_base); $base_select->addOptionArray($base_list); $sform->addElement($base_select, true); @@ -65,22 +54,24 @@ $sform->addElement(new XoopsFormText(_AM_XLANG_WEIGHT, 'weight', 10, 10, $weight)); $image_option_tray = new XoopsFormElementTray(_AM_XLANG_IMAGE, ''); -$image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule -> dirname() . "/images/"); +$image_array =& XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . "/modules/" . $xoopsModule -> dirname() . "/assets/images/"); $lang_image =(empty($lang_image))?'noflag.gif':$lang_image; $image_select = new XoopsFormSelect('', 'lang_image', $lang_image); $image_select->addOptionArray($image_array); -$image_select->setExtra("onchange='showImgSelected(\"image\", \"lang_image\", \"/modules/" . $xoopsModule -> dirname() . "/images/\", \"\", \"" . XOOPS_URL . "\")'"); +$image_select->setExtra("onchange='showImgSelected(\"image\", \"lang_image\", \"/modules/" . $xoopsModule -> dirname() . "/assets/images/\", \"\", \"" . XOOPS_URL . "\")'"); $image_tray = new XoopsFormElementTray('', ' '); $image_tray->addElement($image_select); -if (!empty($lang_image)){ - $image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/images/" . $lang_image . "' name='image' id='image' alt='' /></div>")); -}else{ +if (!empty($lang_image)) { + $image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/assets/images/" . $lang_image . "' name='image' id='image' alt='' /></div>")); +} else { $image_tray->addElement(new XoopsFormLabel('', "<div style='padding: 8px;'><img src='" . XOOPS_URL . "/images/blank.gif' name='image' id='image' alt='' /></div>")); } $image_option_tray->addElement($image_tray); $sform->addElement($image_option_tray); -if(isset($lang_id)) $sform->addElement(new XoopsFormHidden('lang_id', $lang_id)); +if (isset($lang_id)) { + $sform->addElement(new XoopsFormHidden('lang_id', $lang_id)); +} $sform->addElement(new XoopsFormHidden('type', $type)); $button_tray = new XoopsFormElementTray('', ''); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/main.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,94 +1,89 @@ <?php -// $Id: main.php 8586 2011-12-27 12:03:19Z beckmi $ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // -include '../../../include/cp_header.php'; -include_once 'admin_header.php'; +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author D.J.(phppp) ph...@ho... + * @version $Id $ + **/ +include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php'; +include_once __DIR__ . '/admin_header.php'; + include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/vars.php'); include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php'); $op = ""; -if ( isset( $_POST ) ){ - foreach ( $_POST as $k => $v ) { +if (isset($_POST)) { + foreach ($_POST as $k => $v) { ${$k} = $v; } } -if ( isset( $_GET ) ){ - foreach ( $_GET as $k => $v ) { +if (isset($_GET)) { + foreach ($_GET as $k => $v) { ${$k} = $v; } } -define("XLANG_CONFIG_LINK","<a href='main.php' target='_self'>"._AM_XLANG_CONFIG."</a>"); +define("XLANG_CONFIG_LINK", "<a href='main.php' target='_self'>"._AM_XLANG_CONFIG."</a>"); $xlanguage_handler =& xoops_getmodulehandler('language', 'xlanguage'); $xlanguage_handler->loadConfig(); -switch ( $op ) -{ +switch ($op) { case "del": - if (!isset($_POST['ok']) || $_POST['ok'] != 1 ){ + if (!isset($_POST['ok']) || $_POST['ok'] != 1) { xoops_cp_header(); -$aboutAdmin = new ModuleAdmin(); -echo $aboutAdmin->addNavigation('main.php'); -// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; - xoops_confirm( array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => intval( $_GET['lang_id'] ), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM ); - }else{ - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; + $aboutAdmin = new ModuleAdmin(); + echo $aboutAdmin->addNavigation('main.php'); +// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; + xoops_confirm(array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => (int)($_GET['lang_id']), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM); + } else { + if (isset($type) && $type == 'ext') { + $isBase = false; + } else { + $isBase = true; + } $lang =& $xlanguage_handler->get($lang_id, $isBase); $xlanguage_handler->delete($lang); - redirect_header("main.php",2,_AM_XLANG_DELETED); + redirect_header("main.php", 2, _AM_XLANG_DELETED); } break; case "save": - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; - if(isset($lang_id)&&$lang_id>0){ + if (isset($type) && $type == 'ext') { + $isBase = false; + } else { + $isBase = true; + } + if (isset($lang_id)&&$lang_id>0) { $lang =& $xlanguage_handler->get($lang_id, $isBase); - }else{ + } else { $lang =& $xlanguage_handler->create(true, $isBase); } $lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", "", $lang_name); - - $lang->setVar('lang_name',$lang_name); - $lang->setVar('lang_desc',$lang_desc); - $lang->setVar('lang_code',$lang_code); - $lang->setVar('lang_charset',$lang_charset); - $lang->setVar('lang_image',$lang_image); - if(!$isBase){ - $lang->setVar('lang_base',$lang_base); + + $lang->setVar('lang_name', $lang_name); + $lang->setVar('lang_desc', $lang_desc); + $lang->setVar('lang_code', $lang_code); + $lang->setVar('lang_charset', $lang_charset); + $lang->setVar('lang_image', $lang_image); + if (!$isBase) { + $lang->setVar('lang_base', $lang_base); } - $lang->setVar('weight',$weight); + $lang->setVar('weight', $weight); $xlanguage_handler->insert($lang); - redirect_header("main.php",2,_AM_XLANG_SAVED); + redirect_header("main.php", 2, _AM_XLANG_SAVED); break; case "edit": @@ -98,13 +93,16 @@ // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; // echo "<br />"; echo "<h4>" . _AM_XLANG_EDITLANG . "</h4>"; - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; - if(isset($lang_id)&&$lang_id>0){ + if (isset($type) && $type == 'ext') { + $isBase = false; + } else { + $isBase = true; + } + if (isset($lang_id)&&$lang_id>0) { $lang =& $xlanguage_handler->get($lang_id, $isBase); - }elseif(isset($lang_name)){ + } elseif (isset($lang_name)) { $lang =& $xlanguage_handler->getByName($lang_name, $isBase); - }else{ + } else { $lang =& $xlanguage_handler->create(true, $isBase); } $lang_name = $lang->getVar('lang_name'); @@ -113,10 +111,10 @@ $lang_charset = $lang->getVar('lang_charset'); $lang_image = $lang->getVar('lang_image'); $weight = $lang->getVar('weight'); - if(!$isBase){ + if (!$isBase) { $lang_base = $lang->getVar('lang_base'); } - include "langform.inc.php"; + include __DIR__ . '/langform.inc.php'; break; case "add": @@ -125,12 +123,12 @@ // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; // echo "<br />"; // echo "<h4>" . _AM_XLANG_ADDLANG . "</h4>"; - if(isset($type)&&$type=='ext') { - $isBase = false; - echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); } - else { - $isBase = true; - echo $aboutAdmin->addNavigation('main.php?op=add&type=base'); + if (isset($type)&&$type=='ext') { + $isBase = false; + echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); + } else { + $isBase = true; + echo $aboutAdmin->addNavigation('main.php?op=add&type=base'); } $lang_name = ''; $lang_desc = ''; @@ -139,13 +137,13 @@ $lang_image = ''; $weight = 1; $lang_base = ''; - include "langform.inc.php"; + include 'langform.inc.php'; break; - + case 'createconfig': xlanguage_createConfig(); - redirect_header( 'main.php', 1, _AM_XLANG_CREATED ); - exit(); + redirect_header('main.php', 1, _AM_XLANG_CREATED); + break; case "default": @@ -154,7 +152,7 @@ $mainAdmin = new ModuleAdmin(); echo $mainAdmin->addNavigation('main.php'); - // if (TDMDownloads_checkModuleAdmin()){ + // if (TDMDownloads_checkModuleAdmin()) { // $mainAdmin = new ModuleAdmin(); // echo $mainAdmin->addNavigation('downloads.php'); $mainAdmin->addItemButton(_MI_XLANGUAGE_ADMENU1, 'main.php?op=add&type=base', 'add'); @@ -162,14 +160,15 @@ echo $mainAdmin->renderButton(); // } - + // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; languageList(); $configfile_status = (@is_readable(XLANGUAGE_CONFIG_FILE))?_AM_XLANG_CONFIGOK:_AM_XLANG_CONFIGNOTOK; echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\"><br />"; // echo " - <b><a href='index.php?op=add&type=base'>" . _AM_XLANG_ADDBASE . "</a></b><br /><br />\n"; // echo " - <b><a href='index.php?op=add&type=ext'>" . _AM_XLANG_ADDEXT . "</a></b><br /><br />\n"; - echo "<b>".$configfile_status."</b>: ".XLANGUAGE_CONFIG_FILE." (<a href='main.php?op=createconfig' title='"._AM_XLANG_CREATECONFIG."'>" . _AM_XLANG_CREATECONFIG . "</a>)<br /><br />\n"; + echo "<b>" . $configfile_status . "</b>: " . XLANGUAGE_CONFIG_FILE . " (<a href='main.php?op=createconfig' title='" . _AM_XLANG_CREATECONFIG . "'>" . _AM_XLANG_CREATECONFIG + . "</a>)<br /><br />\n"; // echo " - <b><a href='about.php'>" . _AM_XLANG_ABOUT . "</a></b>"; echo"</td></tr></table>"; break; @@ -180,59 +179,63 @@ { global $xlanguage_handler, $xoopsModule; -global $pathIcon16; - + global $pathIcon16; + $lang_list =& $xlanguage_handler->getAllList(); - if ( is_array($lang_list)&&count( $lang_list ) > 0 ){ + if (is_array($lang_list)&&count($lang_list) > 0) { echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\">"; echo "<div style='text-align: center;'><b><h4>" . _AM_XLANG_LANGLIST . "</h4></b><br />"; - echo "<table class='outer' width='100%' border='0' cellpadding='0' cellspacing='0' ><tr class='bg2'><th align='center'>" . _AM_XLANG_DESC . "</th><th align='center'>" . _AM_XLANG_NAME . "</th><th align='center'>" . _AM_XLANG_CHARSET . "</th><th align='center'>" . _AM_XLANG_CODE . "</th><th align='center'>" . _AM_XLANG_IMAGE . "</th><th align='center'>" . _AM_XLANG_WEIGHT . "</th><th align='center'>" . _AM_XLANG_BASE . "</th><th align='center'>" . _AM_XLANG_ACTION . "</th></tr>\n"; + echo "<table class='outer' width='100%' border='0' cellpadding='0' cellspacing='0' ><tr class='bg2'><th align='center'>" . _AM_XLANG_DESC . "</th><th align='center'>" . _AM_XLANG_NAME + . "</th><th align='center'>" . _AM_XLANG_CHARSET . "</th><th align='center'>" . _AM_XLANG_CODE . "</th><th align='center'>" . _AM_XLANG_IMAGE . "</th><th align='center'>" + . _AM_XLANG_WEIGHT . "</th><th align='center'>" . _AM_XLANG_BASE . "</th><th align='center'>" . _AM_XLANG_ACTION . "</th></tr>\n"; $class = 'even'; - foreach( array_keys($lang_list) as $lang_name ) { + foreach (array_keys($lang_list) as $lang_name) { $lang =& $lang_list[$lang_name]; $isOrphan = true; - if(isset($lang['base'])){ + if (isset($lang['base'])) { echo "<tr>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n"; - echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n"; - echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n"; - if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$lang['base'] -> getVar('lang_image'))){ - $lang_image = $lang['base'] -> getVar('lang_image'); - }else{ - $lang_image = 'noflag.gif'; - } - echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n"; - echo "<td class='$class' >Ø</td>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n"; + echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n"; + echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n"; + if (is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/assets/images/'.$lang['base'] -> getVar('lang_image'))) { + $lang_image = $lang['base'] -> getVar('lang_image'); + } else { + $lang_image = 'noflag.gif'; + } + echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/assets/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n"; + echo "<td class='$class' >Ø</td>\n"; echo "<td class='$class' ><a href='main.php?op=edit&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". "<a href='main.php?op=del&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; echo "</tr>\n"; $isOrphan = false; - $class = ($class == 'odd') ? 'even' : 'odd'; + $class = ($class == 'odd') ? 'even' : 'odd'; } - if(!isset($lang['ext'])||count($lang['ext'])<1) continue; - foreach($lang['ext'] as $ext){ + if (!isset($lang['ext']) || count($lang['ext']) < 1) { + continue; + } + foreach ($lang['ext'] as $ext) { echo "<tr>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n"; - echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n"; - if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$ext -> getVar('lang_image'))){ - $lang_image = $ext -> getVar('lang_image'); - }else{ - $lang_image = 'noflag.gif'; - } - echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n"; - echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n"; - $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base'); - echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n"; - echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". - "<a href='main.php?op=del&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n"; + echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n"; + if (is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/assets/images/'.$ext -> getVar('lang_image'))) { + $lang_image = $ext -> getVar('lang_image'); + } else { + $lang_image = 'noflag.gif'; + } + echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/assets/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n"; + echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n"; + $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base'); + echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n"; + echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext->getVar('lang_id') . "'><img src=" . $pathIcon16 . '/edit.png title=' . _EDIT . "></a>\n" + . "<a href='main.php?op=del&type=ext&lang_id=" . $ext->getVar('lang_id') . "'><img src=" . $pathIcon16 . '/delete.png title=' . _DELETE . "></td>\n"; echo "</tr>\n"; } - echo "<tr><td colspan='9' ></td></tr>\n"; - $class = ($class == 'odd') ? 'even' : 'odd'; + echo "<tr><td colspan='9' ></td></tr>\n"; + $class = ($class == 'odd') ? 'even' : 'odd'; } echo "</table></div>\n"; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/menu.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/menu.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/menu.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,60 +1,51 @@ -<?php -// $Id$ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // -$module_handler =& xoops_gethandler('module'); -$xoopsModule =& XoopsModule::getByDirname('xlanguage'); -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathIcon32 = $moduleInfo->getInfo('icons32'); - -$adminmenu = array(); - -$i = 1; -$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU_HOME ; -$adminmenu[$i]['link'] = 'admin/index.php' ; -$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ; -$i++; -$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU0 ; -$adminmenu[$i]['link'] = 'admin/main.php' ; -$adminmenu[$i]['icon'] = $pathIcon32.'/manage.png' ; -$i++; -$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU1 ; -$adminmenu[$i]['link'] = 'admin/main.php?op=add&type=base' ; -$adminmenu[$i]['icon'] = $pathIcon32.'/add.png' ; -$i++; -$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU2 ; -$adminmenu[$i]['link'] = 'admin/main.php?op=add&type=ext'; -$adminmenu[$i]['icon'] = $pathIcon32.'/insert_table_row.png' ; -$i++; -$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU3 ; -$adminmenu[$i]['link'] = 'admin/about.php' ; -$adminmenu[$i]['icon'] = $pathIcon32.'/about.png' ; -// $i++; -// $adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU3; -// $adminmenu[$i]['link'] = "admin/about2.php"; -// $adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; +<?php +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author D.J.(phppp) ph...@ho... + * @version $Id $ + **/ + +$module_handler =& xoops_gethandler('module'); +$xoopsModule =& XoopsModule::getByDirname('xlanguage'); +$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); +$pathIcon32 = $moduleInfo->getInfo('icons32'); + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU_HOME ; +$adminmenu[$i]['link'] = 'admin/index.php' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ; +++$i; +$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU0 ; +$adminmenu[$i]['link'] = 'admin/main.php' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/manage.png' ; +++$i; +$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU1 ; +$adminmenu[$i]['link'] = 'admin/main.php?op=add&type=base' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/add.png' ; +++$i; +$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU2 ; +$adminmenu[$i]['link'] = 'admin/main.php?op=add&type=ext'; +$adminmenu[$i]['icon'] = $pathIcon32.'/insert_table_row.png' ; +++$i; +$adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU3 ; +$adminmenu[$i]['link'] = 'admin/about.php' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/about.png' ; +// ++$i; +// $adminmenu[$i]['title'] = _MI_XLANGUAGE_ADMENU3; +// $adminmenu[$i]['link'] = "admin/about2.php"; +// $adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; + Modified: XoopsModules/xlanguage/trunk/xlanguage/api.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/api.php 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/api.php 2015-09-25 10:12:26 UTC (rev 13153) @@ -1,32 +1,22 @@ <?php -// $Id$ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // +/** + * xLanguage module (eXtensible Language Management For XOOPS) + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright XOOPS Project (http://xoops.org) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} + * @package xlanguage + * @since 2.0 + * @author D.J.(phppp) ph...@ho... + * @version $Id $ + **/ + global $xlanguage; include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/vars.php'); include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php'); @@ -39,62 +29,66 @@ $cookie_path = "/"; setcookie($cookie_var, $_GET[XLANGUAGE_LANG_TAG], time()+3600*24*30, $cookie_path, '', 0); $xlanguage["lang"] = $_GET[XLANGUAGE_LANG_TAG]; -}elseif (!empty($_COOKIE[$cookie_var])) { +} elseif (!empty($_COOKIE[$cookie_var])) { $xlanguage["lang"] = $_COOKIE[$cookie_var]; /* FIXME: shall we remove it? */ /* - if(preg_match("/[&|\?]\b".XLANGUAGE_LANG_TAG."\b=/i",$_SERVER['REQUEST_URI'])){ - }elseif (strpos($_SERVER['REQUEST_URI'], "?")) { + if (preg_match("/[&|\?]\b".XLANGUAGE_LANG_TAG."\b=/i",$_SERVER['REQUEST_URI'])) { + } elseif (strpos($_SERVER['REQUEST_URI'], "?")) { $_SERVER['REQUEST_URI'] .= "&".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; - }else{ + } else { $_SERVER['REQUEST_URI'] .= "?".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; } */ -}elseif($lang = xlanguage_detectLang()) { +} elseif ($lang = xlanguage_detectLang()) { $xlanguage["lang"] = $lang; -}else{ +} else { $xlanguage["lang"] = $xoopsConfig['language']; } $xlanguage_handler=& xoops_getmodulehandler('language', 'xlanguage'); $xlanguage_handler->loadConfig(); $lang = $xlanguage_handler->getByName($xlanguage["lang"]); -if(is_object($lang) && strcasecmp($lang->getVar('lang_name'),$xoopsConfig['language'])){ - if($lang->isBase()){ +if (is_object($lang) && strcasecmp($lang->getVar('lang_name'), $xoopsConfig['language'])) { + if ($lang->isBase()) { $xoopsConfig['language'] = $lang->getVar('lang_name'); - }else{ + } else { $lang_base = $xlanguage_handler->getByName($lang->getVar('lang_base')); - if(is_object($lang_base)){ + if (is_object($lang_base)) { $xlanguage['charset_base'] = $lang_base->getVar('lang_charset'); $xlanguage["action"] = true; $xoopsConfig['language'] = $lang_base->getVar('lang_name'); unset($lang_base); } } - if($lang->getVar('lang_charset')) $xlanguage['charset'] = $lang->getVar('lang_charset'); - if($lang->getVar('lang_code')) $xlanguage['code'] = $lang->getVar('lang_code'); + if ($lang->getVar('lang_charset')) { + $xlanguage['charset'] = $lang->getVar('lang_charset'); + } + if ($lang->getVar('lang_code')) { + $xlanguage['code'] = $lang->getVar('lang_code'); + } } unset($lang); $GLOBALS['xlanguage_handler'] =& $xlanguage_handler; -if($xlanguage["action"]){ - //if(CONV_REQUEST && (!empty($_GET)||!empty($_POST))){ - if(!empty($_POST)){ +if ($xlanguage["action"]) { + //if (CONV_REQUEST && (!empty($_GET)||!empty($_POST))) { + if (!empty($_POST)) { $in_charset = $xlanguage["charset"]; $out_charset = $xlanguage["charset_base"]; //$CONV_REQUEST_array=array("_GET", "_POST"); $CONV_REQUEST_array=array("_POST"); - foreach ($CONV_REQUEST_array as $HV){ - if(!empty(${$HV})) { + foreach ($CONV_REQUEST_array as $HV) { + if (!empty(${$HV})) { ${$HV} = xlanguage_convert_encoding(${$HV}, $out_charset, $in_charset); } $GLOBALS["HTTP".$HV."_VARS"] = ${$HV}; } } ob_start("xlanguage_encoding"); -}else{ +} else { ob_start("xlanguage_ml"); } @@ -107,7 +101,7 @@ * 3 insert "<{$smarty.const.XLANGUAGE_SWITCH_CODE}>" into your theme html anywhere you would like to see it present */ $xlanguage_theme_enable = true; -if(!empty($xlanguage_theme_enable)){ +if (!empty($xlanguage_theme_enable)) { $options = array("dropdown", " ", 5); // display mode, delimitor, number per line xlanguage_select_show($options); } Added: XoopsModules/xlanguage/trunk/xlanguage/assets/css/index.html =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/assets/css/index.html (rev 0) +++ XoopsModules/xlanguage/trunk/xlanguage/assets/css/index.html 2015-09-25 10:12:26 UTC (rev 13153) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif =================================================================== (Binary files differ) Index: XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif 2015-09-25 10:12:26 UTC (rev 13153) Property changes on: XoopsModules/xlanguage/trunk/xlanguage/assets/images/albania.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif =================================================================== (Binary files differ) Index: XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif 2015-09-25 10:12:26 UTC (rev 13153) Property changes on: XoopsModules/xlanguage/trunk/xlanguage/assets/images/austria.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif =================================================================== (Binary files differ) Index: XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif 2015-09-25 10:12:26 UTC (rev 13153) Property changes on: XoopsModules/xlanguage/trunk/xlanguage/assets/images/belgium.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif =================================================================== (Binary files differ) Index: XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif 2015-09-25 09:26:23 UTC (rev 13152) +++ XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif 2015-09-25 10:12:26 UTC (rev 13153) Property changes on: XoopsModules/xlanguage/trunk/xlanguage/assets/images/brazil.gif ________________________________... [truncated message content] |
From: <be...@us...> - 2015-09-25 09:26:25
|
Revision: 13152 http://sourceforge.net/p/xoops/svn/13152 Author: beckmi Date: 2015-09-25 09:26:23 +0000 (Fri, 25 Sep 2015) Log Message: ----------- synch with Git Modified Paths: -------------- XoopsModules/xlanguage/trunk/xlanguage/admin/about.php XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php XoopsModules/xlanguage/trunk/xlanguage/admin/index.php XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php XoopsModules/xlanguage/trunk/xlanguage/admin/main.php XoopsModules/xlanguage/trunk/xlanguage/api.php XoopsModules/xlanguage/trunk/xlanguage/blocks/xlanguage_blocks.php XoopsModules/xlanguage/trunk/xlanguage/class/language.php XoopsModules/xlanguage/trunk/xlanguage/docs/changelog.txt XoopsModules/xlanguage/trunk/xlanguage/language/english/blocks.php XoopsModules/xlanguage/trunk/xlanguage/language/english/modinfo.php XoopsModules/xlanguage/trunk/xlanguage/preloads/core.php XoopsModules/xlanguage/trunk/xlanguage/xoops_version.php Added Paths: ----------- XoopsModules/xlanguage/trunk/xlanguage/images/croatia.png Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/about.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/about.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/about.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -26,4 +26,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; \ No newline at end of file +include 'admin_footer.php'; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/about2.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -1,84 +1,83 @@ -<?php -// $Id: about2.php 8203 2011-11-07 03:55:46Z beckmi $ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // -include '../../../include/cp_header.php'; -include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; -xoops_cp_header(); -$myts = &MyTextSanitizer::getInstance(); - -$module_handler =& xoops_gethandler('module'); -$versioninfo =& $module_handler->get($xoopsModule->getVar('mid')); - -// Left headings... -echo "<a href='index.php'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/" . $versioninfo -> getInfo('image') . "' alt='' hspace='10' vspace='0' align='left'></a>"; -echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " ver " . $versioninfo->getInfo('version') . "</div>"; -echo "</div>"; -echo "<div>" . _MI_XLANG_RELEASE . ": " . $versioninfo -> getInfo('releasedate') . "</div>"; - -// Author Information -$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_INFO, "", ""); -if ( $versioninfo->getInfo('author_realname')) - $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")"; -else - $author_name = $versioninfo->getInfo('author'); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_NAME, $author_name)); -$author_sites = $versioninfo -> getInfo('author_website'); -$author_site_info = ""; -foreach($author_sites as $site){ - $author_site_info .= "<a href='" . $site['url'] . "' target='blank'>" . $site['name'] . "</a>; "; -} -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_WEBSITE, $author_site_info)); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo -> getInfo('author_email') . "'>" . $versioninfo -> getInfo('author_email') . "</a>")); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_CREDITS, $versioninfo -> getInfo('credits'))); -$sform -> display(); - -$sform = new XoopsThemeForm(_MI_XLANG_MODULE_INFO, "", ""); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_STATUS, $versioninfo -> getInfo('status'))); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_XOOPSVERSION, $versioninfo -> getInfo('xoopsversion'))); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_DEMO, "<a href='" . $versioninfo -> getInfo('demo_site_url') . "' target='blank'>" . $versioninfo -> getInfo('demo_site_name') . "</a>")); -$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_SUPPORT, "<a href='" . $versioninfo -> getInfo('support_site_url') . "' target='blank'>" . $versioninfo -> getInfo('support_site_name') . "</a>")); -$sform -> display(); - -$file = "../bugfixlist.txt"; -if (@file_exists($file)) -{ - $fp = @fopen($file, "r"); - $bugtext = @fread($fp, filesize($file)); - @fclose($file); - $sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_BUGFIXES, "", ""); - ob_start(); - echo "<div class='even' align='left'>".$myts->displayTarea($bugtext)."</div>"; - $sform -> addElement(new XoopsFormLabel('', ob_get_contents(), 0)); - ob_end_clean(); - $sform -> display(); - unset($file); -} - -xoops_cp_footer(); -?> \ No newline at end of file +<?php +// $Id: about2.php 8203 2011-11-07 03:55:46Z beckmi $ +// ------------------------------------------------------------------------ // +// Xlanguage: eXtensible Language Management For Xoops // +// Copyright (c) 2004 Xoops China Community // +// <http://www.xoops.org.cn/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: D.J.(phppp) ph...@ho... // +// URL: http://www.xoops.org.cn // +// ------------------------------------------------------------------------- // +include '../../../include/cp_header.php'; +include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; +xoops_cp_header(); +$myts = &MyTextSanitizer::getInstance(); + +$module_handler =& xoops_gethandler('module'); +$versioninfo =& $module_handler->get($xoopsModule->getVar('mid')); + +// Left headings... +echo "<a href='index.php'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule -> dirname() . "/" . $versioninfo -> getInfo('image') . "' alt='' hspace='10' vspace='0' align='left'></a>"; +echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>" . $versioninfo->getInfo('name') . " ver " . $versioninfo->getInfo('version') . "</div>"; +echo "</div>"; +echo "<div>" . _MI_XLANG_RELEASE . ": " . $versioninfo -> getInfo('releasedate') . "</div>"; + +// Author Information +$sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_INFO, "", ""); +if ( $versioninfo->getInfo('author_realname')) + $author_name = $versioninfo->getInfo('author') . " (" . $versioninfo->getInfo('author_realname') . ")"; +else + $author_name = $versioninfo->getInfo('author'); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_NAME, $author_name)); +$author_sites = $versioninfo -> getInfo('author_website'); +$author_site_info = ""; +foreach($author_sites as $site){ + $author_site_info .= "<a href='" . $site['url'] . "' target='blank'>" . $site['name'] . "</a>; "; +} +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_WEBSITE, $author_site_info)); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_EMAIL, "<a href='mailto:" . $versioninfo -> getInfo('author_email') . "'>" . $versioninfo -> getInfo('author_email') . "</a>")); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_AUTHOR_CREDITS, $versioninfo -> getInfo('credits'))); +$sform -> display(); + +$sform = new XoopsThemeForm(_MI_XLANG_MODULE_INFO, "", ""); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_STATUS, $versioninfo -> getInfo('status'))); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_XOOPSVERSION, $versioninfo -> getInfo('xoopsversion'))); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_DEMO, "<a href='" . $versioninfo -> getInfo('demo_site_url') . "' target='blank'>" . $versioninfo -> getInfo('demo_site_name') . "</a>")); +$sform -> addElement(new XoopsFormLabel(_MI_XLANG_MODULE_SUPPORT, "<a href='" . $versioninfo -> getInfo('support_site_url') . "' target='blank'>" . $versioninfo -> getInfo('support_site_name') . "</a>")); +$sform -> display(); + +$file = "../bugfixlist.txt"; +if (@file_exists($file)) +{ + $fp = @fopen($file, "r"); + $bugtext = @fread($fp, filesize($file)); + @fclose($file); + $sform = new XoopsThemeForm(_MI_XLANG_AUTHOR_BUGFIXES, "", ""); + ob_start(); + echo "<div class='even' align='left'>".$myts->displayTarea($bugtext)."</div>"; + $sform -> addElement(new XoopsFormLabel('', ob_get_contents(), 0)); + ob_end_clean(); + $sform -> display(); + unset($file); +} + +xoops_cp_footer(); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/admin_footer.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -7,4 +7,4 @@ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" ."</div>"; -xoops_cp_footer(); \ No newline at end of file +xoops_cp_footer(); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/admin_header.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -43,4 +43,4 @@ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); }else{ redirect_header("../../../admin.php", 5, _AM_XLANG_MODULEADMIN_MISSING, false); - } \ No newline at end of file + } Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/index.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/index.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/index.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -1,37 +1,37 @@ -<?php -// $Id$ -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -include '../../../include/cp_header.php'; - -include 'admin_header.php'; -xoops_cp_header(); - -$indexAdmin = new ModuleAdmin(); - - echo $indexAdmin->addNavigation('index.php'); - echo $indexAdmin->renderIndex(); - -include "admin_footer.php"; \ No newline at end of file +<?php +// $Id$ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000 XOOPS.org // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +include '../../../include/cp_header.php'; + +include 'admin_header.php'; +xoops_cp_header(); + +$indexAdmin = new ModuleAdmin(); + + echo $indexAdmin->addNavigation('index.php'); + echo $indexAdmin->renderIndex(); + +include "admin_footer.php"; Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/langform.inc.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -32,11 +32,11 @@ $sform = new XoopsThemeForm(_AM_XLANG_EDITLANG, "langform", xoops_getenv('PHP_SELF')); if($isBase){ - $lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name); - $lang_select->addOptionArray($xlanguage_handler->getXoopsLangList()); - $sform->addElement($lang_select, true); + $lang_select = new XoopsFormSelect(_AM_XLANG_NAME, 'lang_name', $lang_name); + $lang_select->addOptionArray($xlanguage_handler->getXoopsLangList()); + $sform->addElement($lang_select, true); }else{ - $sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true); + $sform->addElement(new XoopsFormText(_AM_XLANG_NAME, 'lang_name', 50, 255, $lang_name), true); } $sform->addElement(new XoopsFormText(_AM_XLANG_DESC, 'lang_desc', 50, 255, $lang_desc)); @@ -46,23 +46,21 @@ $lang_code->setDescription(_AM_XLANG_CODE_DESC); $sform->addElement($lang_code, true); - //$sform->addElement(new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset), true); $lang_charset = new XoopsFormText(_AM_XLANG_CHARSET, 'lang_charset', 50, 255, $lang_charset); $lang_charset->setDescription(_AM_XLANG_CHARSET_DESC); $sform->addElement($lang_charset, true); - if(!$isBase){ - $baseList =& $xlanguage_handler->getAll(); - $base_list = array(); - foreach($baseList as $base => $baselang){ - $base_list[$base] = $base; - } - - $base_select = new XoopsFormSelect(_AM_XLANG_BASE, 'lang_base', $lang_base); - $base_select->addOptionArray($base_list); - $sform->addElement($base_select, true); + $baseList =& $xlanguage_handler->getAll(); + $base_list = array(); + foreach($baseList as $base => $baselang){ + $base_list[$base] = $base; + } + + $base_select = new XoopsFormSelect(_AM_XLANG_BASE, 'lang_base', $lang_base); + $base_select->addOptionArray($base_list); + $sform->addElement($base_select, true); } $sform->addElement(new XoopsFormText(_AM_XLANG_WEIGHT, 'weight', 10, 10, $weight)); @@ -91,4 +89,4 @@ $button_tray->addElement(new XoopsFormButton('', '', _CANCEL, 'submit')); $sform->addElement($button_tray); -$sform->display(); \ No newline at end of file +$sform->display(); Modified: XoopsModules/xlanguage/trunk/xlanguage/admin/main.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/admin/main.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -1,4 +1,4 @@ -<?php +<?php // $Id: main.php 8586 2011-12-27 12:03:19Z beckmi $ // ------------------------------------------------------------------------ // // Xlanguage: eXtensible Language Management For Xoops // @@ -37,13 +37,13 @@ if ( isset( $_POST ) ){ foreach ( $_POST as $k => $v ) { ${$k} = $v; - } -} + } +} if ( isset( $_GET ) ){ foreach ( $_GET as $k => $v ) { ${$k} = $v; - } -} + } +} define("XLANG_CONFIG_LINK","<a href='main.php' target='_self'>"._AM_XLANG_CONFIG."</a>"); @@ -53,108 +53,107 @@ switch ( $op ) { case "del": - if (!isset($_POST['ok']) || $_POST['ok'] != 1 ){ - xoops_cp_header(); + if (!isset($_POST['ok']) || $_POST['ok'] != 1 ){ + xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); -echo $aboutAdmin->addNavigation('main.php'); +echo $aboutAdmin->addNavigation('main.php'); // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; - xoops_confirm( array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => intval( $_GET['lang_id'] ), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM ); - }else{ - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; - $lang =& $xlanguage_handler->get($lang_id, $isBase); - $xlanguage_handler->delete($lang); - redirect_header("main.php",2,_AM_XLANG_DELETED); - } + xoops_confirm( array( 'op' => 'del', 'type' => $_GET['type'], 'lang_id' => intval( $_GET['lang_id'] ), 'ok' => 1 ), 'main.php', _AM_XLANG_DELETE_CFM ); + }else{ + if(isset($type)&&$type=='ext') $isBase = false; + else $isBase = true; + $lang =& $xlanguage_handler->get($lang_id, $isBase); + $xlanguage_handler->delete($lang); + redirect_header("main.php",2,_AM_XLANG_DELETED); + } break; case "save": - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; - if(isset($lang_id)&&$lang_id>0){ - $lang =& $xlanguage_handler->get($lang_id, $isBase); - }else{ - $lang =& $xlanguage_handler->create(true, $isBase); - } - $lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", "", $lang_name); - - $lang->setVar('lang_name',$lang_name); - $lang->setVar('lang_desc',$lang_desc); - $lang->setVar('lang_code',$lang_code); - $lang->setVar('lang_charset',$lang_charset); - $lang->setVar('lang_image',$lang_image); - if(!$isBase){ - $lang->setVar('lang_base',$lang_base); - } - $lang->setVar('weight',$weight); - $xlanguage_handler->insert($lang); - redirect_header("main.php",2,_AM_XLANG_SAVED); + if(isset($type)&&$type=='ext') $isBase = false; + else $isBase = true; + if(isset($lang_id)&&$lang_id>0){ + $lang =& $xlanguage_handler->get($lang_id, $isBase); + }else{ + $lang =& $xlanguage_handler->create(true, $isBase); + } + $lang_name = preg_replace("/[^a-zA-Z0-9\_\-]/", "", $lang_name); + + $lang->setVar('lang_name',$lang_name); + $lang->setVar('lang_desc',$lang_desc); + $lang->setVar('lang_code',$lang_code); + $lang->setVar('lang_charset',$lang_charset); + $lang->setVar('lang_image',$lang_image); + if(!$isBase){ + $lang->setVar('lang_base',$lang_base); + } + $lang->setVar('weight',$weight); + $xlanguage_handler->insert($lang); + redirect_header("main.php",2,_AM_XLANG_SAVED); break; case "edit": xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); -echo $aboutAdmin->addNavigation('main.php'); - // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; +echo $aboutAdmin->addNavigation('main.php'); + // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; // echo "<br />"; echo "<h4>" . _AM_XLANG_EDITLANG . "</h4>"; - if(isset($type)&&$type=='ext') $isBase = false; - else $isBase = true; - if(isset($lang_id)&&$lang_id>0){ - $lang =& $xlanguage_handler->get($lang_id, $isBase); - }elseif(isset($lang_name)){ - $lang =& $xlanguage_handler->getByName($lang_name, $isBase); - }else{ - $lang =& $xlanguage_handler->create(true, $isBase); - } - $lang_name = $lang->getVar('lang_name'); - $lang_desc = $lang->getVar('lang_desc'); - $lang_code = $lang->getVar('lang_code'); - $lang_charset = $lang->getVar('lang_charset'); - $lang_image = $lang->getVar('lang_image'); - $weight = $lang->getVar('weight'); - if(!$isBase){ - $lang_base = $lang->getVar('lang_base'); - } + if(isset($type)&&$type=='ext') $isBase = false; + else $isBase = true; + if(isset($lang_id)&&$lang_id>0){ + $lang =& $xlanguage_handler->get($lang_id, $isBase); + }elseif(isset($lang_name)){ + $lang =& $xlanguage_handler->getByName($lang_name, $isBase); + }else{ + $lang =& $xlanguage_handler->create(true, $isBase); + } + $lang_name = $lang->getVar('lang_name'); + $lang_desc = $lang->getVar('lang_desc'); + $lang_code = $lang->getVar('lang_code'); + $lang_charset = $lang->getVar('lang_charset'); + $lang_image = $lang->getVar('lang_image'); + $weight = $lang->getVar('weight'); + if(!$isBase){ + $lang_base = $lang->getVar('lang_base'); + } include "langform.inc.php"; break; case "add": xoops_cp_header(); -$aboutAdmin = new ModuleAdmin(); -// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; +$aboutAdmin = new ModuleAdmin(); +// echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; // echo "<br />"; // echo "<h4>" . _AM_XLANG_ADDLANG . "</h4>"; - if(isset($type)&&$type=='ext') { - $isBase = false; - echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); } - else { - $isBase = true; - echo $aboutAdmin->addNavigation('main.php?op=add&type=base'); - } - $lang_name = ''; - $lang_desc = ''; - $lang_code = ''; - $lang_charset = ''; - $lang_image = ''; - $weight = 1; - $lang_base = ''; + if(isset($type)&&$type=='ext') { + $isBase = false; + echo $aboutAdmin->addNavigation('main.php?op=add&type=ext'); } + else { + $isBase = true; + echo $aboutAdmin->addNavigation('main.php?op=add&type=base'); + } + $lang_name = ''; + $lang_desc = ''; + $lang_code = ''; + $lang_charset = ''; + $lang_image = ''; + $weight = 1; + $lang_base = ''; include "langform.inc.php"; break; - case 'createconfig': + case 'createconfig': xlanguage_createConfig(); redirect_header( 'main.php', 1, _AM_XLANG_CREATED ); exit(); break; case "default": - default: + default: xoops_cp_header(); $mainAdmin = new ModuleAdmin(); -echo $mainAdmin->addNavigation('main.php'); +echo $mainAdmin->addNavigation('main.php'); - // if (TDMDownloads_checkModuleAdmin()){ // $mainAdmin = new ModuleAdmin(); // echo $mainAdmin->addNavigation('downloads.php'); @@ -163,7 +162,7 @@ echo $mainAdmin->renderButton(); // } - + // echo "<h4>" . XLANG_CONFIG_LINK . "</h4>"; languageList(); $configfile_status = (@is_readable(XLANGUAGE_CONFIG_FILE))?_AM_XLANG_CONFIGOK:_AM_XLANG_CONFIGNOTOK; @@ -174,67 +173,66 @@ // echo " - <b><a href='about.php'>" . _AM_XLANG_ABOUT . "</a></b>"; echo"</td></tr></table>"; break; -} +} xoops_cp_footer(); - function languageList() { global $xlanguage_handler, $xoopsModule; global $pathIcon16; - + $lang_list =& $xlanguage_handler->getAllList(); if ( is_array($lang_list)&&count( $lang_list ) > 0 ){ echo"<table width='100%' border='0' cellspacing='1' class='outer'><tr><td class=\"odd\">"; echo "<div style='text-align: center;'><b><h4>" . _AM_XLANG_LANGLIST . "</h4></b><br />"; echo "<table class='outer' width='100%' border='0' cellpadding='0' cellspacing='0' ><tr class='bg2'><th align='center'>" . _AM_XLANG_DESC . "</th><th align='center'>" . _AM_XLANG_NAME . "</th><th align='center'>" . _AM_XLANG_CHARSET . "</th><th align='center'>" . _AM_XLANG_CODE . "</th><th align='center'>" . _AM_XLANG_IMAGE . "</th><th align='center'>" . _AM_XLANG_WEIGHT . "</th><th align='center'>" . _AM_XLANG_BASE . "</th><th align='center'>" . _AM_XLANG_ACTION . "</th></tr>\n"; - $class = 'even'; + $class = 'even'; foreach( array_keys($lang_list) as $lang_name ) { - $lang =& $lang_list[$lang_name]; - $isOrphan = true; - if(isset($lang['base'])){ - echo "<tr>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n"; - echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n"; - echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n"; - if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$lang['base'] -> getVar('lang_image'))){ - $lang_image = $lang['base'] -> getVar('lang_image'); - }else{ - $lang_image = 'noflag.gif'; - } - echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n"; - echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n"; - echo "<td class='$class' >Ø</td>\n"; - echo "<td class='$class' ><a href='main.php?op=edit&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". - "<a href='main.php?op=del&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; - echo "</tr>\n"; - $isOrphan = false; - $class = ($class == 'odd') ? 'even' : 'odd'; + $lang =& $lang_list[$lang_name]; + $isOrphan = true; + if(isset($lang['base'])){ + echo "<tr>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('lang_desc') . "</td>\n"; + echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_name') . "</b></td>\n"; + echo "<td class='$class' ><b>" . $lang['base'] -> getVar('lang_charset') . "</b></td>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('lang_code') . "</td>\n"; + if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$lang['base'] -> getVar('lang_image'))){ + $lang_image = $lang['base'] -> getVar('lang_image'); + }else{ + $lang_image = 'noflag.gif'; + } + echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$lang['base'] -> getVar('lang_desc')."' /></td>\n"; + echo "<td class='$class' >" . $lang['base'] -> getVar('weight') . "</td>\n"; + echo "<td class='$class' >Ø</td>\n"; + echo "<td class='$class' ><a href='main.php?op=edit&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". + "<a href='main.php?op=del&type=base&lang_id=" . $lang['base'] -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; + echo "</tr>\n"; + $isOrphan = false; + $class = ($class == 'odd') ? 'even' : 'odd'; } if(!isset($lang['ext'])||count($lang['ext'])<1) continue; foreach($lang['ext'] as $ext){ - echo "<tr>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n"; - echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n"; - echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n"; - if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$ext -> getVar('lang_image'))){ - $lang_image = $ext -> getVar('lang_image'); - }else{ - $lang_image = 'noflag.gif'; - } - echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n"; - echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n"; - $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base'); - echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n"; - echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". - "<a href='main.php?op=del&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; - echo "</tr>\n"; + echo "<tr>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_desc') . "</td>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_name') . "</td>\n"; + echo "<td class='$class' ><b>" . $ext -> getVar('lang_charset') . "</b></td>\n"; + echo "<td class='$class' >" . $ext -> getVar('lang_code') . "</td>\n"; + if(is_readable(XOOPS_ROOT_PATH.'/modules/xlanguage/images/'.$ext -> getVar('lang_image'))){ + $lang_image = $ext -> getVar('lang_image'); + }else{ + $lang_image = 'noflag.gif'; + } + echo "<td class='$class' ><img src='" . XOOPS_URL.'/modules/xlanguage/images/'.$lang_image . "' alt='".$ext -> getVar('lang_desc')."' /></td>\n"; + echo "<td class='$class' >" . $ext -> getVar('weight') . "</td>\n"; + $lang_base = ($isOrphan)?"<font color='red'>".$ext -> getVar('lang_base')."</font>":$ext -> getVar('lang_base'); + echo "<td class='$class' ><b>" . $lang_base . "</b></td>\n"; + echo "<td class='$class' ><a href='main.php?op=edit&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/edit.png title=' . _EDIT . "></a>\n". + "<a href='main.php?op=del&type=ext&lang_id=" . $ext -> getVar('lang_id') . "'><img src=".$pathIcon16.'/delete.png title=' . _DELETE ."></td>\n"; + echo "</tr>\n"; } - echo "<tr><td colspan='9' ></td></tr>\n"; - $class = ($class == 'odd') ? 'even' : 'odd'; + echo "<tr><td colspan='9' ></td></tr>\n"; + $class = ($class == 'odd') ? 'even' : 'odd'; } echo "</table></div>\n"; @@ -242,4 +240,3 @@ echo "<br />"; } } -?> Modified: XoopsModules/xlanguage/trunk/xlanguage/api.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/api.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/api.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -36,43 +36,43 @@ $xlanguage["action"] = false; if (!empty($_GET[XLANGUAGE_LANG_TAG])) { - $cookie_path = "/"; - setcookie($cookie_var, $_GET[XLANGUAGE_LANG_TAG], time()+3600*24*30, $cookie_path, '', 0); - $xlanguage["lang"] = $_GET[XLANGUAGE_LANG_TAG]; + $cookie_path = "/"; + setcookie($cookie_var, $_GET[XLANGUAGE_LANG_TAG], time()+3600*24*30, $cookie_path, '', 0); + $xlanguage["lang"] = $_GET[XLANGUAGE_LANG_TAG]; }elseif (!empty($_COOKIE[$cookie_var])) { - $xlanguage["lang"] = $_COOKIE[$cookie_var]; - /* FIXME: shall we remove it? */ - /* - if(preg_match("/[&|\?]\b".XLANGUAGE_LANG_TAG."\b=/i",$_SERVER['REQUEST_URI'])){ - }elseif (strpos($_SERVER['REQUEST_URI'], "?")) { - $_SERVER['REQUEST_URI'] .= "&".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; + $xlanguage["lang"] = $_COOKIE[$cookie_var]; + /* FIXME: shall we remove it? */ + /* + if(preg_match("/[&|\?]\b".XLANGUAGE_LANG_TAG."\b=/i",$_SERVER['REQUEST_URI'])){ + }elseif (strpos($_SERVER['REQUEST_URI'], "?")) { + $_SERVER['REQUEST_URI'] .= "&".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; }else{ - $_SERVER['REQUEST_URI'] .= "?".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; + $_SERVER['REQUEST_URI'] .= "?".XLANGUAGE_LANG_TAG."=".$xlanguage["lang"]; } */ -}elseif($lang = xlanguage_detectLang()) { - $xlanguage["lang"] = $lang; +}elseif($lang = xlanguage_detectLang()) { + $xlanguage["lang"] = $lang; }else{ - $xlanguage["lang"] = $xoopsConfig['language']; + $xlanguage["lang"] = $xoopsConfig['language']; } $xlanguage_handler=& xoops_getmodulehandler('language', 'xlanguage'); $xlanguage_handler->loadConfig(); $lang = $xlanguage_handler->getByName($xlanguage["lang"]); if(is_object($lang) && strcasecmp($lang->getVar('lang_name'),$xoopsConfig['language'])){ - if($lang->isBase()){ - $xoopsConfig['language'] = $lang->getVar('lang_name'); - }else{ - $lang_base = $xlanguage_handler->getByName($lang->getVar('lang_base')); - if(is_object($lang_base)){ - $xlanguage['charset_base'] = $lang_base->getVar('lang_charset'); - $xlanguage["action"] = true; - $xoopsConfig['language'] = $lang_base->getVar('lang_name'); - unset($lang_base); - } - } - if($lang->getVar('lang_charset')) $xlanguage['charset'] = $lang->getVar('lang_charset'); - if($lang->getVar('lang_code')) $xlanguage['code'] = $lang->getVar('lang_code'); + if($lang->isBase()){ + $xoopsConfig['language'] = $lang->getVar('lang_name'); + }else{ + $lang_base = $xlanguage_handler->getByName($lang->getVar('lang_base')); + if(is_object($lang_base)){ + $xlanguage['charset_base'] = $lang_base->getVar('lang_charset'); + $xlanguage["action"] = true; + $xoopsConfig['language'] = $lang_base->getVar('lang_name'); + unset($lang_base); + } + } + if($lang->getVar('lang_charset')) $xlanguage['charset'] = $lang->getVar('lang_charset'); + if($lang->getVar('lang_code')) $xlanguage['code'] = $lang->getVar('lang_code'); } unset($lang); @@ -84,22 +84,21 @@ $in_charset = $xlanguage["charset"]; $out_charset = $xlanguage["charset_base"]; - //$CONV_REQUEST_array=array("_GET", "_POST"); - $CONV_REQUEST_array=array("_POST"); - foreach ($CONV_REQUEST_array as $HV){ - if(!empty(${$HV})) { - ${$HV} = xlanguage_convert_encoding(${$HV}, $out_charset, $in_charset); - } - $GLOBALS["HTTP".$HV."_VARS"] = ${$HV}; - } - } - ob_start("xlanguage_encoding"); + //$CONV_REQUEST_array=array("_GET", "_POST"); + $CONV_REQUEST_array=array("_POST"); + foreach ($CONV_REQUEST_array as $HV){ + if(!empty(${$HV})) { + ${$HV} = xlanguage_convert_encoding(${$HV}, $out_charset, $in_charset); + } + $GLOBALS["HTTP".$HV."_VARS"] = ${$HV}; + } + } + ob_start("xlanguage_encoding"); }else{ - ob_start("xlanguage_ml"); + ob_start("xlanguage_ml"); } - -/* +/* * hardcoded scripts for language switching in theme html files * * To use it: @@ -107,9 +106,8 @@ * 2 config options "$options = array("images", " ", 5); // display mode, delimitor, number per line"; Options for display mode: image - flag; text - text; dropdown - dropdown selection box with text * 3 insert "<{$smarty.const.XLANGUAGE_SWITCH_CODE}>" into your theme html anywhere you would like to see it present */ -$xlanguage_theme_enable = true; +$xlanguage_theme_enable = true; if(!empty($xlanguage_theme_enable)){ - $options = array("dropdown", " ", 5); // display mode, delimitor, number per line - xlanguage_select_show($options); -} -?> + $options = array("dropdown", " ", 5); // display mode, delimitor, number per line + xlanguage_select_show($options); +} Modified: XoopsModules/xlanguage/trunk/xlanguage/blocks/xlanguage_blocks.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/blocks/xlanguage_blocks.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/blocks/xlanguage_blocks.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -1,108 +1,108 @@ -<?php -// $Id$ -// ------------------------------------------------------------------------ // -// Xlanguage: eXtensible Language Management For Xoops // -// Copyright (c) 2004 Xoops China Community // -// <http://www.xoops.org.cn/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: D.J.(phppp) ph...@ho... // -// URL: http://www.xoops.org.cn // -// ------------------------------------------------------------------------- // - -function b_xlanguage_select_show($options) -{ - global $xlanguage; - - $block = array(); - - $xlanguage_handler =& xoops_getmodulehandler('language', 'xlanguage'); - $xlanguage_handler->loadConfig(); - $lang_list = $xlanguage_handler->getAllList(); - if ( !is_array($lang_list) || count($lang_list)<1 ) return $block; - - $languages = array(); - foreach( $lang_list as $lang_name => $lang ) { - if(!isset($lang['base'])) continue; - $languages[$lang_name]['name'] = $lang_name; - $languages[$lang_name]['desc'] = $lang['base']->getVar('lang_desc'); - $languages[$lang_name]['image'] = XOOPS_URL."/modules/xlanguage/images/".$lang['base']->getVar('lang_image'); - if( !isset($lang['ext']) || count($lang['ext']) < 1 ) continue; - foreach($lang['ext'] as $ext){ - $languages[$ext->getVar('lang_name')]['name'] = $ext->getVar('lang_name'); - $languages[$ext->getVar('lang_name')]['desc'] = $ext->getVar('lang_desc'); - $languages[$ext->getVar('lang_name')]['image'] = XOOPS_URL."/modules/xlanguage/images/".$ext->getVar('lang_image'); - } - } - - $QUERY_STRING_array = array_filter(explode("&",xoops_getenv('QUERY_STRING'))); - $QUERY_STRING_new = array(); - foreach ($QUERY_STRING_array as $QUERY){ - if(substr($QUERY, 0, (strlen(XLANGUAGE_LANG_TAG)+1)) != XLANGUAGE_LANG_TAG."=") { - $vals = explode("=", $QUERY); - foreach(array_keys($vals) as $key){ - if(preg_match("/^a-z0-9$/i", $vals[$key])) $vals[$key] = urlencode($vals[$key]); - } - $QUERY_STRING_new[] = implode("=", $vals); - } - } - - $block["display"] = $options[0]; - $block["delimitor"] = $options[1]; - $block["number"] = $options[2]; - $block["selected"] = $xlanguage["lang"]; - if ( $options[0] == "images" || $options[0] == "text" ) { - $query_string = htmlSpecialChars(implode("&", $QUERY_STRING_new)); - $query_string .= empty($query_string)? "" : "&"; - }else{ - $query_string = implode("&", array_map("htmlspecialchars", $QUERY_STRING_new)); - $query_string .= empty($query_string)? "" : "&"; - } - $block["url"] = xoops_getenv('PHP_SELF')."?".$query_string.XLANGUAGE_LANG_TAG."="; - $block["languages"] =& $languages; - - return $block; -} - -function b_xlanguage_select_edit($options) -{ - $form = _MB_XLANGUAGE_DISPLAY_METHOD." <select name='options[]'>"; - $form .= "<option value='images'"; - if ( $options[0] == "images" ) { - $form .= " selected='selected'"; - } - $form .= ">"._MB_XLANGUAGE_DISPLAY_FLAGLIST."</option>\n"; - $form .= "<option value='text'"; - if($options[0] == "text"){ - $form .= " selected='selected'"; - } - $form .= ">"._MB_XLANGUAGE_DISPLAY_TEXTLIST."</option>\n"; - $form .= "<option value='dropdown'"; - if($options[0] == "dropdown"){ - $form .= " selected='selected'"; - } - $form .= ">"._MB_XLANGUAGE_DISPLAY_DROPDOWNLIST."</option>\n"; - $form .= "</select>\n"; - $form .= "<br />"._MB_XLANGUAGE_IMAGE_SEPARATOR." ("._MB_XLANGUAGE_OPTIONAL."): <input type='text' name='options[]' value='".$options[1]."' />"; - $form .= "<br />"._MB_XLANGUAGE_IMAGE_PERROW." ("._MB_XLANGUAGE_OPTIONAL."): <input type='text' name='options[]' value='".$options[2]."' />"; - return $form; -} -?> \ No newline at end of file +<?php +// $Id$ +// ------------------------------------------------------------------------ // +// Xlanguage: eXtensible Language Management For Xoops // +// Copyright (c) 2004 Xoops China Community // +// <http://www.xoops.org.cn/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: D.J.(phppp) ph...@ho... // +// URL: http://www.xoops.org.cn // +// ------------------------------------------------------------------------- // + +function b_xlanguage_select_show($options) +{ + global $xlanguage; + + $block = array(); + + $xlanguage_handler =& xoops_getmodulehandler('language', 'xlanguage'); + $xlanguage_handler->loadConfig(); + $lang_list = $xlanguage_handler->getAllList(); + if ( !is_array($lang_list) || count($lang_list)<1 ) return $block; + + $languages = array(); + foreach( $lang_list as $lang_name => $lang ) { + if(!isset($lang['base'])) continue; + $languages[$lang_name]['name'] = $lang_name; + $languages[$lang_name]['desc'] = $lang['base']->getVar('lang_desc'); + $languages[$lang_name]['image'] = XOOPS_URL."/modules/xlanguage/images/".$lang['base']->getVar('lang_image'); + if( !isset($lang['ext']) || count($lang['ext']) < 1 ) continue; + foreach($lang['ext'] as $ext){ + $languages[$ext->getVar('lang_name')]['name'] = $ext->getVar('lang_name'); + $languages[$ext->getVar('lang_name')]['desc'] = $ext->getVar('lang_desc'); + $languages[$ext->getVar('lang_name')]['image'] = XOOPS_URL."/modules/xlanguage/images/".$ext->getVar('lang_image'); + } + } + + $QUERY_STRING_array = array_filter(explode("&",xoops_getenv('QUERY_STRING'))); + $QUERY_STRING_new = array(); + foreach ($QUERY_STRING_array as $QUERY){ + if(substr($QUERY, 0, (strlen(XLANGUAGE_LANG_TAG)+1)) != XLANGUAGE_LANG_TAG."=") { + $vals = explode("=", $QUERY); + foreach(array_keys($vals) as $key){ + if(preg_match("/^a-z0-9$/i", $vals[$key])) $vals[$key] = urlencode($vals[$key]); + } + $QUERY_STRING_new[] = implode("=", $vals); + } + } + + $block["display"] = $options[0]; + $block["delimitor"] = $options[1]; + $block["number"] = $options[2]; + $block["selected"] = $xlanguage["lang"]; + if ( $options[0] == "images" || $options[0] == "text" ) { + $query_string = htmlSpecialChars(implode("&", $QUERY_STRING_new)); + $query_string .= empty($query_string)? "" : "&"; + }else{ + $query_string = implode("&", array_map("htmlspecialchars", $QUERY_STRING_new)); + $query_string .= empty($query_string)? "" : "&"; + } + $block["url"] = xoops_getenv('PHP_SELF')."?".$query_string.XLANGUAGE_LANG_TAG."="; + $block["languages"] =& $languages; + + return $block; +} + +function b_xlanguage_select_edit($options) +{ + $form = _MB_XLANGUAGE_DISPLAY_METHOD." <select name='options[]'>"; + $form .= "<option value='images'"; + if ( $options[0] == "images" ) { + $form .= " selected='selected'"; + } + $form .= ">"._MB_XLANGUAGE_DISPLAY_FLAGLIST."</option>\n"; + $form .= "<option value='text'"; + if($options[0] == "text"){ + $form .= " selected='selected'"; + } + $form .= ">"._MB_XLANGUAGE_DISPLAY_TEXTLIST."</option>\n"; + $form .= "<option value='dropdown'"; + if($options[0] == "dropdown"){ + $form .= " selected='selected'"; + } + $form .= ">"._MB_XLANGUAGE_DISPLAY_DROPDOWNLIST."</option>\n"; + $form .= "</select>\n"; + $form .= "<br />"._MB_XLANGUAGE_IMAGE_SEPARATOR." ("._MB_XLANGUAGE_OPTIONAL."): <input type='text' name='options[]' value='".$options[1]."' />"; + $form .= "<br />"._MB_XLANGUAGE_IMAGE_PERROW." ("._MB_XLANGUAGE_OPTIONAL."): <input type='text' name='options[]' value='".$options[2]."' />"; + + return $form; +} Modified: XoopsModules/xlanguage/trunk/xlanguage/class/language.php =================================================================== --- XoopsModules/xlanguage/trunk/xlanguage/class/language.php 2015-09-22 13:04:40 UTC (rev 13151) +++ XoopsModules/xlanguage/trunk/xlanguage/class/language.php 2015-09-25 09:26:23 UTC (rev 13152) @@ -33,7 +33,7 @@ class Blanguage extends XoopsObject { - var $isBase; + var $isBase; function Blanguage() { $this -> db = & XoopsDatabaseFactory::getDatabaseConnection(); @@ -50,7 +50,7 @@ function prepareVars() { foreach ($this->vars as $k => $v) { - $cleanv = $this->cleanVars[$k]; + $cleanv = $this->cleanVars[$k]; switch ($v['data_type']) { case XOBJ_DTYPE_TXTBOX: case XOBJ_DTYPE_TXTAREA: @@ -63,7 +63,7 @@ break; case XOBJ_DTYPE_INT: $cleanv = ($v['changed'])?intval($cleanv):0; - break; + break; case XOBJ_DTYPE_ARRAY: $cleanv = ($v['changed'])?$cleanv:serialize(array()); break; @@ -79,25 +79,25 @@ $this->cleanVars[$k] =& $cleanv; unset($cleanv); } + return true; } function setBase() { - $this->isBase = true; + $this->isBase = true; } function isBase() { - return $this->isBase; + return $this->isBase; } } - class Xlanguage extends Blanguage { function Xlanguage() { - $this->Blanguage(); + $this->Blanguage(); $this->table = $this -> db -> prefix( "xlanguage_ext" ); $this->initVar('lang_base', XOBJ_DTYPE_TXTBOX); $this->isBase = false; @@ -106,126 +106,131 @@ class XlanguageLanguageHandler extends XoopsObjectHandler { - var $cached_config; + var $cached_config; - function loadConfig() - { - $this->cached_config =& $this->loadFileConfig(); - } + function loadConfig() + { + $this->cached_config =& $this->loadFileConfig(); + } function &get($id, $isBase =true) { - $lang = null; - $id = intval($id); - if(!$id) { - return $lang; - } - $prefix = ($isBase) ? "xlanguage_base" : "xlanguage_ext"; - if(isset($this->cached_config[$prefix][$id])) { - $array = $this->cached_config[$prefix][$id]; - }else{ - $sql = 'SELECT * FROM '.$this->db->prefix($prefix).' WHERE lang_id='.$id; - $array = $this->db->fetchArray($this->db->query($sql)); + $lang = null; + $id = intval($id); + if(!$id) { + return $lang; } + $prefix = ($isBase) ? "xlanguage_base" : "xlanguage_ext"; + if(isset($this->cached_config[$prefix][$id])) { + $array = $this->cached_config[$prefix][$id]; + }else{ + $sql = 'SELECT * FROM '.$this->db->prefix($prefix).' WHERE lang_id='.$id; + $array = $this->db->fetchArray($this->db->query($sql)); + } if(!is_array($array) || count($array)==0){ - return $lang; - } + return $lang; + } $lang =& $this->create(false, $isBase); $lang->assignVars($array); if($isBase) $lang->isBase = true; + return $lang; } function &getByName($name) { - $lang = null; - if(empty($name) || preg_match("/[^a-zA-Z0-9\_\-]/", $name)) { - return $lang; - } - $isBase = false; - if(isset($this->cached_config['xlanguage_base'][$name])) { - $array = $this->cached_config['xlanguage_base'][$name]; - $isBase = true; - }elseif(isset($this->cached_config['xlanguage_ext'][$name])) { - $array = $this->cached_config['xlanguage_ext'][$name]; - }elseif(!isset($this->cached_config)){ - $sql = 'SELECT * FROM '.$this->db->prefix('xlanguage_base').' WHERE lang_name=\''.$name.'\''; - $result=$this->db->query($sql); - $array = $this->db->fetchArray($result); - if(!is_array($array) || count($array)==0){ - $sql = 'SELECT * FROM '.$this->db->prefix('xlanguage_ext').' WHERE lang_name=\''.$name.'\''; - $result=$this->db->query($sql); - $array = $this->db->fetchArray($result); - if(!is_array($array) || count($array)==0){ - return $lang; - } - }else{ - $isBase = true; - } + $lang = null; + if(empty($name) || preg_match("/[^a-zA-Z0-9\_\-]/", $name)) { + return $lang; } + $isBase = false; + if(isset($this->cached_config['xlanguage_base'][$name])) { + $array = $this->cached_config['xlanguage_base'][$name]; + $isBase = true; + }elseif(isset($this->cached_config['xlanguage_ext'][$name])) { + $array = $this->cached_config['xlanguage_ext'][$name]; + }elseif(!isset($this->cached_config)){ + $sql = 'SELECT * FROM '.$this->db->prefix('xlanguage_base').' WHERE lang_name=\''.$name.'\''; + $result=$this->db->query($sql); + $array = $this->db->fetchArray($result); + if(!is_array($array) || count($array)==0){ + $sql = 'SELECT * FROM '.$this->db->prefix('xlanguage_ext').' WHERE lang_name=\''.$name.'\''; + $result=$this->db->query($sql); + $array = $this->db->fetchArray($result); + if(!is_array($array) || count($array)==0){ + return $lang; + } + }else{ + $isBase = true; + } + } if(empty($array)) { - return $lang; + return $lang; } $lang =& $this->create(false, $isBase); $lang->assignVars($array); if(!isset($array['lang_base'])) $lang->isBase = true; + return $lang; } function &getAll($isBase = true) { - $prefix = ($isBase) ? "xlanguage_base" : "xlanguage_ext"; + $prefix = ($isBase) ? "xlanguage_base" : "xlanguage_ext"; $ret = array(); - if(isset($this->cached_config[$prefix])) { - $array = $this->cached_config[$prefix]; - foreach($array as $lang_name=>$myrow){ - $lang =& $this->create(false,$isBase); - $lang->assignVars($myrow); - $ret[$myrow['lang_name']] = $lang; - unset($lang); - } - }elseif(!isset($this->cached_config)){ - $sql = 'SELECT * FROM '.$this->db->prefix($prefix); - $result = $this->db->query($sql); - while ($myrow = $this->db->fetchArray($result)) { - $lang =& $this->create(false,$isBase); - $lang->assignVars($myrow); - $ret[$myrow['lang_name']] = $lang; - unset($lang); - } + if(isset($this->cached_config[$prefix])) { + $array = $this->cached_config[$prefix]; + foreach($array as $lang_name=>$myrow){ + $lang =& $this->create(false,$isBase); + $lang->assignVars($myrow); + $ret[$myrow['lang_name']] = $lang; + unset($lang); + } + }elseif(!isset($this->cached_config)){ + $sql = 'SELECT * FROM '.$this->db->prefix($prefix); + $result = $this->db->que... [truncated message content] |
From: <be...@us...> - 2015-09-22 13:04:41
|
Revision: 13151 http://sourceforge.net/p/xoops/svn/13151 Author: beckmi Date: 2015-09-22 13:04:40 +0000 (Tue, 22 Sep 2015) Log Message: ----------- Mamba Branch Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8-mamba/ |
From: <be...@us...> - 2015-09-21 20:09:43
|
Revision: 13150 http://sourceforge.net/p/xoops/svn/13150 Author: beckmi Date: 2015-09-21 20:09:40 +0000 (Mon, 21 Sep 2015) Log Message: ----------- add option to set height of Themes block Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 20:09:40 UTC (rev 13150) @@ -24,6 +24,7 @@ - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) - fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) +- add option to set height of Themes block (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/docs/lang_diff.txt 2015-09-21 20:09:40 UTC (rev 13150) @@ -12,6 +12,12 @@ /modules/system/language/english/admin/modulesadmin.php - added define('_AM_SYSTEM_MODULES_INSTALL_MORE',"Install more modules"); +/modules/system/language/english/admin\users.php +define('_AM_SYSTEM_USERS_ACTIVATE', 'Activate User'); + +/modules/system/language/english/blocks.php +define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)"); + =============================== 2014/06/14: Version 2.5.7 Final =============================== Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/blocks/system_blocks.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -642,7 +642,7 @@ if ($options[0] == 1) { $block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"".XOOPS_THEME_URL."/".$xoopsConfig['theme_set']."/shot.gif\" alt=\"screenshot\" width=\"".(int)($options[1])."\" /><br /><select id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/shot.gif', '".XOOPS_URL."');\">".$theme_options."</select><input type=\"submit\" value=\""._GO."\" />"; } else { - $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="3">'.$theme_options.'</select>'; + $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="'. $options[2] .'">'.$theme_options.'</select>'; } $block['theme_select'] .= '<br />('.sprintf(_MB_SYSTEM_NUMTHEME, '<strong>'.count($xoopsConfig['theme_set_allowed']).'</strong>').')<br />'; @@ -671,6 +671,8 @@ $form .= ' <input type="radio" name="options[0]" value="0"'.$chk.' />'._NO; $form .= '<br />'._MB_SYSTEM_THWIDTH.' '; $form .= "<input type='text' name='options[1]' value='".$options[1]."' />"; + $form .= '<br />'._MB_SYSTEM_BLOCK_HEIGHT.' '; + $form .= "<input type='text' name='options[2]' value='".$options[2]."' />"; return $form; } Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/blocks.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -44,3 +44,5 @@ define('_MB_SYSTEM_THSHOW',"Display screenshot image"); define('_MB_SYSTEM_THWIDTH',"Screenshot image width"); define('_MB_SYSTEM_REMEMBERME',"Remember me"); +//2.5.8 +define('_MB_SYSTEM_BLOCK_HEIGHT',"Block Height (lines)"); \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2015-09-21 19:59:57 UTC (rev 13149) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/xoops_version.php 2015-09-21 20:09:40 UTC (rev 13150) @@ -175,7 +175,7 @@ $modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13; $modversion['blocks'][12]['description'] = 'Shows theme selection box'; $modversion['blocks'][12]['show_func'] = 'b_system_themes_show'; -$modversion['blocks'][12]['options'] = '0|80'; +$modversion['blocks'][12]['options'] = '0|80|3'; $modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit'; $modversion['blocks'][12]['template'] = 'system_block_themes.html'; |
From: <be...@us...> - 2015-09-21 19:59:59
|
Revision: 13149 http://sourceforge.net/p/xoops/svn/13149 Author: beckmi Date: 2015-09-21 19:59:57 +0000 (Mon, 21 Sep 2015) Log Message: ----------- moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:55:41 UTC (rev 13148) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:59:57 UTC (rev 13149) @@ -23,6 +23,7 @@ - added possibility to include full icon URL in module's menu.php (mamba) - added strong { font-weight: bold; } to reset.css (mamba) - added .tpl option for module Help files (mamba) +- fix moved "count($tagsArray)" and "count($attrArray)" outside of FOR loop in xoopsfilterinput.php (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-09-21 19:55:41 UTC (rev 13148) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsfilterinput.php 2015-09-21 19:59:57 UTC (rev 13149) @@ -66,10 +66,12 @@ $xssAuto = 1 ) { // make sure user defined arrays are in lowercase - for ($i = 0; $i < count($tagsArray); ++$i) { + $tagsArrayCount = count($tagsArray); + for ($i = 0; $i < $tagsArrayCount; ++$i) { $tagsArray[$i] = strtolower($tagsArray[$i]); } - for ($i = 0; $i < count($attrArray); ++$i) { + $attrArrayCount = count($attrArray); + for ($i = 0; $i < $attrArrayCount; ++$i) { $attrArray[$i] = strtolower($attrArray[$i]); } // assign to member vars @@ -378,7 +380,8 @@ if (!$isCloseTag) { $attrSet = $this->filterAttr($attrSet); $preTag .= '<' . $tagName; - for ($i = 0; $i < count($attrSet); ++$i) { + $attrSetCount = count($attrSet); + for ($i = 0; $i < $attrSetCount; ++$i) { $preTag .= ' ' . $attrSet[$i]; } // reformat single tags to XHTML @@ -413,7 +416,8 @@ { $newSet = array(); // process attributes - for ($i = 0; $i <count($attrSet); ++$i) { + $attrSetCount = count($attrSet); + for ($i = 0; $i < $attrSetCount; ++$i) { // skip blank spaces in tag if (!$attrSet[$i]) { continue; |
From: <be...@us...> - 2015-09-21 19:55:43
|
Revision: 13148 http://sourceforge.net/p/xoops/svn/13148 Author: beckmi Date: 2015-09-21 19:55:41 +0000 (Mon, 21 Sep 2015) Log Message: ----------- added .tpl option for module Help files Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-12 08:48:58 UTC (rev 13147) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-21 19:55:41 UTC (rev 13148) @@ -22,6 +22,7 @@ - replaced intval() with (int) (mamba) - added possibility to include full icon URL in module's menu.php (mamba) - added strong { font-weight: bold; } to reset.css (mamba) +- added .tpl option for module Help files (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2015-09-12 08:48:58 UTC (rev 13147) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/help.php 2015-09-21 19:55:41 UTC (rev 13148) @@ -88,24 +88,16 @@ if ($page != '') { // Call template - if (file_exists( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html' - ) - ) { - $helpcontent = $xoopsTpl->fetch( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html' - ); + if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.html'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/' . $xoopsConfig['language'] . '/help/' . $page . '.tpl'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html'); + } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl')) { + $helpcontent = $xoopsTpl->fetch(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.tpl'); } else { - if (file_exists( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html' - ) - ) { - $helpcontent = $xoopsTpl->fetch( - XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'e') . '/language/english/help/' . $page . '.html' - ); - } else { - $xoopsTpl->assign('load_error', 1); - } + $xoopsTpl->assign('load_error', 1); } $xoopsTpl->assign('helpcontent', $helpcontent); } else { |
From: <be...@us...> - 2015-09-12 08:49:01
|
Revision: 13147 http://sourceforge.net/p/xoops/svn/13147 Author: beckmi Date: 2015-09-12 08:48:58 +0000 (Sat, 12 Sep 2015) Log Message: ----------- adding "strong { font-weight: bold; }" to reset.css Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-07 00:00:20 UTC (rev 13146) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-12 08:48:58 UTC (rev 13147) @@ -21,6 +21,7 @@ - updated XOOPS copyright to 2015, changed links to http://xoops.org (mamba) - replaced intval() with (int) (mamba) - added possibility to include full icon URL in module's menu.php (mamba) +- added strong { font-weight: bold; } to reset.css (mamba) Security fixes Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css 2015-09-07 00:00:20 UTC (rev 13146) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/themes/default/css/reset.css 2015-09-12 08:48:58 UTC (rev 13147) @@ -26,6 +26,7 @@ /* remember to define focus styles! */ :focus { outline: 0;} body { line-height: 1; color: #000; background: #fff;} +strong { font-weight: bold; } ol, ul { list-style: none;} /* tables still need 'cellspacing="0"' in the markup */ table { border-collapse: separate; border-spacing: 0;} |
From: <be...@us...> - 2015-09-07 00:00:23
|
Revision: 13146 http://sourceforge.net/p/xoops/svn/13146 Author: beckmi Date: 2015-09-07 00:00:20 +0000 (Mon, 07 Sep 2015) Log Message: ----------- jGrowl 1.4.3 Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-02 17:42:02 UTC (rev 13145) +++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2015-09-07 00:00:20 UTC (rev 13146) @@ -1,8 +1,8 @@ XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) -=============================== -NOT RELEASED: Version 2.5.8 Beta 1 -=============================== +=================================== +2.5.8 Beta 1 NOT RELEASED +=================================== - replaced "dirname(__FILE__)" with "__DIR__" since the min. PHP is now 5.3.7, and __DIR__ is faster (mamba) - updating some copyright notices (mamba) - fix issues when protector 'id_forceintval' preference is enabled, that manifests as an error when deleting private messages. (rgriffith) @@ -32,20 +32,21 @@ - PHPMailer to 5.2.9 (rgriffith) - jQuery to 1.11.3 (mamba) - jQuery UI 1.11.4 (mamba) + - jGrowl to 1.4.3 (mamba) -=============================== -2014-06-20: Version 2.5.7 Final (Patch 1) -=============================== +=================================== +2.5.7 Final (Patch 1) 2014-06-20 +=================================== - Updating docu for the correct version of tablesorter (mamba) - Fix path specified for include (rgriffith, mamba) - added mainfile.php to /extras for use on servers where write to root is not possible (rgriffith) - fix for array issue in pm/viempmsg.php (Roby73/mamba) -=============================== -2014/06/14: Version 2.5.7 Final -=============================== +=================================== +2.5.7 Final 2014/06/14 +=================================== - updated XoopsMediaUploader to use system memory values from php.ini, and to offer random file names (mamba/luciorota/zyspec) - added .tpl to XoopsList's getHtmlListAsArray (wizanda) - updating xBootstrap (voltan, Angelo Rocha) @@ -61,9 +62,9 @@ Updated: - TinyMCE to 3.5.11 (mamba) -=============================== -2014/04/06: Version 2.5.7 RC 1 -=============================== +=================================== +2.5.7 RC 1 2014/04/06 +=================================== Bugfixes: - fixed System Module image manager html/js bugs (luciorota) @@ -82,9 +83,9 @@ - jQuery Tablesorter to 2.15.11 (mamba) - jGrowl to 1.2.14 (mamba) -=============================== -2014/03/06: Version 2.5.7 Beta 1 -=============================== +=================================== +2.5.7 Beta 1 2014/03/06 +=================================== Bugfixes: - ID: 1143 (old ID 430840) class/module.errorhandler.php (uberrookie/zyspec) - ID: 1225 Restore user theme choice during "Remember me" processing. (rgriffith) @@ -162,18 +163,18 @@ - TinyMCE to 3.5.10 (mamba) - prototype.js to 1.7.1, Aug 2012 (rgriffith) -=============================== -2013/04/21: Version 2.5.6 Final -=============================== +=================================== +2.5.6 Final 2013/04/21 +=================================== Bugfixes: - updated English translations (Cesag,Mamba) - extra check for $noHtml in XoopsEditorHandler->get (luciorota) - fixing $GLOBAL typo in jquery.php (Zyspec) - improving protection against spam by turning off registration's 1st step saving (timgno) -=============================== -2013/03/25: Version 2.5.6 RC1 -=============================== +=================================== +2.5.6 RC1 2013/03/25 +=================================== Bugfixes: - Array to string conversion (geekwright/mamba) - issues with missing xoopscomments table (geekwright/sabahan/Mamba) @@ -191,9 +192,9 @@ - XSS/CSRF vulnerability in system/admin/blocksadmin/main.php (Marcin,Ariko-Security Team/trabis) - LFI vulnerability in system/admin/tplsets/jquery.php (Marcin,Ariko-Security Team/trabis) -=============================== -2013/01/22: Version 2.5.6 Beta -=============================== +=================================== +2.5.6 Beta 2013/01/22 +=================================== Security fixes: - XSS (Cross Site Scripting) vulnerability in Maintenance (Dingjie Yang,Qualys/trabis) @@ -210,9 +211,9 @@ Added: - Fast Comment Hack (Voltan) -=============================== -2012/04/15: Version 2.5.5 Final -=============================== +=================================== +2.5.5 Final 2012/04/15 +=================================== Bugfixes: - preventing division by zero in pagenav.php (timgno) - ID: 3466534 tooltip "$ not defined" fix (culex) @@ -224,9 +225,9 @@ - phpThumb to 1.7.11 (mamba) - jGrowl to 1.2.6 (mowaffaq/mamba) -=============================== -2012/03/14: Version 2.5.5 RC -=============================== +=================================== +2.5.5 RC 2012/03/14 +=================================== Bugfixes: - ID: 3494895 When changing the # of visible entries in Protector, it goes to Admin (jcweb/mamba) - ID: 3494894 Calendar shows 40 days (peekay/mage) @@ -245,9 +246,9 @@ - jQuery to 1.72 (mamba) - jQueryUI to version 1.8.18 (mamba) -=============================== -2012/02/19: Version 2.5.5 Beta -=============================== +=================================== +2.5.5 Beta 2012/02/19 +=================================== Security fixes: - XSS (Cross Site Scripting) vulnerability in PM module and tinymce (High-Tech Bridge Security Research Lab/trabis) @@ -278,9 +279,9 @@ - jQueryUI to version 1.8.17 (mamba) - PhpMailer to version 5.2.1 (mamba) -=============================== -2011/11/20: Version 2.5.4 Final -=============================== +=================================== +2.5.4 Final 2011/11/20 +=================================== Bugfixes: - ID: 3430112 Java problem in xoops editor (voltan/mamba/trabis) - dhtml smilie is always inserted in the end (mamba/trabis) @@ -291,9 +292,9 @@ Updated: - updated jQuery to 1.7 (mamba) -=============================== -2011/10/10: Version 2.5.4 RC -=============================== +=================================== +2.5.4 RC 2011/10/10 +=================================== Bugfixes: - quoteConv causing problems with large number of quotes (Roby73/trabis) - Cache bug. The key's not generated correctly (andrey3761/trabis) @@ -308,9 +309,9 @@ - Replacing deprecated Database::getInstance(); calls with XoopsDatabaseFactory::getDatabaseConnection(); (trabis) - Logging deprecated methods and files that will be removed on XOOPS 2.6.0 (trabis) -=============================== -2011/10/05: Version 2.5.4 Beta -=============================== +=================================== +2.5.4 Beta 2011/10/05 +=================================== Bugfixes: - Remove a call of non existing css file in admin menu - ID: 3419812 Drag and drop Xoops 2.5.3 bug (cesag/trabis) @@ -328,25 +329,25 @@ Deleted: - Delete xoops_lib/data/secure.php file for exclude update error -=============================== -2011/10/03: Version 2.5.3 -=============================== +=================================== +2.5.3 2011/10/03 +=================================== Bugfixes: - Style switcher does not work on default admin GUI(trabis) - Reverting fix for bug ID: 2672723 Changed the code in Install to omits the SQL command: "ALTER DATABASE ... CHARACTER SET ..." (trabis) -=============================== -2011/09/29: Version 2.5.2 Final -=============================== +=================================== +2.5.2 Final 2011/09/29 +=================================== Bugfixes: - ID: 3416069 - avatars upload problem (cesag/trabis) - MyTextSanitizer::htmlSpecialChars() using UTF-8 by default (trabis) - System Waiting block produces queries for inactive modules (trabis) - 'Selected modules does not exist' if using inactive module on startpage (trabis) -=============================== -2011/09/06: Version 2.5.2 RC -=============================== +=================================== +2.5.2 RC 2011/09/06 +=================================== Security fixes: - Removed support for script driven images!!! (High-Tech Bridge Security Research Lab/trabis) - Fixed XSS (Cross Site Scripting) vulnerability in /include/formdhtmltextarea_preview.php (High-Tech Bridge Security Research Lab/trabis) @@ -428,9 +429,9 @@ - Moved js and css from xo_scripts template into gui class(using $xoTheme) to avoid module conflicts - require class/xoopslocal.php causing problems with RMCommon (mamba/trabis) -=============================== -2011/04/12: Version 2.5.2 Beta -=============================== +=================================== +2.5.2 Beta 2011/04/12 +=================================== Bugfixes: - Module names and orders were not able to update (phppp/aitor) - Custom block was not able to add due to missing of 'block_type' (phppp/tatane/mr-reda04_fr/aitor) @@ -438,24 +439,24 @@ - Improved translations (phppp/mamba) -=============================== -2011/03/23: Version 2.5.1 Final -=============================== +=================================== +2.5.1 Final 2011/03/23 +=================================== Bugfixes: - ID: 3219412 Block Cloning : parent module (mid) not saved when cloning(trabis) - ID: 3219408 Block management : data not saved when editing(trabis) - ID: 3229007 Setting # of banner impressions has no effect(trabis) -=============================== -2011/03/15: Version 2.5.1 RC -=============================== +=================================== +2.5.1 RC 2011/03/15 +=================================== Updates: - Updated suico and zetagenesis themes, zetadigme system admin theme (kris_fr) -=============================== -2011/03/15: Version 2.5.1 RC -=============================== +=================================== +2.5.1 RC 2011/03/15 +=================================== Security improvements: - Added filters to output data to avoid potential XSS (phppp/Aung Khant) Updates: @@ -471,9 +472,9 @@ - ID: 3111137 Module Block is cloned as custom block(trabis) -=============================== -Updated 2010/10/23: Version 2.5.0 -=============================== +=================================== +2.5.0 2010/10/23 +=================================== Bug Fixes: - Fix security bug in Profile (gaba/phppp) Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js 2015-09-02 17:42:02 UTC (rev 13145) +++ XoopsCore/branches/2.5.x/2.5.8/htdocs/xoops_lib/Frameworks/jquery/plugins/jquery.jgrowl.js 2015-09-07 00:00:20 UTC (rev 13146) @@ -1,2 +1,2 @@ -!function(e){var t=function(){return!1===e.support.boxModel&&e.support.objectAll&&e.support.leadingWhitespace}();e.jGrowl=function(t,i){0==e("#jGrowl").size()&&e('<div id="jGrowl"></div>').addClass(i&&i.position?i.position:e.jGrowl.defaults.position).appendTo("body"),e("#jGrowl").jGrowl(t,i)},e.fn.jGrowl=function(t,i){if(e.isFunction(this.each)){var o=arguments;return this.each(function(){void 0==e(this).data("jGrowl.instance")&&(e(this).data("jGrowl.instance",e.extend(new e.fn.jGrowl,{notifications:[],element:null,interval:null})),e(this).data("jGrowl.instance").startup(this)),e.isFunction(e(this).data("jGrowl.instance")[t])?e(this).data("jGrowl.instance")[t].apply(e(this).data("jGrowl.instance"),e.makeArray(o).slice(1)):e(this).data("jGrowl.instance").create(t,i)})}},e.extend(e.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(t,i){var i=e.extend({},this.defaults,i);"undefined"!=typeof i.speed&&(i.openDuration=i.speed,i.closeDuration=i.speed),this.notifications.push({message:t,options:i}),i.log.apply(this.element,[this.element,t,i])},render:function(t){var i=this,o=t.message,n=t.options;n.themeState=""==n.themeState?"":"ui-state-"+n.themeState;var t=e("<div/>").addClass("jGrowl-notification "+n.themeState+" ui-corner-all"+(void 0!=n.group&&""!=n.group?" "+n.group:"")).append(e("<div/>").addClass("jGrowl-close").html(n.closeTemplate)).append(e("<div/>").addClass("jGrowl-header").html(n.header)).append(e("<div/>").addClass("jGrowl-message").html(o)).data("jGrowl",n).addClass(n.theme).children("div.jGrowl-close").bind("click.jGrowl",function(){e(this).parent().trigger("jGrowl.beforeClose")}).parent();e(t).bind("mouseover.jGrowl",function(){e("div.jGrowl-notification",i.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){e("div.jGrowl-notification",i.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){n.beforeOpen.apply(t,[t,o,n,i.element])!==!1&&e(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){n.open.apply(t,[t,o,n,i.element])!==!1&&("after"==n.glue?e("div.jGrowl-notification:last",i.element).after(t):e("div.jGrowl-notification:first",i.element).before(t),e(this).animate(n.animateOpen,n.openDuration,n.easing,function(){e.support.opacity===!1&&this.style.removeAttribute("filter"),null!==e(this).data("jGrowl")&&(e(this).data("jGrowl").created=new Date),e(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){n.afterOpen.apply(t,[t,o,n,i.element])}).bind("jGrowl.beforeClose",function(){n.beforeClose.apply(t,[t,o,n,i.element])!==!1&&e(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){e(this).data("jGrowl.pause",!0),e(this).animate(n.animateClose,n.closeDuration,n.easing,function(){e.isFunction(n.close)?n.close.apply(t,[t,o,n,i.element])!==!1&&e(this).remove():e(this).remove()})}).trigger("jGrowl.beforeOpen"),""!=n.corners&&void 0!=e.fn.corner&&e(t).corner(n.corners),e("div.jGrowl-notification:parent",i.element).size()>1&&0==e("div.jGrowl-closer",i.element).size()&&this.defaults.closer!==!1&&e(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(i.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){e(this).siblings().trigger("jGrowl.beforeClose"),e.isFunction(i.defaults.closer)&&i.defaults.closer.apply(e(this).parent()[0],[e(this).parent()[0]])})},update:function(){e(this.element).find("div.jGrowl-notification:parent").each(function(){void 0!=e(this).data("jGrowl")&&void 0!==e(this).data("jGrowl").created&&e(this).data("jGrowl").created.getTime()+parseInt(e(this).data("jGrowl").life)<(new Date).getTime()&&e(this).data("jGrowl").sticky!==!0&&(void 0==e(this).data("jGrowl.pause")||e(this).data("jGrowl.pause")!==!0)&&e(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0==this.defaults.pool||e(this.element).find("div.jGrowl-notification:parent").size()<this.defaults.pool)&&this.render(this.notifications.shift()),e(this.element).find("div.jGrowl-notification:parent").size()<2&&e(this.element).find("div.jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){e(this).remove()})},startup:function(i){this.element=e(i).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){e(i).data("jGrowl.instance").update()},parseInt(this.defaults.check)),t&&e(this.element).addClass("ie6")},shutdown:function(){e(this.element).removeClass("jGrowl").find("div.jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){e(this.element).find("div.jGrowl-notification").each(function(){e(this).trigger("jGrowl.beforeClose")})}}),e.jGrowl.defaults=e.fn.jGrowl.prototype.defaults}(jQuery); +!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('<div id="jGrowl"></div>').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("<div/>").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("<button/>").addClass("jGrowl-close").html(e.closeTemplate)).append(a("<div/>").addClass("jGrowl-header").html(e.header)).append(a("<div/>").addClass("jGrowl-message").html(d)).data("jGrowl",e).addClass(e.theme).children(".jGrowl-close").bind("click.jGrowl",function(){return a(this).parent().trigger("jGrowl.beforeClose"),!1}).parent();a(f).bind("mouseover.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){e.beforeOpen.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){e.open.apply(f,[f,d,e,c.element])!==!1&&("after"==e.glue?a(".jGrowl-notification:last",c.element).after(f):a(".jGrowl-notification:first",c.element).before(f),a(this).animate(e.animateOpen,e.openDuration,e.easing,function(){a.support.opacity===!1&&this.style.removeAttribute("filter"),null!==a(this).data("jGrowl")&&"undefined"!=typeof a(this).data("jGrowl")&&(a(this).data("jGrowl").created=new Date),a(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){e.afterOpen.apply(f,[f,d,e,c.element])}).bind("click",function(){e.click.apply(f,[f.message,e,c.element])}).bind("jGrowl.beforeClose",function(){e.beforeClose.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){a(this).data("jGrowl.pause",!0),a(this).animate(e.animateClose,e.closeDuration,e.easing,function(){a.isFunction(e.close)?e.close.apply(f,[f,d,e,c.element])!==!1&&a(this).remove():a(this).remove()})}).trigger("jGrowl.beforeOpen"),""!==e.corners&&void 0!==a.fn.corner&&a(f).corner(e.corners),a(".jGrowl-notification:parent",c.element).length>1&&0===a(".jGrowl-closer",c.element).length&&this.defaults.closer!==!1&&a(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(c.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){a(this).siblings().trigger("jGrowl.beforeClose"),a.isFunction(c.defaults.closer)&&c.defaults.closer.apply(a(this).parent()[0],[a(this).parent()[0]])})},update:function(){a(this.element).find(".jGrowl-notification:parent").each(function(){void 0!==a(this).data("jGrowl")&&void 0!==a(this).data("jGrowl").created&&a(this).data("jGrowl").created.getTime()+parseInt(a(this).data("jGrowl").life,10)<(new Date).getTime()&&a(this).data("jGrowl").sticky!==!0&&(void 0===a(this).data("jGrowl.pause")||a(this).data("jGrowl.pause")!==!0)&&a(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0===this.defaults.pool||a(this.element).find(".jGrowl-notification:parent").length<this.defaults.pool)&&this.render(this.notifications.shift()),a(this.element).find(".jGrowl-notification:parent").length<2&&a(this.element).find(".jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){a(this).remove()})},startup:function(b){this.element=a(b).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){var c=a(b).data("jGrowl.instance");void 0!==c&&c.update()},parseInt(this.defaults.check,10))},shutdown:function(){a(this.element).removeClass("jGrowl").find(".jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){a(this.element).find(".jGrowl-notification").each(function(){a(this).trigger("jGrowl.beforeClose")})}}),a.jGrowl.defaults=a.fn.jGrowl.prototype.defaults}(jQuery); //# sourceMappingURL=jquery.jgrowl.map \ No newline at end of file |