You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(361) |
Oct
(65) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(798) |
Feb
(694) |
Mar
(586) |
Apr
(145) |
May
(24) |
Jun
(24) |
Jul
(56) |
Aug
(11) |
Sep
(138) |
Oct
(107) |
Nov
(58) |
Dec
(39) |
2004 |
Jan
(157) |
Feb
(24) |
Mar
(13) |
Apr
(14) |
May
(73) |
Jun
(106) |
Jul
(217) |
Aug
(91) |
Sep
(116) |
Oct
(357) |
Nov
(27) |
Dec
(272) |
2005 |
Jan
(97) |
Feb
(40) |
Mar
(167) |
Apr
(365) |
May
(344) |
Jun
(357) |
Jul
(407) |
Aug
(529) |
Sep
(204) |
Oct
(52) |
Nov
(80) |
Dec
(1) |
2006 |
Jan
(2) |
Feb
(1) |
Mar
(11) |
Apr
(112) |
May
(121) |
Jun
(86) |
Jul
(51) |
Aug
(48) |
Sep
(107) |
Oct
(20) |
Nov
(50) |
Dec
(11) |
2007 |
Jan
(7) |
Feb
(11) |
Mar
(8) |
Apr
(11) |
May
(2) |
Jun
(25) |
Jul
(67) |
Aug
(134) |
Sep
(54) |
Oct
(69) |
Nov
(10) |
Dec
(74) |
2008 |
Jan
(73) |
Feb
(81) |
Mar
(64) |
Apr
(98) |
May
(157) |
Jun
(68) |
Jul
(80) |
Aug
(108) |
Sep
(176) |
Oct
(107) |
Nov
(265) |
Dec
(60) |
2009 |
Jan
(149) |
Feb
(140) |
Mar
(195) |
Apr
(141) |
May
(53) |
Jun
(45) |
Jul
(98) |
Aug
(153) |
Sep
(160) |
Oct
(138) |
Nov
(139) |
Dec
(104) |
2010 |
Jan
(188) |
Feb
(259) |
Mar
(133) |
Apr
(104) |
May
(42) |
Jun
(121) |
Jul
(38) |
Aug
(223) |
Sep
(259) |
Oct
(255) |
Nov
(106) |
Dec
(157) |
2011 |
Jan
(202) |
Feb
(110) |
Mar
(261) |
Apr
(272) |
May
(218) |
Jun
(108) |
Jul
(141) |
Aug
(205) |
Sep
(326) |
Oct
(279) |
Nov
(368) |
Dec
(238) |
2012 |
Jan
(239) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(2) |
Jun
|
Jul
(3) |
Aug
(6) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
2013 |
Jan
(1) |
Feb
(3) |
Mar
(9) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(3) |
Aug
(1) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(1) |
2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <wis...@us...> - 2011-12-29 02:24:37
|
Revision: 8616 http://xoops.svn.sourceforge.net/xoops/?rev=8616&view=rev Author: wishcraft Date: 2011-12-29 02:24:26 +0000 (Thu, 29 Dec 2011) Log Message: ----------- Xortify 3.04 [STABLE] - For XOOPS 2.6.x - Defaulted to Xortify.com - Warning/Notices Addresses Modified Paths: -------------- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curl.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlserialised.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlxml.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.loader.mainfile.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/xoops_version.php Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curl.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curl.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curl.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -33,7 +33,8 @@ if ($nativecurl==true) { define('XOOPS_CURL_LIB', 'PHPCURL'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']); Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlserialised.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlserialised.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlserialised.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -15,7 +15,8 @@ if ($nativecurl==true) { define('XOOPS_CURLSERIAL_LIB', 'PHPCURLSERIAL'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']); @@ -160,10 +161,11 @@ } public function checkBanned($ipdata) { - switch (XOOPS_CURL_LIB){ - case "PHPCURL": + if (!empty($this->curl_client)) + switch (XOOPS_CURLSERIAL_LIB){ + case "PHPCURLSERIAL": try { - curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.serialize(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "ipdata"=> $ipdata) ) ); + curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.serialize(array("username"=> $this->serial_xoops_username, "password"=> $this->serial_xoops_password, "ipdata"=> $ipdata) ) ); $data = curl_exec($this->curl_client); curl_close($this->curl_client); $result = (unserialize($data)); Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlxml.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlxml.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlxml.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -18,7 +18,8 @@ if ($nativecurl==true&&$nativexml==true) { define('XOOPS_CURLXML_LIB', 'PHPCURLXML'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']); @@ -162,10 +163,11 @@ } public function checkBanned($ipdata) { - switch (XOOPS_CURL_LIB){ - case "PHPCURL": + if (!empty($this->curl_client)) + switch (XOOPS_CURLXML_LIB){ + case "PHPCURLXML": try { - curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.xortify_toXml(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "ipdata"=> $ipdata), 'banned')); + curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.xortify_toXml(array("username"=> $this->xml_xoops_username, "password"=> $this->xml_xoops_password, "ipdata"=> $ipdata), 'banned')); $data = curl_exec($this->curl_client); curl_close($this->curl_client); $result = xortify_elekey2numeric(xortify_xml2array($data),'banned'); Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.loader.mainfile.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -10,7 +10,7 @@ include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php'); - require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['xortify_api'].'.php' ); + require_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' ); $check = new Providers('postcheck'); ?> \ No newline at end of file Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/core.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/core.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/core.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -16,6 +16,7 @@ static function init() { $xoops = Xoops::getInstance(); + $xoops->loadLanguage('modinfo', 'xortify'); $module_handler = $xoops->getHandler('module'); $config_handler = $xoops->getHandler('config'); $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); @@ -40,7 +41,7 @@ static function eventCoreIncludeCommonEnd($args) { - + $result = XoopsCache::read('xortify_core_include_common_end'); if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); Modified: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/xoops_version.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/xoops_version.php 2011-12-29 02:14:28 UTC (rev 8615) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/xoops_version.php 2011-12-29 02:24:26 UTC (rev 8616) @@ -17,7 +17,7 @@ $modversion['dirname'] = basename(dirname(__FILE__)); $modversion['name'] = ucfirst(basename(dirname(__FILE__))); $modversion['version'] = "3.04"; -$modversion['releasedate'] = "Wednesday: December 28, 2011"; +$modversion['releasedate'] = "Thusday: December 29, 2011"; $modversion['module_status']= "Stable"; $modversion['description'] = _MI_XOR_DESC; $modversion['credits'] = _MI_XOR_CREDITS; @@ -32,9 +32,9 @@ $modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; $modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; -$modversion['release_info'] = "Stable 2011/12/28"; +$modversion['release_info'] = "Stable 2011/12/29"; $modversion['release_file'] = XOOPS_URL."/modules/xortify/docs/changelog.txt"; -$modversion['release_date'] = "2011/12/28"; +$modversion['release_date'] = "2011/12/29"; $modversion['author_realname'] = "Simon Antony Roberts"; $modversion['author_website_url'] = "http://www.chronolabs.coops"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2011-12-29 02:14:34
|
Revision: 8615 http://xoops.svn.sourceforge.net/xoops/?rev=8615&view=rev Author: wishcraft Date: 2011-12-29 02:14:28 +0000 (Thu, 29 Dec 2011) Log Message: ----------- Xortify 3.00 [STABLE] - For XOOPS 2.5.x - Extras Tested - Defaulted to Xortify.com - Warning/Notices Addressed Modified Paths: -------------- XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/admin.php Modified: XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php =================================================================== --- XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php 2011-12-29 02:04:55 UTC (rev 8614) +++ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php 2011-12-29 02:14:28 UTC (rev 8615) @@ -27,6 +27,7 @@ function eventCoreIncludeCommonEnd($args) { + xoops_loadLanguage('modinfo', 'xortify'); $module_handler = xoops_gethandler('module'); $config_handler = xoops_gethandler('config'); $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php 2011-12-29 02:04:55 UTC (rev 8614) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php 2011-12-29 02:14:28 UTC (rev 8615) @@ -389,7 +389,7 @@ $aboutAdmin = new ModuleAdmin(); $about = $aboutAdmin->renderabout($paypalitemno, false); $donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">', - 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_PROFILE_AM_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', + 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_XOR_AM_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>', 2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'', 3 => '', 4 => '<!-- Start Form Validation JavaScript //--> Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/admin.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/admin.php 2011-12-29 02:04:55 UTC (rev 8614) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/admin.php 2011-12-29 02:14:28 UTC (rev 8615) @@ -64,4 +64,7 @@ define('_XOR_ADMIN_SIGNUP_XORTIFY_H2', 'Signup to the XOOPS fortification cloud'); define('_XOR_ADMIN_SIGNUP_XORTIFY_P', 'Here you can signup to the XOOPS fortification cloud called Xortify, the main node for this cloud is featured at http://xortify.com but there can be other nodes, this will prevent spam signup, website harvesting, and general hacking of your site.<br/><br/>It will also share the IP\'s of Bad IP Highlighted by Protector with other people running Xortify.'); define('_XOR_ADMIN_SIGNUP_XORTIFY_FORM_TD2', 'Sign-up this Website\'s User Account on the Xortify Cloud.'); + + //Version 3.0 + define('_XOR_AM_ABOUT_MAKEDONATE', 'Make Xortify Better, Donate Now!!'); ?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2011-12-29 02:05:05
|
Revision: 8614 http://xoops.svn.sourceforge.net/xoops/?rev=8614&view=rev Author: wishcraft Date: 2011-12-29 02:04:55 +0000 (Thu, 29 Dec 2011) Log Message: ----------- Xortify 3.00 [STABLE] - For XOOPS 2.5.x - Extras Tested - Defaulted to Xortify.com - Warning/Notices Addressed Modified Paths: -------------- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curl.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlserialised.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlxml.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.loader.mainfile.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/xoops_version.php Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -64,7 +64,7 @@ } $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']); - $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['xortifyImageAdin']); + $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['xortifyImageAdmin']); $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard"; $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:""; @@ -346,7 +346,9 @@ $proxyiptype = ''; } - $GLOBALS['xoopsTpl']->append('bans', array('iptype' => $iptype, 'ipaddy' => $ipaddy, + $GLOBALS['xoopsTpl']->append('bans', array('netaddy' => $data['network-addy']?$data['network-addy']:' ', + 'macaddy' => $data['mac-addy']?$data['mac-addy']:' ', + 'iptype' => $iptype, 'ipaddy' => $ipaddy, 'proxyiptype' => $proxyiptype, 'ip' => $proxyip, 'long' => $data['long']?$data['long']:' ')); } Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curl.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curl.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curl.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -33,7 +33,8 @@ if ($nativecurl==true) { define('XOOPS_CURL_LIB', 'PHPCURL'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURL_API', $GLOBALS['xortifyModuleConfig']['xortify_uricurl']); Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlserialised.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlserialised.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlserialised.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -14,8 +14,10 @@ } if ($nativecurl==true) { - define('XOOPS_CURLSERIAL_LIB', 'PHPCURLSERIAL'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XOOPS_CURLSERIAL_LIB')) + define('XOOPS_CURLSERIAL_LIB', 'PHPCURLSERIAL'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURLSERIAL_API', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']); @@ -159,10 +161,11 @@ } function checkBanned($ipdata) { - switch (XOOPS_CURL_LIB){ - case "PHPCURL": + if (!empty($this->curl_client)) + switch (XOOPS_CURLSERIAL_LIB){ + case "PHPCURLSERIAL": try { - curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.serialize(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "ipdata"=> $ipdata) ) ); + curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.serialize(array("username"=> $this->serial_xoops_username, "password"=> $this->serial_xoops_password, "ipdata"=> $ipdata) ) ); $data = curl_exec($this->curl_client); curl_close($this->curl_client); $result = (unserialize($data)); Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlxml.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlxml.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlxml.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -18,7 +18,8 @@ if ($nativecurl==true&&$nativexml==true) { define('XOOPS_CURLXML_LIB', 'PHPCURLXML'); - define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); + if (!defined('XORTIFY_USER_AGENT')) + define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (X11; U; Linux i686; pl-PL; rv:1.9.0.2) XOOPS/20100101 XoopsAuth/1.xx (php)'); } define('XORTIFY_CURLXML_API', $GLOBALS['xortifyModuleConfig']['xortify_urixml']); @@ -161,17 +162,18 @@ } function checkBanned($ipdata) { - switch (XOOPS_CURL_LIB){ - case "PHPCURL": - try { - curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.xortify_toXml(array("username"=> $this->curl_xoops_username, "password"=> $this->curl_xoops_password, "ipdata"=> $ipdata), 'banned')); - $data = curl_exec($this->curl_client); - curl_close($this->curl_client); - $result = xortify_elekey2numeric(xortify_xml2array($data),'banned'); - } - catch (Exception $e) { trigger_error($e); } - break; - } + if (!empty($this->curl_client)) + switch (XOOPS_CURLXML_LIB){ + case "PHPCURLXML": + try { + curl_setopt($this->curl_client, CURLOPT_POSTFIELDS, 'banned='.xortify_toXml(array("username"=> $this->xml_xoops_username, "password"=> $this->xml_xoops_password, "ipdata"=> $ipdata), 'banned')); + $data = curl_exec($this->curl_client); + curl_close($this->curl_client); + $result = xortify_elekey2numeric(xortify_xml2array($data),'banned'); + } + catch (Exception $e) { trigger_error($e); } + break; + } return $result; } Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.loader.mainfile.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.loader.mainfile.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -10,7 +10,7 @@ include_once (XOOPS_ROOT_PATH.'/modules/xortify/providers/providers.php'); - include_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['xortify_api'].'.php' ); + include_once( XOOPS_ROOT_PATH.'/modules/xortify/class/'.$GLOBALS['xortifyModuleConfig']['protocol'].'.php' ); $check = new Providers('postcheck'); ?> \ No newline at end of file Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/core.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/core.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/core.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -27,6 +27,7 @@ function eventCoreIncludeCommonEnd($args) { + xoops_loadLanguage('modinfo', 'xortify'); $module_handler = xoops_gethandler('module'); $config_handler = xoops_gethandler('config'); $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); @@ -64,7 +65,7 @@ } - function eventCoreHeaderCacheend($args) + function eventCoreHeaderCacheEnd($args) { include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; @@ -99,7 +100,7 @@ XoopsCache::write('xortify_core_header_add_meta', array('time'=>microtime(true)), -1); } } - + function hasAPIUserPass() { if ($GLOBALS['xortifyModuleConfig']['xortify_username']!=''&&$GLOBALS['xortifyModuleConfig']['xortify_password']!='') Modified: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/xoops_version.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/xoops_version.php 2011-12-28 15:58:55 UTC (rev 8613) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/xoops_version.php 2011-12-29 02:04:55 UTC (rev 8614) @@ -17,7 +17,7 @@ $modversion['dirname'] = basename(dirname(__FILE__)); $modversion['name'] = ucfirst(basename(dirname(__FILE__))); $modversion['version'] = "3.00"; -$modversion['releasedate'] = "Wednesday: December 28, 2011"; +$modversion['releasedate'] = "Wednesday: December 29, 2011"; $modversion['module_status']= "Stable"; $modversion['description'] = _MI_XOR_DESC; $modversion['credits'] = _MI_XOR_CREDITS; @@ -32,9 +32,9 @@ $modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; $modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; -$modversion['release_info'] = "Stable 2011/12/28"; +$modversion['release_info'] = "Stable 2011/12/29"; $modversion['release_file'] = XOOPS_URL."/modules/xortify/docs/changelog.txt"; -$modversion['release_date'] = "2011/12/28"; +$modversion['release_date'] = "2011/12/29"; $modversion['author_realname'] = "Simon Antony Roberts"; $modversion['author_website_url'] = "http://www.chronolabs.org.au"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-28 15:59:04
|
Revision: 8613 http://xoops.svn.sourceforge.net/xoops/?rev=8613&view=rev Author: beckmi Date: 2011-12-28 15:58:55 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Adding missing TCPDF files Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/2dbarcodes.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/barcodes.php Removed Paths: ------------- XoopsModules/modulepacks/basicmodulepack/trunk/Framework/ Added: XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/2dbarcodes.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/2dbarcodes.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/2dbarcodes.php 2011-12-28 15:58:55 UTC (rev 8613) @@ -0,0 +1,333 @@ +<?php +//============================================================+ +// File name : 2dbarcodes.php +// Version : 1.0.012 +// Begin : 2009-04-07 +// Last Update : 2011-09-15 +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - in...@te... +// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) +// ------------------------------------------------------------------- +// Copyright (C) 2009-2012 Nicola Asuni - Tecnick.com LTD +// +// This file is part of TCPDF software library. +// +// TCPDF is free software: you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// TCPDF 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with TCPDF. If not, see <http://www.gnu.org/licenses/>. +// +// See LICENSE.TXT file for more information. +// ------------------------------------------------------------------- +// +// Description : PHP class to creates array representations for +// 2D barcodes to be used with TCPDF. +// +//============================================================+ + +/** + * @file + * PHP class to creates array representations for 2D barcodes to be used with TCPDF. + * @package com.tecnick.tcpdf + * @author Nicola Asuni + * @version 1.0.012 + */ + +/** + * @class TCPDF2DBarcode + * PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org). + * @package com.tecnick.tcpdf + * @version 1.0.012 + * @author Nicola Asuni + */ +class TCPDF2DBarcode { + + /** + * Array representation of barcode. + * @protected + */ + protected $barcode_array = false; + + /** + * This is the class constructor. + * Return an array representations for 2D barcodes:<ul> + * <li>$arrcode['code'] code to be printed on text label</li> + * <li>$arrcode['num_rows'] required number of rows</li> + * <li>$arrcode['num_cols'] required number of columns</li> + * <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul> + * @param $code (string) code to print + * @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul> + */ + public function __construct($code, $type) { + $this->setBarcode($code, $type); + } + + /** + * Return an array representations of barcode. + * @return array + */ + public function getBarcodeArray() { + return $this->barcode_array; + } + + /** + * Send barcode as SVG image object to the standard output. + * @param $w (int) Width of a single rectangle element in user units. + * @param $h (int) Height of a single rectangle element in user units. + * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent). + * @public + */ + public function getBarcodeSVG($w=3, $h=3, $color='black') { + // send headers + $code = $this->getBarcodeSVGcode($w, $h, $color); + header('Content-Type: application/svg+xml'); + header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1 + header('Pragma: public'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + header('Content-Disposition: inline; filename="'.md5($code).'.svg";'); + //header('Content-Length: '.strlen($code)); + echo $code; + } + + /** + * Return a SVG string representation of barcode. + * @param $w (int) Width of a single rectangle element in user units. + * @param $h (int) Height of a single rectangle element in user units. + * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent). + * @return string SVG code. + * @public + */ + public function getBarcodeSVGcode($w=3, $h=3, $color='black') { + // replace table for special characters + $repstr = array("\0" => '', '&' => '&', '<' => '<', '>' => '>'); + $svg = '<'.'?'.'xml version="1.0" standalone="no"'.'?'.'>'."\n"; + $svg .= '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'."\n"; + $svg .= '<svg width="'.round(($this->barcode_array['num_cols'] * $w), 3).'" height="'.round(($this->barcode_array['num_rows'] * $h), 3).'" version="1.1" xmlns="http://www.w3.org/2000/svg">'."\n"; + $svg .= "\t".'<desc>'.strtr($this->barcode_array['code'], $repstr).'</desc>'."\n"; + $svg .= "\t".'<g id="elements" fill="'.$color.'" stroke="none">'."\n"; + // print barcode elements + $y = 0; + // for each row + for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) { + $x = 0; + // for each column + for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) { + if ($this->barcode_array['bcode'][$r][$c] == 1) { + // draw a single barcode cell + $svg .= "\t\t".'<rect x="'.$x.'" y="'.$y.'" width="'.$w.'" height="'.$h.'" />'."\n"; + } + $x += $w; + } + $y += $h; + } + $svg .= "\t".'</g>'."\n"; + $svg .= '</svg>'."\n"; + return $svg; + } + + /** + * Return an HTML representation of barcode. + * @param $w (int) Width of a single rectangle element in pixels. + * @param $h (int) Height of a single rectangle element in pixels. + * @param $color (string) Foreground color for bar elements (background is transparent). + * @return string HTML code. + * @public + */ + public function getBarcodeHTML($w=10, $h=10, $color='black') { + // replace table for special characters + $html = '<div style="font-size:0;position:relative;">'."\n"; + // print barcode elements + $y = 0; + // for each row + for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) { + $x = 0; + // for each column + for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) { + if ($this->barcode_array['bcode'][$r][$c] == 1) { + // draw a single barcode cell + $html .= '<div style="background-color:'.$color.';width:'.$w.'px;height:'.$h.'px;position:absolute;left:'.$x.'px;top:'.$y.'px;"> </div>'."\n"; + } + $x += $w; + } + $y += $h; + } + $html .= '</div>'."\n"; + return $html; + } + + /** + * Return a PNG image representation of barcode (requires GD or Imagick library). + * @param $w (int) Width of a single rectangle element in pixels. + * @param $h (int) Height of a single rectangle element in pixels. + * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent). + * @return image or false in case of error. + * @public + */ + public function getBarcodePNG($w=3, $h=3, $color=array(0,0,0)) { + // calculate image size + $width = ($this->barcode_array['num_cols'] * $w); + $height = ($this->barcode_array['num_rows'] * $h); + if (function_exists('imagecreate')) { + // GD library + $imagick = false; + $png = imagecreate($width, $height); + $bgcol = imagecolorallocate($png, 255, 255, 255); + imagecolortransparent($png, $bgcol); + $fgcol = imagecolorallocate($png, $color[0], $color[1], $color[2]); + } elseif (extension_loaded('imagick')) { + $imagick = true; + $bgcol = new imagickpixel('rgb(255,255,255'); + $fgcol = new imagickpixel('rgb('.$color[0].','.$color[1].','.$color[2].')'); + $png = new Imagick(); + $png->newImage($width, $height, 'none', 'png'); + $bar = new imagickdraw(); + $bar->setfillcolor($fgcol); + } else { + return false; + } + // print barcode elements + $y = 0; + // for each row + for ($r = 0; $r < $this->barcode_array['num_rows']; ++$r) { + $x = 0; + // for each column + for ($c = 0; $c < $this->barcode_array['num_cols']; ++$c) { + if ($this->barcode_array['bcode'][$r][$c] == 1) { + // draw a single barcode cell + if ($imagick) { + $bar->rectangle($x, $y, ($x + $w), ($y + $h)); + } else { + imagefilledrectangle($png, $x, $y, ($x + $w), ($y + $h), $fgcol); + } + } + $x += $w; + } + $y += $h; + } + // send headers + header('Content-Type: image/png'); + header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1 + header('Pragma: public'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + if ($imagick) { + $png->drawimage($bar); + echo $png; + } else { + imagepng($png); + imagedestroy($png); + } + } + + /** + * Set the barcode. + * @param $code (string) code to print + * @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul> + * @return array + */ + public function setBarcode($code, $type) { + $mode = explode(',', $type); + $qrtype = strtoupper($mode[0]); + switch ($qrtype) { + case 'DATAMATRIX': { // DATAMATRIX (ISO/IEC 16022) + require_once(dirname(__FILE__).'/datamatrix.php'); + $qrcode = new Datamatrix($code); + $this->barcode_array = $qrcode->getBarcodeArray(); + $this->barcode_array['code'] = $code; + break; + } + case 'PDF417': { // PDF417 (ISO/IEC 15438:2006) + require_once(dirname(__FILE__).'/pdf417.php'); + if (!isset($mode[1]) OR ($mode[1] === '')) { + $aspectratio = 2; // default aspect ratio (width / height) + } else { + $aspectratio = floatval($mode[1]); + } + if (!isset($mode[2]) OR ($mode[2] === '')) { + $ecl = -1; // default error correction level (auto) + } else { + $ecl = intval($mode[2]); + } + // set macro block + $macro = array(); + if (isset($mode[3]) AND ($mode[3] !== '') AND isset($mode[4]) AND ($mode[4] !== '') AND isset($mode[5]) AND ($mode[5] !== '')) { + $macro['segment_total'] = intval($mode[3]); + $macro['segment_index'] = intval($mode[4]); + $macro['file_id'] = strtr($mode[5], "\xff", ','); + for ($i = 0; $i < 7; ++$i) { + $o = $i + 6; + if (isset($mode[$o]) AND ($mode[$o] !== '')) { + // add option + $macro['option_'.$i] = strtr($mode[$o], "\xff", ','); + } + } + } + $qrcode = new PDF417($code, $ecl, $aspectratio, $macro); + $this->barcode_array = $qrcode->getBarcodeArray(); + $this->barcode_array['code'] = $code; + break; + } + case 'QRCODE': { // QR-CODE + require_once(dirname(__FILE__).'/qrcode.php'); + if (!isset($mode[1]) OR (!in_array($mode[1],array('L','M','Q','H')))) { + $mode[1] = 'L'; // Ddefault: Low error correction + } + $qrcode = new QRcode($code, strtoupper($mode[1])); + $this->barcode_array = $qrcode->getBarcodeArray(); + $this->barcode_array['code'] = $code; + break; + } + case 'RAW': + case 'RAW2': { // RAW MODE + // remove spaces + $code = preg_replace('/[\s]*/si', '', $code); + if (strlen($code) < 3) { + break; + } + if ($qrtype == 'RAW') { + // comma-separated rows + $rows = explode(',', $code); + } else { // RAW2 + // rows enclosed in square parentheses + $code = substr($code, 1, -1); + $rows = explode('][', $code); + } + $this->barcode_array['num_rows'] = count($rows); + $this->barcode_array['num_cols'] = strlen($rows[0]); + $this->barcode_array['bcode'] = array(); + foreach ($rows as $r) { + $this->barcode_array['bcode'][] = str_split($r, 1); + } + $this->barcode_array['code'] = $code; + break; + } + case 'TEST': { // TEST MODE + $this->barcode_array['num_rows'] = 5; + $this->barcode_array['num_cols'] = 15; + $this->barcode_array['bcode'] = array( + array(1,1,1,0,1,1,1,0,1,1,1,0,1,1,1), + array(0,1,0,0,1,0,0,0,1,0,0,0,0,1,0), + array(0,1,0,0,1,1,0,0,1,1,1,0,0,1,0), + array(0,1,0,0,1,0,0,0,0,0,1,0,0,1,0), + array(0,1,0,0,1,1,1,0,1,1,1,0,0,1,0)); + $this->barcode_array['code'] = $code; + break; + } + default: { + $this->barcode_array = false; + } + } + } +} // end of class + +//============================================================+ +// END OF FILE +//============================================================+ Added: XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/barcodes.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/barcodes.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/barcodes.php 2011-12-28 15:58:55 UTC (rev 8613) @@ -0,0 +1,2288 @@ +<?php +//============================================================+ +// File name : barcodes.php +// Version : 1.0.021 +// Begin : 2008-06-09 +// Last Update : 2011-09-15 +// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - in...@te... +// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) +// ------------------------------------------------------------------- +// Copyright (C) 2008-2012 Nicola Asuni - Tecnick.com LTD +// +// This file is part of TCPDF software library. +// +// TCPDF is free software: you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// TCPDF 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 Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with TCPDF. If not, see <http://www.gnu.org/licenses/>. +// +// See LICENSE.TXT file for more information. +// ------------------------------------------------------------------- +// +// Description : PHP class to creates array representations for +// common 1D barcodes to be used with TCPDF. +// +//============================================================+ + +/** + * @file + * PHP class to creates array representations for common 1D barcodes to be used with TCPDF. + * @package com.tecnick.tcpdf + * @author Nicola Asuni + * @version 1.0.021 + */ + +/** + * @class TCPDFBarcode + * PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br> + * @package com.tecnick.tcpdf + * @version 1.0.021 + * @author Nicola Asuni + */ +class TCPDFBarcode { + + /** + * Array representation of barcode. + * @protected + */ + protected $barcode_array; + + /** + * This is the class constructor. + * Return an array representations for common 1D barcodes:<ul> + * <li>$arrcode['code'] code to be printed on text label</li> + * <li>$arrcode['maxh'] max barcode height</li> + * <li>$arrcode['maxw'] max barcode width</li> + * <li>$arrcode['bcode'][$k] single bar or space in $k position</li> + * <li>$arrcode['bcode'][$k]['t'] bar type: true = bar, false = space.</li> + * <li>$arrcode['bcode'][$k]['w'] bar width in units.</li> + * <li>$arrcode['bcode'][$k]['h'] bar height in units.</li> + * <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul> + * @param $code (string) code to print + * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul> + * @public + */ + public function __construct($code, $type) { + $this->setBarcode($code, $type); + } + + /** + * Return an array representations of barcode. + * @return array + * @public + */ + public function getBarcodeArray() { + return $this->barcode_array; + } + + /** + * Send barcode as SVG image object to the standard output. + * @param $w (int) Minimum width of a single bar in user units. + * @param $h (int) Height of barcode in user units. + * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent). + * @public + */ + public function getBarcodeSVG($w=2, $h=30, $color='black') { + // send headers + $code = $this->getBarcodeSVGcode($w, $h, $color); + header('Content-Type: application/svg+xml'); + header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1 + header('Pragma: public'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + header('Content-Disposition: inline; filename="'.md5($code).'.svg";'); + //header('Content-Length: '.strlen($code)); + echo $code; + } + + /** + * Return a SVG string representation of barcode. + * @param $w (int) Minimum width of a single bar in user units. + * @param $h (int) Height of barcode in user units. + * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent). + * @return string SVG code. + * @public + */ + public function getBarcodeSVGcode($w=2, $h=30, $color='black') { + // replace table for special characters + $repstr = array("\0" => '', '&' => '&', '<' => '<', '>' => '>'); + $svg = '<'.'?'.'xml version="1.0" standalone="no"'.'?'.'>'."\n"; + $svg .= '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'."\n"; + $svg .= '<svg width="'.round(($this->barcode_array['maxw'] * $w), 3).'" height="'.$h.'" version="1.1" xmlns="http://www.w3.org/2000/svg">'."\n"; + $svg .= "\t".'<desc>'.strtr($this->barcode_array['code'], $repstr).'</desc>'."\n"; + $svg .= "\t".'<g id="bars" fill="'.$color.'" stroke="none">'."\n"; + // print bars + $x = 0; + foreach ($this->barcode_array['bcode'] as $k => $v) { + $bw = round(($v['w'] * $w), 3); + $bh = round(($v['h'] * $h / $this->barcode_array['maxh']), 3); + if ($v['t']) { + $y = round(($v['p'] * $h / $this->barcode_array['maxh']), 3); + // draw a vertical bar + $svg .= "\t\t".'<rect x="'.$x.'" y="'.$y.'" width="'.$bw.'" height="'.$bh.'" />'."\n"; + } + $x += $bw; + } + $svg .= "\t".'</g>'."\n"; + $svg .= '</svg>'."\n"; + return $svg; + } + + /** + * Return an HTML representation of barcode. + * @param $w (int) Width of a single bar element in pixels. + * @param $h (int) Height of a single bar element in pixels. + * @param $color (string) Foreground color for bar elements (background is transparent). + * @return string HTML code. + * @public + */ + public function getBarcodeHTML($w=2, $h=30, $color='black') { + // replace table for special characters + $html = '<div style="font-size:0;position:relative;">'."\n"; + // print bars + $x = 0; + foreach ($this->barcode_array['bcode'] as $k => $v) { + $bw = round(($v['w'] * $w), 3); + $bh = round(($v['h'] * $h / $this->barcode_array['maxh']), 3); + if ($v['t']) { + $y = round(($v['p'] * $h / $this->barcode_array['maxh']), 3); + // draw a vertical bar + $html .= '<div style="background-color:'.$color.';width:'.$bw.'px;height:'.$bh.'px;position:absolute;left:'.$x.'px;top:'.$y.'px;"> </div>'."\n"; + } + $x += $bw; + } + $html .= '</div>'."\n"; + return $html; + } + + /** + * Return a PNG image representation of barcode (requires GD or Imagick library). + * @param $w (int) Width of a single bar element in pixels. + * @param $h (int) Height of a single bar element in pixels. + * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent). + * @return image or false in case of error. + * @public + */ + public function getBarcodePNG($w=2, $h=30, $color=array(0,0,0)) { + // calculate image size + $width = ($this->barcode_array['maxw'] * $w); + $height = $h; + if (function_exists('imagecreate')) { + // GD library + $imagick = false; + $png = imagecreate($width, $height); + $bgcol = imagecolorallocate($png, 255, 255, 255); + imagecolortransparent($png, $bgcol); + $fgcol = imagecolorallocate($png, $color[0], $color[1], $color[2]); + } elseif (extension_loaded('imagick')) { + $imagick = true; + $bgcol = new imagickpixel('rgb(255,255,255'); + $fgcol = new imagickpixel('rgb('.$color[0].','.$color[1].','.$color[2].')'); + $png = new Imagick(); + $png->newImage($width, $height, 'none', 'png'); + $bar = new imagickdraw(); + $bar->setfillcolor($fgcol); + } else { + return false; + } + // print bars + $x = 0; + foreach ($this->barcode_array['bcode'] as $k => $v) { + $bw = round(($v['w'] * $w), 3); + $bh = round(($v['h'] * $h / $this->barcode_array['maxh']), 3); + if ($v['t']) { + $y = round(($v['p'] * $h / $this->barcode_array['maxh']), 3); + // draw a vertical bar + if ($imagick) { + $bar->rectangle($x, $y, ($x + $bw), ($y + $bh)); + } else { + imagefilledrectangle($png, $x, $y, ($x + $bw), ($y + $bh), $fgcol); + } + } + $x += $bw; + } + // send headers + header('Content-Type: image/png'); + header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1 + header('Pragma: public'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + if ($imagick) { + $png->drawimage($bar); + echo $png; + } else { + imagepng($png); + imagedestroy($png); + } + } + + /** + * Set the barcode. + * @param $code (string) code to print + * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extention</li><li>EAN5 : 5-Digits UPC-Based Extention</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul> + * @return array barcode array + * @public + */ + public function setBarcode($code, $type) { + switch (strtoupper($type)) { + case 'C39': { // CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9. + $arrcode = $this->barcode_code39($code, false, false); + break; + } + case 'C39+': { // CODE 39 with checksum + $arrcode = $this->barcode_code39($code, false, true); + break; + } + case 'C39E': { // CODE 39 EXTENDED + $arrcode = $this->barcode_code39($code, true, false); + break; + } + case 'C39E+': { // CODE 39 EXTENDED + CHECKSUM + $arrcode = $this->barcode_code39($code, true, true); + break; + } + case 'C93': { // CODE 93 - USS-93 + $arrcode = $this->barcode_code93($code); + break; + } + case 'S25': { // Standard 2 of 5 + $arrcode = $this->barcode_s25($code, false); + break; + } + case 'S25+': { // Standard 2 of 5 + CHECKSUM + $arrcode = $this->barcode_s25($code, true); + break; + } + case 'I25': { // Interleaved 2 of 5 + $arrcode = $this->barcode_i25($code, false); + break; + } + case 'I25+': { // Interleaved 2 of 5 + CHECKSUM + $arrcode = $this->barcode_i25($code, true); + break; + } + case 'C128': { // CODE 128 + $arrcode = $this->barcode_c128($code, ''); + break; + } + case 'C128A': { // CODE 128 A + $arrcode = $this->barcode_c128($code, 'A'); + break; + } + case 'C128B': { // CODE 128 B + $arrcode = $this->barcode_c128($code, 'B'); + break; + } + case 'C128C': { // CODE 128 C + $arrcode = $this->barcode_c128($code, 'C'); + break; + } + case 'EAN2': { // 2-Digits UPC-Based Extention + $arrcode = $this->barcode_eanext($code, 2); + break; + } + case 'EAN5': { // 5-Digits UPC-Based Extention + $arrcode = $this->barcode_eanext($code, 5); + break; + } + case 'EAN8': { // EAN 8 + $arrcode = $this->barcode_eanupc($code, 8); + break; + } + case 'EAN13': { // EAN 13 + $arrcode = $this->barcode_eanupc($code, 13); + break; + } + case 'UPCA': { // UPC-A + $arrcode = $this->barcode_eanupc($code, 12); + break; + } + case 'UPCE': { // UPC-E + $arrcode = $this->barcode_eanupc($code, 6); + break; + } + case 'MSI': { // MSI (Variation of Plessey code) + $arrcode = $this->barcode_msi($code, false); + break; + } + case 'MSI+': { // MSI + CHECKSUM (modulo 11) + $arrcode = $this->barcode_msi($code, true); + break; + } + case 'POSTNET': { // POSTNET + $arrcode = $this->barcode_postnet($code, false); + break; + } + case 'PLANET': { // PLANET + $arrcode = $this->barcode_postnet($code, true); + break; + } + case 'RMS4CC': { // RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) + $arrcode = $this->barcode_rms4cc($code, false); + break; + } + case 'KIX': { // KIX (Klant index - Customer index) + $arrcode = $this->barcode_rms4cc($code, true); + break; + } + case 'IMB': { // IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200 + $arrcode = $this->barcode_imb($code); + break; + } + case 'CODABAR': { // CODABAR + $arrcode = $this->barcode_codabar($code); + break; + } + case 'CODE11': { // CODE 11 + $arrcode = $this->barcode_code11($code); + break; + } + case 'PHARMA': { // PHARMACODE + $arrcode = $this->barcode_pharmacode($code); + break; + } + case 'PHARMA2T': { // PHARMACODE TWO-TRACKS + $arrcode = $this->barcode_pharmacode2t($code); + break; + } + default: { + $this->barcode_array = false; + $arrcode = false; + break; + } + } + $this->barcode_array = $arrcode; + } + + /** + * CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9. + * General-purpose code in very wide use world-wide + * @param $code (string) code to represent. + * @param $extended (boolean) if true uses the extended mode. + * @param $checksum (boolean) if true add a checksum to the code. + * @return array barcode representation. + * @protected + */ + protected function barcode_code39($code, $extended=false, $checksum=false) { + $chr['0'] = '111331311'; + $chr['1'] = '311311113'; + $chr['2'] = '113311113'; + $chr['3'] = '313311111'; + $chr['4'] = '111331113'; + $chr['5'] = '311331111'; + $chr['6'] = '113331111'; + $chr['7'] = '111311313'; + $chr['8'] = '311311311'; + $chr['9'] = '113311311'; + $chr['A'] = '311113113'; + $chr['B'] = '113113113'; + $chr['C'] = '313113111'; + $chr['D'] = '111133113'; + $chr['E'] = '311133111'; + $chr['F'] = '113133111'; + $chr['G'] = '111113313'; + $chr['H'] = '311113311'; + $chr['I'] = '113113311'; + $chr['J'] = '111133311'; + $chr['K'] = '311111133'; + $chr['L'] = '113111133'; + $chr['M'] = '313111131'; + $chr['N'] = '111131133'; + $chr['O'] = '311131131'; + $chr['P'] = '113131131'; + $chr['Q'] = '111111333'; + $chr['R'] = '311111331'; + $chr['S'] = '113111331'; + $chr['T'] = '111131331'; + $chr['U'] = '331111113'; + $chr['V'] = '133111113'; + $chr['W'] = '333111111'; + $chr['X'] = '131131113'; + $chr['Y'] = '331131111'; + $chr['Z'] = '133131111'; + $chr['-'] = '131111313'; + $chr['.'] = '331111311'; + $chr[' '] = '133111311'; + $chr['$'] = '131313111'; + $chr['/'] = '131311131'; + $chr['+'] = '131113131'; + $chr['%'] = '111313131'; + $chr['*'] = '131131311'; + $code = strtoupper($code); + if ($extended) { + // extended mode + $code = $this->encode_code39_ext($code); + } + if ($code === false) { + return false; + } + if ($checksum) { + // checksum + $code .= $this->checksum_code39($code); + } + // add start and stop codes + $code = '*'.$code.'*'; + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + $k = 0; + $clen = strlen($code); + for ($i = 0; $i < $clen; ++$i) { + $char = $code{$i}; + if(!isset($chr[$char])) { + // invalid character + return false; + } + for ($j = 0; $j < 9; ++$j) { + if (($j % 2) == 0) { + $t = true; // bar + } else { + $t = false; // space + } + $w = $chr[$char]{$j}; + $bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); + $bararray['maxw'] += $w; + ++$k; + } + // intercharacter gap + $bararray['bcode'][$k] = array('t' => false, 'w' => 1, 'h' => 1, 'p' => 0); + $bararray['maxw'] += 1; + ++$k; + } + return $bararray; + } + + /** + * Encode a string to be used for CODE 39 Extended mode. + * @param $code (string) code to represent. + * @return encoded string. + * @protected + */ + protected function encode_code39_ext($code) { + $encode = array( + chr(0) => '%U', chr(1) => '$A', chr(2) => '$B', chr(3) => '$C', + chr(4) => '$D', chr(5) => '$E', chr(6) => '$F', chr(7) => '$G', + chr(8) => '$H', chr(9) => '$I', chr(10) => '$J', chr(11) => '£K', + chr(12) => '$L', chr(13) => '$M', chr(14) => '$N', chr(15) => '$O', + chr(16) => '$P', chr(17) => '$Q', chr(18) => '$R', chr(19) => '$S', + chr(20) => '$T', chr(21) => '$U', chr(22) => '$V', chr(23) => '$W', + chr(24) => '$X', chr(25) => '$Y', chr(26) => '$Z', chr(27) => '%A', + chr(28) => '%B', chr(29) => '%C', chr(30) => '%D', chr(31) => '%E', + chr(32) => ' ', chr(33) => '/A', chr(34) => '/B', chr(35) => '/C', + chr(36) => '/D', chr(37) => '/E', chr(38) => '/F', chr(39) => '/G', + chr(40) => '/H', chr(41) => '/I', chr(42) => '/J', chr(43) => '/K', + chr(44) => '/L', chr(45) => '-', chr(46) => '.', chr(47) => '/O', + chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3', + chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7', + chr(56) => '8', chr(57) => '9', chr(58) => '/Z', chr(59) => '%F', + chr(60) => '%G', chr(61) => '%H', chr(62) => '%I', chr(63) => '%J', + chr(64) => '%V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C', + chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G', + chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K', + chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O', + chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S', + chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W', + chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => '%K', + chr(92) => '%L', chr(93) => '%M', chr(94) => '%N', chr(95) => '%O', + chr(96) => '%W', chr(97) => '+A', chr(98) => '+B', chr(99) => '+C', + chr(100) => '+D', chr(101) => '+E', chr(102) => '+F', chr(103) => '+G', + chr(104) => '+H', chr(105) => '+I', chr(106) => '+J', chr(107) => '+K', + chr(108) => '+L', chr(109) => '+M', chr(110) => '+N', chr(111) => '+O', + chr(112) => '+P', chr(113) => '+Q', chr(114) => '+R', chr(115) => '+S', + chr(116) => '+T', chr(117) => '+U', chr(118) => '+V', chr(119) => '+W', + chr(120) => '+X', chr(121) => '+Y', chr(122) => '+Z', chr(123) => '%P', + chr(124) => '%Q', chr(125) => '%R', chr(126) => '%S', chr(127) => '%T'); + $code_ext = ''; + $clen = strlen($code); + for ($i = 0 ; $i < $clen; ++$i) { + if (ord($code{$i}) > 127) { + return false; + } + $code_ext .= $encode[$code{$i}]; + } + return $code_ext; + } + + /** + * Calculate CODE 39 checksum (modulo 43). + * @param $code (string) code to represent. + * @return char checksum. + * @protected + */ + protected function checksum_code39($code) { + $chars = array( + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', + 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%'); + $sum = 0; + $clen = strlen($code); + for ($i = 0 ; $i < $clen; ++$i) { + $k = array_keys($chars, $code{$i}); + $sum += $k[0]; + } + $j = ($sum % 43); + return $chars[$j]; + } + + /** + * CODE 93 - USS-93 + * Compact code similar to Code 39 + * @param $code (string) code to represent. + * @return array barcode representation. + * @protected + */ + protected function barcode_code93($code) { + $chr[48] = '131112'; // 0 + $chr[49] = '111213'; // 1 + $chr[50] = '111312'; // 2 + $chr[51] = '111411'; // 3 + $chr[52] = '121113'; // 4 + $chr[53] = '121212'; // 5 + $chr[54] = '121311'; // 6 + $chr[55] = '111114'; // 7 + $chr[56] = '131211'; // 8 + $chr[57] = '141111'; // 9 + $chr[65] = '211113'; // A + $chr[66] = '211212'; // B + $chr[67] = '211311'; // C + $chr[68] = '221112'; // D + $chr[69] = '221211'; // E + $chr[70] = '231111'; // F + $chr[71] = '112113'; // G + $chr[72] = '112212'; // H + $chr[73] = '112311'; // I + $chr[74] = '122112'; // J + $chr[75] = '132111'; // K + $chr[76] = '111123'; // L + $chr[77] = '111222'; // M + $chr[78] = '111321'; // N + $chr[79] = '121122'; // O + $chr[80] = '131121'; // P + $chr[81] = '212112'; // Q + $chr[82] = '212211'; // R + $chr[83] = '211122'; // S + $chr[84] = '211221'; // T + $chr[85] = '221121'; // U + $chr[86] = '222111'; // V + $chr[87] = '112122'; // W + $chr[88] = '112221'; // X + $chr[89] = '122121'; // Y + $chr[90] = '123111'; // Z + $chr[45] = '121131'; // - + $chr[46] = '311112'; // . + $chr[32] = '311211'; // + $chr[36] = '321111'; // $ + $chr[47] = '112131'; // / + $chr[43] = '113121'; // + + $chr[37] = '211131'; // % + $chr[128] = '121221'; // ($) + $chr[129] = '311121'; // (/) + $chr[130] = '122211'; // (+) + $chr[131] = '312111'; // (%) + $chr[42] = '111141'; // start-stop + $code = strtoupper($code); + $encode = array( + chr(0) => chr(131).'U', chr(1) => chr(128).'A', chr(2) => chr(128).'B', chr(3) => chr(128).'C', + chr(4) => chr(128).'D', chr(5) => chr(128).'E', chr(6) => chr(128).'F', chr(7) => chr(128).'G', + chr(8) => chr(128).'H', chr(9) => chr(128).'I', chr(10) => chr(128).'J', chr(11) => '£K', + chr(12) => chr(128).'L', chr(13) => chr(128).'M', chr(14) => chr(128).'N', chr(15) => chr(128).'O', + chr(16) => chr(128).'P', chr(17) => chr(128).'Q', chr(18) => chr(128).'R', chr(19) => chr(128).'S', + chr(20) => chr(128).'T', chr(21) => chr(128).'U', chr(22) => chr(128).'V', chr(23) => chr(128).'W', + chr(24) => chr(128).'X', chr(25) => chr(128).'Y', chr(26) => chr(128).'Z', chr(27) => chr(131).'A', + chr(28) => chr(131).'B', chr(29) => chr(131).'C', chr(30) => chr(131).'D', chr(31) => chr(131).'E', + chr(32) => ' ', chr(33) => chr(129).'A', chr(34) => chr(129).'B', chr(35) => chr(129).'C', + chr(36) => chr(129).'D', chr(37) => chr(129).'E', chr(38) => chr(129).'F', chr(39) => chr(129).'G', + chr(40) => chr(129).'H', chr(41) => chr(129).'I', chr(42) => chr(129).'J', chr(43) => chr(129).'K', + chr(44) => chr(129).'L', chr(45) => '-', chr(46) => '.', chr(47) => chr(129).'O', + chr(48) => '0', chr(49) => '1', chr(50) => '2', chr(51) => '3', + chr(52) => '4', chr(53) => '5', chr(54) => '6', chr(55) => '7', + chr(56) => '8', chr(57) => '9', chr(58) => chr(129).'Z', chr(59) => chr(131).'F', + chr(60) => chr(131).'G', chr(61) => chr(131).'H', chr(62) => chr(131).'I', chr(63) => chr(131).'J', + chr(64) => chr(131).'V', chr(65) => 'A', chr(66) => 'B', chr(67) => 'C', + chr(68) => 'D', chr(69) => 'E', chr(70) => 'F', chr(71) => 'G', + chr(72) => 'H', chr(73) => 'I', chr(74) => 'J', chr(75) => 'K', + chr(76) => 'L', chr(77) => 'M', chr(78) => 'N', chr(79) => 'O', + chr(80) => 'P', chr(81) => 'Q', chr(82) => 'R', chr(83) => 'S', + chr(84) => 'T', chr(85) => 'U', chr(86) => 'V', chr(87) => 'W', + chr(88) => 'X', chr(89) => 'Y', chr(90) => 'Z', chr(91) => chr(131).'K', + chr(92) => chr(131).'L', chr(93) => chr(131).'M', chr(94) => chr(131).'N', chr(95) => chr(131).'O', + chr(96) => chr(131).'W', chr(97) => chr(130).'A', chr(98) => chr(130).'B', chr(99) => chr(130).'C', + chr(100) => chr(130).'D', chr(101) => chr(130).'E', chr(102) => chr(130).'F', chr(103) => chr(130).'G', + chr(104) => chr(130).'H', chr(105) => chr(130).'I', chr(106) => chr(130).'J', chr(107) => chr(130).'K', + chr(108) => chr(130).'L', chr(109) => chr(130).'M', chr(110) => chr(130).'N', chr(111) => chr(130).'O', + chr(112) => chr(130).'P', chr(113) => chr(130).'Q', chr(114) => chr(130).'R', chr(115) => chr(130).'S', + chr(116) => chr(130).'T', chr(117) => chr(130).'U', chr(118) => chr(130).'V', chr(119) => chr(130).'W', + chr(120) => chr(130).'X', chr(121) => chr(130).'Y', chr(122) => chr(130).'Z', chr(123) => chr(131).'P', + chr(124) => chr(131).'Q', chr(125) => chr(131).'R', chr(126) => chr(131).'S', chr(127) => chr(131).'T'); + $code_ext = ''; + $clen = strlen($code); + for ($i = 0 ; $i < $clen; ++$i) { + if (ord($code{$i}) > 127) { + return false; + } + $code_ext .= $encode[$code{$i}]; + } + // checksum + $code_ext .= $this->checksum_code93($code_ext); + // add start and stop codes + $code = '*'.$code_ext.'*'; + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + $k = 0; + $clen = strlen($code); + for ($i = 0; $i < $clen; ++$i) { + $char = ord($code{$i}); + if(!isset($chr[$char])) { + // invalid character + return false; + } + for ($j = 0; $j < 6; ++$j) { + if (($j % 2) == 0) { + $t = true; // bar + } else { + $t = false; // space + } + $w = $chr[$char]{$j}; + $bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); + $bararray['maxw'] += $w; + ++$k; + } + } + $bararray['bcode'][$k] = array('t' => true, 'w' => 1, 'h' => 1, 'p' => 0); + $bararray['maxw'] += 1; + ++$k; + return $bararray; + } + + /** + * Calculate CODE 93 checksum (modulo 47). + * @param $code (string) code to represent. + * @return string checksum code. + * @protected + */ + protected function checksum_code93($code) { + $chars = array( + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', + 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', + 'W', 'X', 'Y', 'Z', '-', '.', ' ', '$', '/', '+', '%', + '<', '=', '>', '?'); + // translate special characters + $code = strtr($code, chr(128).chr(131).chr(129).chr(130), '<=>?'); + $len = strlen($code); + // calculate check digit C + $p = 1; + $check = 0; + for ($i = ($len - 1); $i >= 0; --$i) { + $k = array_keys($chars, $code{$i}); + $check += ($k[0] * $p); + ++$p; + if ($p > 20) { + $p = 1; + } + } + $check %= 47; + $c = $chars[$check]; + $code .= $c; + // calculate check digit K + $p = 1; + $check = 0; + for ($i = $len; $i >= 0; --$i) { + $k = array_keys($chars, $code{$i}); + $check += ($k[0] * $p); + ++$p; + if ($p > 15) { + $p = 1; + } + } + $check %= 47; + $k = $chars[$check]; + $checksum = $c.$k; + // resto respecial characters + $checksum = strtr($checksum, '<=>?', chr(128).chr(131).chr(129).chr(130)); + return $checksum; + } + + /** + * Checksum for standard 2 of 5 barcodes. + * @param $code (string) code to process. + * @return int checksum. + * @protected + */ + protected function checksum_s25($code) { + $len = strlen($code); + $sum = 0; + for ($i = 0; $i < $len; $i+=2) { + $sum += $code{$i}; + } + $sum *= 3; + for ($i = 1; $i < $len; $i+=2) { + $sum += ($code{$i}); + } + $r = $sum % 10; + if($r > 0) { + $r = (10 - $r); + } + return $r; + } + + /** + * MSI. + * Variation of Plessey code, with similar applications + * Contains digits (0 to 9) and encodes the data only in the width of bars. + * @param $code (string) code to represent. + * @param $checksum (boolean) if true add a checksum to the code (modulo 11) + * @return array barcode representation. + * @protected + */ + protected function barcode_msi($code, $checksum=false) { + $chr['0'] = '100100100100'; + $chr['1'] = '100100100110'; + $chr['2'] = '100100110100'; + $chr['3'] = '100100110110'; + $chr['4'] = '100110100100'; + $chr['5'] = '100110100110'; + $chr['6'] = '100110110100'; + $chr['7'] = '100110110110'; + $chr['8'] = '110100100100'; + $chr['9'] = '110100100110'; + $chr['A'] = '110100110100'; + $chr['B'] = '110100110110'; + $chr['C'] = '110110100100'; + $chr['D'] = '110110100110'; + $chr['E'] = '110110110100'; + $chr['F'] = '110110110110'; + if ($checksum) { + // add checksum + $clen = strlen($code); + $p = 2; + $check = 0; + for ($i = ($clen - 1); $i >= 0; --$i) { + $check += (hexdec($code{$i}) * $p); + ++$p; + if ($p > 7) { + $p = 2; + } + } + $check %= 11; + if ($check > 0) { + $check = 11 - $check; + } + $code .= $check; + } + $seq = '110'; // left guard + $clen = strlen($code); + for ($i = 0; $i < $clen; ++$i) { + $digit = $code{$i}; + if (!isset($chr[$digit])) { + // invalid character + return false; + } + $seq .= $chr[$digit]; + } + $seq .= '1001'; // right guard + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + return $this->binseq_to_array($seq, $bararray); + } + + /** + * Standard 2 of 5 barcodes. + * Used in airline ticket marking, photofinishing + * Contains digits (0 to 9) and encodes the data only in the width of bars. + * @param $code (string) code to represent. + * @param $checksum (boolean) if true add a checksum to the code + * @return array barcode representation. + * @protected + */ + protected function barcode_s25($code, $checksum=false) { + $chr['0'] = '10101110111010'; + $chr['1'] = '11101010101110'; + $chr['2'] = '10111010101110'; + $chr['3'] = '11101110101010'; + $chr['4'] = '10101110101110'; + $chr['5'] = '11101011101010'; + $chr['6'] = '10111011101010'; + $chr['7'] = '10101011101110'; + $chr['8'] = '10101110111010'; + $chr['9'] = '10111010111010'; + if ($checksum) { + // add checksum + $code .= $this->checksum_s25($code); + } + if((strlen($code) % 2) != 0) { + // add leading zero if code-length is odd + $code = '0'.$code; + } + $seq = '11011010'; + $clen = strlen($code); + for ($i = 0; $i < $clen; ++$i) { + $digit = $code{$i}; + if (!isset($chr[$digit])) { + // invalid character + return false; + } + $seq .= $chr[$digit]; + } + $seq .= '1101011'; + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + return $this->binseq_to_array($seq, $bararray); + } + + /** + * Convert binary barcode sequence to TCPDF barcode array. + * @param $seq (string) barcode as binary sequence. + * @param $bararray (array) barcode array. + * òparam array $bararray TCPDF barcode array to fill up + * @return array barcode representation. + * @protected + */ + protected function binseq_to_array($seq, $bararray) { + $len = strlen($seq); + $w = 0; + $k = 0; + for ($i = 0; $i < $len; ++$i) { + $w += 1; + if (($i == ($len - 1)) OR (($i < ($len - 1)) AND ($seq{$i} != $seq{($i+1)}))) { + if ($seq{$i} == '1') { + $t = true; // bar + } else { + $t = false; // space + } + $bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); + $bararray['maxw'] += $w; + ++$k; + $w = 0; + } + } + return $bararray; + } + + /** + * Interleaved 2 of 5 barcodes. + * Compact numeric code, widely used in industry, air cargo + * Contains digits (0 to 9) and encodes the data in the width of both bars and spaces. + * @param $code (string) code to represent. + * @param $checksum (boolean) if true add a checksum to the code + * @return array barcode representation. + * @protected + */ + protected function barcode_i25($code, $checksum=false) { + $chr['0'] = '11221'; + $chr['1'] = '21112'; + $chr['2'] = '12112'; + $chr['3'] = '22111'; + $chr['4'] = '11212'; + $chr['5'] = '21211'; + $chr['6'] = '12211'; + $chr['7'] = '11122'; + $chr['8'] = '21121'; + $chr['9'] = '12121'; + $chr['A'] = '11'; + $chr['Z'] = '21'; + if ($checksum) { + // add checksum + $code .= $this->checksum_s25($code); + } + if((strlen($code) % 2) != 0) { + // add leading zero if code-length is odd + $code = '0'.$code; + } + // add start and stop codes + $code = 'AA'.strtolower($code).'ZA'; + + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + $k = 0; + $clen = strlen($code); + for ($i = 0; $i < $clen; $i = ($i + 2)) { + $char_bar = $code{$i}; + $char_space = $code{$i+1}; + if((!isset($chr[$char_bar])) OR (!isset($chr[$char_space]))) { + // invalid character + return false; + } + // create a bar-space sequence + $seq = ''; + $chrlen = strlen($chr[$char_bar]); + for ($s = 0; $s < $chrlen; $s++){ + $seq .= $chr[$char_bar]{$s} . $chr[$char_space]{$s}; + } + $seqlen = strlen($seq); + for ($j = 0; $j < $seqlen; ++$j) { + if (($j % 2) == 0) { + $t = true; // bar + } else { + $t = false; // space + } + $w = $seq{$j}; + $bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); + $bararray['maxw'] += $w; + ++$k; + } + } + return $bararray; + } + + /** + * C128 barcodes. + * Very capable code, excellent density, high reliability; in very wide use world-wide + * @param $code (string) code to represent. + * @param $type (string) barcode type: A, B, C or empty for automatic switch (AUTO mode) + * @return array barcode representation. + * @protected + */ + protected function barcode_c128($code, $type='') { + $chr = array( + '212222', /* 00 */ + '222122', /* 01 */ + '222221', /* 02 */ + '121223', /* 03 */ + '121322', /* 04 */ + '131222', /* 05 */ + '122213', /* 06 */ + '122312', /* 07 */ + '132212', /* 08 */ + '221213', /* 09 */ + '221312', /* 10 */ + '231212', /* 11 */ + '112232', /* 12 */ + '122132', /* 13 */ + '122231', /* 14 */ + '113222', /* 15 */ + '123122', /* 16 */ + '123221', /* 17 */ + '223211', /* 18 */ + '221132', /* 19 */ + '221231', /* 20 */ + '213212', /* 21 */ + '223112', /* 22 */ + '312131', /* 23 */ + '311222', /* 24 */ + '321122', /* 25 */ + '321221', /* 26 */ + '312212', /* 27 */ + '322112', /* 28 */ + '322211', /* 29 */ + '212123', /* 30 */ + '212321', /* 31 */ + '232121', /* 32 */ + '111323', /* 33 */ + '131123', /* 34 */ + '131321', /* 35 */ + '112313', /* 36 */ + '132113', /* 37 */ + '132311', /* 38 */ + '211313', /* 39 */ + '231113', /* 40 */ + '231311', /* 41 */ + '112133', /* 42 */ + '112331', /* 43 */ + '132131', /* 44 */ + '113123', /* 45 */ + '113321', /* 46 */ + '133121', /* 47 */ + '313121', /* 48 */ + '211331', /* 49 */ + '231131', /* 50 */ + '213113', /* 51 */ + '213311', /* 52 */ + '213131', /* 53 */ + '311123', /* 54 */ + '311321', /* 55 */ + '331121', /* 56 */ + '312113', /* 57 */ + '312311', /* 58 */ + '332111', /* 59 */ + '314111', /* 60 */ + '221411', /* 61 */ + '431111', /* 62 */ + '111224', /* 63 */ + '111422', /* 64 */ + '121124', /* 65 */ + '121421', /* 66 */ + '141122', /* 67 */ + '141221', /* 68 */ + '112214', /* 69 */ + '112412', /* 70 */ + '122114', /* 71 */ + '122411', /* 72 */ + '142112', /* 73 */ + '142211', /* 74 */ + '241211', /* 75 */ + '221114', /* 76 */ + '413111', /* 77 */ + '241112', /* 78 */ + '134111', /* 79 */ + '111242', /* 80 */ + '121142', /* 81 */ + '121241', /* 82 */ + '114212', /* 83 */ + '124112', /* 84 */ + '124211', /* 85 */ + '411212', /* 86 */ + '421112', /* 87 */ + '421211', /* 88 */ + '212141', /* 89 */ + '214121', /* 90 */ + '412121', /* 91 */ + '111143', /* 92 */ + '111341', /* 93 */ + '131141', /* 94 */ + '114113', /* 95 */ + '114311', /* 96 */ + '411113', /* 97 */ + '411311', /* 98 */ + '113141', /* 99 */ + '114131', /* 100 */ + '311141', /* 101 */ + '411131', /* 102 */ + '211412', /* 103 START A */ + '211214', /* 104 START B */ + '211232', /* 105 START C */ + '233111', /* STOP */ + '200000' /* END */ + ); + // ASCII characters for code A (ASCII 00 - 95) + $keys_a = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_'; + $keys_a .= chr(0).chr(1).chr(2).chr(3).chr(4).chr(5).chr(6).chr(7).chr(8).chr(9); + $keys_a .= chr(10).chr(11).chr(12).chr(13).chr(14).chr(15).chr(16).chr(17).chr(18).chr(19); + $keys_a .= chr(20).chr(21).chr(22).chr(23).chr(24).chr(25).chr(26).chr(27).chr(28).chr(29); + $keys_a .= chr(30).chr(31); + // ASCII characters for code B (ASCII 32 - 127) + $keys_b = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~'.chr(127); + // special codes + $fnc_a = array(241 => 102, 242 => 97, 243 => 96, 244 => 101); + $fnc_b = array(241 => 102, 242 => 97, 243 => 96, 244 => 100); + // array of symbols + $code_data = array(); + // lenght of the code + $len = strlen($code); + switch(strtoupper($type)) { + case 'A': { // MODE A + $startid = 103; + for ($i = 0; $i < $len; ++$i) { + $char = $code{$i}; + $char_id = ord($char); + if (($char_id >= 241) AND ($char_id <= 244)) { + $code_data[] = $fnc_a[$char_id]; + } elseif (($char_id >= 0) AND ($char_id <= 95)) { + $code_data[] = strpos($keys_a, $char); + } else { + return false; + } + } + break; + } + case 'B': { // MODE B + $startid = 104; + for ($i = 0; $i < $len; ++$i) { + $char = $code{$i}; + $char_id = ord($char); + if (($char_id >= 241) AND ($char_id <= 244)) { + $code_data[] = $fnc_b[$char_id]; + } elseif (($char_id >= 32) AND ($char_id <= 127)) { + $code_data[] = strpos($keys_b, $char); + } else { + return false; + } + } + break; + } + case 'C': { // MODE C + $startid = 105; + if (ord($code{0}) == 241) { + $code_data[] = 102; + $code = substr($code, 1); + --$len; + } + if (($len % 2) != 0) { + // the length must be even + return false; + } + for ($i = 0; $i < $len; $i+=2) { + $chrnum = $code{$i}.$code{$i+1}; + if (preg_match('/([0-9]{2})/', $chrnum) > 0) { + $code_data[] = intval($chrnum); + } else { + return false; + } + } + break; + } + default: { // MODE AUTO + // split code into sequences + $sequence = array(); + // get numeric sequences (if any) + $numseq = array(); + preg_match_all('/([0-9]{4,})/', $code, $numseq, PREG_OFFSET_CAPTURE); + if (isset($numseq[1]) AND !empty($numseq[1])) { + $end_offset = 0; + foreach ($numseq[1] as $val) { + $offset = $val[1]; + if ($offset > $end_offset) { + // non numeric sequence + $sequence = array_merge($sequence, $this->get128ABsequence(substr($code, $end_offset, ($offset - $end_offset)))); + } + // numeric sequence + $slen = strlen($val[0]); + if (($slen % 2) != 0) { + // the length must be even + --$slen; + } + $sequence[] = array('C', substr($code, $offset, $slen), $slen); + $end_offset = $offset + $slen; + } + if ($end_offset < $len) { + $sequence = array_merge($sequence, $this->get128ABsequence(substr($code, $end_offset))); + } + } else { + // text code (non C mode) + $sequence = array_merge($sequence, $this->get128ABsequence($code)); + } + // process the sequence + foreach ($sequence as $key => $seq) { + switch($seq[0]) { + case 'A': { + if ($key == 0) { + $startid = 103; + } elseif ($sequence[($key - 1)][0] != 'A') { + if (($seq[2] == 1) AND ($key > 0) AND ($sequence[($key - 1)][0] == 'B') AND (!isset($sequence[($key - 1)][3]))) { + // single character shift + $code_data[] = 98; + // mark shift + $sequence[$key][3] = true; + } elseif (!isset($sequence[($key - 1)][3])) { + $code_data[] = 101; + } + } + for ($i = 0; $i < $seq[2]; ++$i) { + $char = $seq[1]{$i}; + $char_id = ord($char); + if (($char_id >= 241) AND ($char_id <= 244)) { + $code_data[] = $fnc_a[$char_id]; + } else { + $code_data[] = strpos($keys_a, $char); + } + } + break; + } + case 'B': { + if ($key == 0) { + $tmpchr = ord($seq[1]{0}); + if (($seq[2] == 1) AND ($tmpchr >= 241) AND ($tmpchr <= 244) AND isset($sequence[($key + 1)]) AND ($sequence[($key + 1)][0] != 'B')) { + switch ($sequence[($key + 1)][0]) { + case 'A': { + $startid = 103; + $sequence[$key][0] = 'A'; + $code_data[] = $fnc_a[$tmpchr]; + break; + } + case 'C': { + $startid = 105; + $sequence[$key][0] = 'C'; + $code_data[] = $fnc_a[$tmpchr]; + break; + } + } + break; + } else { + $startid = 104; + } + } elseif ($sequence[($key - 1)][0] != 'B') { + if (($seq[2] == 1) AND ($key > 0) AND ($sequence[($key - 1)][0] == 'A') AND (!isset($sequence[($key - 1)][3]))) { + // single character shift + $code_data[] = 98; + // mark shift + $sequence[$key][3] = true; + } elseif (!isset($sequence[($key - 1)][3])) { + $code_data[] = 100; + } + } + for ($i = 0; $i < $seq[2]; ++$i) { + $char = $seq[1]{$i}; + $char_id = ord($char); + if (($char_id >= 241) AND ($char_id <= 244)) { + $code_data[] = $fnc_b[$char_id]; + } else { + $code_data[] = strpos($keys_b, $char); + } + } + break; + } + case 'C': { + if ($key == 0) { + $startid = 105; + } elseif ($sequence[($key - 1)][0] != 'C') { + $code_data[] = 99; + } + for ($i = 0; $i < $seq[2]; $i+=2) { + $chrnum = $seq[1]{$i}.$seq[1]{$i+1}; + $code_data[] = intval($chrnum); + } + break; + } + } + } + } + } + // calculate check character + $sum = $startid; + foreach ($code_data as $key => $val) { + $sum += ($val * ($key + 1)); + } + // add check character + $code_data[] = ($sum % 103); + // add stop sequence + $code_data[] = 106; + $code_data[] = 107; + // add start code at the beginning + array_unshift($code_data, $startid); + // build barcode array + $bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array()); + foreach ($code_data as $val) { + $seq = $chr[$val]; + for ($j = 0; $j < 6; ++$j) { + if (($j % 2) == 0) { + $t = true; // bar + } else { + $t = false; // space + } + $w = $seq{$j}; + $bararray['bcode'][] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0); + $bararray['maxw'] += $w; + } + } + return $bararray; + } + + /** + * Split text code in A/B sequence for 128 code + * @param $code (string) code to split. + * @return array sequence + * @protected + */ + protected function get128ABsequence($code) { + $len = strlen($code); + $sequence = array(); + // get A sequences (if any) + $numseq = array(); + preg_match_all('/([\0-\31])/', $code, $numseq, PREG_OFFSET_CAPTURE); + if (isset($numseq[1]) AND !empty($numseq[1])) { + $end_offset = 0; + foreach ($numseq[1] as $val) { + $offset = $val[1]; + if ($offset > $end_offset) { + // B sequence + $sequence[] = array('B', substr($code, $end_offset, ($offset - $end_offset)), ($offset - $end_offset)); + } + // A sequence + $slen = strlen($val[0]); + $sequence[] = array('A', substr($code, $offset, $slen), $slen); + $end_offset = $offset + $slen; + } + if ($end_offset < $len) { + $sequence[] = array('B', substr($code, $end_offset), ($len - $end_offset)); + } + } else { + // only B sequence + $sequence[] = array('B', $code, $len); + } + return $sequence; + } + + /** + * EAN13 and UPC-A barcodes. + * EAN13: European Article Numbering international retail product code + * UPC-A: Universal product code seen on almost all retail products in the USA and Canada + * UPC-E: Short version of UPC symbol + * @param $code (string) code to represent. + * @param $len (string) barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A + * @return array barcode representation. + * @protected + */ + protected function barcode_eanupc($code, $len=13) { + $upce = false; + if ($len == 6) { + $len = 12; // UPC-A + $upce = true; // UPC-E mode + } + $data_len = $len - 1; + //Padding + $code = str_pad($code, $data_len, '0', STR_PAD_LEFT); + $code_len = strlen... [truncated message content] |
From: <be...@us...> - 2011-12-28 15:44:18
|
Revision: 8612 http://xoops.svn.sourceforge.net/xoops/?rev=8612&view=rev Author: beckmi Date: 2011-12-28 15:44:06 +0000 (Wed, 28 Dec 2011) Log Message: ----------- moving TCPDF to /Frameworks out of Publisher, and updating to 5.9.142 Modified Paths: -------------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/about.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/admin_header.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/clone.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/news.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/index.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/main.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/menu.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/mimetypes.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pagewrap.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/permissions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/preferences.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/archive.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/author_items.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/backend.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_columns.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_menu.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_new.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_recent.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_spot.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/latest_files.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/search.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/blockform.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/formdatetime.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/groupperm.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/metagen.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/mimetype.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/permission.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/publisher.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/rating.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/registry.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/session.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/themetabform.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_delete.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_edit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_new.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_post.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_reply.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/footer.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/header.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/comment_functions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/common.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/constants.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/functions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/notification.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/plugin.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/search.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/seo.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/index.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/list.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/makepdf.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/notification_update.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/pop.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/print.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/rate.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/search.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/submit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/view.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/visit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/CHANGELOG.TXT XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/LICENSE.TXT XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/README.TXT XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/cache/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/cache/chapter_demo_1.txt XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/cache/chapter_demo_2.txt XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/cache/table_data_demo.txt XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/cache/utf8test.txt XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/afr.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ara.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/aze.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/bel.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/bra.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/cat.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ces.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/chi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/cym.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/dan.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/eng.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/est.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/eus.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/far.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/fra.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ger.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/gle.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/glg.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/hat.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/heb.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/hrv.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/hun.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/hye.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ind.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ita.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/kat.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/kor.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/mkd.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/mlt.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/msa.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/nld.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/nob.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/pol.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/por.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/ron.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/rus.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/slv.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/spa.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/sqi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/srp.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/swa.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/swe.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/urd.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/yid.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/lang/zho.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/tcpdf_config.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/config/tcpdf_config_alt.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/datamatrix.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/doc/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/doc/index.html XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/encodings_maps.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/courier.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/courierb.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/courierbi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/courieri.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/dejavusans.ctg.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/dejavusans.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/dejavusans.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/helvetica.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/helveticab.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/helveticabi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/helveticai.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/hysmyeongjostdmedium.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/kozgopromedium.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/kozminproregular.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/msungstdlight.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourier.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourier.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourierb.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourierb.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourierbi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourierbi.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourieri.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfacourieri.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelvetica.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelvetica.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticab.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticab.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticabi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticabi.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticai.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfahelveticai.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfasymbol.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfasymbol.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimes.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimes.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesb.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesb.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesbi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesbi.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfatimesi.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfazapfdingbats.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/pdfazapfdingbats.z XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/stsongstdlight.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/symbol.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/times.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/timesb.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/timesbi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/timesi.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/fonts/zapfdingbats.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/htmlcolors.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/_blank.png XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/bug.eps XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/tcpdf_cell.png XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/tcpdf_logo.jpg XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/tcpdf_signature.png XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/testsvg.svg XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/images/tux.svg XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/pdf417.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/qrcode.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/sRGB.icc XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/spotcolors.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf.crt XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf.fdf XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf.p12 XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf_filters.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/tcpdf_parser.php XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/unicode_data.php Removed Paths: ------------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/ Added: XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/CHANGELOG.TXT =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/CHANGELOG.TXT (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/Frameworks/tcpdf/CHANGELOG.TXT 2011-12-28 15:44:06 UTC (rev 8612) @@ -0,0 +1,2254 @@ +5.9.142 (2011-12-23) + - Source code documentation was updated. + +5.9.141 (2011-12-14) + - Some minor bugs were fixed. + +5.9.140 (2011-12-13) + - SVG now supports embedded images encoded as base64. + +5.9.139 (2011-12-11) + - Spot color methods were fixed. + +5.9.138 (2011-12-10) + - cropMark() method was improved (check source code documentation). + - Example n. 56 was updated. + - Bug item #3452390 "Check Box still not ticked when set to true" was fixed. + +5.9.137 (2011-12-01) + - Bug item #3447005 "Background color and border of Form Elements is printed" was fixed. + - Color support for Form elements was improved. + +5.9.136 (2011-11-27) + - Bug item #3443387 "SetMargins with keep option does not work for top margin" was fixed. + +5.9.135 (2011-11-04) + - Bug item #3433406 "Double keywords in description" was fixed. + +5.9.134 (2011-10-29) + - The default value for $defcol parameter on convertHTMLColorToDec() method was fixed. + - Deafult HTTP headers were changed to avoid browser caching. + - Some deprecated syntax were replaced. + +5.9.133 (2011-10-26) + - Bug item #3428446 "copyPage method not working when diskcache enabled" was fixed. + +5.9.132 (2011-10-20) + - Bug item #3426167 "bug in function convertHTMLColorToDec()" was fixed. + +5.9.131 (2011-10-13) + - An error message was added to ImagePngAlpha() method. + +5.9.130 (2011-10-12) + - Now you can set image data strings on HTML img tag by encoding the image binary data in this way: $imgsrc = '@'.base64_encode($imgdata); + +5.9.129 (2011-10-07) + - Core fonts metrics was fixed (replace all helvetica and times php files on fonts folder). + - Form fields support was improved and some problems were fixed (check the example n. 14). + - Bug item #3420249 "Issue with booklet and MultiCell" was fixed. + +5.9.128 (2011-10-06) + - Method addTTFfont() was improved (check the source code documentation). + - Method setExtraXMP() to set custom XMP data was added. + +5.9.127 (2011-10-04) + - Readonly mode option was activated for radiobuttons. + +5.9.126 (2011-10-03) + - Bug item #3417989 "Graphics State operator in form XObject fails to render" was fixed. + - Xobjects problems with transparency, gradients and spot colors were fixed. + +5.9.125 (2011-10-03) + - Support for 8-digit CMYK hexadecimal color representation was added (to be used with XHTML and SVG). + - Spot colors support was improved (check example n. 37). + - Color methods were improved. + +5.9.124 (2011-10-02) + - Core fonts were updated. + +5.9.123 (2011-10-02) + - The method addTTFfont() wad added to automatically convert TTF fonts (check the new fonts guide at http://www.tcpdf.org). + - Old font utils were removed. + - All fonts were updated and new arabic fonts were added (almohanad were removed and replaced by aefurat and aealarabiya). + - The file unicode_data.php was updated. + - The file encodings_maps.php was added. + - PDF/A files are now compressed to save space. + - XHTML input form fields now support text-alignment attribute. + +5.9.122 (2011-09-29) + - PDF/A-1b compliance was improved to pass some online testing. + +5.9.121 (2011-09-28) + - This version includes support for PDF/A-1b format (the class constructor signature was changed - see example n. 65). + - Method setSRGBmode() was added to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document (file sRGB.icc was added). + - 14 new fonts were added to allow embedding core fonts (for PDF/A compliance). + - Font utils were fixed. + +5.9.120 (2011-09-22) + - This version includes a fix for _getTrueTypeFontSubset() method. + +5.9.119 (2011-09-19) + - This version includes a fix for extra page numbering on TOC. + +5.9.118 (2011-09-17) + - This version includes some changes that allows you to add a bookmark for a page that do not exist. + +5.9.117 (2011-09-15) + - TCPDFBarcode and TCPDF2DBarcode classes were extended to include a method for exporting barcodes as PNG images. + +5.9.116 (2011-09-14) + - Datamatrix class was improved and documentation was fixed. + +5.9.115 (2011-09-13) + - Datamatrix ECC200 barcode support was added (a new datamatrix.php file was added) - check example n. 50. + - getBarcodeHTML() method was added on TCPDFBarcode and TCPDF2DBarcode classes to return an HTML representation of the barcode. + - cURL options on Image() method were improved. + - A bug on write2DBarcode() was fixed. + +5.9.114 (2011-09-04) + - A bug related to column position was fixed. + +5.9.113 (2011-08-24) + - This release include two new experimental files for parsing an existing PDF document (the integration with TCPDF is under development). + +5.9.112 (2011-08-18) + - A newline character was added after the 'trailer' keyword for compatibility with some parsers. + - Support for layers was improved. + +5.9.111 (2011-08-17) + - Barcode CODE 39 default gap was restored at 1. + +5.9.110 (2011-08-17) + - Barcode CODE 39 was fixed. + +5.9.109 (2011-08-12) + - Method getNumLines() was fixed. + - A bug related to page break in multi-column mode was fixed. + +5.9.108 (2011-08-09) + - A bug on PHP4 version was fixed. + +5.9.107 (2011-08-08) + - This version includes a minor bugfix. + +5.9.106 (2011-08-04) + - This version includes transparency groups: check the new parameter on startTemplate() method and example 62. + +5.9.105 (2011-08-04) + - Bug item #3386153 "Check Box not ticked when set to true" was fixed. + +5.9.104 (2011-08-01) + - Bug item #3383698 "imagemagick, resize and dpi" was fixed. + +5.9.103 (2011-07-16) + - Alignment of XHTML lines was improved. + - Spell of the "length" word was fixed. + +5.9.102 (2011-07-13) + - Methods startLayer() and endLayer() were added to support arbitrary PDF layers. + - Some improvements/fixes for images were added (thanks to Brendan Abbott). + +5.9.101 (2011-07-07) + - Support for JPEG and PNG ICC Color Profiles was added. + - Method addEmptySignatureAppearance() was added to add empty signature fields (see example n. 52). + - Bug item #3354332 "Strange line spacing with reduced font-size in writeHTML" was fixed. + +5.9.100 (2011-06-29) + - An SVG bug has been fixed. + +5.9.099 (2011-06-27) + - Bug item #3335045 "Font freesans seems somehow corrupted in footer" was fixed. + +5.9.098 (2011-06-23) + - The Named Destination feature was fixed. + +5.9.097 (2011-06-23) + - The method setHtmlVSpace() now can be used also for tags: div, li, br, dt and dd. + - The Named Destination feature was added (check the example n. 15) - thanks to Christian Deligant. + +5.9.096 (2011-06-19) + - Bug item #3322234 "Surrogate pairs codes in arrUTF8ToUTF16BE" was fixed. + +5.9.095 (2011-06-18) + - Numbers alignment for Table-Of-Content methods was improved and fixed. + - Font subsetting was fixed to include all parts of composite fonts. + +5.9.094 (2011-06-17) + - Bug item #3317898 "Page Group numbering broken in 5.9.093" was fixed. + +5.9.093 (2011-06-16) + - Method setStartingPageNumber() was added to set starting page number (for automatic page numbering). + +5.9.092 (2011-06-15) + - Method _putpages() was improved. + - Bug item #3316678 "Memory overflow when use Rotate and SetAutoPageBreak" was fixed. + - Right alignment of page numbers was improved. + +5.9.090 (2011-06-14) + - Methods AliasNbPages() and AliasNumPage() were re-added as deprecated for backward compatibility. + +5.9.089 (2011-06-13) + - Example n. 8 was updated. + - Method sendOutputData() was changed to remove default compression (it was incompatible with some server settings). + - Bugs related to page group numbers were fixed. + - Method copyPage() was fixed. + - Method Image() was improved to include support for alternative and external images. + +5.9.088 (2011-06-01) + - Method getAutoPageBreak() was added (see example n. 51). + - Example n. 51 (full page background) was updated. + +5.9.087 (2011-06-01) + - Method sendOutputData() was improved to include deflate encoding. + - Barcode classes on PHP 4 version were fixed. + +5.9.086 (2011-05-31) + - Font files were updated (the ones on the previous release were broken). + - The script fonts/utils/makeallttffonts.php was updated and fixed. + - Output() method was improved to use compression when available. + +5.9.085 (2011-05-31) + - TCPDFBarcode class (barcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode. + - TCPDF2DBarcode class (2dbarcodes.php) now includes getBarcodeSVG() and getBarcodeSVGcode() methods to get SVG image representation of the barcode. + +5.9.084 (2011-05-29) + - Font files were updated. + - The file fonts/utils/makeallttffonts.php was updated. + - Bug item# 3308774 "Problems with font subsetting" was fixed. + +5.9.083 (2011-05-24) + - Bug item #3308387 "line height & SetCellHeightRatio" was fixed. + +5.9.082 (2011-05-22) + - Bug item #3305592 "Setting fill color <> text color breaks text clipping" was fixed. + +5.9.081 (2011-05-18) + - Method resetHeaderTemplate() was added to reset the xobject template used by Header() method. + - Method setHeaderTemplateAutoreset() was added to automatically reset the xobject template used by Header() method at each page. + +5.9.080 (2011-05-17) + - A problem related to file path calculation for images was fixed. + - A problem related to unsupressed getimagesize() error was fixed. + +5.9.079 (2011-05-16) + - Footer() method was changed to use C128 barcode as default (instead of the previous C128B). + +5.9.078 (2011-05-12) + - Bug item #3300878 "wrong rendering for html bullet list in some case" was fixed. + - Bug item #3301017 "Emphasized vs. font-weight" was fixed. + - Barcode Code 128 was improved to include AUTO mode (automatically switch between A, B and C modes). + - Examples n. 27 and 49 were updated. + +5.9.077 (2011-05-07) + - Bug item #3298591 "error code93" was fixed. + - SetLineStyle() function was improved. + +5.9.076 (2011-05-06) + - Bug item #3298264 "codebar 93 error" was fixed. + +5.9.075 (2011-05-02) + - Table header alignment when using WriteHTMLCell() or MultiCell() was fixed. + +5.9.074 (2011-04-28) + - Bug item #3294306 "CSS classes not work in <thead> table section" was fixed. + +5.9.073 (2011-04-27) + - A bug related to character entities on HTML cells was fixed. + +5.9.072 (2011-04-26) + - Method resetColumns() was added to remove multiple columns and reset page margins (example n. 10 was updated). + +5.9.071 (2011-04-19) + - Bug #3288574 "<br/> trouble" was fixed. + +5.9.069 (2011-04-19) + - Bug #3288763 "HTML-Table: non-breaking table rows: Bug" was fixed. + +5.9.068 (2011-04-15) + - Bookmark, addTOC and addHTMLTOC methods were improved to include font style and color (Examples 15, 49 and 59 were updated). + - Default $_SERVER['DOCUMENT_ROOT'] value on tcpdf_config.php file was changed. + +5.9.067 (2011-04-10) + - Performances were drastically improved (PDF documents are now created more quickly). + +5.9.066 (2011-04-09) + - A bug related to digital signature + encryption was fixed. + - A bug related to encryption + xobject templates was fixed. + +5.9.065 (2011-04-08) + - Bug item #3280512 "Text encoding iso-8859-2 crashes" was fixed. + +5.9.064 (2011-04-05) + - A bug related to character entities on HTML cells was fixed. + +5.9.063 (2011-04-01) + - Bug item #3267235 "WriteHTML() and image that doesn't fit on the page" was fixed. + +5.9.062 (2011-03-23) + - Bug item #3232650 "Using Write if there are pageRegions active creates error" was fixed. + - Bug item #3221891 "text input borders" was fixed. + - Bug item #3228958 "Adobe Reader 9.4.2 crash" was fixed. + +5.9.061 (2011-03-15) + - Bug item #3213488 "wrong function call in function Write" was fixed. + - Bug item #3203007 "list element with black background" was fixed. + +5.9.060 (2011-03-08) + - addTOC() method was fixed for text alignment problems. + +5.9.059 (2011-02-27) + - Default Header() method was improved to reduce document size. + +5.9.058 (2011-02-25) + - Image() method was improved to cache images with transparency layers (thanks to Korneliusz Jarzębski for reporting this problem). + +5.9.057 (2011-02-24) + - A problem with image caching system was fixed (thanks to Korneliusz Jarzębski for reporting this problem). + +5.9.056 (2011-02-22) + - A bug on fixHTMLCode() method was fixed. + - Automatic line break for HTML was fixed. + +5.9.055 (2011-02-17) + - Another bug related to HTML table page break was fixed. + +5.9.054 (2011-02-16) + - A bug related to HTML table page break was fixed. + +5.9.053 (2011-02-16) + - Support for HTML attribute display="none" was added. + +5.9.052 (2011-02-15) + - A bug related to HTML automatic newlines was fixed. + +5.9.051 (2011-02-12) + - "Commas at beginning of new lines" problem was fixed. + +5.9.050 (2011-02-11) + - Bug #3177606 "SVG Bar chart error" was fixed. + +5.9.049 (2011-02-03) + - Bug #3170777 "TCPDF creates a new page after a single line in writeHTML" was fixed. + +5.9.048 (2011-02-02) + - No changes. Just released to override previous release that was not uploaded correctly. + +5.9.047 (2011-01-28) + - Bug #3167115 "PDF error in <table> (example 48)" was fixed (was introduced in 5.8.046). + +5.9.046 (2011-01-18) + - PDF view/print layers are now automatically turned off if not used (see setVisibility() method). + +5.9.045 (2011-01-17) + - HTML list support were improved. + +5.9.044 (2011-01-15) + - Bug #3158422 "writeHTMLCell Loop" was fixed. + - Some HTML image alignment problems were fixed. + +5.9.043 (2011-01-14) + - Bug #3158178 "PHP Notice" was fixed. + - Bug #3158193 "Endless loop in writeHTML" was fixed. + - Bug #3157764 "SVG Pie chart incorrectly rendered2". + +5.9.042 (2011-01-14) + - Some problems of the PHP4 version were fixed. + +5.9.041 (2011-01-13) + - A problem with SVG elliptical arc path was fixed (ref. bug #3156574). + - A problem related to font weight on HTML table headers was fixed. + +5.9.040 (2011-01-12) + - A bug related to empty pages after table was fixed. + +5.9.039 (2011-01-12) + - Bug item #3155759 "openssl_random_pseudo_bytes() slow under Windows" was fixed. + +5.9.038 (2011-01-11) + - Minor bugs were fixed. + +5.9.037 (2011-01-09) + - An alignment problem for HTML texts was fixed. + +5.9.036 (2011-01-07) + - A bug related to HTML tables on header was fixed. + +5.9.035 (2011-01-03) + - A problem related to HTML table border alignment was fixed. + - Bug #2996366 "FastCGI and Header Problems" was fixed. + +5.9.034 (2010-12-19) + - DejaVu and GNU Free fonts were updated. + +5.9.033 (2010-12-18) + - Source code documetnation was improved. + +5.9.032 (2010-12-18) + - Default font stretching and spacing values are now inherited by HTML methods. + +5.9.031 (2010-12-16) + - Source code documentation errors were fixed. + +5.9.030 (2010-12-16) + - Several source code documentation errors were fixed. + - Source code style was changed for Doxygen. + - Source code documentation was moved online to http://www.tcpdf.org + +5.9.029 (2010-12-04) + - The $fitbox parameter on Image() method was extended to specify image alignment inside the box (check the example n. 9). + +5.9.028 (2010-12-03) + - Font utils makefont.php and makeallttffonts.php were updated. + +5.9.027 (2010-12-01) + - Spot Colors are now better integrated with HTML mode. + - Method SetDocInfoUnicode() was added to turn on/off Unicode mode for document information dictionary (meta tags) - check the example n. 19. + +5.9.026 (2010-12-01) + - A problem with mixed text directions on HTML was fixed. + +5.9.025 (2010-12-01) + - The AddSpotColor() now automatically fills the spotcolor array (defined on spotcolors.php file). + +5.9.024 (2010-11-30) + - Bug item #3123612 "SVG not use gradientTransform in percentage mode" was fixed. + +5.9.023 (2010-11-25) + - A potential bug on SVG transcoder was fixed. + +5.9.022 (2010-11-21) + - Method ImageEPS includes support for EPS/AI Spot colors. + - Method ImageEPS includes a new parameter $fixoutvals to remove values outside the bounding box. + +5.9.021 (2010-11-20) + - Support for custom bullet points images was added (check the example n.6) + - Examples n. 6 and 61 were update (check the comments inside). + +5.9.020 (2010-11-19) + - A problem related to additional page when using multicolumn mode was fixed. + +5.9.019 (2010-11-19) + - An SVG bug was fixed. + - ImageSVG() and ImageEPS() methods now accepts image data streams (put the string on the $file parameter preceded by '@' character). + - Option 'E' was added to the $dest parameter of Output() method to return the document as base64 mime multi-part email attachment (RFC 2045). + +5.9.018 (2010-11-19) + - An SVG bug was fixed. + +5.9.017 (2010-11-16) + - Tagline color was set to transparent. + - The method fixHTMLCode() was added to automatically clean up HTML code (requires HTML Tidy). + +5.9.016 (2010-11-16) + - Bug item #3109705 "list item page break hanging bullet" was fixed. + +5.9.015 (2010-11-16) + - Bug item affecting QRCode was fixed. + - Some bugs affecting HTML lists were fixed. + - ImageSVG() and fitBlock() methods were improved to handle some SVG problems. + - Some problems with PHP4 compatibility were fixed. + +5.9.014 (2010-11-15) + - Bug item #3109464 "QRCode error" was fixed. + +5.9.013 (2010-11-15) + - Bug item #3109257 "Problem with interlaced GIFs and PNGs" was fixed. + - Image function now accepts image data streams (check example n. 9). + +5.9.012 (2010-11-12) + - Method getTCPDFVersion() was added. + - PDF_PRODUCER constant was removed. + - Method convertHTMLColorToDec() was improved. + - HTML colors now support spot color names defined on the new spotcolors.php file. + - The default method Header() was improved to support SVG and EPS/AI images. + - A bug on SVG importer was fixed. + +5.9.011 (2010-11-02) + - Bug item #3101486 "Bug Fix for image loading" was fixed. + +5.9.010 (2010-10-27) + - Support for CSS properties 'border-spacing' and 'padding' for tables were added. + - Several language files were added. + +5.9.009 (2010-10-21) + - HTML text alignment was improved to include the case of RTL text on LTR direction and LTR text on RTL direction. + +5.9.008 (2010-10-21) + - Bug item #3091502 "Bookmark oddity" was fixed. + - HTML internal links now accepts page number and Y position. + - The method write1DBarcode() was improved to accept separate horizontal and vertical padding (see example n. 27). + +5.9.007 (2010-10-20) + - Method adjustCellPadding() was fixed to handle bad input. + +5.9.006 (2010-10-19) + - Support for AES 256 bit encryption was added (see example n. 16). + - Method getNumLines() was fixed for the empty string case. + +5.9.005 (2010-10-18) + - Method addPageRegion() was changed to accept regions starting exactly from the top of the page. + +5.9.004 (2010-10-18) + - A bug related to annotations was fixed. + - The file unicode_data.php was canged to encapsulate all data in a class. + - The file htmlcolors.php was changed to remove the global variable. + +5.9.003 (2010-10-15) + - Support for no-write page regions was added. Check the example n. 64 and new methods setPageRegions(), addPageRegion(), getPageRegions(), removePageRegion(). + - A bug on Right-To-Left alignment was fixed. + +5.9.002 (2010-10-08) + - Cell method was improved to preserve the font stretching and spacing values when using the $stretch parameter (see example n. 4). + +5.9.001 (2010-10-07) + - The problem of blank page for nobr table higher than a single page was fixed. + +5.9.000 (2010-10-06) + - Support for text stretching and spacing (kerning) was added, see example n. 63 and methods setFontStretching(), getFontStretching(), setFontSpacing(), getFontSpacing(). + - Support for CSS properties 'font-stretch' and 'letter-spacing' was added (see example n. 63). + - The cMargin state was replaced by cell_padding array that can be set/get using setCellPadding() and getCellPadding() methods. + - Methods getCellPaddings() and setCellPaddings() were added to fine tune cell paddings (see example n. 5). + - Methods getCellMargins() and setCellMargins() were added to fine tune cell margins (see example n. 5). + - Method write1DBarcode() was improved to permit custom labels (see example n. 27). + - Method ImagePngAlpha() now includes support for ImageMagick to improve performances. + - XObject Template support was extended to support Multicell(), writeHTML() and writeHTMLCell() methods. + - The signature of getNumLines() and getStringHeight() methods is changed. + - Example n. 57 was updated. + +// ------------------------------------------------------------------- + +5.8.034 (2010-09-27) + - A bug related to SetFont on XObject templates was fixed. + +5.8.033 (2010-09-25) + - A problem with Footer() and multiple columns was fixed. + +5.8.032 (2010-09-22) + - Bug #3073165 "Issues with changes to addHTMLVertSpace()" was fixed. + +5.8.031 (2010-09-20) + - Bug #3071961 "Spaces in HTML" was fixed. + +5.8.030 (2010-09-17) + - SVG support was improved and some bugs were fixed. + +5.8.029 (2010-09-16) + - A problem with HTML borders was fixed. + +5.8.028 (2010-09-13) + - Bug #3065224 "mcrypt_create_iv error on TCPDF 5.8.027 on PHP 5.3.2" was fixed. + +5.8.027 (2010-09-13) + - Bug #3065118 "mcrypt_decrypt error on TCPDF 5.8.026 on PHP 5.3.2" was fixed. + +5.8.026 (2010-09-13) + - A bug on addHTMLTOC() method was fixed. Note: be sure that the #TOC_PAGE_NUMBER# template has enough width to be printed correctly. + +5.8.025 (2010-09-09) + - Bug #3062692 "Textarea inside a table" was fixed. + +5.8.024 (2010-09-08) + - Bug #3062005 "Undefined variable: ann_obj_id" was fixed. + +5.8.023 (2010-08-31) + - Forms bug added on version 5.8.019 was fixed. + +5.8.022 (2010-08-31) + - Bug #3056632 "SVG rendered vertically flipped" was fixed. + +5.8.021 (2010-08-30) + - A new CID-0 'chinese' font was added for traditional Chinese. + - Bug #3054287 'Inner tags are ignored due to "align" attribute' was fixed. + +5.8.020 (2010-08-26) + - CSS "catch-all" class selector is now supported. + +5.8.019 (2010-08-26) + - XObject Templates now includes support for links and annotations. + - A problem related to link alignment on cell was fixed. + - A problem related to SVG styles was fixed. + +5.8.018 (2010-08-25) + - Method getNumberOfColumns() was added. + - A problem related to table header was fixed. + - Method getSVGTransformMatrix() was fixed to apply SVG transformations in the correct order. + - SVG support was improved and several bugs were fixed. + +5.8.017 (2010-08-25) + - This version includes support for XObject Templates (see the new example n. 62). + - Methods starttemplate(), endTemplate() and printTemplate() were added (see the new example n. 62). + +5.8.016 (2010-08-24) + - Alignment problem on write2DBarcode was fixed. + +5.8.015 (2010-08-24) + - A problem arised with the latest bugfix was fixed. + +5.8.014 (2010-08-23) + - Method _getxobjectdict() was added for better compatibility with external extensions. + - A bug related to radiobuttons was fixed. + - Bug #3051509 "new line after punctuation marks" was fixed (partially). + +5.8.013 (2010-08-23) + - SVG support for 'direction' property was added. + - A problem on default width calculation for linear barcodes was fixed. + - New option was added to write1DBarcode() method to improve alignments (see example n. 27). + - Bug #3050896 "Nested HTML tables: styles are not applied" was fixed. + - Method _putresourcedict() was improved to include external XObject templates. + +5.8.012 (2010-08-22) + - Support for SVG 'text-anchor' property was added. + +5.8.011 (2010-08-21) + - Method write1DBarcode() was improved to be backward compatible (check the new example n. 27). + - Support for CSS width and height properties on images were added. + +5.8.010 (2010-08-20) + - Documentation of unhtmlentities() was fixed. + - The 'fitwidth' option was added and border color problem was fixed on write1DBarcode() method (check the example n. 27). + +5.8.009 (2010-08-20) + - Internal object numbering was improved. + - Some errors in object encryption were fixed. + +5.8.008 (2010-08-19) + - Method write1DBarcode() was changed, check the example n. 27. + - Method Footer() was changed to account for barcode changes. + - Automatic calculation of K_PATH_URL constant was fixed on configuration file. + - Method setEqualColumns() was fixed for $width=0 case. + - Method AddTOC() was fixed for multipage and multicolumn modes. + - Better support for SVG "font-family" property. + - A problem on default Page Zoom mode was fixed. + - Several Annotation bugs were fixed. + +5.8.007 (2010-08-18) + - A bug affecting HTML tables was fixed. + - Bug #3047500 "SVG not rendering paths properly" was fixed. + +5.8.006 (2010-08-17) + - A bug affecting HTML table nesting was fixed. + +5.8.005 (2010-08-17) + - A bug affecting the HTML 'select' tag in certain conditions was fixed. + +5.8.004 (2010-08-17) + - Better support for HTML "font-family" property. + - A bug related to HTML multicolumn was fixed. + +5.8.003 (2010-08-16) + - Better support for HTML "font-family" property. + +5.8.002 (2010-08-14) + - HTML alignments were improved + - IMPORTANT: Default regular expression to find spaces has been changed to exclude the non-breaking-space (160 DEC- A0 HEX). If you are using setSpacesRE() method, please read the new documentation. + - Example n. 1 was updated. + +5.8.001 (2010-08-12) + - Bug #3043650 "subsetchars incorrectly cached" was fixed. + +5.8.000 (2010-08-11) + - A control to avoid bookmarking page 0 was added. + - addTOC() method now includes support for multicolumn mode. + - Support for tables in multicolumn mode was improved. + - Example n.10 was updated. + - All trimming functions were replaced with stringLeftTrim(), stringRightTrim() and stringTrim(). + - HTML alignments were improved. + +------------------------------------------------------------ + +5.7.003 (2010-08-08) + - Bug #3041263 "php source ending is bad" was fixed (all PHP files were updated, including fonts). + +5.7.002 (2010-08-06) + - Methods copyPage(), movePage() and deletePage() were changed to account for internal markings. + +5.7.001 (2010-08-05) + - Bug #3040105 "Broken PDF when using TOC (example 45)" was fixed. + +5.7.000 (2010-08-03) + - CSS borders are now supported for HTML tables and other block tags (see example n. 61); + - Cell borders were improved (see example n. 57); + - Minor bugs were fixed. + +------------------------------------------------------------ + +5.6.000 (2010-07-31) + - A bug with object IDs was fixes. + - Performances were improved. + +------------------------------------------------------------ + +5.5.015 (2010-07-29) + - Automatic fix for unclosed self-closing tag. + - Support for deprecated 's' and 'strike' tags was added. + - Empty list items problem was fixed. + +5.5.014 (2010-07-15) + - Support for external images was improved. + +5.5.013 (2010-07-14) + - Bug #3029338 "FI and FO output destination filename bug" was fixed (previous fix was wrong). + +5.5.012 (2010-07-14) + - Bug #3029310 "Font baseline inconsistencies with line-height and font-size" was fixed. + - Bug #3029338 "FI and FO output destination filename bug" was fixed. + +5.5.011 (2010-07-09) + - Support for multiple CSS classes was added. + - The method getColumn() was added to return the current column number. + - Some regular Expressions were fixed to be more compatible with UTF-8. + +5.5.010 (2010-07-06) + - Bug item #3025772 "Borders in all image functions are still flawed" was fixed. + +5.5.009 (2010-07-05) + - A problem related to last page footer was fixed. + - Image alignments and fit-on-page features were improved. + +5.5.008 (2010-07-02) + - A problem on table header alignment in booklet mode was fixed. + - Default graphic vars are now applied for setHeader(); + +5.5.007 (2010-07-02) + - Attribute "readonly" was added to input and textarea form fields. + - Vertical alignment feature was added on MultiCell() method only for simple text mode (see example n. 5). + - Text-Fit feature was added on MultiCell() method only for simple text mode (see example n. 5). + +5.5.006 (2010-06-29) + - getStringHeight() and getNumLines() methods were fixed. + +5.5.005 (2010-06-28) + - Bug #3022170 "getFontDescent() does not return correct descent value" was fixed. + - Some problems with multicolumn mode were fixed. + +5.5.004 (2010-06-27) + - Bug #3021803 "SVG Border" was fixed. + +5.5.003 (2010-06-26) + - On Write() method, blank lines at the beginning of a page or column are now automatically removed. + +5.5.002 (2010-06-24) + - ToUnicode Identity-H name was replaced with a full CMap (to avoid preflight syntax error). + - Bug #3020638 "str_split() not available in php4" was fixed. + - Bug #3020665 "file_get_contents() too many parameters for php4" was fixed. + +5.5.001 (2010-06-23) + - A problem on image streams was fixed. + +5.5.000 (2010-06-22) + - Several PDF syntax errors (and related bugs) were fixed. + - Bug #3019090 "/Length values are wrong if AES encryption is used" was fixed. + +------------------------------------------------------------ + +5.4.003 (2010-06-19) + - A problem related to page boxes was fixed. + - Bug #3016920 "Font subsetting issues when editing pdf" was partially fixed (Note that flattening transparency layers is currently incompatible with TrueTypeUnicode fonts). + +5.4.002 (2010-06-18) + - A problem related with setProtection() method was fixed. + +5.4.001 (2010-06-18) + - A problem related with setProtection() method was fixed. + +5.4.000 (2010-06-18) + - The method setSignatureAppearance() was added, check the example n. 52. + - Several problems related to font subsetting were fixed. + +------------------------------------------------------------ + +5.3.010 (2010-06-15) + - Previous release was corrupted. + +5.3.009 (2010-06-15) + - Bug #3015934 "Bullets don't display correctly" was fixed. + +5.3.008 (2010-06-13) + - This version fixes some problems of SVG rasterization. + +5.3.007 (2010-06-13) + - This version improves SVG support. + +5.3.006 (2010-06-10) + - This version includes a change in uniqid calls for backward compatibility with PHP4. + +5.3.005 (2010-06-09) + - The method getPageSizeFromFormat() was changed to include all standard page formats (includes 281 page formats + variation). + +5.3.004 (2010-06-08) + - Bug #3013291 "HTML table cell width" was fixed. + - Bug #3013294 "HTML table cell alignment" was fixed. + - The columns widths of HTML tables are now inherited from the first row. + +5.3.003 (2010-06-08) + - Bug #3013102 "HTML table header misaligned after page break" was fixed. + +5.3.002 (2010-06-07) + - The methods setFontSubsetting() and setFontSubsetting() were added to control the default font subsetting mode (see example n. 1). + - Bug #3012596 "Whitespace should not appeared after use Thai top characters" was fixed. + - Examples n. 1, 14, and 54 were updated. + +5.3.001 (2010-06-06) + - Barcode PDF417 was improved to support Macro Code Blocks (see example n. 50). + +5.3.000 (2010-06-05) + - License was changed to GNU-LGPLv3 (see the updated LICENSE.TXT file). + - PDF417 barcode support was added (check the example n. 50). + - The method write2DBarcode() was improved (some parameters were added and other changed - check example n. 50). + +------------------------------------------------------------ + +5.2.000 (2010-06-02) + - IMPORTANT: Support for font subsetting was added by default to reduce the size of documents using large unicode font files. + If you embed the whole font in the PDF, the person on the other end can make changes to it even if he didn't have your font. + If you subset the font, file size of the PDF will be smaller but the person who receives your PDF would need to have your same font in order to make changes to your PDF. + - The signature of the SetFont() and AddFont() methods were changed to include the font subsetting option (subsetting is applied by default). + - Examples 14 and 54 were updated. + +------------------------------------------------------------ + +5.1.002 (2010-05-27) + - Bug #3007818 "SetAutoPageBreak fails with MultiCell" was fixed. + - A bug related to MultiCell() minimun height was fixed. + +5.1.001 (2010-05-26) + - The problem of blank page after table was fixed. + +5.1.000 (2010-05-25) + - This version includes support for CSS (Cascading Style Sheets) (see example n. 61). + - The convertHTMLColorToDec() method was improved. + +------------------------------------------------------------ + +5.0.014 (2010-05-21) + - A problem on color and style of HTML links was fixed. + - A bug relative to gradients was fixed. + - The getStringHeight() method was added and getNumLines() method was improved. + - All examples were updated. + +5.0.013 (2010-05-19) + - A bug related to page-breaks and table cells was fixed. + +5.0.012 (2010-05-19) + - Page orientation bug was fixed. + - The access to method setPageFormat() was changed to 'protected' because it is not intended to be directly called. + +5.0.011 (2010-05-19) + - Page orientation bug was fixed. + - Bug #3003966 "Multiple columns and nested lists" was fixed. + +5.0.010 (2010-05-17) + - The methods setPageFormat(), setPageOrientation() and related methods were extended to include page boxes, page rotations and page transitions. + - The method setPageBoxes() was added to set page boundaries (MediaBox, CropBox, BleedBox, TrimBox, ArtBox); + - A bug relative to underline, overline and linethrough was fixed. + +5.0.009 (2010-05-16) + - Bug #3002381 "Multiple columns and nested lists" was fixed. + +5.0.008 (2010-05-15) + - Bug "Columns WriteHTML and Justification" was fixed. + +5.0.007 (2010-05-14) + - Bug #3001347 "Bug when using WriteHTML with setEqualColumns()" was fixed. + - Bug #3001505 "problem with sup and sub tags at the beginning of a line" was fixed. + +5.0.006 (2010-05-13) + - Length of hr tag was fixed. + - An error on 2d barcode method was fixed. + +5.0.005 (2010-05-12) + - WARNING: The logic of permissions on the SetProtection() method has been inverted and extended (see example 16). Now you have to specify the features you want to block. + - SetProtection() method was extended to support RSA and AES 128 encryption and public-keys (see example 16). + - Bug #2999489 "setEqualColumns() and TOC uses wrong columns" was fixed (see the example 10). + +5.0.004 (2010-05-10) + - HTML line alignment when using sub and sup tags was fixed. + +5.0.003 (2010-05-07) + - Horizontal alignment was fixed for images and barcodes. Now the X coordinate is always relative to the left margin. Use GetAbsX() instead of GetX() to get the X relative to left margin. + - Header() method was changed to account for new image alignment rules. + +5.0.002 (2010-05-06) + - Bookmark() and related methods were fixed to accept HTML code. + - A problem on HTML links was fixed. + +5.0.001 (2010-05-06) + - Protected method _putstream was re-added for backward compatibility. + - The following method were added to display HTML Table Of Content (see example n. 59): + addTOCPage(), endTOCPage(), addHTMLTOC(). + +5.0.000 (2010-05-05) + - Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported. + - Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library. + - Method RoundedRectXY() was added. + - Method PieSectorXY() was added. + - Gradient() method is now public and support new features. + - Shading to transparency is now supported. + - Image alignments were fixed. + - Support for dynamic images were improved. + - PDF_IMAGE_SCALE_RATIO has been changed to 1.25 for better compatibility with SVG. + - RAW and RAW2 modes were added to 2D Barcodes (see example n. 50). + - Automatic padding feature was added on barcodes (see examples n. 27 and 50). + - Bug #2995003 "Reproduced thead bug" was fixed. + - The Output() method now accepts FI and FD destinations to save the document on server before sending it to the client. + - Ellipse() method was improved and fixed (see page 2 of example n. 12). + +------------------------------------------------------------ + +4.9.018 (2010-04-21) + - Bug item #2990356 "Current font size not respected with more than two HTML <p>" was fixed. + +4.9.017 (2010-04-21) + - Bug item #2990224 "Different behaviour for equivalent HTML strings" was fixed. + - Bug item #2990314 "Dash is not appearing with SHY character" was fixed. + +4.9.016 (2010-04-20) + - An error on htmlcolors.php was fixed. + - getImageFileType() method was improved. + - GIF images with transparency are now better supported. + - Automatic page orientation was improved. + +4.9.015 (2010-04-20) + - A new method copyPage() was added to clone pages (see example n. 44). + - Support for text overline was added. + - Underline and linethrough methods were fixed. + - Bug #2989058 "SHY character causes unnecessary word-wrapping" was fixed. + +4.9.014 (2010-04-18) + - Bug item #2988845 was fixed. + +4.9.013 (2010-04-15) + - Image() and ImageEPS() methods were fixed and improved; $fitonpage parameter was added. + +4.9.012 (2010-04-12) + - The hyphenateText() method was added to automatically hyphenate text (see example n. 46). + +4.9.011 (2010-04-07) + - Vertical alignments for Cell() method were improved (see example n. 57). + +4.9.010 (2010-04-06) + - Signature of Cell() method now includes new parameters for vertical alignment (see example n. 57). + - Text() method was extended to include all Cell() parameters. + - HTML line alignment procedure was changed to fix some bugs. + +4.9.009 (2010-04-05) + - Text() method was fixed for backward compatibility. + +4.9.008 (2010-04-03) + - Additional line space after table header was removed. + - Support for HTML lists in multicolumn mode was added. + - The method setTextRenderingMode() was added to set text rendering modes (see the example n. 26). + - The following HTML attributes were added to set text rendering modes (see the example n. 26): stroke, strokecolor, fill. + +4.9.007 (2010-04-03) + - Font Descent computation was fixed (patch #2981441). + +4.9.006 (2010-04-02) + - The constant K_TCPDF_CALLS_IN_HTML was added on configuration file to enable/disable the ability to call TCPDF methods in HTML. + - The usage of tcpdf tag in HTML mode was changed to remove the possible security flaw offered by the eval() function (thanks to Matthias Hecker for spotting this security problem). See the new example n. 49 for further information. + +4.9.005 (2010-04-01) + - Bug# 2980354 "Wrong File attachment description with security" was fixed. + - Several problems with HTML line alignment were fixed. + - The constant K_THAI_TOPCHAR was added on configuration file to enable/disable the special procedure used to avoid the overlappind of symbols on Thai language. + - A problem with font name directory was fixed. + - A bug on _destroy() method was fixed. + +4.9.004 (2010-03-31) + - Patch #979681 "GetCharWidth - default character width" was applied (bugfix). + +4.9.003 (2010-03-30) + - Problem of first <br /> on multiple columns was fixed. + - HTML line alignment was fixed. + - A QR-code bug was fixed. + +4.9.002 (2010-03-29) + - Patch #2978349 "$ignore_min_height is ignored in function Cell()" was applied. + - Bug #2978607 "2D Barcodes are wrong" was fixed. + - A problem with HTML block tags was fixed. + - Artificial italic for CID-0 fonts was added. + - Several multicolumn bugs were fixed. + - Support for HTML tables on multicolumn was added. + +4.9.001 (2010-03-28) + - QR Code minor bug was fixed. + - Multicolumn mode was added (see the new example n. 10). + - The following methods were added: setEqualColumns(), setColumnsArray(), selectColumn(). + - Thai diacritics support were changed (note that this is incompatible with html justification). + +4.9.000 (2010-03-27) + - QR Code (2D barcode) support was added (see example n. 50). + - The following methods were added to print crop and registration marks (see example n. 56): colorRegistrationBar(), cropMark(), registrationMark(). + - Limited support for CSS line-height property was added. + - Gradient method now supports Gray, RGB and CMYK space color. + - Example n. 51 was updated. + - Vertical alignment of font inside cell was fixed. + - Support for multiple Thai diacritics was added. + - Bug item #2974929 "Duplicate case values" was fixed. + - Bug item #2976729 "File attachment not working with security" was fixed. + +------------------------------------------------------------ + +4.8.039 (2010-03-20) + - Problems related to custom locale settings were fixed. + - Problems related to HTML on Header and Footer were fixed. + +4.8.038 (2010-03-13) + - Various bugs related to page-break in HTML mode were fixed. + - Bug item #2968974 "Another <thead> pagebreak problem" was fixed. + - Bug item #2969276 "justification problem" was fixed. + - Bug item #2969289 "bug when using justified text and custom headers" was fixed. + - Images are now automatically resized to be contained on the page. + - Some HTML line alignments were fixed. + - Signature of AddPage() and SetMargins() methods were changed to include an option to set default page m... [truncated message content] |
From: <be...@us...> - 2011-12-28 12:44:55
|
Revision: 8611 http://xoops.svn.sourceforge.net/xoops/?rev=8611&view=rev Author: beckmi Date: 2011-12-28 12:44:49 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Adding placeholders Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/Framework/ XoopsModules/modulepacks/basicmodulepack/trunk/Framework/moduleclasses/ XoopsModules/modulepacks/basicmodulepack/trunk/Framework/tcpdf/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-28 12:40:51
|
Revision: 8610 http://xoops.svn.sourceforge.net/xoops/?rev=8610&view=rev Author: beckmi Date: 2011-12-28 12:40:40 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Adding Publisher to Basic Module Pack Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/about.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/admin_header.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/clone.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/news.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/smartsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/wfsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import/xfsection.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/import.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/index.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/main.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/menu.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/mimetypes.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pagewrap.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/permissions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/preferences.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pw_delete_file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/pw_upload_file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/ajaxrating.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/archive.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/author_items.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/backend.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/category_items_sel.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/date_to_date.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_columns.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_menu.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_new.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_random_item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_recent.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/items_spot.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/latest_files.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/latest_news.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/blocks/search.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/changelog.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/blockform.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/category.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/form/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/formdatetime.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/groupperm.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/metagen.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/mimetype.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/permission.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/publisher.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/rating.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/registry.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/request.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/session.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/themetabform.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/class/uploader.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_delete.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_edit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_new.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_post.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/comment_reply.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_flat_75_ffffff_40x100.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_glass_65_ffffff_1x400.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_glass_75_dadada_1x400.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_glass_95_fef1ec_1x400.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-icons_222222_256x240.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-icons_2e83ff_256x240.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-icons_454545_256x240.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-icons_888888_256x240.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/images/ui-icons_cd0a0a_256x240.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/jquery-ui-1.7.1.custom.css XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/jquery.popeye.style.css XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/css/publisher.css XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/changelog.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/credits.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/install.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/lang_diff.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/licence.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/docs/readme.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/seo/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/seo/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/seo/sample.htaccess XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/extra/seo/seo.txt XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/file.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/footer.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/header.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/VeraBd.ttf XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/arrow-bg.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/bg.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/blank.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/bullet.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/button_delete.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/button_edit.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/dot-grey.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/count-2.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/enlarge-1.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/enlarge-2.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/loading.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/next-1.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/next-2.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/next.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/prev-1.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/prev-2.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/gfx/prev.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/grad-bg.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/approve.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/cat.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/clone.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/close12.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/delete.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/delete.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/doc.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/edit.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/edit.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/editcopy.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/file.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/friend.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/newanswer.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/open12.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/pdf.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/print.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon/subcat.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon32/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon32/editcopy.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon32/folder_txt.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/icon32/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/important-32.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/item_icon.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/left_both.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/approve.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/cat.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/clone.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/close12.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/delete.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/delete.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/doc.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/edit.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/edit.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/editcopy.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/file.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/friend.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/newanswer.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/next.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/open12.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/pdf.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/previous.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/print.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/links/subcat.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/loadingbar.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/module_logo.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/no.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/off.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/on.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/bg1.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/compact3.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/enlarge3.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/loading3.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/next3.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/popeye/prev3.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/right_both.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/rss.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/span-bg.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/starrating.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/transparent_bg.png XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/images/working.gif XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/ajax_rating.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/ajax_upload.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/comment_functions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/common.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/constants.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/functions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/media.textsanitizer.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/notification.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/plugin.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/search.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/seo.inc.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/include/seo_functions.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/index.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/item.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/ajaxupload.3.9.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/behavior.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/cookies.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/funcs.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/jquery.easing.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/jquery.popeye-2.0.4.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/publisher.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/rating.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/script.easing.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/ui.core.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/js/ui.tabs.js XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/admin.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/blocks.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/common.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/help/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/help/help.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/help/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/category_item_published.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/category_item_submitted.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/global_item_category_created.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/global_item_published.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/global_item_submitted.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/item_approved.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/mail_template/item_rejected.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/main.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/english/modinfo.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/admin.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/blocks.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/common.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/category_item_published.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/category_item_submitted.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/global_item_category_created.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/global_item_published.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/global_item_submitted.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/item_approved.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/mail_template/item_rejected.tpl XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/main.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/french/modinfo.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/language/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/list.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/makepdf.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/notification_update.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/pop.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/print.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/rate.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/search.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/sql/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/sql/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/sql/mysql.sql XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/submit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/CHANGELOG.TXT XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/LICENSE.TXT XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/README.TXT XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/cache/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/cache/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/ar.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/de.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/en.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/fa.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/fr.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/lang/nl.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/config/tcpdf_config.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.ctg.z XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/almohanad.z XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.ctg.z XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/dejavusans.z XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/fonts/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/htmlcolors.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/images/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/images/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/tcpdf.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/tcpdf/unicode_data.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_category_items_sel.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_date_to_date.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_columns.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_menu.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_new.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_random_item.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_recent.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_items_spot.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_files.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_latest_news.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/blocks/publisher_search_block.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/index.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_addfile.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_archive.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_author_items.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_categories_table.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_display_full.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_display_list.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_display_summary.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_display_wfsection.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_footer.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_header.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_item.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_print.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_rss.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_search.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_singleitem_block.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/templates/publisher_submit.html XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/thumb.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/view.tag.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/visit.php XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/xoops_version.php Added: XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/about.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/about.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/about.php 2011-12-28 12:40:40 UTC (rev 8610) @@ -0,0 +1,32 @@ +<?php +/* + 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. +*/ + +/** + * Publisher + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) + * @package Publisher + * @since 1.0 + * @author Mage, Mamba + * @version $Id: about.php 337 2011-12-06 20:08:50Z lus...@gm... $ + */ + +include_once dirname(__FILE__) . '/admin_header.php'; + +xoops_cp_header(); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); + +xoops_cp_footer(); \ No newline at end of file Added: XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/admin_header.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/admin_header.php 2011-12-28 12:40:40 UTC (rev 8610) @@ -0,0 +1,46 @@ +<?php +/* + 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 XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Publisher + * @since 1.0 + * @author trabis <lus...@gm...> + * @author The SmartFactory <www.smartfactory.ca> + * @version $Id: admin_header.php 337 2011-12-06 20:08:50Z lus...@gm... $ + */ + +include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; +include_once dirname(dirname(__FILE__)) . '/include/common.php'; +include_once XOOPS_ROOT_PATH . '/include/cp_header.php'; + +//xoops_loadLanguage('admin', PUBLISHER_DIRNAME); +xoops_loadLanguage('modinfo', PUBLISHER_DIRNAME); + +$imagearray = array( + 'editimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_edit.png' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle' />", + 'deleteimg' => "<img src='" . PUBLISHER_IMAGES_URL . "/button_delete.png' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle' />", + 'online' => "<img src='" . PUBLISHER_IMAGES_URL . "/on.png' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle' />", + 'offline' => "<img src='" . PUBLISHER_IMAGES_URL . "/off.png' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle' />", +); +if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); +}else{ + echo xoops_error('/Frameworks/moduleclasses/moduleadmin/ is required!!!'); +} +/* +$myts =& MyTextSanitizer::getInstance(); + +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once(XOOPS_ROOT_PATH."/class/template.php"); + $xoopsTpl = new XoopsTpl(); +} */ \ No newline at end of file Added: XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/category.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/category.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/category.php 2011-12-28 12:40:40 UTC (rev 8610) @@ -0,0 +1,430 @@ +<?php +/* + 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 XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Publisher + * @since 1.0 + * @author trabis <lus...@gm...> + * @author The SmartFactory <www.smartfactory.ca> + * @version $Id: category.php 339 2011-12-07 00:09:26Z lus...@gm... $ + */ + +include_once dirname(__FILE__) . '/admin_header.php'; + +$op = PublisherRequest::getString('op'); + +$op = isset($_POST['editor']) ? 'mod' : $op; +if (isset($_POST['addcategory'])) { + $op = 'addcategory'; +} + +// Where do we start ? +$startcategory = PublisherRequest::getInt('startcategory'); +$categoryid = PublisherRequest::getInt('categoryid'); + +switch ($op) { + + case "del": + $categoryObj = $publisher->getHandler('category')->get($categoryid); + $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0; + $name = (isset($_POST['name'])) ? $_POST['name'] : ''; + if ($confirm) { + if (!$publisher->getHandler('category')->delete($categoryObj)) { + redirect_header("category.php", 1, _AM_PUBLISHER_DELETE_CAT_ERROR); + exit(); + } + redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_COLISDELETED, $name)); + exit(); + } else { + xoops_cp_header(); + xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_PUBLISHER_DELETE_CAT_CONFIRM, _AM_PUBLISHER_DELETE); + xoops_cp_footer(); + } + break; + + case "mod": + //Added by fx2024 + $nb_subcats = isset($_POST['nb_subcats']) ? intval($_POST['nb_subcats']) : 0; + $nb_subcats = $nb_subcats + (isset($_POST['nb_sub_yet']) ? intval($_POST['nb_sub_yet']) : 4); + //end of fx2024 code + + publisher_cpHeader(); + publisher_editCat(true, $categoryid, $nb_subcats); + break; + + case "addcategory": + global $modify; + + $parentid = PublisherRequest::getInt('parentid'); + + if ($categoryid != 0) { + $categoryObj = $publisher->getHandler('category')->get($categoryid); + } else { + $categoryObj = $publisher->getHandler('category')->create(); + } + + // Uploading the image, if any + // Retreive the filename to be uploaded + if (isset($_FILES['image_file']['name']) && $_FILES['image_file']['name'] != "") { + $filename = $_POST["xoops_upload_file"][0]; + if (!empty($filename) || $filename != "") { + // TODO : implement publisher mimetype management + $max_size = $publisher->getConfig('maximum_filesize'); + $max_imgwidth = $publisher->getConfig('maximum_image_width'); + $max_imgheight = $publisher->getConfig('maximum_image_height'); + $allowed_mimetypes = publisher_getAllowedImagesTypes(); + + if ($_FILES[$filename]['tmp_name'] == "" || !is_readable($_FILES[$filename]['tmp_name'])) { + redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR); + exit(); + } + + xoops_load('XoopsMediaUploader'); + $uploader = new XoopsMediaUploader(publisher_getImageDir('category'), $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight); + if ($uploader->fetchMedia($filename) && $uploader->upload()) { + $categoryObj->setVar('image', $uploader->getSavedFileName()); + } else { + redirect_header('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors()); + exit(); + } + } + } else { + if (isset($_POST['image'])) { + $categoryObj->setVar('image', $_POST['image']); + } + } + $categoryObj->setVar('parentid', (isset($_POST['parentid'])) ? intval($_POST['parentid']) : 0); + + $applyall = isset($_POST['applyall']) ? intval($_POST['applyall']) : 0; + $categoryObj->setVar('weight', isset($_POST['weight']) ? intval($_POST['weight']) : 1); + + // Groups and permissions + if (isset($_POST['groups_read'])) { + $categoryObj->setGroups_read($_POST['groups_read']); + } else { + $categoryObj->setGroups_read(); + } + $grpread = isset($_POST['groups_read']) ? $_POST['groups_read'] : array(); + + if (isset($_POST['groups_submit'])) { + $categoryObj->setGroups_submit($_POST['groups_submit']); + } else { + $categoryObj->setGroups_submit(); + } + $grpsubmit = isset($_POST['groups_submit']) ? $_POST['groups_submit'] : array(); + + $categoryObj->setVar('name', $_POST['name']); + + //Added by skalpa: custom template support + if (isset($_POST['template'])) { + $categoryObj->setVar('template', $_POST['template']); + } + + if (isset($_POST['meta_description'])) { + $categoryObj->setVar('meta_description', $_POST['meta_description']); + } + if (isset($_POST['meta_keywords'])) { + $categoryObj->setVar('meta_keywords', $_POST['meta_keywords']); + } + if (isset($_POST['short_url'])) { + $categoryObj->setVar('short_url', $_POST['short_url']); + } + $categoryObj->setVar('moderator', intval($_POST['moderator'])); + $categoryObj->setVar('description', $_POST['description']); + + if (isset($_POST['header'])) { + $categoryObj->setVar('header', $_POST['header']); + } + + if ($categoryObj->isNew()) { + $redirect_msg = _AM_PUBLISHER_CATCREATED; + $redirect_to = 'category.php?op=mod'; + } else { + $redirect_msg = _AM_PUBLISHER_COLMODIFIED; + $redirect_to = 'category.php'; + } + + if (!$categoryObj->store()) { + redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors())); + exit; + } + // TODO : put this function in the category class + publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read'); + publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit'); + //publisher_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin'); + if ($applyall) { + // TODO : put this function in the category class + publisher_overrideItemsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid()); + } + //Added by fx2024 + $parentCat = $categoryObj->categoryid(); + $sizeof = sizeof($_POST['scname']); + for ($i = 0; $i < $sizeof; $i++) { + if ($_POST['scname'][$i] != '') { + $categoryObj = $publisher->getHandler('category')->create(); + $categoryObj->setVar('name', $_POST['scname'][$i]); + $categoryObj->setVar('parentid', $parentCat); + $categoryObj->setGroups_read($grpread); + $categoryObj->setGroups_submit($grpsubmit); + + if (!$categoryObj->store()) { + redirect_header("javascript:history.go(-1)", 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . publisher_formatErrors($categoryObj->getErrors())); + exit; + } + // TODO : put this function in the category class + publisher_saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read'); + publisher_saveCategoryPermissions($categoryObj->getGroups_submit(), $categoryObj->categoryid(), 'item_submit'); + //publisher_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin'); + if ($applyall) { + // TODO : put this function in the category class + publisher_overrideItemsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid()); + } + } + } + //end of fx2024 code + redirect_header($redirect_to, 2, $redirect_msg); + exit(); + break; + + //Added by fx2024 + + case "addsubcats": + $categoryid = 0; + $nb_subcats = intval($_POST['nb_subcats']) + $_POST['nb_sub_yet']; + + $categoryObj = $publisher->getHandler('category')->create(); + $categoryObj->setVar('name', $_POST['name']); + $categoryObj->setVar('description', $_POST['description']); + $categoryObj->setVar('weight', $_POST['weight']); + $categoryObj->setGroups_read(isset($_POST['groups_read']) ? $_POST['groups_read'] : array()); + if (isset($parentCat)) { + $categoryObj->setVar('parentid', $parentCat); + } + + publisher_cpHeader(); + publisher_editCat(true, $categoryid, $nb_subcats, $categoryObj); + exit(); + + break; + //end of fx2024 code + + case "cancel": + redirect_header("category.php", 1, sprintf(_AM_PUBLISHER_BACK2IDX, '')); + exit(); + + case "default": + default: + publisher_cpHeader(); + //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES); + + echo "<br />\n"; + echo "<form><div style=\"margin-bottom: 12px;\">"; + echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'> "; + //echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'> "; + echo "</div></form>"; + + // Creating the objects for top categories + $categoriesObj = $publisher->getHandler('category')->getCategories($publisher->getConfig('idxcat_perpage'), $startcategory, 0); + + publisher_openCollapsableBar('createdcategories', 'createdcategoriesicon', _AM_PUBLISHER_CATEGORIES_TITLE, _AM_PUBLISHER_CATEGORIES_DSC); + + echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; + echo "<tr>"; + echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . "</strong></td>"; + echo "<td width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . "</strong></td>"; + echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>"; + echo "</tr>"; + $totalCategories = $publisher->getHandler('category')->getCategoriesCount(0); + if (count($categoriesObj) > 0) { + foreach ($categoriesObj as $key => $thiscat) { + publisher_displayCategory($thiscat); + } + } else { + echo "<tr>"; + echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . "</td>"; + echo "</tr>"; + $categoryid = '0'; + } + echo "</table>\n"; + include_once XOOPS_ROOT_PATH . '/class/pagenav.php'; + $pagenav = new XoopsPageNav($totalCategories, $publisher->getConfig('idxcat_perpage'), $startcategory, 'startcategory'); + echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>'; + echo "<br />"; + publisher_closeCollapsableBar('createdcategories', 'createdcategoriesicon'); + echo "<br>"; + //editcat(false); + break; +} + +xoops_cp_footer(); + +function publisher_displayCategory($categoryObj, $level = 0) +{ + $publisher = PublisherPublisher::getInstance(); + + $description = $categoryObj->description(); + if (!XOOPS_USE_MULTIBYTES) { + if (strlen($description) >= 100) { + $description = substr($description, 0, (100 - 1)) . "..."; + } + } + $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "&parentid=" . $categoryObj->parentid() . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "' /></a>"; + $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "' /></a>"; + + $spaces = ''; + for ($j = 0; $j < $level; $j++) { + $spaces .= ' '; + } + + echo "<tr>"; + echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . "/category.php?categoryid=" . $categoryObj->categoryid() . "'><img src='" . PUBLISHER_URL . "/images/links/subcat.gif' alt='' /> " . $categoryObj->name() . "</a></td>"; + echo "<td class='even' align='center'>" . $categoryObj->weight() . "</td>"; + echo "<td class='even' align='center'> $modify $delete </td>"; + echo "</tr>"; + $subCategoriesObj = $publisher->getHandler('category')->getCategories(0, 0, $categoryObj->categoryid()); + if (count($subCategoriesObj) > 0) { + $level++; + foreach ($subCategoriesObj as $key => $thiscat) { + publisher_displayCategory($thiscat, $level); + } + } + unset($categoryObj); +} + +function publisher_editCat($showmenu = false, $categoryid = 0, $nb_subcats = 4, $categoryObj = null) +{ + $publisher = PublisherPublisher::getInstance(); + + // if there is a parameter, and the id exists, retrieve data: we're editing a category + if ($categoryid != 0) { + // Creating the category object for the selected category + $categoryObj = $publisher->getHandler('category')->get($categoryid); + if ($categoryObj->notLoaded()) { + redirect_header("category.php", 1, _AM_PUBLISHER_NOCOLTOEDIT); + exit(); + } + } else { + if (!$categoryObj) { + $categoryObj = $publisher->getHandler('category')->create(); + } + } + + if ($categoryid != 0) { + if ($showmenu) { + //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_EDITING); + } + echo "<br />\n"; + publisher_openCollapsableBar('edittable', 'edittableicon', _AM_PUBLISHER_EDITCOL, _AM_PUBLISHER_CATEGORY_EDIT_INFO); + } else { + if ($showmenu) { + //publisher_adminMenu(1, _AM_PUBLISHER_CATEGORIES . " > " . _AM_PUBLISHER_CREATINGNEW); + } + publisher_openCollapsableBar('createtable', 'createtableicon', _AM_PUBLISHER_CATEGORY_CREATE, _AM_PUBLISHER_CATEGORY_CREATE_INFO); + } + + $sform = $categoryObj->getForm($nb_subcats); + $sform->display(); + + if (!$categoryid) { + publisher_closeCollapsableBar('createtable', 'createtableicon'); + } else { + publisher_closeCollapsableBar('edittable', 'edittableicon'); + } + + //Added by fx2024 + if ($categoryid) { + $sel_cat = $categoryid; + + publisher_openCollapsableBar('subcatstable', 'subcatsicon', _AM_PUBLISHER_SUBCAT_CAT, _AM_PUBLISHER_SUBCAT_CAT_DSC); + // Get the total number of sub-categories + $categoriesObj = $publisher->getHandler('category')->get($sel_cat); + $totalsubs = $publisher->getHandler('category')->getCategoriesCount($sel_cat); + // creating the categories objects that are published + $subcatsObj = $publisher->getHandler('category')->getCategories(0, 0, $categoriesObj->categoryid()); + $totalSCOnPage = count($subcatsObj); + echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; + echo "<tr>"; + echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . "</strong></td>"; + echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . "</strong></td>"; + echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . "</strong></td>"; + echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>"; + echo "</tr>"; + if ($totalsubs > 0) { + foreach ($subcatsObj as $subcat) { + $modify = "<a href='category.php?op=mod&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_MODIFY . "' alt='" . _AM_PUBLISHER_MODIFY . "' /></a>"; + $delete = "<a href='category.php?op=del&categoryid=" . $subcat->categoryid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETE . "' alt='" . _AM_PUBLISHER_DELETE . "' /></a>"; + echo "<tr>"; + echo "<td class='head' align='left'>" . $subcat->categoryid() . "</td>"; + echo "<td class='even' align='left'><a href='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/category.php?categoryid=" . $subcat->categoryid() . "&parentid=" . $subcat->parentid() . "'>" . $subcat->name() . "</a></td>"; + echo "<td class='even' align='left'>" . $subcat->description() . "</td>"; + echo "<td class='even' align='right'> {$modify} {$delete} </td>"; + echo "</tr>"; + } + } else { + echo "<tr>"; + echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . "</td>"; + echo "</tr>"; + } + echo "</table>\n"; + echo "<br />\n"; + publisher_closeCollapsableBar('subcatstable', 'subcatsicon'); + + publisher_openCollapsableBar('bottomtable', 'bottomtableicon', _AM_PUBLISHER_CAT_ITEMS, _AM_PUBLISHER_CAT_ITEMS_DSC); + $startitem = PublisherRequest::getInt('startitem'); + // Get the total number of published ITEMS + $totalitems = $publisher->getHandler('item')->getItemsCount($sel_cat, array(_PUBLISHER_STATUS_PUBLISHED)); + // creating the items objects that are published + $itemsObj = $publisher->getHandler('item')->getAllPublished($publisher->getConfig('idxcat_perpage'), $startitem, $sel_cat); + $totalitemsOnPage = count($itemsObj); + $allcats = $publisher->getHandler('category')->getObjects(null, true); + echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>"; + echo "<tr>"; + echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . "</strong></td>"; + echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . "</strong></td>"; + echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . "</strong></td>"; + echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . "</strong></td>"; + echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . "</strong></td>"; + echo "</tr>"; + if ($totalitems > 0) { + for ($i = 0; $i < $totalitemsOnPage; $i++) { + $categoryObj =& $allcats[$itemsObj[$i]->categoryid()]; + $modify = "<a href='item.php?op=mod&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITITEM . "' alt='" . _AM_PUBLISHER_EDITITEM . "' /></a>"; + $delete = "<a href='item.php?op=del&itemid=" . $itemsObj[$i]->itemid() . "'><img src='" . XOOPS_URL . "/modules/" . $publisher->getModule()->dirname() . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETEITEM . "' alt='" . _AM_PUBLISHER_DELETEITEM . "'/></a>"; + echo "<tr>"; + echo "<td class='head' align='center'>" . $itemsObj[$i]->itemid() . "</td>"; + echo "<td class='even' align='left'>" . $categoryObj->name() . "</td>"; + echo "<td class='even' align='left'>" . $itemsObj[$i]->getitemLink() . "</td>"; + echo "<td class='even' align='center'>" . $itemsObj[$i]->datesub('s') . "</td>"; + echo "<td class='even' align='center'> $modify $delete </td>"; + echo "</tr>"; + } + } else { + $itemid = -1; + echo "<tr>"; + echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . "</td>"; + echo "</tr>"; + } + echo "</table>\n"; + echo "<br />\n"; + $parentid = PublisherRequest::getInt('parentid'); + $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid"; + xoops_load('XoopsPageNav'); + $pagenav = new XoopsPageNav($totalitems, $publisher->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args); + echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>'; + echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'> "; + echo "</div>"; + } + //end of fx2024 code +} + +?> Added: XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/clone.php =================================================================== --- XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/clone.php (rev 0) +++ XoopsModules/modulepacks/basicmodulepack/trunk/modules/publisher/admin/clone.php 2011-12-28 12:40:40 UTC (rev 8610) @@ -0,0 +1,167 @@ +<?php +/* + 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 XUUPS Project http://sourceforge.net/projects/xuups/ + * @license http://www.fsf.org/copyleft/gpl.html GNU public license + * @package Publisher + * @since 1.0 + * @author trabis <lus...@gm...> + * @version $Id: clone.php 337 2011-12-06 20:08:50Z lus...@gm... $ + */ + +include_once dirname(__FILE__) . "/admin_header.php"; + +publisher_cpHeader(); +//publisher_adminMenu(-1, _AM_PUBLISHER_CLONE); +publisher_openCollapsableBar('clone', 'cloneicon', _AM_PUBLISHER_CLONE, _AM_PUBLISHER_CLONE_DSC); + +if (@$_POST['op'] == 'submit') { + + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('clone.php', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + exit(); + } + + $clone = $_POST['clone']; + + //check if name is valid + if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) { + redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_INVALIDNAME, $clone)); + exit(); + } + + // Check wether the cloned module exists or not + if ($clone && is_dir(XOOPS_ROOT_PATH . '/modules/' . $clone)) { + redirect_header('clone.php', 3, sprintf(_AM_PUBLISHER_CLONE_EXISTS, $clone)); + } + + $patterns = array( + strtolower(PUBLISHER_DIRNAME) => strtolower($clone), + strtoupper(PUBLISHER_DIRNAME) =>... [truncated message content] |
From: <dh...@us...> - 2011-12-28 11:01:08
|
Revision: 8609 http://xoops.svn.sourceforge.net/xoops/?rev=8609&view=rev Author: dhcst Date: 2011-12-28 11:00:57 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Chance to stable Version 4.1 Modified Paths: -------------- XoopsModules/newbb/branches/alfred/class/post.php XoopsModules/newbb/branches/alfred/class/uploader.php XoopsModules/newbb/branches/alfred/header.php XoopsModules/newbb/branches/alfred/include/form.post.php XoopsModules/newbb/branches/alfred/include/plugin.php XoopsModules/newbb/branches/alfred/language/english/mail_template/forum_report.tpl XoopsModules/newbb/branches/alfred/language/english/modinfo.php XoopsModules/newbb/branches/alfred/language/german/modinfo.php XoopsModules/newbb/branches/alfred/sql/mysql.304.sql XoopsModules/newbb/branches/alfred/sql/mysql.400.sql XoopsModules/newbb/branches/alfred/sql/mysql.sql XoopsModules/newbb/branches/alfred/sql/upgrade_230.sql XoopsModules/newbb/branches/alfred/templates/newbb_index.html XoopsModules/newbb/branches/alfred/templates/newbb_viewforum.html XoopsModules/newbb/branches/alfred/templates/newbb_viewpost.html XoopsModules/newbb/branches/alfred/templates/newbb_viewtopic.html XoopsModules/newbb/branches/alfred/templates/style.css XoopsModules/newbb/branches/alfred/viewforum.php XoopsModules/newbb/branches/alfred/viewtopic.php XoopsModules/newbb/branches/alfred/xoops_version.php Modified: XoopsModules/newbb/branches/alfred/class/post.php =================================================================== --- XoopsModules/newbb/branches/alfred/class/post.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/class/post.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -466,10 +466,12 @@ $thread_action = array(); - $thread_action['pdf']['image'] = newbb_displayImage('pdf', _MD_PDF); - $thread_action['pdf']['link'] = "makepdf.php?type=post&pageid=0"; - $thread_action['pdf']['name'] = _MD_PDF; - $thread_action['pdf']['target'] = '_blank'; + if (file_exists(XOOPS_ROOT_PATH."/Frameworks/tcpdf/tcpdf.php")) { + $thread_action['pdf']['image'] = newbb_displayImage('pdf', _MD_PDF); + $thread_action['pdf']['link'] = "makepdf.php?type=post&pageid=0"; + $thread_action['pdf']['name'] = _MD_PDF; + $thread_action['pdf']['target'] = '_blank'; + } $thread_action['print']['image'] = newbb_displayImage('printer', _MD_PRINT); $thread_action['print']['link'] = "print.php?form=2&forum=". $forum_id."&topic_id=" . $topic_id; Modified: XoopsModules/newbb/branches/alfred/class/uploader.php =================================================================== --- XoopsModules/newbb/branches/alfred/class/uploader.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/class/uploader.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -40,7 +40,11 @@ } } $_allowedMimeTypes = array(); - $extensionToMime = include XOOPS_ROOT_PATH . '/class/mimetypes.inc.php'; + if ( file_exists($GLOBALS['xoops']->path('/class/mimetypes.inc.php'))) { + $extensionToMime = include XOOPS_ROOT_PATH . '/class/mimetypes.inc.php'; + } elseif ( file_exists($GLOBALS['xoops']->path('/include/mimetypes.inc.php'))) { + $extensionToMime = include XOOPS_ROOT_PATH . '//mimetypes.inc.php'; + } foreach ($allowedMimeTypes as $type) { if (isset($extensionToMime[$type])) { $_allowedMimeTypes[] = $extensionToMime[$type]; Modified: XoopsModules/newbb/branches/alfred/header.php =================================================================== --- XoopsModules/newbb/branches/alfred/header.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/header.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -13,7 +13,7 @@ defined('XOOPS_ROOT_PATH') or die('Restricted access'); if (!empty($xoopsModuleConfig['do_rewrite'])) include_once "seo_url.php"; /* for seo */ -$noseo_url = array("newtopic.php","list.topic.php","viewpost.php","reply.php","report.php","search.php","edit.php","moderate.php","polls.php","delete.php","index.php"); +$noseo_url = array("newtopic.php","list.topic.php","viewpost.php","reply.php","report.php","search.php","edit.php","moderate.php","polls.php","delete.php","index.php","makepdf.php"); if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <=0))) { Modified: XoopsModules/newbb/branches/alfred/include/form.post.php =================================================================== --- XoopsModules/newbb/branches/alfred/include/form.post.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/include/form.post.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -169,14 +169,12 @@ $editor_configs = array(); $editor_configs["name"] = "message"; $editor_configs["value"] = $message; -$editor_configs["rows"] = empty($xoopsModuleConfig["editor_rows"]) ? 30 : $xoopsModuleConfig["editor_rows"]; -$editor_configs["cols"] = empty($xoopsModuleConfig["editor_cols"]) ? 40 : $xoopsModuleConfig["editor_cols"]; +$editor_configs["rows"] = empty($xoopsModuleConfig["editor_rows"]) ? 10 : $xoopsModuleConfig["editor_rows"]; +$editor_configs["cols"] = empty($xoopsModuleConfig["editor_cols"]) ? 30 : $xoopsModuleConfig["editor_cols"]; $editor_configs["width"] = empty($xoopsModuleConfig["editor_width"]) ? "100%" : $xoopsModuleConfig["editor_width"]; $editor_configs["height"] = empty($xoopsModuleConfig["editor_height"])? "400px" : $xoopsModuleConfig["editor_height"]; $_editor = new XoopsFormEditor(_MD_MESSAGEC, $editor, $editor_configs, $nohtml, $onfailure = null ); -$_editor->_cols = $editor_configs["cols"]; -$_editor->_rows = $editor_configs["rows"]; $forum_form->addElement($_editor, true); if (!empty($xoopsModuleConfig['do_tag']) && (empty($post_obj) || $post_obj->isTopic())) { Modified: XoopsModules/newbb/branches/alfred/include/plugin.php =================================================================== --- XoopsModules/newbb/branches/alfred/include/plugin.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/include/plugin.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -44,8 +44,8 @@ $customConfig["editor_default"] = "dhtmltextarea"; // default value for editor rows, coloumns -$customConfig["editor_rows"] = 25; -$customConfig["editor_cols"] = 60; +$customConfig["editor_rows"] = 15; +$customConfig["editor_cols"] = 40; // default value for editor width, height (string) $customConfig["editor_width"] = "100%"; Modified: XoopsModules/newbb/branches/alfred/language/english/mail_template/forum_report.tpl =================================================================== --- XoopsModules/newbb/branches/alfred/language/english/mail_template/forum_report.tpl 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/language/english/mail_template/forum_report.tpl 2011-12-28 11:00:57 UTC (rev 8609) @@ -1,11 +1,11 @@ -Hallo Moderator, +Hi Moderator, -ein Beitrag wurde im Forum gemeldet. -Bitte schau nach, was der Grund dafür ist. +a contribution has been reported in the forum. +Please check to see what is the reason. {MESSAGE} -Bitte nicht auf diese E-Mail antworten. +Please do not respond to this e-mail. ----------------------------------------------------- {X_SITENAME} ({X_SITEURL}) Modified: XoopsModules/newbb/branches/alfred/language/english/modinfo.php =================================================================== --- XoopsModules/newbb/branches/alfred/language/english/modinfo.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/language/english/modinfo.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -275,15 +275,12 @@ Welcome to ".(htmlspecialchars($GLOBALS["xoopsConfig"]['sitename'], ENT_QUOTES))." forum. Feel free to register and login to start your topics. - If you have any question concerning CBB usage, plz visit your local support site or [url=http://xoopsforge.com/modules/newbb/]CBB Module Site[/url]. + If you have any question concerning NewBB usage, plz visit your local support site or [url=http://www.simple-xoops.de/forum/]CBB Module Site[/url]. "); define("_MI_NEWBB_ADMENU_GROUPMOD", "Group moderate"); - -define('_MI_THEMESET','Themeset'); - define("_MI_SUBJECT_PREFIX", "Add a prefix to the topic subject"); define("_MI_SUBJECT_PREFIX_DESC", "Sets a prefix, such as [SOLVED] at the beginning of the subject. For more options please use one ',' as the separator. NONE is no prefix."); define("_MI_SUBJECT_PREFIX_DEFAULT", '<font color="#00CC00"> [solved] </ font> <font color="#00CC00"> [done] </ font> <font color="#FF0000"> [request] </ font> , <font color="#FF0000"> [bug report] </ font> <font color="#FF0000"> [unsolved] </ font>'); @@ -296,4 +293,7 @@ define("_MI_SPL_MODERATOR", 'moderators'); define("_MI_SPL_ADMIN", 'administrators'); +define("_MI_STATISTIK_ENABLE","enable Stats"); +define("_MI_STATISTIK_ENABLE_DESC",""); + ?> \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/language/german/modinfo.php =================================================================== --- XoopsModules/newbb/branches/alfred/language/german/modinfo.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/language/german/modinfo.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -280,7 +280,7 @@ define("_MI_NEWBB_INSTALL_POST_TEXT", " Willkommen zu diesem neuen Forum.<br /> Jetzt Registrieren, Anmelden und mit Themen starten.<br /><br /> - Für Fragen hinsichtlich des CBB steht die lokale Supportseite oder die <a href=\"http://www.simple-xoops.de/\" target=\"_blank\" title=\"CBB @ myXOOPS\">CBB Modul Seite</a> zur Verfügung. + Für Fragen hinsichtlich des NewBB steht die lokale Supportseite oder die <a href=\"http://www.simple-xoops.de/\" target=\"_blank\" title=\"CBB @ myXOOPS\">CBB Modul Seite</a> zur Verfügung. "); define("_MI_NEWBB_ADMENU_GROUPMOD", "Gruppen Moderation"); Modified: XoopsModules/newbb/branches/alfred/sql/mysql.304.sql =================================================================== --- XoopsModules/newbb/branches/alfred/sql/mysql.304.sql 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/sql/mysql.304.sql 2011-12-28 11:00:57 UTC (rev 8609) @@ -132,7 +132,7 @@ KEY `uid` (`uid`), KEY `read_item` (`read_item`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE `bb_reads_forum` ( `read_id` int(10) unsigned NOT NULL auto_increment, @@ -144,4 +144,4 @@ KEY `uid` (`uid`), KEY `read_item` (`read_item`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; \ No newline at end of file +) ENGINE=MyISAM; \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/sql/mysql.400.sql =================================================================== --- XoopsModules/newbb/branches/alfred/sql/mysql.400.sql 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/sql/mysql.400.sql 2011-12-28 11:00:57 UTC (rev 8609) @@ -30,7 +30,7 @@ `type_description` varchar(255) NOT NULL default '', PRIMARY KEY (`type_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -47,7 +47,7 @@ PRIMARY KEY (`tf_id`), KEY `forum_id` (`forum_id`), KEY `type_order` (`type_order`) -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE `bb_user_stats` ( `uid` int(10) unsigned NOT NULL default '0', @@ -57,7 +57,7 @@ `user_lastpost` int(10) unsigned NOT NULL default '0', UNIQUE KEY (`uid`) -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE `bb_stats` ( @@ -71,4 +71,4 @@ KEY `stats_id` (`stats_id`), KEY `stats_type` (`stats_type`, `stats_period`) -) TYPE=MyISAM; +) ENGINE=MyISAM; Modified: XoopsModules/newbb/branches/alfred/sql/mysql.sql =================================================================== --- XoopsModules/newbb/branches/alfred/sql/mysql.sql 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/sql/mysql.sql 2011-12-28 11:00:57 UTC (rev 8609) @@ -23,7 +23,7 @@ `topic_id` int(8) unsigned NOT NULL default '0', `post_id` int(10) unsigned NOT NULL default '0', `post_text` text NOT NULL -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -43,7 +43,7 @@ PRIMARY KEY (`attach_id`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -61,7 +61,7 @@ PRIMARY KEY (`cat_id`), KEY `cat_order` (`cat_order`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -76,7 +76,7 @@ PRIMARY KEY (`digest_id`), KEY `digest_time` (`digest_time`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -105,7 +105,7 @@ KEY `cat_forum` (`cat_id`,`forum_order`), KEY `forum_order` (`forum_order`), KEY `cat_id` (`cat_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -126,7 +126,7 @@ KEY `uid` (`uid`), KEY `mod_end` (`mod_end`), KEY `forum_id` (`forum_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -145,7 +145,7 @@ KEY `online_forum` (`online_forum`), KEY `online_topic` (`online_topic`), KEY `online_updated` (`online_updated`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -183,7 +183,7 @@ KEY `approved` (`approved`), KEY `topicid_postid_pid` (`topic_id`,`post_id`,`pid`), FULLTEXT KEY `search` (`subject`(64)) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -204,7 +204,7 @@ PRIMARY KEY (`post_id`), FULLTEXT KEY `search` (`post_text`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -223,7 +223,7 @@ KEY `uid` (`uid`), KEY `read_item` (`read_item`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -242,7 +242,7 @@ KEY `uid` (`uid`), KEY `read_item` (`read_item`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -262,7 +262,7 @@ PRIMARY KEY (`report_id`), KEY `post_id` (`post_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -303,7 +303,7 @@ KEY `topic_time` (`topic_time`), KEY `approved` (`approved`), KEY `type_id` (`type_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -323,7 +323,7 @@ KEY `ratinguser` (`ratinguser`), KEY `ratinghostname` (`ratinghostname`), KEY `topic_id` (`topic_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -338,7 +338,7 @@ `type_description` varchar(255) NOT NULL default '', PRIMARY KEY (`type_id`) -) TYPE=MyISAM; +) ENGINE=MyISAM; -- -------------------------------------------------------- @@ -355,7 +355,7 @@ PRIMARY KEY (`tf_id`), KEY `forum_id` (`forum_id`), KEY `type_order` (`type_order`) -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE `bb_user_stats` ( `uid` mediumint(8) unsigned NOT NULL default '0', @@ -365,7 +365,7 @@ `user_lastpost` int(10) unsigned NOT NULL default '0', UNIQUE KEY (`uid`) -) TYPE=MyISAM; +) ENGINE=MyISAM; CREATE TABLE `bb_stats` ( `stats_id` smallint(4) NOT NULL default '0', @@ -378,4 +378,4 @@ KEY `stats_id` (`stats_id`), KEY `stats_type` (`stats_type`, `stats_period`) -) TYPE=MyISAM; +) ENGINE=MyISAM; Modified: XoopsModules/newbb/branches/alfred/sql/upgrade_230.sql =================================================================== --- XoopsModules/newbb/branches/alfred/sql/upgrade_230.sql 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/sql/upgrade_230.sql 2011-12-28 11:00:57 UTC (rev 8609) @@ -8,4 +8,4 @@ `forum_id` smallint(4) NOT NULL default '0', PRIMARY KEY (`mod_id`), KEY `uid` (`uid`) -) TYPE=MyISAM; \ No newline at end of file +) ENGINE=MyISAM; \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/templates/newbb_index.html =================================================================== --- XoopsModules/newbb/branches/alfred/templates/newbb_index.html 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/templates/newbb_index.html 2011-12-28 11:00:57 UTC (rev 8609) @@ -1,3 +1,4 @@ +<fieldset> <div class="forum_header"> <div class="forum_title" style="float:left;"> <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$index_title}></a></h2> @@ -27,13 +28,15 @@ <div style="clear:both;"></div> </div> <{/if}> +</fieldset> <br style="clear: both;" /> - +<fieldset> <div class="dropdown"> <{includeq file="db:newbb_index_menu.html"}> </div> +</fieldset> <br style="clear: both;" /> -<br /><br /> +<fieldset> <!-- start forum categories --> <div class="index_category"> <!-- start forum categories --> @@ -269,7 +272,8 @@ </div> <{/foreach}> <!-- end forum categories --> - +</fieldset> +<fieldset> <div> <div style="float: left; text-align: left;"> <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}><br /> @@ -290,14 +294,16 @@ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED"> <{$rss_button}> </a> - <br /><font size="0.7em;">Forum CBB Version <{$version/100}></font> - <br /><br /> + <br /><font size="0.7em;">NewBB Version <{$version/100}></font> + <br /> <{/if}> </div> </div> +</fieldset> <br style="clear: both;" /> <{if $currenttime}> +<fieldset> <div> <div class="even" style="padding: 5px; line-height: 150%;"> <span style="padding: 2px;"><{$online.statistik}></span> @@ -329,10 +335,17 @@ </div> </div> <div style="clear:both;"></div> +</fieldset> <{/if}> -</div> + <br style="clear:both;"/> -<{if $online}><{includeq file="db:newbb_online.html"}><{/if}> +<{if $online}> + <fieldset> + <{includeq file="db:newbb_online.html"}> + </fieldset> +<{/if}> +<fieldset> <{includeq file='db:system_notification_select.html'}> +</fieldset> <!-- end module contents --> </div> \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/templates/newbb_viewforum.html =================================================================== --- XoopsModules/newbb/branches/alfred/templates/newbb_viewforum.html 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/templates/newbb_viewforum.html 2011-12-28 11:00:57 UTC (rev 8609) @@ -1,3 +1,4 @@ +<fieldset> <div class="forum_header"> <div class="forum_title"> <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$forum_index_title}></a></h2> @@ -212,7 +213,7 @@ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum_id}>" target="_blank" title="RSS FEED"> <{$rss_button}> </a> - <font size="0.7em;">Forum CBB Version <{$version/100}></font> + <font size="0.7em;">Forum newBB Version <{$version/100}></font> <br style="clear: both;" /><br /> <{/if}> <{$forum_jumpbox}> @@ -230,9 +231,11 @@ </div> </div> <div class="clear"></div> - -<br style="clear: both;" /> <br /> -<{if $online}><{includeq file="db:newbb_online.html"}><{/if}> +<{if $online}> + <br /> + <{includeq file="db:newbb_online.html"}> +<{/if}> <{includeq file='db:system_notification_select.html'}> +</fieldset> <!-- end module contents --> \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/templates/newbb_viewpost.html =================================================================== --- XoopsModules/newbb/branches/alfred/templates/newbb_viewpost.html 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/templates/newbb_viewpost.html 2011-12-28 11:00:57 UTC (rev 8609) @@ -1,3 +1,4 @@ +<fieldset> <div class="forum_header"> <div class="forum_title"> <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2> @@ -131,9 +132,10 @@ </div> </div> <div class="clear"></div> - <br /> -<br /> - -<{if $online}><{includeq file="db:newbb_online.html"}><{/if}> +<{if $online}> + <br /> + <{includeq file="db:newbb_online.html"}> +<{/if}> +</fieldset> <!-- end module contents --> \ No newline at end of file Modified: XoopsModules/newbb/branches/alfred/templates/newbb_viewtopic.html =================================================================== --- XoopsModules/newbb/branches/alfred/templates/newbb_viewtopic.html 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/templates/newbb_viewtopic.html 2011-12-28 11:00:57 UTC (rev 8609) @@ -1,3 +1,4 @@ +<fieldset> <div class="forum_header"> <div class="forum_title"> <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2> @@ -241,6 +242,7 @@ <br /> <{includeq file='db:system_notification_select.html'}> +</fieldset> <script type="text/javascript"> <!-- xoopsGetElementById('aktuell').scrollIntoView(true); Modified: XoopsModules/newbb/branches/alfred/templates/style.css =================================================================== --- XoopsModules/newbb/branches/alfred/templates/style.css 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/templates/style.css 2011-12-28 11:00:57 UTC (rev 8609) @@ -82,7 +82,7 @@ div.karma { background-color: transparent; - text-align: center; + text-align: left; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #AAAAAA; @@ -218,6 +218,7 @@ padding: 0px; border-collapse: collapse; border-spacing: 0; + text-align: left; } table.userlevel td{ Modified: XoopsModules/newbb/branches/alfred/viewforum.php =================================================================== --- XoopsModules/newbb/branches/alfred/viewforum.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/viewforum.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -38,7 +38,7 @@ } newbb_setRead_topic($markvalue, $_GET['forum']); $url = XOOPS_URL."/modules/".$xoopsModule->getVar("dirname")."/viewforum.php?".$page_query; - redirect_header($url, 2, $markresult); + redirect_header($url, 2, _MD_ALL_TOPIC_MARKED . ' ' .$markresult); } $forum_id = intval($_GET['forum']); @@ -77,7 +77,6 @@ mod_loadFunctions("render", "newbb"); $xoopsTpl->assign('xoops_module_header', $xoops_module_header); -$xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle); $xoopsTpl->assign("forum_id", $forum_id); $xoopsTpl->assign('version', $xoopsModule->getVar("version")); Modified: XoopsModules/newbb/branches/alfred/viewtopic.php =================================================================== --- XoopsModules/newbb/branches/alfred/viewtopic.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/viewtopic.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -134,6 +134,8 @@ $xoopsTpl->assign('online', $online_handler->show_online()); } +$infobox = intval($xoopsModuleConfig['show_infobox']); //4.05 +$xoopsTpl->assign('infobox', $infobox); //4.05 $xoopsTpl->assign("parentforum", $forum_handler->getParents($forum_obj)); $xoopsTpl->assign("icon_path", XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/templates/images/icon/"); @@ -243,7 +245,7 @@ $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle); $xoopsOption['xoops_pagetitle']= $xoops_pagetitle; $kw = array_unique(explode(" ",strip_tags($postsArray[$post_id]->getVar('post_text')),150)); - arsort($kw); + asort($kw); $kwort = ""; $z = 0; foreach ($kw as $k) { @@ -575,10 +577,8 @@ $editor_configs["caption"] = _MD_MESSAGEC; $editor_configs["name"] ="message"; $editor_configs["rows"] = 10; - $editor_configs["cols"] = 50; + $editor_configs["cols"] = 30; $_editor = new XoopsFormEditor(_MD_MESSAGEC, $quickform, $editor_configs, true); - $_editor->_rows = $editor_configs["rows"]; - $_editor->_cols = $editor_configs["cols"]; $forum_form->addElement($_editor, true); $forum_form->addElement(new XoopsFormHidden('dohtml', 0)); Modified: XoopsModules/newbb/branches/alfred/xoops_version.php =================================================================== --- XoopsModules/newbb/branches/alfred/xoops_version.php 2011-12-28 10:09:20 UTC (rev 8608) +++ XoopsModules/newbb/branches/alfred/xoops_version.php 2011-12-28 11:00:57 UTC (rev 8609) @@ -30,7 +30,7 @@ $modversion['release_date'] = '2011/12/04'; $modversion["module_website_url"] = "http://www.simple-xoops.de/"; $modversion["module_website_name"] = "SIMPLE-XOOPS"; -$modversion["module_status"] = "RC 2"; +$modversion["module_status"] = "STABLE"; $modversion['min_php'] = "5.2"; $modversion['min_xoops'] = "2.5"; $modversion['min_admin'] = "1.1"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wis...@us...> - 2011-12-28 10:09:33
|
Revision: 8608 http://xoops.svn.sourceforge.net/xoops/?rev=8608&view=rev Author: wishcraft Date: 2011-12-28 10:09:20 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Xortify 3.04 [STABLE] - For XOOPS 2.6.x - Defaulted to Xortify.com Added Paths: ----------- XoopsModules/xortify/branch/2.6/3.04/ XoopsModules/xortify/branch/2.6/3.04/docs/ XoopsModules/xortify/branch/2.6/3.04/docs/INSTALL XoopsModules/xortify/branch/2.6/3.04/docs/UPGRADE XoopsModules/xortify/branch/2.6/3.04/docs/licence.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/access.list.png XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/ XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/access.list.png XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/preloads/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/preloads/xortify.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/menu.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curl.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curlserialised.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curlxml.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_json.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_json_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_soap.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_wgetserialised.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_wgetxml.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/authfactory.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/auth/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curl.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlserialised.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/curlxml.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/json.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/log.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/soap.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/wgetserialised.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/class/wgetxml.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/cron/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/cron/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/cron/serverup.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/changelog.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/credits.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/install.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/lang_diff.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/licence.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/docs/readme.txt XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/accessdenied.png XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/left_both.gif XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/right_both.gif XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/images/xortify_slogo.png XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/JSON.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/forms.objects.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/forms.xortify.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/functions.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/install.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.header.addmeta.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.header.endcache.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/post.loader.mainfile.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/pre.loader.mainfile.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/include/update.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/admin.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/ban.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/help/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/help/help.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/help/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/main.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/english/modinfo.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/language/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/projecthoneypot.org.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/protector.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/spiders.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/stopforumspam.com.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/plugin/xortify.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/preloads/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/projecthoneypot.org/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/protector/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/protector/footer.post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/protector/header.post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/protector/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/providers.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/spiders/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/spiders/post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/stopforumspam.com/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/xortify/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/xortify/footer.post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/xortify/header.post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/xortify/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/providers/xortify/post.loader.php XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/sql/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/sql/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/sql/mysql.sql XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/admin/ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/admin/xortify_cpanel_bans.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/admin/xortify_cpanel_log.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_form.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/admin/xortify_cpanel_signup_nocommunication.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/index.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/templates/xortify_banning_notice.html XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/xoops_version.php Added: XoopsModules/xortify/branch/2.6/3.04/docs/INSTALL =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/docs/INSTALL (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/docs/INSTALL 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,46 @@ ++-----------------------------------------------------------------------------------+ +| | +| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY | +| XX XX OO OO RR RR TT II FF YY YY | +| XXX OO OO RRRR TT II FFFF YYYY | +| XX XX OO OO RR RR TT II FF YY | +| XXX XXX OOOOO RR RR TT IIIIII FF YY version 3.03 | +| | ++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+ +| | +| Install the Providers Xortify support currently these are: | +| | +| * XOOPS Protector (Based in 3.xx) | +| * Xortify Network Security Drone | +| | +| Sign up a username for Xortify.com you can do this in the module if everything | +| is working fine and there isn't any problem with the API SOAP communications. | +| | +| You will recieve an activation notice but you account will already be active. | +| | +| You will need to alter mainfile.php and do the following:: | +| | +| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you | +| | +| Xortify is also fited with the XOOPS 2.6 Series Preloads. | +| | ++--[ Step 1 - Installing Cron ]-----------------------------------------------------+ +| | +| You will need to install the following cron within your cronjobs section of your | +| Wesite, if you are using a windows server in WAMP then you will need to schedule | +| this as a task, remember to change the path to suit your configuration. | +| | +| command to run every minute to once an hour, make sure it is within your cache | +| refresh time. This is the or unix based systems the following is for windows | +| | +| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php | +| | +| Assuming you have your PHP added to your executable path this is the scheduled | +| task to run on a windows environment. | +| | +| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php | +| | +| Some of the paths in these examples for executables or the cron file may be | +| different and you will have to alter them to your needs. | +| | ++-----------------------------------------------------------------------------------+ \ No newline at end of file Added: XoopsModules/xortify/branch/2.6/3.04/docs/UPGRADE =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/docs/UPGRADE (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/docs/UPGRADE 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,74 @@ ++-----------------------------------------------------------------------------------+ +| | +| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY | +| XX XX OO OO RR RR TT II FF YY YY | +| XXX OO OO RRRR TT II FFFF YYYY | +| XX XX OO OO RR RR TT II FF YY | +| XXX XXX OOOOO RR RR TT IIIIII FF YY version 3.03 | +| | ++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+ +| | +| Install the Providers Xortify support currently these are: | +| | +| * XOOPS Protector (Based in 3.xx) | +| * Xortify Network Security Drone | +| | +| Make sure you delete the 'providers' folder in the existing module then upload | +| Xortify 3.03. Once you have install the file base this way you will remember | +| to upgrade the module in the system modules application in the xoops system | +| menu you will need to then goto the preferences and make sure you are running | +| the protector provider if you are running protector this will populate the | +| cloud with your bans that come in protector as well:: | +| | +| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you | +| | +| Xortify is also fited with the XOOPS 2.6 Series Preloads. | +| | ++--[ Step 1 - Installing Cron ]-----------------------------------------------------+ +| | +| You will need to install the following cron within your cronjobs section of your | +| Wesite, if you are using a windows server in WAMP then you will need to schedule | +| this as a task, remember to change the path to suit your configuration. | +| | +| command to run every minute to once an hour, make sure it is within your cache | +| refresh time. This is the or unix based systems the following is for windows | +| | +| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php | +| | +| Assuming you have your PHP added to your executable path this is the scheduled | +| task to run on a windows environment. | +| | +| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php | +| | +| Some of the paths in these examples for executables or the cron file may be | +| different and you will have to alter them to your needs. | +| | ++--[ Step 2 - mainfile.php ]--------------------------------------------------------+ +| | +| You will need to remove the following the main file has the following code on it | +| | +| [code] | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| [/code] | +| | +| You will need to alter that to this after it is all install. | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); | +| [/code] | +| | ++--[ Step 3 - footer.php ----------------------------------------------------------+ +| | +| At the bottom of footer.php remove this line without the [|] Of course. | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); | +| [/code] | +| | ++-----------------------------------------------------------------------------------+ \ No newline at end of file Added: XoopsModules/xortify/branch/2.6/3.04/docs/licence.txt =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/docs/licence.txt (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/docs/licence.txt 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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. + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/access.list.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/access.list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/access.list.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/access.list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/branch/2.6/3.04/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/preloads/xortify.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/preloads/xortify.php (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/system/preloads/xortify.php 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,55 @@ +<?php +/** + * @package xortify + * @subpackage module + * @description Sector Nexoork Security Drone + * @author Simon Roberts WISHCRAFT <si...@ch...> + * @author Richardo Costa TRABIS + * @copyright copyright (c) 2010-2013 XOOPS.org + * @licence GPL 2.0 - see docs/LICENCE.txt + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class SystemXortifyPreload extends XoopsPreloadItem +{ + + static function init() { + $xoops = Xoops::getInstance(); + $module_handler = $xoops->getHandler('module'); + $config_handler = $xoops->getHandler('config'); + $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); + if (is_object($GLOBALS['xortifyModule'])) { + $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid')); + } else { + $GLOBALS['xortifyModuleConfig']['fault_delay'] = 600; + } + XoopsLoad::load('xoopscache'); + } + + + static function eventCoreIncludeCommonEnd($args) + { + SystemXortifyPreload::init(); + $result = XoopsCache::read('xortify_core_include_common_end_cron'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + switch ($GLOBALS['xortifyModuleConfig']['crontype']) { + case 'preloader': + $read = XoopsCache::read('xortify_pause_preload'); + if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval'])); + $GLOBALS['xortify_preloader']=true; + ob_start(); + include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php'); + ob_end_clean(); + } + break; + } + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1); + } + + } +} + +?> \ No newline at end of file Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.html =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.html (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.html 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,10 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<title>Untitled Document</title> +</head> + +<body> +</body> +</html> Added: XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.php =================================================================== --- XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.php (rev 0) +++ XoopsModules/xortify/branch/2.6/3.04/htdocs/modules/xortify/admin/index.php 2011-12-28 10:09:20 UTC (rev 8608) @@ -0,0 +1,455 @@ +<?php +/** + * @package xortify + * @subpackage module + * @description Sector Network Security Drone + * @author Simon Roberts WISHCRAFT <si...@ch...> + * @copyright copyright (c) 2010-2013 XOOPS.org + * @licence GPL 2.0 - see docs/LICENCE.txt + */ + + + include(dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php'); + + $GLOBALS['xoops'] = Xoops::getInstance(); + + if (!defined('_CHARSET')) + define ("_CHARSET","UTF-8"); + if (!defined('_CHARSET_ISO')) + define ("_CHARSET_ISO","ISO-8859-1"); + + $GLOBALS['myts'] = MyTextSanitizer::getInstance(); + + $module_handler = $GLOBALS['xoops']->getHandler('module'); + $config_handler = $GLOBALS['xoops']->getHandler('config'); + $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); + $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid')); + + include_once $GLOBALS['xoops']->path('class'.DS.'cache'.DS.'xoopscache.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'pagenav.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopslists.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'tree.php'); + include_once $GLOBALS['xoops']->path('class'.DS.'xoopsformloader.php'); + include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'class'.DS.'auth'.DS.'authfactory.php'); + include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'functions.php'); + include_once $GLOBALS['xoops']->path('modules'.DS.'xortify'.DS.'include'.DS.'forms.xortify.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 $GLOBALS['xoops']->error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks"); + //return false; + } + $GLOBALS['xortifyImageIcon'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons16'); + $GLOBALS['xortifyImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['xortifyModule']->getInfo('icons32'); + + $myts = MyTextSanitizer::getInstance(); + + if ($GLOBALS['xoopsUser']) { + $moduleperm_handler = $GLOBALS['xoops']->getHandler('groupperm'); + if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['xortifyModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) { + $GLOBALS['xoops']->redirect(XOOPS_URL, 1, _NOPERM); + exit(); + } + } else { + $GLOBALS['xoops']->redirect(XOOPS_URL . "/user.php", 1, _NOPERM); + exit(); + } + + $GLOBALS['xoops']->loadLanguage('admin', 'xortify'); + $GLOBALS['xoops']->loadLanguage('modinfo', 'xortify'); + + $GLOBALS['xoops']->header(); + $GLOBALS['xoops']->tpl->assign('pathImageIcon', $GLOBALS['xortifyImageIcon']); + $GLOBALS['xoops']->tpl->assign('pathImageAdmin', $GLOBALS['xortifyImageAdmin']); + + $op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard"; + $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:""; + + switch($op) { + case "signup": + + switch ($fct) + { + case "save": + + $xortifyAuth = XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']); + $myts = MyTextSanitizer::getInstance(); + $uname = isset($_POST['uname']) ? $myts->stripSlashesGPC(trim($_POST['uname'])) : ''; + $email = isset($_POST['email']) ? $myts->stripSlashesGPC(trim($_POST['email'])) : ''; + $url = isset($_POST['url']) ? $myts->stripSlashesGPC(trim($_POST['url'])) : ''; + $pass = isset($_POST['pass']) ? $myts->stripSlashesGPC(trim($_POST['pass'])) : ''; + $vpass = isset($_POST['vpass']) ? $myts->stripSlashesGPC(trim($_POST['vpass'])) : ''; + $agree = (isset($_POST['agree']) && intval($_POST['agree'])) ? 1 : 0; + + if ($agree != 1) { + $stop .= _US_UNEEDAGREE . '<br />'; + } + + $validate = $xortifyAuth->validate($uname, $email, $pass, $vpass); + + if ($validate!=false) + $stop .= "User details didn't validate with Xortify.com<br/>$validate"; + + XoopsLoad::load("captcha"); + $xoopsCaptcha = XoopsCaptcha::getInstance(); + if (! $xoopsCaptcha->verify() ) { + $stop .= $xoopsCaptcha->getMessage(); + } + + if ($stop!='') { + + echo xortify_adminMenu(2); + echo "<p align='center' style='font-size: 15px; color: #FF0000;'>$stop</p>"; + $GLOBALS['xoops'] = Xoops::getInstance(); + $xortifyAuth = XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol']); + $disclaimer = $xortifyAuth->network_disclaimer(); + if (strlen(trim($disclaimer))==0) + { + $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER; + } + if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) { + $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:'')); + $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:'')); + $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:'')); + $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:'')); + $url = new XoopsFormText('', "url", 35, 128, (isset($_POST['url'])?$_POST['url']:'')); + $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false)); + $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:'')); + $myts = MyTextSanitizer::getInstance(); + $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer)); + $agree = new XoopsFormRadioYN('', "agree", false); + $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false); + $op = new XoopsFormHidden('op', 'signup'); + $fct = new XoopsFormHidden('fct', 'save'); + $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit'); + $GLOBALS['xoops']->tpl->assign('uname',$uname->render()); + $GLOBALS['xoops']->tpl->assign('pass',$pass->render()); + $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render()); + $GLOBALS['xoops']->tpl->assign('email',$email->render()); + $GLOBALS['xoops']->tpl->assign('yoururl',$url->render()); + $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render()); + $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render()); + $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render()); + $GLOBALS['xoops']->tpl->assign('agree',$agree->render()); + $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render()); + $GLOBALS['xoops']->tpl->assign('op',$op->render()); + $GLOBALS['xoops']->tpl->assign('fct',$fct->render()); + $GLOBALS['xoops']->tpl->assign('submit',$submit->render()); + $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html'); + xortify_footer_adminMenu(); + $GLOBALS['xoops']->footer(); + exit; + } else { + $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']); + switch($GLOBALS['xortifyModuleConfig']['protocol']) { + case 'curlserialised': + case 'wgetserialised': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']); + break; + case 'curl': + case 'json': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']); + break; + case 'curlxml': + case 'wgetxml': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']); + break; + case 'soap': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']); + break; + } + $GLOBALS['xoops']->tpl->assign('error', $disclaimer); + $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html'); + } + } else { + @$xortifyAuth->create_user( $_POST['viewemail'], $uname, $email, $url, $actkey, + $pass, $_POST['timezone'], $_POST['mailok'], $xortifyAuth->check_siteinfo(array())); + + $moduleHandler = $GLOBALS['xoops']->getHandler('module'); + $configHandler = $GLOBALS['xoops']->getHandler('config'); + $GLOBALS['xortifyModule'] = $moduleHandler->getByDirname('xortify'); + $configs = $configHandler->getConfigs(new Criteria('conf_modid', $GLOBALS['xortifyModule']->mid()) ); + foreach($configs as $id => $config) + switch($config->getVar('conf_name')) { + case 'xortify_username': + $config->setVar('conf_value', $uname); + @$configHandler->insertConfig($config); + break; + case 'xortify_password': + $config->setVar('conf_value', $pass); + @$configHandler->insertConfig($config); + break; + } + + $GLOBALS['xoops']->redirect("index.php", 4, _XOR_USERCREATED_PLEASEACTIVATE); + exit(0); + } + break; + default: + case "signup": + + echo xortify_adminMenu(4); + $GLOBALS['xoops'] = Xoops::getInstance(); + + $disclaimer = XortifyAuthFactory::getAuthConnection(false, $GLOBALS['xortifyModuleConfig']['protocol'])->network_disclaimer(); + + if (strlen(trim($disclaimer))==0) + { + $disclaimer = _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER; + } + if ($disclaimer != _XOR_ADMIN_NONETWORKCOMM_DISCLAIMER) { + + $uname = new XoopsFormText('', "uname", 35, 128, (isset($_POST['uname'])?$_POST['uname']:'')); + $pass = new XoopsFormPassword('', "pass", 35, 128, (isset($_POST['pass'])?$_POST['pass']:'')); + $vpass = new XoopsFormPassword('', "vpass", 35, 128, (isset($_POST['vpass'])?$_POST['vpass']:'')); + $email = new XoopsFormText('', "email", 35, 128, (isset($_POST['email'])?$_POST['email']:'')); + $url = new XoopsFormText('', "yoururl", 35, 128, (isset($_POST['url'])?$_POST['url']:'')); + $viewemail = new XoopsFormRadioYN('', "viewemail", (isset($_POST['viewemail'])?$_POST['viewemail']:false)); + $timezone = new XoopsFormSelectTimezone('', "timezone", (isset($_POST['timezone'])?$_POST['timezone']:'')); + $myts = MyTextSanitizer::getInstance(); + $disclaim = new XoopsFormLabel('', $myts->nl2br($disclaimer)); + $agree = new XoopsFormRadioYN('', "agree", false); + $captcha = new XoopsFormCaptcha('', 'xoopscaptcha', false); + $op = new XoopsFormHidden('op', 'signup'); + $fct = new XoopsFormHidden('fct', 'save'); + $submit = new XoopsFormButton('', 'submit', _XOR_FRM_REGISTER, 'submit'); + $GLOBALS['xoops']->tpl->assign('uname',$uname->render()); + $GLOBALS['xoops']->tpl->assign('pass',$pass->render()); + $GLOBALS['xoops']->tpl->assign('vpass',$vpass->render()); + $GLOBALS['xoops']->tpl->assign('email',$email->render()); + $GLOBALS['xoops']->tpl->assign('yoururl',$url->render()); + $GLOBALS['xoops']->tpl->assign('viewemail',$viewemail->render()); + $GLOBALS['xoops']->tpl->assign('timezone',$timezone->render()); + $GLOBALS['xoops']->tpl->assign('disclaimer',$disclaim->render()); + $GLOBALS['xoops']->tpl->assign('agree',$agree->render()); + $GLOBALS['xoops']->tpl->assign('captcha',$captcha->render()); + $GLOBALS['xoops']->tpl->assign('op',$op->render()); + $GLOBALS['xoops']->tpl->assign('fct',$fct->render()); + $GLOBALS['xoops']->tpl->assign('submit',$submit->render()); + $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_form.html'); + + xortify_footer_adminMenu(); + $GLOBALS['xoops']->footer(); + exit; + } else { + + $GLOBALS['xoops']->tpl->assign('protocol', $GLOBALS['xortifyModuleConfig']['protocol']); + switch($GLOBALS['xortifyModuleConfig']['protocol']) { + case 'curlserialised': + case 'wgetserialised': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_uriserial']); + break; + case 'curl': + case 'json': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urijson']); + break; + case 'curlxml': + case 'wgetxml': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urixml']); + break; + case 'soap': + $GLOBALS['xoops']->tpl->assign('port', $GLOBALS['xortifyModuleConfig']['xortify_urisoap']); + break; + } + $GLOBALS['xoops']->tpl->assign('error', $disclaimer); + $GLOBALS['xoops']->tpl->display('admin:xortify|xortify_cpanel_signup_nocommunication.html'); + + } + break; + } + break; + case "log": + echo xortify_adminMenu(3); + + include_once $GLOBALS['xoops']->path( "/class/pagenav.php" ); + + $log_handler = $GLOBALS['xoops']->getModuleHandler('log', 'xortify'); + + $ttl = $log_handler->getCount(NULL); + $limit = !empty($_POST['limit'])?intval($_POST['limit']):30; + $start = !empty($_POST['start'])?intval($_POST['start']):0; + $order = !empty($_POST[... [truncated message content] |
From: <wis...@us...> - 2011-12-28 09:59:14
|
Revision: 8607 http://xoops.svn.sourceforge.net/xoops/?rev=8607&view=rev Author: wishcraft Date: 2011-12-28 09:59:02 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Xortify 3.00 [STABLE] - For XOOPS 2.5.x - Extras Tested - Defaulted to Xortify.com Added Paths: ----------- XoopsModules/xortify/releases/3.00/ XoopsModules/xortify/releases/3.00/docs/ XoopsModules/xortify/releases/3.00/docs/INSTALL XoopsModules/xortify/releases/3.00/docs/UPGRADE XoopsModules/xortify/releases/3.00/docs/licence.txt XoopsModules/xortify/releases/3.00/extras/ XoopsModules/xortify/releases/3.00/extras/2.5.x/ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/header.php XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/releases/3.00/htdocs/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/access.list.png XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/ XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/access.list.png XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png XoopsModules/xortify/releases/3.00/htdocs/modules/ XoopsModules/xortify/releases/3.00/htdocs/modules/system/ XoopsModules/xortify/releases/3.00/htdocs/modules/system/preloads/ XoopsModules/xortify/releases/3.00/htdocs/modules/system/preloads/xortify.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/menu.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curl.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curl_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curlserialised.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curlserialised_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curlxml.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_curlxml_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_json.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_json_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_soap.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_soap_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_wgetserialised.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_wgetserialised_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_wgetxml.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/auth_wgetxml_provisionning.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/authfactory.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/auth/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curl.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlserialised.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/curlxml.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/json.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/log.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/soap.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/wgetserialised.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/class/wgetxml.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/cron/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/cron/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/cron/serverup.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/changelog.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/credits.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/install.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/lang_diff.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/licence.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/docs/readme.txt XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/accessdenied.png XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/left_both.gif XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/right_both.gif XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/images/xortify_slogo.png XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/JSON.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/forms.objects.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/forms.xortify.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/functions.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/install.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.header.addmeta.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.header.endcache.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/post.loader.mainfile.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/pre.loader.mainfile.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/include/update.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/admin.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/ban.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/help/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/help/help.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/help/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/main.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/english/modinfo.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/language/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/projecthoneypot.org.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/protector.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/spiders.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/stopforumspam.com.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/plugin/xortify.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/core.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/preloads/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/projecthoneypot.org/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/projecthoneypot.org/post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/protector/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/protector/footer.post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/protector/header.post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/protector/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/providers.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/spiders/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/spiders/post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/stopforumspam.com/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/stopforumspam.com/post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/xortify/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/xortify/footer.post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/xortify/header.post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/xortify/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/providers/xortify/post.loader.php XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/sql/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/sql/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/sql/mysql.sql XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/index.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/xortify_banning_notice.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/xortify_cpanel_bans.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/xortify_cpanel_log.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/xortify_cpanel_signup_form.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/templates/xortify_cpanel_signup_nocommunication.html XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/xoops_version.php Added: XoopsModules/xortify/releases/3.00/docs/INSTALL =================================================================== --- XoopsModules/xortify/releases/3.00/docs/INSTALL (rev 0) +++ XoopsModules/xortify/releases/3.00/docs/INSTALL 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,75 @@ ++-----------------------------------------------------------------------------------+ +| | +| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY | +| XX XX OO OO RR RR TT II FF YY YY | +| XXX OO OO RRRR TT II FFFF YYYY | +| XX XX OO OO RR RR TT II FF YY | +| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.48 | +| | ++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+ +| | +| Install the Providers Xortify support currently these are: | +| | +| * XOOPS Protector (Based in 3.22) | +| * Xortify Network Security Drone | +| | +| Sign up a username for Xortify.com you can do this in the module if everything | +| is working fine and there isn't any problem with the API SOAP communications. | +| | +| You will recieve an activation notice but you account will already be active. | +| | +| You will need to alter mainfile.php and do the following:: | +| | +| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you | +| | +| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to | +| do steps 2 and 3 with XOOPS 2.4 and later series. | +| | ++--[ Step 1 - Installing Cron ]-----------------------------------------------------+ +| | +| You will need to install the following cron within your cronjobs section of your | +| Wesite, if you are using a windows server in WAMP then you will need to schedule | +| this as a task, remember to change the path to suit your configuration. | +| | +| command to run every minute to once an hour, make sure it is within your cache | +| refresh time. This is the or unix based systems the following is for windows | +| | +| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php | +| | +| Assuming you have your PHP added to your executable path this is the scheduled | +| task to run on a windows environment. | +| | +| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php | +| | +| Some of the paths in these examples for executables or the cron file may be | +| different and you will have to alter them to your needs. | +| | ++--[ Step 2 - mainfile.php (pre 2.4 series) ]---------------------------------------+ +| | +| You will need to change the following the main file has the following code on it | +| | +| [code] | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| [/code] | +| | +| You will need to alter that to this after it is all install. | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); | +| [/code] | +| | ++--[ Step 3 - header.php (pre 2.4 series) ]----------------------------------------+ +| | +| Below the lin of footer.php which reads $xoopsTpl =& $xoTheme->template; | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.add.meta.php' ); | +| [/code] | +| | ++-----------------------------------------------------------------------------------+ \ No newline at end of file Added: XoopsModules/xortify/releases/3.00/docs/UPGRADE =================================================================== --- XoopsModules/xortify/releases/3.00/docs/UPGRADE (rev 0) +++ XoopsModules/xortify/releases/3.00/docs/UPGRADE 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,75 @@ ++-----------------------------------------------------------------------------------+ +| | +| XXX XXX OOOOO RRRRR TTTTTT IIIIII FFFFFF YYY YYY | +| XX XX OO OO RR RR TT II FF YY YY | +| XXX OO OO RRRR TT II FFFF YYYY | +| XX XX OO OO RR RR TT II FF YY | +| XXX XXX OOOOO RR RR TT IIIIII FF YY version 2.30 | +| | ++----[ NETWORK SECTOR SECURITY ]----------------------------------------------------+ +| | +| Install the Providers Xortify support currently these are: | +| | +| * XOOPS Protector (Based in 3.22) | +| * Xortify Network Security Drone | +| | +| Make sure you delete the 'providers' folder in the existing module then upload | +| Xortify 2.30. Once you have install the file base this way you will remember | +| to upgrade the module in the system modules application in the xoops system | +| menu you will need to then goto the preferences and make sure you are running | +| the protector provider if you are running protector this will populate the | +| cloud with your bans that come in protector as well:: | +| | +| * DO NOT INSTALL PROTECTOR IN THE MAINFILE - Xortify will call this for you | +| | +| Xortify is also fited with the XOOPS 2.4 Series Preloads you will not need to | +| do steps 2 and 3 with XOOPS 2.4 and later series. | +| | ++--[ Step 1 - Installing Cron ]-----------------------------------------------------+ +| | +| You will need to install the following cron within your cronjobs section of your | +| Wesite, if you are using a windows server in WAMP then you will need to schedule | +| this as a task, remember to change the path to suit your configuration. | +| | +| command to run every minute to once an hour, make sure it is within your cache | +| refresh time. This is the or unix based systems the following is for windows | +| | +| /usr/bin/php -q /home/yoursite/public_html/modules/xortify/cron/serverup.php | +| | +| Assuming you have your PHP added to your executable path this is the scheduled | +| task to run on a windows environment. | +| | +| php.exe -q c:\htdocs\modules\xortify\cron\serverup.php | +| | +| Some of the paths in these examples for executables or the cron file may be | +| different and you will have to alter them to your needs. | +| | ++--[ Step 2 - mainfile.php ]--------------------------------------------------------+ +| | +| You will need to change the following the main file has the following code on it | +| | +| [code] | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| [/code] | +| | +| You will need to alter that to this after it is all install. | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/pre.loader.mainfile.php' ); | +| if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") { | +| include XOOPS_ROOT_PATH."/include/common.php"; | +| } | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.mainfile.php' ); | +| [/code] | +| | ++--[ Step 3 - footer.php ----------------------------------------------------------+ +| | +| At the bottom of footer.php place this line without the [|] Of course. | +| | +| [code] | +| @include( XOOPS_ROOT_PATH.'/modules/xortify/include/post.loader.footer.php' ); | +| [/code] | +| | ++-----------------------------------------------------------------------------------+ \ No newline at end of file Added: XoopsModules/xortify/releases/3.00/docs/licence.txt =================================================================== --- XoopsModules/xortify/releases/3.00/docs/licence.txt (rev 0) +++ XoopsModules/xortify/releases/3.00/docs/licence.txt 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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 + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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. + + 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. Added: XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/header.php =================================================================== --- XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/header.php (rev 0) +++ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/header.php 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,110 @@ +<?php +/** + * XOOPS global header file + * + * 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 core + * @since 2.0.0 + * @author Kazumi Ono <web...@my...> + * @author Skalpa Keo <sk...@xo...> + * @author Taiwen Jiang <ph...@us...> + * @version $Id: header.php 8066 2011-11-06 05:09:33Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +$xoopsPreload =& XoopsPreload::getInstance(); +$xoopsPreload->triggerEvent('core.header.start'); + +include_once $GLOBALS['xoops']->path('class/xoopsblock.php'); + +$xoopsLogger =& XoopsLogger::getInstance(); +$xoopsLogger->stopTime('Module init'); +$xoopsLogger->startTime('XOOPS output init'); + +if ($xoopsConfig['theme_set'] != 'default' && file_exists(XOOPS_THEME_PATH . '/' . $xoopsConfig['theme_set'] . '/theme.php')) { + require_once $GLOBALS['xoops']->path('include/xoops13_header.php'); +} else { + global $xoopsOption, $xoopsConfig, $xoopsModule; + + $xoopsOption['theme_use_smarty'] = 1; + + // include Smarty template engine and initialize it + require_once $GLOBALS['xoops']->path('class/template.php'); + require_once $GLOBALS['xoops']->path('class/theme.php'); + require_once $GLOBALS['xoops']->path('class/theme_blocks.php'); + + if (@$xoopsOption['template_main']) { + if (false === strpos($xoopsOption['template_main'], ':')) { + $xoopsOption['template_main'] = 'db:' . $xoopsOption['template_main']; + } + } + + $xoopsThemeFactory = null; + $xoopsThemeFactory = new xos_opal_ThemeFactory(); + $xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed']; + $xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set']; + + /** + * @var xos_opal_Theme + */ + $xoTheme =& $xoopsThemeFactory->createInstance(array('contentTemplate' => @$xoopsOption['template_main'])); + $xoopsTpl =& $xoTheme->template; + + $xoopsPreload->triggerEvent('core.header.addmeta'); + + // Temporary solution for start page redirection + if (defined("XOOPS_STARTPAGE_REDIRECTED")) { + $params = $content = $tpl = $repeat = null; + $xoTheme->headContent($params, "<base href='" . XOOPS_URL . '/modules/' . $xoopsConfig['startpage'] . "/' />", $tpl, $repeat); + } + + if (@is_object($xoTheme->plugins['xos_logos_PageBuilder'])) { + $aggreg =& $xoTheme->plugins['xos_logos_PageBuilder']; + // Backward compatibility code for pre 2.0.14 themes + $xoopsTpl->assign_by_ref('xoops_lblocks', $aggreg->blocks['canvas_left']); + $xoopsTpl->assign_by_ref('xoops_rblocks', $aggreg->blocks['canvas_right']); + $xoopsTpl->assign_by_ref('xoops_ccblocks', $aggreg->blocks['page_topcenter']); + $xoopsTpl->assign_by_ref('xoops_clblocks', $aggreg->blocks['page_topleft']); + $xoopsTpl->assign_by_ref('xoops_crblocks', $aggreg->blocks['page_topright']); + $xoopsTpl->assign('xoops_showlblock', !empty($aggreg->blocks['canvas_left'])); + $xoopsTpl->assign('xoops_showrblock', !empty($aggreg->blocks['canvas_right'])); + $xoopsTpl->assign('xoops_showcblock', !empty($aggreg->blocks['page_topcenter']) || !empty($aggreg->blocks['page_topleft']) || !empty($aggreg->blocks['page_topright'])); + } + + // Sets cache time + if (!empty($xoopsModule)) { + $xoTheme->contentCacheLifetime = @$xoopsConfig['module_cache'][$xoopsModule->getVar('mid', 'n')]; + // Tricky solution for setting cache time for homepage + } else if (!empty($xoopsOption['template_main']) && $xoopsOption['template_main'] == 'db:system_homepage.html') { + $xoTheme->contentCacheLifetime = 604800; + } + + $xoopsPreload->triggerEvent('core.header.checkcache'); + if ($xoTheme->checkCache()) { + $xoopsPreload->triggerEvent('core.header.cacheend'); + exit(); + } + + if (!isset($xoopsOption['template_main']) && $xoopsModule) { + // new themes using Smarty does not have old functions that are required in old modules, so include them now + include $GLOBALS['xoops']->path('include/old_theme_functions.php'); + // need this also + $xoopsTheme['thename'] = $xoopsConfig['theme_set']; + ob_start(); + } + + $xoopsLogger->stopTime('XOOPS output init'); + $xoopsLogger->startTime('Module display'); +} + +$xoopsPreload->triggerEvent('core.header.end'); +?> \ No newline at end of file Added: XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php =================================================================== --- XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php (rev 0) +++ XoopsModules/xortify/releases/3.00/extras/2.5.x/htdocs/modules/xortify/preloads/core.php 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,117 @@ +<?php +/** + * @package xortify + * @subpackage module + * @description Sector Nexoork Security Drone + * @author Simon Roberts WISHCRAFT <si...@ch...> + * @author Richardo Costa TRABIS + * @copyright copyright (c) 2010-2013 XOOPS.org + * @licence GPL 2.0 - see docs/LICENCE.txt + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class XortifyCorePreload extends XoopsPreloadItem +{ + + function eventCoreIncludeCommonStart($args) + { + include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; + $result = XoopsCache::read('xortify_core_include_common_start'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)+600), 600); + include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/pre.loader.mainfile.php' ); + XoopsCache::write('xortify_core_include_common_start', array('time'=>microtime(true)), -1); + } + } + + function eventCoreIncludeCommonEnd($args) + { + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); + if (is_object($GLOBALS['xortifyModule'])) { + $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid')); + } + + include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; + $result = XoopsCache::read('xortify_core_include_common_end_cron'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + switch ($GLOBALS['xortifyModuleConfig']['crontype']) { + case 'preloader': + $read = XoopsCache::read('xortify_pause_preload'); + if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval'])); + $GLOBALS['xortify_preloader']=true; + ob_start(); + include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php'); + ob_end_clean(); + } + break; + } + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1); + } + + $result = XoopsCache::read('xortify_core_include_common_end'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + if (XortifyCorePreload::hasAPIUserPass()) { + include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.loader.mainfile.php' ); + } + XoopsCache::write('xortify_core_include_common_end', array('time'=>microtime(true)), -1); + } + + } + + function eventCoreHeaderCacheend($args) + { + + include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; + $result = XoopsCache::read('xortify_core_header_cache_end'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + if (XortifyCorePreload::hasAPIUserPass()) { + include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' ); + } + XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1); + } + } + + function eventCoreFooterEnd($args) + { + + include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; + $result = XoopsCache::read('xortify_core_header_cache_end'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + if (XortifyCorePreload::hasAPIUserPass()) { + include_once XOOPS_ROOT_PATH . ( '/modules/xortify/include/post.header.endcache.php' ); + } + XoopsCache::write('xortify_core_header_cache_end', array('time'=>microtime(true)), -1); + } + } + + function eventCoreHeaderAddmeta($args) + { + if (isset($GLOBALS['xortify_pass'])) { + if ($GLOBALS['xortify_pass'] == true) { + include_once XOOPS_ROOT_PATH.'/modules/xortify/include/functions.php'; + addmeta_googleanalytics(_XOR_MI_XOOPS_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED, $_SERVER['HTTP_HOST']); + if (defined('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED')&&strlen(constant('_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED'))>=13) { + addmeta_googleanalytics(_XOR_MI_CLIENT_GOOGLE_ANALYTICS_ACCOUNTID_USERPASSED, $_SERVER['HTTP_HOST']); + } + } + } + } + + function hasAPIUserPass() + { + if ($GLOBALS['xortifyModuleConfig']['xortify_username']!=''&&$GLOBALS['xortifyModuleConfig']['xortify_password']!='') + return true; + else + return false; + } +} + +?> \ No newline at end of file Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/access.list.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/access.list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/current.bans.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/16/xortify.log.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/access.list.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/access.list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/current.bans.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png =================================================================== (Binary files differ) Property changes on: XoopsModules/xortify/releases/3.00/htdocs/Frameworks/moduleclasses/icons/32/xortify.log.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: XoopsModules/xortify/releases/3.00/htdocs/modules/system/preloads/xortify.php =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/system/preloads/xortify.php (rev 0) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/system/preloads/xortify.php 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,46 @@ +<?php +/** + * @package xortify + * @subpackage module + * @description Sector Nexoork Security Drone + * @author Simon Roberts WISHCRAFT <si...@ch...> + * @author Richardo Costa TRABIS + * @copyright copyright (c) 2010-2013 XOOPS.org + * @licence GPL 2.0 - see docs/LICENCE.txt + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class SystemXortifyPreload extends XoopsPreloadItem +{ + function eventCoreIncludeCommonEnd($args) + { + $module_handler = xoops_gethandler('module'); + $config_handler = xoops_gethandler('config'); + $GLOBALS['xortifyModule'] = $module_handler->getByDirname('xortify'); + if (is_object($GLOBALS['xortifyModule'])) { + $GLOBALS['xortifyModuleConfig'] = $config_handler->getConfigList($GLOBALS['xortifyModule']->getVar('mid')); + } + + include_once XOOPS_ROOT_PATH.'/class/cache/xoopscache.php'; + $result = XoopsCache::read('xortify_core_include_common_end_cron'); + if ((isset($result['time'])?(float)$result['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['fault_delay']), $GLOBALS['xortifyModuleConfig']['fault_delay']); + switch ($GLOBALS['xortifyModuleConfig']['crontype']) { + case 'preloader': + $read = XoopsCache::read('xortify_pause_preload'); + if ((isset($read['time'])?(float)$read['time']:0)<=microtime(true)) { + XoopsCache::write('xortify_pause_preload', array('time'=>microtime(true)+$GLOBALS['xortifyModuleConfig']['croninterval'])); + $GLOBALS['xortify_preloader']=true; + ob_start(); + include(XOOPS_ROOT_PATH.'/modules/xortify/cron/serverup.php'); + ob_end_clean(); + } + break; + } + XoopsCache::write('xortify_core_include_common_end_cron', array('time'=>microtime(true)), -1); + } + } +} + +?> \ No newline at end of file Added: XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.html =================================================================== --- XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.html (rev 0) +++ XoopsModules/xortify/releases/3.00/htdocs/modules/xortify/admin/index.html 2011-12-28 09:59:02 UTC (rev 8607) @@ -0,0 +1,10 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/x... [truncated message content] |
From: <dj...@us...> - 2011-12-28 03:31:07
|
Revision: 8606 http://xoops.svn.sourceforge.net/xoops/?rev=8606&view=rev Author: djculex Date: 2011-12-28 03:31:01 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Fix: visitor avatar not showing correct when commenting in userprofile.php Modified Paths: -------------- XoopsModules/smallworld/trunk/templates/smallworld_userprofile_template.html XoopsModules/smallworld/trunk/userprofile.php Modified: XoopsModules/smallworld/trunk/templates/smallworld_userprofile_template.html =================================================================== --- XoopsModules/smallworld/trunk/templates/smallworld_userprofile_template.html 2011-12-28 02:13:38 UTC (rev 8605) +++ XoopsModules/smallworld/trunk/templates/smallworld_userprofile_template.html 2011-12-28 03:31:01 UTC (rev 8606) @@ -257,7 +257,7 @@ <div class="smallworld_commentupdate" style='display:none' id='smallworld_commentbox<{$post.msg_id}>'> <div class="smallworld_stcommentimg"> - <img src="<{$myavatarlink}>" class='smallworld_small_face'/> + <img src="<{$visitoravatarlink}>" class='smallworld_small_face'/> </div> <div class="smallworld_stcommenttext" > <form method="post" action=""> Modified: XoopsModules/smallworld/trunk/userprofile.php =================================================================== --- XoopsModules/smallworld/trunk/userprofile.php 2011-12-28 02:13:38 UTC (rev 8605) +++ XoopsModules/smallworld/trunk/userprofile.php 2011-12-28 03:31:01 UTC (rev 8606) @@ -89,8 +89,10 @@ // Things to do with wall $Wall = new Wall_Updates(); - $myavatar = $Wall->Gravatar($id); - $myavatarlink = smallworld_getAvatarLink($id, $myavatar); + $myavatar = $Wall->Gravatar($id); //profile owners data + $myavatarlink = smallworld_getAvatarLink($id, $myavatar); //profile owners data + $visitorAvatar = $Wall->Gravatar($yourid); + $visitorAvatarlink = smallworld_getAvatarLink($yourid, $visitorAvatar); // Follow array here $followers = $Wall->getFollowers($id); @@ -182,6 +184,8 @@ $xoopsTpl->assign('friendinvitations',$getInvitations); $xoopsTpl->assign('myavatar',$myavatar); $xoopsTpl->assign('myavatarlink',$myavatarlink); + $xoopsTpl->assign('visitoravatar',$visitorAvatar); + $xoopsTpl->assign('visitoravatarlink',$visitorAvatarlink); $xoopsTpl->assign('myusername',$username); $xoopsTpl->assign('username',$Xusername); $xoopsTpl->assign('bdaynow',$birthday_today_text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 02:13:45
|
Revision: 8605 http://xoops.svn.sourceforge.net/xoops/?rev=8605&view=rev Author: djculex Date: 2011-12-28 02:13:38 +0000 (Wed, 28 Dec 2011) Log Message: ----------- adjusted for IE Modified Paths: -------------- XoopsModules/smallworld/trunk/templates/smallworld_admin.html Modified: XoopsModules/smallworld/trunk/templates/smallworld_admin.html =================================================================== --- XoopsModules/smallworld/trunk/templates/smallworld_admin.html 2011-12-28 02:12:52 UTC (rev 8604) +++ XoopsModules/smallworld/trunk/templates/smallworld_admin.html 2011-12-28 02:13:38 UTC (rev 8605) @@ -236,6 +236,6 @@ <p class="smallworldadmin"><{$lang_prefslink}></p> </fieldset> </div> - <span style="margin: 33%;"><{$smarty.const._AM_SMALLWORLD_SP}></span> + <span style="margin:27%;"><{$smarty.const._AM_SMALLWORLD_SP}></span> </div> <!-- end smallworld Admin --> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 02:12:58
|
Revision: 8604 http://xoops.svn.sourceforge.net/xoops/?rev=8604&view=rev Author: djculex Date: 2011-12-28 02:12:52 +0000 (Wed, 28 Dec 2011) Log Message: ----------- removin empty lines Modified Paths: -------------- XoopsModules/smallworld/trunk/templates/smallworld_index.html Modified: XoopsModules/smallworld/trunk/templates/smallworld_index.html =================================================================== --- XoopsModules/smallworld/trunk/templates/smallworld_index.html 2011-12-28 02:12:11 UTC (rev 8603) +++ XoopsModules/smallworld/trunk/templates/smallworld_index.html 2011-12-28 02:12:52 UTC (rev 8604) @@ -87,9 +87,6 @@ </div> <div id="smallworld_content"> <{foreach item=post from=$walldata}> - - - <div class="smallworld_stbody" id="smallworld_stbody<{$post.msg_id}>"> <script type="text/javascript"> xoops_smallworld(document).ready(function(){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 02:12:18
|
Revision: 8603 http://xoops.svn.sourceforge.net/xoops/?rev=8603&view=rev Author: djculex Date: 2011-12-28 02:12:11 +0000 (Wed, 28 Dec 2011) Log Message: ----------- css adjustments for IE (suprice suprice) Modified Paths: -------------- XoopsModules/smallworld/trunk/css/SmallworldAdmin.css Modified: XoopsModules/smallworld/trunk/css/SmallworldAdmin.css =================================================================== --- XoopsModules/smallworld/trunk/css/SmallworldAdmin.css 2011-12-28 02:11:24 UTC (rev 8602) +++ XoopsModules/smallworld/trunk/css/SmallworldAdmin.css 2011-12-28 02:12:11 UTC (rev 8603) @@ -47,7 +47,11 @@ border: 1px solid #fff; /*--Gives the bevel look with a 1px white border inside the list item--*/ outline: none; } -ul.smallworldadmin_tabs li a:hover { background-color: #ccc;} + +ul.smallworldadmin_tabs li a:hover { + background-color: #ccc; +} + html ul.smallworldadmin_tabs li.active, html ul.smallworldadmin_tabs li.active a:hover { /*--Makes sure that the active tab does not listen to the hover properties--*/ background-color: #fff; border-bottom: 1px solid #fff; /*--Makes the active tab look like it's connected with its content--*/ @@ -58,15 +62,25 @@ border-top: 0 !important; overflow: hidden; clear: both; - /*float: left;*/ width: 100%; background-color: #fff; } -.smallworldadmin_tab_content { padding: 20px; font-size: 1.2em;} -p.smallworldadmin { font-size:11px; margin : 8px; line-height : 15px;} +.smallworldadmin_tab_content { + padding: 20px; + font-size: 1.2em; +} -p.smallworldadmin a, p.smallworldadmin a:hover, p.smallworldadmin a:visited { color: #0000FF; font-size: 11px;} +p.smallworldadmin { + font-size:11px; + margin : 8px; + line-height : 15px; +} +p.smallworldadmin a, p.smallworldadmin a:hover, p.smallworldadmin a:visited { + color: #0000FF; + font-size: 11px; +} + table.smallworldadmin { position:relative; left:20px; @@ -75,17 +89,44 @@ margin: 0; } -td.smallworldadmin { font-size:10px; line-height:70%;} +td.smallworldadmin { + font-size:10px; +} -.smallworldadmin_legend { font-weight:bold; font-size: 16px; color:#FF0000;} -.smallworldadmin_tab_container fieldset { border-radius: 7px; -moz-border-radius:7px; -webkit-border-radius: 7px;} -.smallworldadmin_tab_container legend { font-size: 14px; text-shadow: 1px 1px 2px #ccc;} -smallworldFrm, smallworld_admin_button {border:0; margin:0; padding:0;} -.smallworldAdminSpacer {clear:both; height:1px;} +.smallworldadmin_legend { + font-weight:bold; + font-size: 16px; + color:#FF0000; +} + +.smallworldadmin_tab_container fieldset { + border-radius: 7px; + -moz-border-radius:7px; + -webkit-border-radius: 7px; +} +.smallworldadmin_tab_container legend { + font-size: 14px; + text-shadow: 1px 1px 2px #ccc; +} +smallworldFrm, smallworld_admin_button { + border:0; + margin:0; + padding:0; +} +.smallworldAdminSpacer { + clear:both; + height:1px; +} + /* ----------- My Form ----------- */ -.smallworldForm{ margin:35px 20px; width:400px; padding:14px;} +.smallworldForm{ + margin:35px 20px; + width:400px; + padding:14px; +} + /* ----------- smallworldAdminForm ----------- */ #smallworldAdminForm{ border:solid 2px #b7ddf2; @@ -141,8 +182,16 @@ color: transparent; text-transform: capitalize; } -.smallworld_admin_error { font-weight: bold; color:red;} -.success { font-weight: bold; color:green;} +.smallworld_admin_error { + font-weight: bold; + color:red; +} + +.success { + font-weight: bold; + color:green; +} + .smallworld_admin_button-link a { border-style: solid; border: 0; @@ -160,8 +209,13 @@ margin-bottom:20px; padding-bottom:10px; } -.smallworld_admin_button-link a:hover { background-color: #C85304;} -.smallworld_update_header { font-size:14px;} +.smallworld_admin_button-link a:hover { + background-color: #C85304; +} +.smallworld_update_header { + font-size:14px; +} + .smallworld_upd_img { width:22px; height:22px; @@ -188,7 +242,11 @@ height: 150px; width: 300px; } -#smallworldadmin_tab5 h2 { font-size: 14px; margin: 1em 0 .5em 0;} +#smallworldadmin_tab5 h2 { + font-size: 14px; + margin: 1em 0 .5em 0; +} + ul.help { margin: 8px; padding: 8px; @@ -217,7 +275,9 @@ font-size: 11px; outline: none; } -li.help a:hover { background-color: #0000FF;} +li.help a:hover { + background-color: #0000FF; +} #smallworld_admin_allusers { background-color: Lavender; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 02:11:30
|
Revision: 8602 http://xoops.svn.sourceforge.net/xoops/?rev=8602&view=rev Author: djculex Date: 2011-12-28 02:11:24 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Css for IE not showing ok. ajusted a few places Modified Paths: -------------- XoopsModules/smallworld/trunk/css/smallworld.css Modified: XoopsModules/smallworld/trunk/css/smallworld.css =================================================================== --- XoopsModules/smallworld/trunk/css/smallworld.css 2011-12-28 02:10:41 UTC (rev 8601) +++ XoopsModules/smallworld/trunk/css/smallworld.css 2011-12-28 02:11:24 UTC (rev 8602) @@ -550,14 +550,11 @@ } .smallworld_edit_image { - position:relative; - left:25%; + margin:25%; } .smallworld_edit_desc { - position:relative; - left:15%; - margin: 0 10px 0 0; + margin: 0 10px 0 15%; width: 250px; height:50px; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 02:10:48
|
Revision: 8601 http://xoops.svn.sourceforge.net/xoops/?rev=8601&view=rev Author: djculex Date: 2011-12-28 02:10:41 +0000 (Wed, 28 Dec 2011) Log Message: ----------- adjusting functions to show best best & rated users Modified Paths: -------------- XoopsModules/smallworld/trunk/class/adminclass.php Modified: XoopsModules/smallworld/trunk/class/adminclass.php =================================================================== --- XoopsModules/smallworld/trunk/class/adminclass.php 2011-12-28 00:30:50 UTC (rev 8600) +++ XoopsModules/smallworld/trunk/class/adminclass.php 2011-12-28 02:10:41 UTC (rev 8601) @@ -171,7 +171,7 @@ $counter++; } } else { - $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')." where down='1' GROUP by owner ORDER BY cnt DESC limit 20"; + $sql = "SELECT owner, count(*) as cnt FROM ".$xoopsDB->prefix('smallworld_vote')." where down='1' GROUP by owner ORDER BY cnt DESC limit 20"; $result = $xoopsDB->queryF($sql); while ($row = $xoopsDB->fetchArray($result)) { $array['counter'] = $counter; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 00:30:56
|
Revision: 8600 http://xoops.svn.sourceforge.net/xoops/?rev=8600&view=rev Author: djculex Date: 2011-12-28 00:30:50 +0000 (Wed, 28 Dec 2011) Log Message: ----------- fiex: searchbox css wrong position in IE Modified Paths: -------------- XoopsModules/smallworld/trunk/css/smallworld.css Modified: XoopsModules/smallworld/trunk/css/smallworld.css =================================================================== --- XoopsModules/smallworld/trunk/css/smallworld.css 2011-12-28 00:17:55 UTC (rev 8599) +++ XoopsModules/smallworld/trunk/css/smallworld.css 2011-12-28 00:30:50 UTC (rev 8600) @@ -529,8 +529,7 @@ } #smallworld_searchform { - left: 20%; - margin: 25px 0 0 5px; + margin: 25px 33% 0 33%; position: relative; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <dj...@us...> - 2011-12-28 00:18:03
|
Revision: 8599 http://xoops.svn.sourceforge.net/xoops/?rev=8599&view=rev Author: djculex Date: 2011-12-28 00:17:55 +0000 (Wed, 28 Dec 2011) Log Message: ----------- Fixed oembed giving permission denied using bandcamp Modified Paths: -------------- XoopsModules/smallworld/trunk/js/jquery.oembed.js Modified: XoopsModules/smallworld/trunk/js/jquery.oembed.js =================================================================== --- XoopsModules/smallworld/trunk/js/jquery.oembed.js 2011-12-27 22:49:31 UTC (rev 8598) +++ XoopsModules/smallworld/trunk/js/jquery.oembed.js 2011-12-28 00:17:55 UTC (rev 8599) @@ -8,36 +8,38 @@ * Forked by Andrew Mee to Provide a slightly diffent kind of embedding * experience */ - -(function (xoops_smallworld) { - xoops_smallworld.fn.oembed = function (url, options, embedAction) { +(function(xoops_smallworld) { + xoops_smallworld.fn.oembed = function(url, options, embedAction) { + settings = xoops_smallworld.extend(true, xoops_smallworld.fn.oembed.defaults, options); - if(xoops_smallworld('#jqoembeddata').length==0)xoops_smallworld('<span id="jqoembeddata"></span>').appendTo('body'); + if (xoops_smallworld('#jqoembeddata').length === 0) xoops_smallworld('<span id="jqoembeddata"></span>').appendTo('body'); - return this.each(function () { + return this.each(function() { var container = xoops_smallworld(this), - resourceURL = (url != null) ? url : container.attr("href"), - provider; + resourceURL = (url !== null) ? url : container.attr("href"), + provider; if (embedAction) { settings.onEmbed = embedAction; - } else { - settings.onEmbed = function (oembedData) { + } + else { + settings.onEmbed = function(oembedData) { xoops_smallworld.fn.oembed.insertCode(this, settings.embedMethod, oembedData); }; } - if (resourceURL != null) { + if (resourceURL !== null) { provider = xoops_smallworld.fn.oembed.getOEmbedProvider(resourceURL); - if (provider != null) { + if (provider !== null) { provider.params = getNormalizedParams(settings[provider.name]) || {}; provider.maxWidth = settings.maxWidth; provider.maxHeight = settings.maxHeight; embedCode(container, resourceURL, provider); - } else { + } + else { settings.onProviderNotFound.call(container, resourceURL); } } @@ -48,553 +50,656 @@ }; - var settings, activeProviders = []; + var settings; // Plugin defaults xoops_smallworld.fn.oembed.defaults = { maxWidth: null, maxHeight: null, - embedMethod: 'auto', // "auto", "append", "fill" - onProviderNotFound: function () { }, - beforeEmbed: function () { }, - afterEmbed: function () { }, - onEmbed: function () { }, + embedMethod: 'auto', + // "auto", "append", "fill", "replace" + onProviderNotFound: function() {}, + beforeEmbed: function() {}, + afterEmbed: function() {}, + onEmbed: function() {}, onError: function() {}, ajaxOptions: {} }; /* Private functions */ + function getRequestUrl(provider, externalUrl) { - var url = provider.apiendpoint, qs = "", i; - url += (url.indexOf("?") <= 0)?"?":"&"; + var url = provider.apiendpoint, + qs = "", + i; + url += (url.indexOf("?") <= 0) ? "?" : "&"; - if (provider.maxWidth != null && provider.params["maxwidth"] == null) - provider.params["maxwidth"] = provider.maxWidth; + if (provider.maxWidth !== null && provider.params.maxwidth === null) provider.params.maxwidth = provider.maxWidth; - if (provider.maxHeight != null && provider.params["maxheight"] == null) - provider.params["maxheight"] = provider.maxHeight; + if (provider.maxHeight !== null && provider.params.maxheight === null) provider.params.maxheight = provider.maxHeight; for (i in provider.params) { // We don't want them to jack everything up by changing the callback parameter - if (i == provider.callbackparameter) - continue; + if (i == provider.callbackparameter) continue; // allows the options to be set to null, don't send null values to the server as parameters - if (provider.params[i] != null) - qs += "&" + escape(i) + "=" + provider.params[i]; + if (provider.params[i] !== null) qs += "&" + escape(i) + "=" + provider.params[i]; } - url += "format="+provider.format+"&url=" + escape(externalUrl) + - qs +"&" + provider.callbackparameter + "=?"; + url += "format=" + provider.format + "&url=" + escape(externalUrl) + qs + "&" + provider.callbackparameter + "=?"; return url; - }; - - function success(oembedData,externalUrl,container){ - xoops_smallworld('#jqoembeddata').data(externalUrl,oembedData.code); - settings.beforeEmbed.call(container, oembedData); - settings.onEmbed.call(container, oembedData); - settings.afterEmbed.call(container, oembedData); } + function success(oembedData, externalUrl, container) { + xoops_smallworld('#jqoembeddata').data(externalUrl, oembedData.code); + settings.beforeEmbed.call(container, oembedData); + settings.onEmbed.call(container, oembedData); + settings.afterEmbed.call(container, oembedData); + } + function embedCode(container, externalUrl, embedProvider) { - if(xoops_smallworld('#jqoembeddata').data(externalUrl)!=undefined){ - var oembedData = {code: xoops_smallworld('#jqoembeddata').data(externalUrl)}; - success(oembedData, externalUrl,container); - }else if(embedProvider.yql){ - var urlq = embedProvider.yql.url?embedProvider.yql.url(externalUrl):externalUrl; - var from = embedProvider.yql.from||'htmlstring' - var pathq = /html/.test(from)?'xpath':'itemPath'; - var query = 'SELECT * FROM '+ from+ ' WHERE url="' +urlq+ '"' - + "and " +pathq+ "='" +(embedProvider.yql.xpath||'/')+ "'"; - ajaxopts = xoops_smallworld.extend({ - url:"http://query.yahooapis.com/v1/public/yql", - dataType: 'jsonp', - data: { - q: query, - format: "json", - env: 'store://datatables.org/alltableswithkeys', - callback: "?" - }, - success: function (data) { - var result = embedProvider.yql.datareturn?embedProvider.yql.datareturn(data.query.results): data.query.results.result; - var oembedData = xoops_smallworld.extend({}, result); - oembedData.code = result; - success(oembedData, externalUrl,container); - }, - error: settings.onError.call(container, externalUrl, embedProvider) - }, settings.ajaxOptions || { } ); - - xoops_smallworld.ajax( ajaxopts ); - }else if(embedProvider.templateRegex){ - if(embedProvider.apiendpoint){ - ajaxopts = xoops_smallworld.extend({ - url:externalUrl.replace(embedProvider.templateRegex,embedProvider.apiendpoint), - dataType: 'jsonp', - success: function (data) { - var oembedData = xoops_smallworld.extend({}, data); - oembedData.code = embedProvider.templateData(data); - success(oembedData, externalUrl,container); - }, - error: settings.onError.call(container, externalUrl, embedProvider) - }, settings.ajaxOptions || { } ); - - xoops_smallworld.ajax( ajaxopts ); - }else if(embedProvider.embedtag){ - var flashvars = embedProvider.embedtag.flashvars || ''; - var tag = embedProvider.embedtag.tag || 'embed'; - - var code = xoops_smallworld('<'+tag+'/>') - .attr('src',externalUrl.replace(embedProvider.templateRegex,embedProvider.embedtag.src)) - .attr('width',embedProvider.embedtag.width) - .attr('height',embedProvider.embedtag.height) - .attr('allowfullscreen',embedProvider.embedtag.allowfullscreen || 'true') - .attr('allowscriptaccess',embedProvider.embedtag.allowfullscreen || 'always'); - if(tag=='embed') - code - .attr('type',embedProvider.embedtag.type || "application/x-shockwave-flash") - .attr('flashvars',externalUrl.replace(embedProvider.templateRegex,flashvars)); - if(tag=='iframe') - code - .attr('scrolling',embedProvider.embedtag.scrolling || "no") - .attr('frameborder',embedProvider.embedtag.frameborder || "0") - ; - - - var oembedData = {code: code}; - success(oembedData, externalUrl,container); - }else{ - var oembedData = {code: externalUrl.replace(embedProvider.templateRegex,embedProvider.template)}; - success(oembedData, externalUrl,container); + if (xoops_smallworld('#jqoembeddata').data(externalUrl) !== undefined) { + var oembedData = { + code: xoops_smallworld('#jqoembeddata').data(externalUrl) + }; + success(oembedData, externalUrl, container); } - - }else{ + else if (embedProvider.yql) { + var urlq = embedProvider.yql.url ? embedProvider.yql.url(externalUrl) : externalUrl; + var from = embedProvider.yql.from || 'htmlstring'; + var pathq = /html/.test(from) ? 'xpath' : 'itemPath'; + var query = 'SELECT * FROM ' + from + ' WHERE url="' + urlq + '"' + "and " + pathq + "='" + (embedProvider.yql.xpath || '/') + "'"; + ajaxopts = xoops_smallworld.extend({ + url: "http://query.yahooapis.com/v1/public/yql", + dataType: 'jsonp', + data: { + q: query, + format: "json", + env: 'store://datatables.org/alltableswithkeys', + callback: "?" + }, + success: function(data) { + var result = embedProvider.yql.datareturn ? embedProvider.yql.datareturn(data.query.results) : data.query.results.result; + var oembedData = xoops_smallworld.extend({}, result); + oembedData.code = result; + success(oembedData, externalUrl, container); + }, + error: settings.onError.call(container, externalUrl, embedProvider) + }, settings.ajaxOptions || {}); - var requestUrl = getRequestUrl(embedProvider, externalUrl), - ajaxopts = xoops_smallworld.extend({ - url: requestUrl, - dataType: 'jsonp', - success: function (data) { - var oembedData = xoops_smallworld.extend({}, data); - switch (oembedData.type) { - case "photo": - oembedData.code = xoops_smallworld.fn.oembed.getPhotoCode(externalUrl, oembedData); - break; - case "video": - case "rich": - oembedData.code = xoops_smallworld.fn.oembed.getRichCode(externalUrl, oembedData); - break; - default: - oembedData.code = xoops_smallworld.fn.oembed.getGenericCode(externalUrl, oembedData); - break; + xoops_smallworld.ajax(ajaxopts); + } + else if (embedProvider.templateRegex) { + if (embedProvider.apiendpoint) { + //Add APIkey if true + if (embedProvider.apikey) embedProvider.apiendpoint = embedProvider.apiendpoint.replace('_APIKEY_', settings.apikeys[embedProvider.name]); + ajaxopts = xoops_smallworld.extend({ + url: externalUrl.replace(embedProvider.templateRegex, embedProvider.apiendpoint), + dataType: 'jsonp', + success: function(data) { + var oembedData = xoops_smallworld.extend({}, data); + oembedData.code = embedProvider.templateData(data); + success(oembedData, externalUrl, container); + }, + error: settings.onError.call(container, externalUrl, embedProvider) + }, settings.ajaxOptions || {}); + + xoops_smallworld.ajax(ajaxopts); } - success(oembedData, externalUrl,container); - }, - error: settings.onError.call(container, externalUrl, embedProvider) - }, settings.ajaxOptions || { } ); - - xoops_smallworld.ajax( ajaxopts ); - } - }; + else if (embedProvider.embedtag) { + var flashvars = embedProvider.embedtag.flashvars || ''; + var tag = embedProvider.embedtag.tag || 'embed'; + var src = externalUrl.replace(embedProvider.templateRegex, embedProvider.embedtag.src); + var params = ""; + if (embedProvider.params) { + params = []; + for (var param in embedProvider.params) { + params.push(param + "=" + embedProvider.params[param]); + } + params = "&" + params.join("&"); + } + src += params; + + var code = xoops_smallworld('<' + tag + '/>').attr('src', src).attr('width', embedProvider.maxWidth || embedProvider.embedtag.width).attr('height', embedProvider.maxHeight || embedProvider.embedtag.height).attr('allowfullscreen', embedProvider.embedtag.allowfullscreen || 'true').attr('allowscriptaccess', embedProvider.embedtag.allowfullscreen || 'always'); + if (tag == 'embed') code.attr('type', embedProvider.embedtag.type || "application/x-shockwave-flash").attr('flashvars', externalUrl.replace(embedProvider.templateRegex, flashvars)); + if (tag == 'iframe') code.attr('scrolling', embedProvider.embedtag.scrolling || "no").attr('frameborder', embedProvider.embedtag.frameborder || "0"); + + + var oembedData = { + code: code + }; + success(oembedData, externalUrl, container); + } + else { + var oembedData = { + code: externalUrl.replace(embedProvider.templateRegex, embedProvider.template) + }; + success(oembedData, externalUrl, container); + } + + } + else { + + var requestUrl = getRequestUrl(embedProvider, externalUrl), + ajaxopts = xoops_smallworld.extend({ + url: requestUrl, + dataType: 'jsonp', + success: function(data) { + var oembedData = xoops_smallworld.extend({}, data); + switch (oembedData.type) { + case "photo": + oembedData.code = xoops_smallworld.fn.oembed.getPhotoCode(externalUrl, oembedData); + break; + case "video": + case "rich": + oembedData.code = xoops_smallworld.fn.oembed.getRichCode(externalUrl, oembedData); + break; + default: + oembedData.code = xoops_smallworld.fn.oembed.getGenericCode(externalUrl, oembedData); + break; + } + success(oembedData, externalUrl, container); + }, + error: settings.onError.call(container, externalUrl, embedProvider) + }, settings.ajaxOptions || {}); + + xoops_smallworld.ajax(ajaxopts); + } + } + function getNormalizedParams(params) { - if (params == null) - return null; + if (params === null) return null; var key, normalizedParams = {}; for (key in params) { - if (key != null) - normalizedParams[key.toLowerCase()] = params[key]; + if (key !== null) normalizedParams[key.toLowerCase()] = params[key]; } return normalizedParams; } function isNullOrEmpty(object) { - if (typeof object == "undefined" || object == null || (xoops_smallworld.isArray(object) && object.length == 0)) - return true; + if (typeof object == "undefined" || object === null || (xoops_smallworld.isArray(object) && object.length === 0)) return true; return false; } /* Public functions */ - xoops_smallworld.fn.oembed.insertCode = function (container, embedMethod, oembedData) { - if (oembedData == null) - return; + xoops_smallworld.fn.oembed.insertCode = function(container, embedMethod, oembedData) { + if (oembedData === null) return; switch (embedMethod) { - case "auto": - if (container.attr("href") != null) { - xoops_smallworld.fn.oembed.insertCode(container, "append", oembedData); - }else { - xoops_smallworld.fn.oembed.insertCode(container, "replace", oembedData); - }; - break; - case "replace": - container.replaceWith(oembedData.code); - break; - case "fill": - container.html(oembedData.code); - break; - case "append": - container.wrap('<div class="oembed-container"></div>'); - var oembedContainer = container.parent(); - xoops_smallworld('<span class="oembedclosehide">↓</span>').insertBefore(container).click(function(){ - var encodedString=encodeURIComponent(xoops_smallworld(this).text()); - xoops_smallworld(this).html((encodedString=='%E2%86%91')?'↓':'↑'); - xoops_smallworld(this).parent().children().last().toggle(); - }); - oembedContainer.append('<br/>'); - oembedContainer.append(oembedData.code); - break; + case "auto": + if (container.attr("href") !== null) { + xoops_smallworld.fn.oembed.insertCode(container, "append", oembedData); + } + else { + xoops_smallworld.fn.oembed.insertCode(container, "replace", oembedData); + } + break; + case "replace": + container.replaceWith(oembedData.code); + break; + case "fill": + container.html(oembedData.code); + break; + case "append": + container.wrap('<div class="oembed-container"></div>'); + var oembedContainer = container.parent(); + xoops_smallworld('<span class="oembedclosehide">↓</span>').insertBefore(container).click(function() { + var encodedString = encodeURIComponent(xoops_smallworld(this).text()); + xoops_smallworld(this).html((encodedString == '%E2%86%91') ? '↓' : '↑'); + xoops_smallworld(this).parent().children().last().toggle(); + }); + oembedContainer.append('<br/>'); + oembedContainer.append(oembedData.code); + break; } }; - xoops_smallworld.fn.oembed.getPhotoCode = function (url, oembedData) { + xoops_smallworld.fn.oembed.getPhotoCode = function(url, oembedData) { var code, alt = oembedData.title ? oembedData.title : ''; alt += oembedData.author_name ? ' - ' + oembedData.author_name : ''; alt += oembedData.provider_name ? ' - ' + oembedData.provider_name : ''; code = '<div><a href="' + url + '" target=\'_blank\'><img src="' + oembedData.url + '" alt="' + alt + '"/></a></div>'; - if (oembedData.html) - code += "<div>" + oembedData.html + "</div>"; + if (oembedData.html) code += "<div>" + oembedData.html + "</div>"; return code; }; - xoops_smallworld.fn.oembed.getRichCode = function (url, oembedData) { + xoops_smallworld.fn.oembed.getRichCode = function(url, oembedData) { var code = oembedData.html; return code; }; - xoops_smallworld.fn.oembed.getGenericCode = function (url, oembedData) { - var title = (oembedData.title != null) ? oembedData.title : url, - code = '<a href="' + url + '">' + title + '</a>'; - if (oembedData.html) - code += "<div>" + oembedData.html + "</div>"; + xoops_smallworld.fn.oembed.getGenericCode = function(url, oembedData) { + var title = (oembedData.title !== null) ? oembedData.title : url, + code = '<a href="' + url + '">' + title + '</a>'; + if (oembedData.html) code += "<div>" + oembedData.html + "</div>"; return code; }; - xoops_smallworld.fn.oembed.isProviderAvailable = function (url) { + xoops_smallworld.fn.oembed.isProviderAvailable = function(url) { var provider = getOEmbedProvider(url); - return (provider != null); + return (provider !== null); }; - xoops_smallworld.fn.oembed.getOEmbedProvider = function (url) { + xoops_smallworld.fn.oembed.getOEmbedProvider = function(url) { for (var i = 0; i < this.providers.length; i++) { - if (this.providers[i].matches(url)) - return this.providers[i]; + if (this.providers[i].matches(url)) return this.providers[i]; } return null; }; - xoops_smallworld.fn.oembed.OEmbedProvider = function (name, type, urlschemesarray, apiendpoint, extraSettings){ + xoops_smallworld.fn.oembed.OEmbedProvider = function(name, type, urlschemesarray, apiendpoint, extraSettings) { this.name = name; this.type = type; // "photo", "video", "link", "rich", null this.urlschemes = getUrlSchemes(urlschemesarray); - this.apiendpoint = apiendpoint ; + this.apiendpoint = apiendpoint; this.maxWidth = 500; this.maxHeight = 400; - - this.fromJSON = function (json) { + + this.fromJSON = function(json) { for (property in json) { - if (property != "urlschemes") - this[property] = json[property]; - else - this[property] = getUrlSchemes(json[property]); + if (property != "urlschemes") this[property] = json[property]; + else this[property] = getUrlSchemes(json[property]); } return true; }; - - if(!isNullOrEmpty(extraSettings))this.fromJSON(extraSettings); - + + if (!isNullOrEmpty(extraSettings)) this.fromJSON(extraSettings); + this.format = this.format || 'json'; - this.callbackparameter = this.callbackparameter || "callback"; - + this.callbackparameter = this.callbackparameter || "callback"; + var i, property, regExp; - this.matches = function (externalUrl) { + this.matches = function(externalUrl) { for (i = 0; i < this.urlschemes.length; i++) { regExp = new RegExp(this.urlschemes[i], "i"); - if (externalUrl.match(regExp) != null) - return true; + if (externalUrl.match(regExp) !== null) return true; } return false; }; function getUrlSchemes(urls) { - if (isNullOrEmpty(urls)) - return ["."]; - if (xoops_smallworld.isArray(urls)) - return urls; + if (isNullOrEmpty(urls)) return ["."]; + if (xoops_smallworld.isArray(urls)) return urls; return urls.split(";"); } }; /* Native & common providers */ xoops_smallworld.fn.oembed.providers = [ - + //Video - new xoops_smallworld.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?"],null, - {templateRegex:/.*v\=([\w-]+)&?.*/ - ,embedtag : {tag: 'iframe', width:'425',height: '349', - src: "http://www.youtube.com/embed/$1", + new xoops_smallworld.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?", "youtu\\.be/[\\w-]+"], null, { + templateRegex: /.*(?:v\=|be\/)([\w\-]+)&?.*/, + embedtag: { + tag: 'iframe', + width: '425', + height: '349', + src: "http://www.youtube.com/embed/$1?wmode=transparent" } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("xtranormal", "video", ["xtranormal\\.com/watch/.+"],null, - {templateRegex:/.*com\/watch\/([\w-]+)\/([\w-]+).*/ - ,embedtag : {tag: 'iframe', width:'320',height: '269', - src: "http://www.xtranormal.com/xtraplayr/$1/$2", + }), new xoops_smallworld.fn.oembed.OEmbedProvider("xtranormal", "video", ["xtranormal\\.com/watch/.+"], null, { + templateRegex: /.*com\/watch\/([\w\-]+)\/([\w\-]+).*/, + embedtag: { + tag: 'iframe', + width: '320', + height: '269', + src: "http://www.xtranormal.com/xtraplayr/$1/$2" } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("gametrailers", "video", ["gametrailers\\.com/video/.+"],null, - {templateRegex:/.*com\/video\/([\w-]+)\/([\w-]+).*/ - ,embedtag : { width:'512',height: '288', - src: "http://media.mtvnservices.com/mgid:moses:video:gametrailers.com:$2", + }), new xoops_smallworld.fn.oembed.OEmbedProvider("gametrailers", "video", ["gametrailers\\.com/video/.+"], null, { + templateRegex: /.*com\/video\/([\w\-]+)\/([\w\-]+).*/, + embedtag: { + width: '512', + height: '288', + src: "http://media.mtvnservices.com/mgid:moses:video:gametrailers.com:$2" } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("funnyordie", "video", ["funnyordie\\.com/videos/.+"],null, - {templateRegex:/.*videos\/([^\/]+)\/([^\/]+)?/ - , embedtag : {width:512,height: 328,flashvars : "key=$1", - src: "http://player.ordienetworks.com/flash/fodplayer.swf"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("justintv", "video", ["justin\\.tv/.+"],null, - {templateRegex:/.*justin\.tv\/(\w+).*/ - , template : '<object type="application/x-shockwave-flash" height="295" width="353" id="live_embed_player_flash" data="http://www.justin.tv/widgets/live_embed_player.swf?channel=$1" bgcolor="#000000">' - +'<param name="allowFullScreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="allownetworking" value="all" /><param name="wmode" value="opaque">' - +'<param name="movie" value="http://www.justin.tv/widgets/live_embed_player.swf" /><param name="flashvars" value="hostname=www.justin.tv&channel=$1&auto_play=false&start_volume=25" /></object>' - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("colledgehumour", "video", ["collegehumor\\.com/video/.+"],null, - {templateRegex:/.*video\/([^\/]+).*/ - , embedtag : {width:600,height: 338, - src: "http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=$1&use_node_id=true&fullscreen=1"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("metacafe", "video", ["metacafe\\.com/watch/.+"],null, - {templateRegex:/.*watch\/(\d+)\/(\w+)\/.*/ - , embedtag : {width:400,height: 345, - src: "http://www.metacafe.com/fplayer/$1/$2.swf"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("bambuser", "video", ["bambuser\\.com\/channel\/.*\/broadcast\/.*"],null, - {templateRegex:/.*bambuser\.com\/channel\/.*\/broadcast\/(\w+).*/ - , embedtag : {width:512,height: 339, - src: "http://static.bambuser.com/r/player.swf?vid=$1"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("twitvid", "video", ["twitvid\\.com/.+"],null, - {templateRegex:/.*twitvid\.com\/(\w+).*/ - , embedtag : {tag:'iframe',width:480,height: 360, - src: "http://www.twitvid.com/embed.php?guid=$1&autoplay=0"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("embedr", "video", ["embedr\\.com/playlist/.+"],null, - {templateRegex:/.*playlist\/([^\/]+).*/ - , embedtag : {width:425,height: 520, - src: "http://embedr.com/swf/slider/$1/425/520/default/false/std"} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("blip", "video", ["blip\\.tv/.+"], "http://blip.tv/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("hulu", "video", ["hulu\\.com/watch/.*"], "http://www.hulu.com/api/oembed.json"), - new xoops_smallworld.fn.oembed.OEmbedProvider("ustream", "video", ["ustream\\.tv/recorded/.*"], null, - {yql:{xpath:"json.html", from:'json' - , url: function(externalurl){return 'http://www.ustream.tv/oembed?format=json&url='+externalurl} - , datareturn:function(results){return results.html || ''} + }), new xoops_smallworld.fn.oembed.OEmbedProvider("funnyordie", "video", ["funnyordie\\.com/videos/.+"], null, { + templateRegex: /.*videos\/([^\/]+)\/([^\/]+)?/, + embedtag: { + width: 512, + height: 328, + flashvars: "key=$1", + src: "http://player.ordienetworks.com/flash/fodplayer.swf" } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("vimeo", "video", ["http:\/\/www\.vimeo\.com\/groups\/.*\/videos\/.*", "http:\/\/www\.vimeo\.com\/.*", "http:\/\/vimeo\.com\/groups\/.*\/videos\/.*", "http:\/\/vimeo\.com\/.*"], "http://vimeo.com/api/oembed.json"), - new xoops_smallworld.fn.oembed.OEmbedProvider("dailymotion", "video", ["dailymotion\\.com/.+"],'http://www.dailymotion.com/services/oembed'), - new xoops_smallworld.fn.oembed.OEmbedProvider("5min", "video", ["www\\.5min\\.com/.+"], null, - {yql:{xpath:"//oembed/html", from:'xml' - , url: function(externalurl){return 'http://api.5min.com/oembed.xml?url='+externalurl} - , datareturn:function(results){return results.html.replace(/.*\[CDATA\[(.*)\]\]>$/,'$1') || ''} - } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("viddler", "video", ["viddler\\.com/.+"], "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20html%20where%20url%3D%22http%3A%2F%2Flab.viddler.com%2Fservices%2Foembed%2f%3Furl%3D$1%22%20and%20xpath%3D%22%2F%2F*%2Fobject%22&format=xml&callback=?", - {templateRegex:/(.*)/, - templateData : function(data){if(!data.results[0])return false;return data.results[0];}, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("National Film Board of Canada", "video", ["nfb\\.ca/film/.+"], "http://www.nfb.ca/remote/services/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("qik", "video", ["qik\\.com/\\w+"], "http://qik.com/api/oembed.json"), - new xoops_smallworld.fn.oembed.OEmbedProvider("revision3", "video", ["revision3\\.com"], "http://revision3.com/api/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("dotsub", "video", ["dotsub\\.com/view/.+"], "http://dotsub.com/services/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("clickthrough", "video", ["clikthrough\\.com/theater/video/\\d+"], "http://clikthrough.com/services/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("Kinomap", "video", ["kinomap\\.com/.+"], "http://www.kinomap.com/oembed"), - + }), new xoops_smallworld.fn.oembed.OEmbedProvider("justintv", "video", ["justin\\.tv/.+"], null, { + templateRegex: /.*justin\.tv\/(\w+).*/, + template: '<object type="application/x-shockwave-flash" height="295" width="353" id="live_embed_player_flash" data="http://www.justin.tv/widgets/live_embed_player.swf?channel=$1" bgcolor="#000000">' + '<param name="allowFullScreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="allownetworking" value="all" /><param name="wmode" value="opaque">' + '<param name="movie" value="http://www.justin.tv/widgets/live_embed_player.swf" /><param name="flashvars" value="hostname=www.justin.tv&channel=$1&auto_play=false&start_volume=25" /></object>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("colledgehumour", "video", ["collegehumor\\.com/video/.+"], null, { + templateRegex: /.*video\/([^\/]+).*/, + embedtag: { + width: 600, + height: 338, + src: "http://www.collegehumor.com/moogaloop/moogaloop.swf?clip_id=$1&use_node_id=true&fullscreen=1" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("metacafe", "video", ["metacafe\\.com/watch/.+"], null, { + templateRegex: /.*watch\/(\d+)\/(\w+)\/.*/, + embedtag: { + width: 400, + height: 345, + src: "http://www.metacafe.com/fplayer/$1/$2.swf" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("bambuser", "video", ["bambuser\\.com\/channel\/.*\/broadcast\/.*"], null, { + templateRegex: /.*bambuser\.com\/channel\/.*\/broadcast\/(\w+).*/, + embedtag: { + width: 512, + height: 339, + src: "http://static.bambuser.com/r/player.swf?vid=$1" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("twitvid", "video", ["twitvid\\.com/.+"], null, { + templateRegex: /.*twitvid\.com\/(\w+).*/, + embedtag: { + tag: 'iframe', + width: 480, + height: 360, + src: "http://www.twitvid.com/embed.php?guid=$1&autoplay=0" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("embedr", "video", ["embedr\\.com/playlist/.+"], null, { + templateRegex: /.*playlist\/([^\/]+).*/, + embedtag: { + width: 425, + height: 520, + src: "http://embedr.com/swf/slider/$1/425/520/default/false/std" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("blip", "video", ["blip\\.tv/.+"], "http://blip.tv/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("hulu", "video", ["hulu\\.com/watch/.*"], "http://www.hulu.com/api/oembed.json"), new xoops_smallworld.fn.oembed.OEmbedProvider("ustream", "video", ["ustream\\.tv/recorded/.*"], null, { + yql: { + xpath: "json.html", + from: 'json', + url: function(externalurl) { + return 'http://www.ustream.tv/oembed?format=json&url=' + externalurl; + }, + datareturn: function(results) { + return results.html || ''; + } + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("vimeo", "video", ["http:\/\/www\\.vimeo\\.com\/groups\/.*\/videos\/.*", "http:\/\/www\\.vimeo\\.com\/.*", "http:\/\/vimeo\\.com\/groups\/.*\/videos\/.*", "http:\/\/vimeo\\.com\/.*"], "http://vimeo\\.com/api/oembed.json"), new xoops_smallworld.fn.oembed.OEmbedProvider("dailymotion", "video", ["dailymotion\\.com/.+"], 'http://www.dailymotion.com/services/oembed'), new xoops_smallworld.fn.oembed.OEmbedProvider("5min", "video", ["www\\.5min\\.com/.+"], null, { + yql: { + xpath: "//oembed/html", + from: 'xml', + url: function(externalurl) { + return 'http://api.5min.com/oembed.xml?url=' + externalurl; + }, + datareturn: function(results) { + return results.html.replace(/.*\[CDATA\[(.*)\]\]>$/, '$1') || ''; + } + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("viddler", "video", ["viddler\\.com/.+"], "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20html%20where%20url%3D%22http%3A%2F%2Flab.viddler.com%2Fservices%2Foembed%2f%3Furl%3D$1%22%20and%20xpath%3D%22%2F%2F*%2Fobject%22&format=xml&callback=?", { + templateRegex: /(.*)/, + templateData: function(data) { + if (!data.results[0]) return false; + return data.results[0]; + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("National Film Board of Canada", "video", ["nfb\\.ca/film/.+"], "http://www.nfb.ca/remote/services/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("qik", "video", ["qik\\.com/\\w+"], "http://qik.com/api/oembed.json"), new xoops_smallworld.fn.oembed.OEmbedProvider("revision3", "video", ["revision3\\.com"], "http://revision3.com/api/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("dotsub", "video", ["dotsub\\.com/view/.+"], "http://dotsub.com/services/oembed"), new xoops_smallworld.fn.oembed.OEmbedProvider("clickthrough", "video", ["clikthrough\\.com/theater/video/\\d+"], "http://clikthrough.com/services/oembed"), new xoops_smallworld.fn.oembed.OEmbedProvider("Kinomap", "video", ["kinomap\\.com/.+"], "http://www.kinomap.com/oembed"), + //Audio - new xoops_smallworld.fn.oembed.OEmbedProvider("Huffduffer", "rich", ["huffduffer.com/[-.\\w@]+/\\d+"], "http://huffduffer.com/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("rdio.com", "rich", ["rd.io/.+","rdio.com"], "http://www.rdio.com/api/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("Soundcloud", "rich", ["soundcloud.com/.+"], "http://soundcloud.com/oembed",{format:'js'}), - new xoops_smallworld.fn.oembed.OEmbedProvider("bandcamp", "rich", ["bandcamp\\.com/album/.+"], null, - {yql:{xpath:"//meta[contains(@content, \\'EmbeddedPlayer\\')]", from:'html' - , datareturn:function(results){ - return results.meta ?'<iframe width="400" height="100" src="'+results.meta.content+'" allowtransparency="true" frameborder="0"></iframe>':false; - } - } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("podomatic", "audio", [".+\\.podomatic\\.com/"],null, - {templateRegex:/http:\/\/([^\/]+).*/ - , embedtag : {width:480,height: 360, - src: "http://$1/swf/joe_multiplayer_v09.swf", - flashvars : "minicast=false&jsonLocation=http%3A%2F%2F$1%2Fembed%2Fmulti%2Fcomixclaptrap?%26color%3D43bee7%26autoPlay%3Dfalse%26width%3D480%26height%3D360", - } - }), + new xoops_smallworld.fn.oembed.OEmbedProvider("Huffduffer", "rich", ["huffduffer.com/[-.\\w@]+/\\d+"], "http://huffduffer.com/oembed"), new xoops_smallworld.fn.oembed.OEmbedProvider("rdio.com", "rich", ["rd.io/.+", "rdio.com"], "http://www.rdio.com/api/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("Soundcloud", "rich", ["soundcloud.com/.+"], "http://soundcloud.com/oembed", { + format: 'js' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("bandcamp", "rich", ["bandcamp\\.com/album/.+"], null, { + yql: { + xpath: "//meta[contains(@content, \\'EmbeddedPlayer\\')]", + from: 'html', + datareturn: function(results) { + // return results.meta ? '<iframe width="400" height="100" src="' + results.meta.content + '" allowtransparency="true" frameborder="0"></iframe>' : false; + return results.meta ? '<embed type="application/x-shockwave-flash" allowfullscreen="true" menu="false" src="' + results.meta.content + '" allowtransparency="true" width="400" height="100" frameborder="0"></embed>' : false; + } + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("podomatic", "audio", [".+\\.podomatic\\.com/"], null, { + templateRegex: /http:\/\/([^\/]+).*/, + embedtag: { + width: 480, + height: 360, + src: "http://ecdn0.hark.com/swfs/player_fb.swf?pid=$1", + flashvars: "minicast=false&jsonLocation=http%3A%2F%2F$1%2Fembed%2Fmulti%2Fcomixclaptrap?%26color%3D43bee7%26autoPlay%3Dfalse%26width%3D480%26height%3D360" + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("hark", "audio", ["hark\\.com/clips/.+"], null, { + templateRegex: /.*clips\/([^\-]+).*/, + embedtag: { + width: 300, + height: 28, + src: "http://ecdn0.hark.com/swfs/player_fb.swf?pid=$1" + } + }), + + //Photo + new xoops_smallworld.fn.oembed.OEmbedProvider("flickr", "photo", ["flickr\\.com/photos/[-.\\w@]+/\\d+/?"], "http://flickr.com/services/oembed", { + callbackparameter: 'jsoncallback' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("photobucket", "photo", ["photobucket\\.com/(albums|groups)/.+"], "http://photobucket.com/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("instagram", "photo", ["instagr\\.?am(\\.com)?/.+"], "http://api.instagram.com/oembed"), new xoops_smallworld.fn.oembed.OEmbedProvider("yfrog", "photo", ["yfrog\\.(com|ru|com\\.tr|it|fr|co\\.il|co\\.uk|com\\.pl|pl|eu|us)/.+"], null, { + templateRegex: /(.*)/, + template: '<a href="$1"><img src="$1:small" alt="on yfrog" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("SmugMug", "photo", ["smugmug.com/[-.\\w@]+/.+"], "http://api.smugmug.com/services/oembed/"), new xoops_smallworld.fn.oembed.OEmbedProvider("twitpic", "photo", ["twitpic.com/.+"], "http://api.twitpic.com/2/media/show.jsonp?callback=?&id=$1", { + templateRegex: /.*\/([^\/]+).*/, + templateData: function(data) { + if (!data.user) return false; + return '<div id="content"><div id="view-photo-user"><div id="photo-user-avatar"><img src="' + data.user.avatar_url + '"></div><div id="photo-info"><h3><a id="photo_username" class="nav-link" href="http://twitter.com/#!/' + data.user.username + '">@' + data.user.username + '</a></h3><p><span id="photo-info-name">' + data.user.name + '</span> ' + data.user.timestamp + '</p></div></div><div id="photo-wrap" style="margin: auto;width:600px;height:450px;">' + '<img class="photo" id="photo-display" src="http://s3.amazonaws.com/twitpic/photos/large/' + data.id + '.jpg?AWSAccessKeyId=AKIAJF3XCCKACR3QDMOA&Expires=1310509343&Signature=gsukngCVqUE9qb%2FGHvyBqlQTjOo%3D" alt="' + data.message + '"></div><div id="view-photo-caption">' + data.message + '</div></div>'; + } + }), new xoops_smallworld.fn.oembed.OEmbedProvider("500px", "photo", ["500px\\.com/photo/.+"], null, { + templateRegex: /.*photo\/([^\/]+).*/, + template: '<a href="http://500px.com/photo/$1"><img src="http://photos.500px.com/$1/3" alt="on 500px.com" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("23hq", "photo", ["23hq.com/[-.\\w@]+/photo/.+"], null, { + templateRegex: /(.*)/, + template: '<a href="$1"><img src="$1/thumb" alt="on img.ly" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("img.ly", "photo", ["img\\.ly/.+"], null, { + templateRegex: /.*com\/([^\/]+).*/, + template: '<a href="http://img.ly/$1"><img src="http://img.ly/show/thumb/$1" alt="on img.ly" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("twitgoo.com", "photo", ["twitgoo\\.com/.+"], null, { + templateRegex: /.*com\/([^\/]+).*/, + template: '<a href="http://twitgoo.com/$1"><img src="http://twitgoo.com/show/thumb/$1" alt="on twitgoo.com" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("imgur.com", "photo", ["imgur\\.com/gallery/.+"], null, { + templateRegex: /.*gallery\/([^\/]+).*/, + template: '<a href="http://imgur.com/gallery/$1"><img src="http://imgur.com/$1l.jpg" alt="on imgur.com" class="jqoaImg"></a>' + }), new xoops_smallworld.fn.oembed.OEmbedProvider("visual.ly", "rich", ["visual\\.ly/.+"], null, { + yql: { + xpath: "//a[@id=\\'gc_article_graphic_image\\']/img", + from: 'htmlstring' + } + }), + + //Rich + new xoops_smallworld.fn.oembed.OEmbedProvider("meetup", "rich", ["meetup\\.(com|ps)/.+"], "http://api.meetup.com/oembed"), new xoops_smallworld.fn.oembed.OEmbedProvider("ebay", "rich", ["ebay\\.*"], null, { + templateRegex: /.*\/([^\/]+)\/(\d{10,13}).*/, + embedtag: { + width: 355, + height: 300, + src: "http://togo.ebay.com/togo/togo.swf?2008013100", + flashvars: "base=http://togo.ebay.com/togo/&lang=en-us&mode=normal&itemid=$2&query=$1" + } + }), - //Photo - new xoops_smallworld.fn.oembed.OEmbedProvider("flickr", "photo", ["flickr\\.com/photos/[-.\\w@]+/\\d+/?"], "http://flickr.com/services/oembed",{callbackparameter:'jsoncallback'}), - new xoops_smallworld.fn.oembed.OEmbedProvider("photobucket", "photo", ["photobucket\\.com/(albums|groups)/.+"], "http://photobucket.com/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("instagram", "photo", ["instagr\\.?am(\\.com)?/.+"], "http://api.instagram.com/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("yfrog", "photo", ["yfrog\\.(com|ru|com\\.tr|it|fr|co\\.il|co\\.uk|com\\.pl|pl|eu|us)/.+"], "http://www.yfrog.com/api/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("23hq", "photo", ["23hq.com/[-.\\w@]/photo/.+"], "http://www.23hq.com/23/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("SmugMug", "photo", ["smugmug.com/[-.\\w@]/.+"], "http://api.smugmug.com/services/oembed/"), - new xoops_smallworld.fn.oembed.OEmbedProvider("twitpic", "photo", ["twitpic.com/.+"], "http://api.twitpic.com/2/media/show.jsonp?callback=?&id=$1", - { templateRegex:/.*\/([^\/]+).*/, - templateData : function(data){if(!data.user)return false; - return '<div id="content"><div id="view-photo-user"><div id="photo-user-avatar"><img src="'+data.user.avatar_url+'"></div><div id="photo-info"><h3><a id="photo_username" class="nav-link" href="http://twitter.com/#!/'+data.user.username+'">@'+data.user.username+'</a></h3><p><span id="photo-info-name">'+data.user.name+'</span> '+data.user.timestamp+'</p></div></div><div id="photo-wrap" style="margin: auto;width:600px;height:450px;">' - +'<img class="photo" id="photo-display" src="http://s3.amazonaws.com/twitpic/photos/large/'+data.id+'.jpg?AWSAccessKeyId=AKIAJF3XCCKACR3QDMOA&Expires=1310509343&Signature=gsukngCVqUE9qb%2FGHvyBqlQTjOo%3D" alt="'+data.message+'"></div><div id="view-photo-caption">'+data.message+'</div></div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("500px", "photo", ["500px\\.com/photo/.+"],null, - {templateRegex:/.*photo\/([^\/]+).*/ - , template : '<a href="http://500px.com/photo/$1"><img src="http://photos.500px.com/$1/3" width="280" height="280" alt="on 500px.com" border="0" style="margin: 0 0 5px 0;"></a>' - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("img.ly", "photo", ["img\\.ly/.+"],null, - {templateRegex:/.*com\/([^\/]+).*/ - , template : '<a href="http://img.ly/$1"><img src="http://img.ly/show/thumb/$1" alt="on img.ly" border="0" style="margin: 0 0 5px 0;"></a>' - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("imgur.com", "photo", ["imgur\\.com/gallery/.+"],null, - {templateRegex:/.*gallery\/([^\/]+).*/ - , template : '<a href="http://imgur.com/gallery/$1"><img src="http://imgur.com/$1l.jpg" alt="on imgur.com" border="0" style="margin: 0 0 5px 0;"></a>' - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("visual.ly", "rich", ["visual\\.ly/.+"], null, - {yql:{xpath:"//a[@id=\\'gc_article_graphic_image\\']/img", from:'htmlstring'} - }), - - //Rich - new xoops_smallworld.fn.oembed.OEmbedProvider("meetup", "rich", ["meetup\\.(com|ps)/.+"], "http://api.meetup.com/oembed"), - new xoops_smallworld.fn.oembed.OEmbedProvider("ebay", "rich", ["ebay\\.*"],null, - {templateRegex:/.*\/([^\/]+)\/(\d{10,13}).*/, - embedtag : {width:355,height: 300, - src: "http://togo.ebay.com/togo/togo.swf?2008013100", - flashvars : "base=http://togo.ebay.com/togo/&lang=en-us&mode=normal&itemid=$2&query=$1", - } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("eventful_venue", "rich", ["eventful.com/.*/venues/.*"],null, - {templateRegex:/.*venues\/([^\/]+)\/([^\/]+).*/ - , template : '<object type = "application/x-shockwave-flash" allowScriptAccess = "always" allowNetworking = "all" width = "450" height ="407" data = "http://static.eventful.com/store/flash/widgets/eventWidget.swf">' - +'<param name ="flashVars" value="&id=$2&interfaceFolder=eventView&theme=0&numberPerPage=5&displayTitle=1&location=0&venue=0&eventTitle=1&date=1&time=1&peopleCount=1&countDownClock=0&title=Event at $1">' - +'<param name="movie" value="http://static.eventful.com/store/flash/widgets/eventWidget.swf" /><param name="wmode" value="transparent" /></object>' - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("tumblr", "rich", ["tumblr.com/.+"], "http://$1.tumblr.com/api/read/json?callback=?&id=$2", - {templateRegex:/.*\/\/([\w]+).*\/post\/([^\/]+).*/, - templateData : function(data){if(!data.posts)return false; - return '<div id="content"><h3><a class="nav-link" href="'+data.posts[0]['url-with-slug']+'">'+data.posts[0]['regular-title']+'</a></h3>'+data.posts[0]['regular-body']+'</div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("wikipedia", "rich", ["wikipedia.org/wiki/.+"], "http://$1.wikipedia.org/w/api.php?action=parse&page=$2&format=json§ion=0&callback=?",{ - templateRegex:/.*\/\/([\w]+).*\/wiki\/([^\/]+).*/, - templateData : function(data){if(!data.parse)return false; - var text = data.parse['text']['*'].replace('href="/wiki','href="http://en.wikipedia.org/wiki'); - return '<div id="content"><h3><a class="nav-link" href="http://en.wikipedia.org/wiki/'+data.parse['displaytitle']+'">'+data.parse['displaytitle']+'</a></h3>'+text+'</div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("imdb", "rich", ["imdb.com/title/.+"], "http://www.imdbapi.com/?i=$1&callback=?", - {templateRegex:/.*\/title\/([^\/]+).*/, - templateData : function(data){if(!data.Title)return false; - return '<div id="content"><h3><a class="nav-link" href="http://imdb.com/title/'+data.ID+'/">'+data.Title+'</a> ('+data.Year+')</h3><p>Starring: '+data.Actors+'</p><div id="photo-wrap" style="margin: auto;width:600px;height:450px;"><img class="photo" id="photo-display" src="'+data.Poster+'" alt="'+data.Title+'"></div> <div id="view-photo-caption">'+data.Plot+'</div></div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("livejournal", "rich", ["livejournal.com/"], "http://ljpic.seacrow.com/json/$2$4?jsonp=?" - ,{templateRegex:/(http:\/\/(((?!users).)+)\.livejournal\.com|.*users\.livejournal\.com\/([^\/]+)).*/, - templateData : function(data){if(!data.username)return false; - return '<div id="content"><img src="'+data.image+'" align="left" style="margin-right: 1em;" /><span class="ljuser"><a href="http://'+data.username+'.livejournal.com/profile"><img src="http://www.livejournal.com/img/userinfo.gif" alt="[info]" width="17" height="17" /></a><a href="http://'+data.username+'.livejournal.com/">'+data.username+'</a></span><br />'+data.name+'</div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("circuitbee", "rich", ["circuitbee\\.com/circuit/view/.+"],null, - {templateRegex:/.*circuit\/view\/(\d+).*/ - ,embedtag : {tag: 'iframe', width:'500',height: '350', - src: "http://c.circuitbee.com/build/r/schematic-embed.html?id=$1", + new xoops_smallworld.fn.oembed.OEmbedProvider("eventful_venue", "rich", ["eventful.com/.*/venues/.*"], null, { + templateRegex: /.*venues\/([^\/]+)\/([^\/]+).*/, + template: '<object type = "application/x-shockwave-flash" allowScriptAccess = "always" allowNetworking = "all" width = "450" height ="407" data = "http://static.eventful.com/store/flash/widgets/eventWidget.swf">' + '<param name ="flashVars" value="&id=$2&interfaceFolder=eventView&theme=0&numberPerPage=5&displayTitle=1&location=0&venue=0&eventTitle=1&date=1&time=1&peopleCount=1&countDownClock=0&title=Event at $1">' + '<param name="movie" value="http://static.eventful.com/store/flash/widgets/eventWidget.swf" /><param name="wmode" value="transparent" /></object>' + }), + + new xoops_smallworld.fn.oembed.OEmbedProvider("tumblr", "rich", ["tumblr.com/.+"], "http://$1.tumblr.com/api/read/json?callback=?&id=$2", { + templateRegex: /.*\/\/([\w]+).*\/post\/([^\/]+).*/, + templateData: function(data) { + if (!data.posts) return false; + return '<div id="content"><h3><a class="nav-link" href="' + data.posts[0]['url-with-slug'] + '">' + data.posts[0]['regular-title'] + '</a></h3>' + data.posts[0]['regular-body'] + '</div>'; } - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("pastebin", "rich", ["pastebin\\.com/[\\S]{8}"],null, - {templateRegex:/.*\/(\S{8}).*/ - ,embedtag : {tag: 'iframe', width:'100%',height: 'auto', - src: "http://pastebin.com/embed_iframe.php?i=$1", + }), + + new xoops_smallworld.fn.oembed.OEmbedProvider("wikipedia", "rich", ["wikipedia.org/wiki/.+"], "http://$1.wikipedia.org/w/api.php?action=parse&page=$2&format=json§ion=0&callback=?", { + templateRegex: /.*\/\/([\w]+).*\/wiki\/([^\/]+).*/, + templateData: function(data) { + if (!data.parse) return false; + var text = data.parse.text['*'].replace('href="/wiki', 'href="http://en.wikipedia.org/wiki'); + return '<div id="content"><h3><a class="nav-link" href="http://en.wikipedia.org/wiki/' + data.parse.displaytitle + '">' + data.parse.displaytitle + '</a></h3>' + text + '</div>'; } - - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("pastie", "rich", ["pastie\\.org/pastes/.+"],null, - {yql:{xpath:'//pre[@class="textmate-source"]'} - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("github", "rich", ["github.com/[-.\\w@]+/[-.\\w@]+"], "https://api.github.com/repos/$1/$2?callback=?" - ,{templateRegex:/.*\/([^\/]+)\/([^\/]+).*/, - templateData : function(data){ if(!data.data.html_url)return false; - return '<div class="githubrepos"><ul class="repo-stats"><li>'+data.data.language+'</li><li class="watchers"><a title="Watchers" href="'+data.data.html_url+'/watchers">'+data.data.watchers+'</a></li>' - +'<li class="forks"><a title="Forks" href="'+data.data.html_url+'/network">'+data.data.forks+'</a></li></ul><h3><a href="'+data.data.html_url+'">'+data.data.name+'</a></h3><div class="body"><p class="description">'+data.data.description+'</p>' - +'<p class="updated-at">Last updated: '+data.data.pushed_at+'</p></div></div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("myspace", "rich", ["myspace.com/[-.\\w@]+"], "http://api.myspace.com/opensearch/people?searchTerms=$1&callback=?&searchBy=displayname&count=1" - ,{templateRegex:/.*\/([^\/]+).*/, - templateData : function(data){ if(!data.entries)return false; - return '<div class="myspace1"><div class="myspace2"><a href="http://www.myspace.com/" class="MSIcon">Myspace </a> <a href="'+data.entries[0].profileUrl+'">'+data.entries[0].displayName+'</a></div><div class="myspaceBody"><div><img src="'+data.entries[0].thumbnailUrl+'" align="left"></div><div>Location <strong>'+data.entries[0].location+'</strong><br/>Type: <strong>'+data.entries[0].msUserType+'</strong><br/></div></div></div>'; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("facebook", "rich", ["facebook.com/(people/[^\\/]+/\\d+|[^\\/]+$)"], "https://graph.facebook.com/$2$3/?callback=?" - ,{templateRegex:/.*facebook.com\/(people\/[^\/]+\/(\d+).*|([^\/]+$))/, - templateData : function(data){ if(!data.id)return false; - var out = '<div class="facebook1"><div class="facebook2"><a href="http://www.facebook.com/">facebook</a> <a href="'+data.link+'">'+data.name+'</a></div><div class="facebookBody"><div>'; - if(data.picture) out += '<img src="'+data.picture+'" align="left"></div><div>'; - if(data.category) out += 'Category <strong>'+data.category+'</strong><br/>'; - if(data.website) out += 'Website <strong>'+data.website+'</strong><br/>'; - if(data.gender) out += 'Gender <strong>'+data.gender+'</strong><br/>'; - out += '</div></div></div>'; - return out; - }, - }), - new xoops_smallworld.fn.oembed.OEmbedProvider("stackoverflow", "rich", ["stackoverflow.com/questions/[\\d]+"], "http://api.stackoverflow.com/1.1/questions/$1?body=true&jsonp=?" - ,{templateRegex:/.*questions\/([\d]+).*/, - templateData : function(data){ - if(!data.questions)return false; - var q = data.questions[0]; - var body = $(q.body).text(); - var out = '<div class="stoqembed"><div class="statscontainer"><div class="statsarrow"></div><div class="stats"><div class="vote"><div class="votes">' - +'<span class="vote-count-post"><strong>'+ (q.up_vote_count - q.down_vote_count)+ '</strong></span><div class="viewcount">vote(s)</div></div>' - +'</div><div class="status"><strong>'+q.answer_count+'</strong>answer</div></div><div class="views">'+q.view_count+' view(s)</div></div>' - +'<div class="summary"><h3><a class="question-hyperlink" href="http://stackoverflow.com/questions/'+q.question_id+'/">'+q.title+'</a></h3>' - +'<div class="excerpt">'+ body.substring(0,100)+'...</div><div class="tags">'; - for(i in q.tags) out += '<a title="" class="post-tag" href="http://stackoverflow.com/questions/tagged/'+q.tags[i]+'">'+q.tags[i]+'</a>' - out += '</div><div class="fr"><div class="user-info"><div class="user-gravatar32"><a href="http://stackoverflow.com/users/'+q.owner.user_id+'/'+q.owner.display_name+'">' - +'<img width="32" height="32" alt="" src="http://www.gravatar.com/avatar/'+q.owner.email_hash+'?s=32&d=identicon&r=PG"></a></div><div class="user-details">' - +'<a href="http://stackoverflow.com/users/'+q.owner.user_id+'/'+q.owner.display_name+'">'+q.owner.display_name+'</a><br><span title="reputation score" class="reputation-score">' - +q.owner.reputation+'</span></div></div></div></div></div>'; + }), + + new xoops_smallworld.fn.oembed.OEmbedProvider("imdb", "rich", ["imdb.com/title/.+"], "http://www.imdbapi.com/?i=$1&callback=?", { + templateRegex: /.*\/title\/([^\/]+).*/, + templateData: function(data) { + if (!data.Title) return false; + return '<div id="content"><h3><a class="nav-link" href="http://imdb.com/title/' + data.ID + '/">' + data.Title + '</a> (' + data.Year + ')</h3><p>Starring: ' + data.Actors + '</p><div id="photo-wrap" style="margin: auto;width:600px;height:450px;"><img class="photo" id="photo-display" src="' + data.Poster + '" alt="' + data.Title + '"></div> <div id="view-photo-caption">' + data.Plot + '</div></div>'; + } + }), + + new xoops_smallworld.fn.oembed.OEmbedProvider("livejournal", "rich", ["livejournal.com/"], "http://ljpic.seacrow.com/json/$2$4?jsonp=?", { + templateRegex: /(http:\/\/(((?!users).)+)\.livejournal\.com|.*users\.livejournal\.com\/([^\/]+)).*/, + templateData: function(data) { + if (!data.username) return false; + return '<div id="content"><img src="' + data.image + '" align="left" style="margin-right: 1em;" /><span class="ljuser"><a href="http://' + data.username + '.livejournal.com/profile"><img src="http://www.livejournal.com/img/userinfo.gif" alt="[info]" width="17" height="17" /></a><a href="http://' + data.username + '.livejournal.com/">' + data.username + '</a></span><br />' + data.name + '</div>'; + } + }), + + new xoops_smallworld.fn.oembed.OEmbedProvider("circuitbee", "rich", ["circuitbee\\.com/circuit/view/.+"], null, { + templateRegex: /.*circuit\/view\/(\d+).*/, + embedtag: { + tag: 'iframe', + width: '500', + height: '350', + src: "http://c.ci... [truncated message content] |
From: <ren...@us...> - 2011-12-27 22:49:37
|
Revision: 8598 http://xoops.svn.sourceforge.net/xoops/?rev=8598&view=rev Author: renetjuh Date: 2011-12-27 22:49:31 +0000 (Tue, 27 Dec 2011) Log Message: ----------- Removed Paths: ------------- XoopsLanguages/dutch/modules/protector/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 18:21:40
|
Revision: 8597 http://xoops.svn.sourceforge.net/xoops/?rev=8597&view=rev Author: beckmi Date: 2011-12-27 18:21:34 +0000 (Tue, 27 Dec 2011) Log Message: ----------- creating xSiteMap branch @ Basic Module Pack Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/xsitemap/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 18:20:54
|
Revision: 8596 http://xoops.svn.sourceforge.net/xoops/?rev=8596&view=rev Author: beckmi Date: 2011-12-27 18:20:47 +0000 (Tue, 27 Dec 2011) Log Message: ----------- Final adjustments Modified Paths: -------------- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/about.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_footer.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_header.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/index.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/menu.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/plugin.php XoopsModules/xsitemap/branches/mamba/xsitemap/admin/xml.php XoopsModules/xsitemap/branches/mamba/xsitemap/css/admin.css XoopsModules/xsitemap/branches/mamba/xsitemap/docs/changelog.txt XoopsModules/xsitemap/branches/mamba/xsitemap/docs/lang_diff.txt XoopsModules/xsitemap/branches/mamba/xsitemap/include/functions.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/admin.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/modinfo.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/admin.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/modinfo.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/admin.php XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/modinfo.php XoopsModules/xsitemap/branches/mamba/xsitemap/xoops_version.php Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/about.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/about.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/about.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -10,25 +10,22 @@ * 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 + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @copyright The XOOPS Project (http://www.xoops.org) - * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package xSiteMap * @since 2.5.0 * @author Mage, Mamba * @version $Id $ **/ -include '../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; -include 'admin_header.php'; +include_once dirname(__FILE__) . '/admin_header.php'; -$module_info =& $module_handler->get($xoopsModule->getVar("mid")); +xoops_cp_header(); -if (checkModuleAdmin()){ $aboutAdmin = new ModuleAdmin(); echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -} + include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_footer.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_footer.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_footer.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -10,13 +10,17 @@ * 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 + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License * @package xSitemMap * @since 2.5.0 * @author XOOPS Module Team * @version $Id $ **/ -echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>"; -echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->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>"; +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_XSITEMAP_FOOTER . "\n" + ."</div>"; xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_header.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_header.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/admin_header.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -10,7 +10,7 @@ * 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 + * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package:: xSiteMap * @subpackage:: admin * @since:: 2.5.0 @@ -18,57 +18,37 @@ * @version:: $Id $ **/ -include XOOPS_ROOT_PATH . '/mainfile.php'; -include_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; -include_once("../../../include/cp_header.php"); -include_once XOOPS_ROOT_PATH . "/modules/" . $xoopsModule->getVar("dirname") . "/include/functions.php"; -//include_once("../include/functions.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{ - redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); - //return false; - } +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; -$index_admin = new ModuleAdmin(); +global $xoopsModule; +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); -$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +//if functions.php file exist +require_once dirname(dirname(__FILE__)) . '/include/functions.php'; +include_once dirname(dirname(__FILE__)) . '/class/plugin.php'; -$myts =& MyTextSanitizer::getInstance(); -include_once XOOPS_ROOT_PATH."/modules/xsitemap/class/plugin.php"; +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); -if ($xoopsUser) { - $moduleperm_handler =& xoops_gethandler('groupperm'); - if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) { - redirect_header(XOOPS_URL, 1, _NOPERM); - exit(); +$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_MODULEADMIN_MISSING, false); } -} 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(); -} -xoops_cp_header(); - -// Define Stylesheet and JScript -$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/admin.css" ); - -//Load languages -xoops_loadLanguage('admin', $xoopsModule->getVar("dirname")); -xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname")); -xoops_loadLanguage('main', $xoopsModule->getVar("dirname")); - function xsitemap_adminmenu ($currentoption = 0, $breadcrumb = "") { global $xoopsModule, $xoopsConfig; Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/index.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/index.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/index.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -24,7 +24,7 @@ include '../../../include/cp_header.php'; include_once("./admin_header.php"); //$moduleInfo =& $module_handler->get( $xoopsModule->getVar("mid") ); -//xoops_cp_header(); +xoops_cp_header(); $index_admin = new ModuleAdmin(); Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/menu.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/menu.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/menu.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -21,6 +21,14 @@ * Version : 1.00: * **************************************************************************** */ +defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); + +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); + +xoops_loadLanguage('admin', $dirname); $adminmenu = array(); $i = 1; Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/plugin.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/plugin.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/plugin.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -24,6 +24,8 @@ include '../../../include/cp_header.php'; include 'admin_header.php'; + +xoops_cp_header(); $index_admin = new ModuleAdmin(); Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/admin/xml.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/admin/xml.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/admin/xml.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -26,6 +26,7 @@ //xoops_cp_header(); include 'admin_header.php'; +xoops_cp_header(); $index_admin = new ModuleAdmin(); Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/css/admin.css =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/css/admin.css 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/css/admin.css 2011-12-27 18:20:47 UTC (rev 8596) @@ -10,7 +10,7 @@ * 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 + * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package:: mylinks * @since:: 2.5.0 * @author: kris <http://www.xoofoo.org> Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/docs/changelog.txt =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/docs/changelog.txt 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/docs/changelog.txt 2011-12-27 18:20:47 UTC (rev 8596) @@ -1,4 +1,4 @@ -1.52 RC 1 2011/04/17 (Mamba) +1.52 RC 2 2011/12/12 (Mamba) ============================ - changed GUI to standard XOOPS Module GUI - included ModuleAdmin class from Mage Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/docs/lang_diff.txt =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/docs/lang_diff.txt 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/docs/lang_diff.txt 2011-12-27 18:20:47 UTC (rev 8596) @@ -15,11 +15,6 @@ define("_AM_XSITEMAP_ABOUT_DESCRIPTION", "Description: "); define("_AM_XSITEMAP_ADMIN_ABOUT", "About"); -// Configuration -define("_AM_XSITEMAP_CONFIG_CHECK","Configuration Check"); -define("_AM_XSITEMAP_CONFIG_PHP","Minimum PHP required: %s (your version is %s)"); -define("_AM_XSITEMAP_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)"); - modinfo.php ------------- // index.php Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/include/functions.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/include/functions.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/include/functions.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -101,7 +101,7 @@ global $xoopsModuleConfig; - $xoopsDB =& Database::getInstance(); + $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection(); $xsitemap = array(); $myts =& MyTextSanitizer::getInstance(); Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/admin.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/admin.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/admin.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -121,11 +121,9 @@ define("_AM_XSITEMAP_ABOUT_DESCRIPTION", "Description: "); define("_AM_XSITEMAP_ADMIN_ABOUT", "About"); -////admin/index.php -// Configuration -define("_AM_XSITEMAP_CONFIG_CHECK","Configuration Check"); -define("_AM_XSITEMAP_CONFIG_PHP","Minimum PHP required: %s (your version is %s)"); -define("_AM_XSITEMAP_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)"); +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); +define("_AM_MARQUEE_BGCOLOR_SHORT","Background color"); - -?> \ No newline at end of file +// Text for Admin footer +define("_AM_XSITEMAP_FOOTER", "<div class='center smallsmall italic pad5'>xSiteMap is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/modinfo.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/modinfo.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/english/modinfo.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -55,6 +55,4 @@ define("_MI_XSITEMAP_MANAGER_XML","Manage XML"); //1.52 -define("_MI_XSITEMAP_DESC","Module to visualize Sitemap in a XOOPS Website"); - -?> \ No newline at end of file +define("_MI_XSITEMAP_DESC","Module to visualize Sitemap in a XOOPS Website"); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/admin.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/admin.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/admin.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -114,4 +114,17 @@ define("_AM_XSITEMAP_XML_ERROR_UPDATE","Errore durante l'aggiornamento del file XML"); define("_AM_XSITEMAP_XML_VIEW_XML","Guarda il file XML"); -?> \ No newline at end of file + +//1.52 + +// About.php +define("_AM_XSITEMAP_ABOUT_UPDATEDATE", "Updated: "); +define("_AM_XSITEMAP_ABOUT_DESCRIPTION", "Description: "); +define("_AM_XSITEMAP_ADMIN_ABOUT", "About"); + +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); +define("_AM_MARQUEE_BGCOLOR_SHORT","Background color"); + +// Text for Admin footer +define("_AM_XSITEMAP_FOOTER", "<div class='center smallsmall italic pad5'>xSiteMap is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/modinfo.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/modinfo.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/italian/modinfo.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -50,4 +50,5 @@ //1.52 define("_MI_XSITEMAP_DESC","Modulo per la visualizzazione della sitemap in xoops."); -?> \ No newline at end of file +//1.52 +define("_MI_XSITEMAP_DESC","Module to visualize Sitemap in a XOOPS Website"); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/admin.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/admin.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/admin.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -100,7 +100,32 @@ define("_AM_XSITEMAP_ABOUT_DISCLAIMER_TEXT","Licen\xE7a GPL - Sem garantia"); define("_AM_XSITEMAP_ABOUT_BY","Realizado por <a href ='http://www.takeaweb.it'>TAKEAWEB</a>"); + //add by urbanspaceman 22/08/2009 -define("_AM_XSITEMAP_ABOUT_TRANSLATION","Traduzioni"); -define("_AM_XSITEMAP_ABOUT_TRANSLATION_TEXT","<ul><li>Italiano : Urbanspaceman</li><li>Portoghese : Artsgeral</li><li>English : dbman</li></ul>"); -?> +define("_AM_XSITEMAP_ABOUT_TRANSLATION","Translation"); +define("_AM_XSITEMAP_ABOUT_TRANSLATION_TEXT","<ul><li>Italiano : Urbanspaceman</li><li>PortgueseBr : Artsgeral</li><li>English : dbman</li></ul>"); + +//add by urbanspaceman 26/08/2009 +//xml.php +define("_AM_XSITEMAP_XML","XML"); +define("_AM_XSITEMAP_MANAGER_XML","Manage XML"); +define("_AM_XSITEMAP_XML_LASTUPD","Last update of file xsitemap.xml"); +define("_AM_XSITEMAP_UPDATE_XML","Update XML file"); +define("_AM_XSITEMAP_XML_UPDATE","XML file update with success"); +define("_AM_XSITEMAP_XML_ERROR_UPDATE","Error during the update of XML file"); +define("_AM_XSITEMAP_XML_VIEW_XML","View XML file"); + + +//1.52 + +// About.php +define("_AM_XSITEMAP_ABOUT_UPDATEDATE", "Updated: "); +define("_AM_XSITEMAP_ABOUT_DESCRIPTION", "Description: "); +define("_AM_XSITEMAP_ADMIN_ABOUT", "About"); + +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); +define("_AM_MARQUEE_BGCOLOR_SHORT","Background color"); + +// Text for Admin footer +define("_AM_XSITEMAP_FOOTER", "<div class='center smallsmall italic pad5'>xSiteMap is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/modinfo.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/modinfo.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/language/portuguesebr/modinfo.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -49,4 +49,6 @@ define("_MI_XSITEMAP_REGISTER","Registrar"); define("_MI_XSITEMAP_LOGIN","Login"); define("_MI_XSITEMAP_SITEMAP","Sitemap"); -?> + +//1.52 +define("_MI_XSITEMAP_DESC","Module to visualize Sitemap in a XOOPS Website"); Modified: XoopsModules/xsitemap/branches/mamba/xsitemap/xoops_version.php =================================================================== --- XoopsModules/xsitemap/branches/mamba/xsitemap/xoops_version.php 2011-12-27 18:05:52 UTC (rev 8595) +++ XoopsModules/xsitemap/branches/mamba/xsitemap/xoops_version.php 2011-12-27 18:20:47 UTC (rev 8596) @@ -17,8 +17,7 @@ * @license GPL * @package xsitemap * @author Urbanspaceman (http://www.takeaweb.it) - * - * Version : 1.00: + * @version $Id $ * **************************************************************************** */ @@ -39,19 +38,21 @@ $modversion["manual_file"] = ""; $modversion["image"] = "images/logo.png"; $modversion["dirname"] = "xsitemap"; - $modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses'; - $modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; - $modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; + $modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; + $modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; + $modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; $modversion['min_php']='5.2'; - $modversion['min_xoops']="2.5.0"; + $modversion['min_xoops']="2.5.0"; + $modversion['min_admin']='1.1'; + $modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7'); //about $modversion["demo_site_url"] = "http://www.takeaweb.it"; $modversion["demo_site_name"] = "Takeaweb "; $modversion["module_website_url"] = "http://xoops.org"; $modversion["module_website_name"] = "XOOPS"; - $modversion["release_date"] = "2011/4/17"; - $modversion["module_status"] = "RC 1"; + $modversion["release_date"] = "2011/12/12"; + $modversion["module_status"] = "RC 2"; // Admin things $modversion["hasAdmin"] = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 18:05:58
|
Revision: 8595 http://xoops.svn.sourceforge.net/xoops/?rev=8595&view=rev Author: beckmi Date: 2011-12-27 18:05:52 +0000 (Tue, 27 Dec 2011) Log Message: ----------- creating xForms branch @ Basic Module Pack Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/xforms/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 16:48:23
|
Revision: 8594 http://xoops.svn.sourceforge.net/xoops/?rev=8594&view=rev Author: beckmi Date: 2011-12-27 16:48:16 +0000 (Tue, 27 Dec 2011) Log Message: ----------- Final adjustments Modified Paths: -------------- XoopsModules/xforms/branches/mamba/xforms/admin/about.php XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php XoopsModules/xforms/branches/mamba/xforms/admin/elements.php XoopsModules/xforms/branches/mamba/xforms/admin/main.php XoopsModules/xforms/branches/mamba/xforms/admin/menu.php XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt XoopsModules/xforms/branches/mamba/xforms/docs/install.txt XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt XoopsModules/xforms/branches/mamba/xforms/docs/readme.txt XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php XoopsModules/xforms/branches/mamba/xforms/language/english/help/help.html XoopsModules/xforms/branches/mamba/xforms/xoops_version.php Modified: XoopsModules/xforms/branches/mamba/xforms/admin/about.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/about.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -10,21 +10,20 @@ * 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/) + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package XoopsPartners * @since 2.5.0 * @author Mage, Mamba * @version $Id $ **/ -include '../../../include/cp_header.php'; -include '../../../class/xoopsformloader.php'; -include 'admin_header.php'; + include_once dirname(__FILE__) . '/admin_header.php'; + xoops_cp_header(); $aboutAdmin = new ModuleAdmin(); + echo $aboutAdmin->addNavigation('about.php'); -echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); +echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; -xoops_cp_footer(); \ No newline at end of file +include 'admin_footer.php'; \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/admin_footer.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -10,30 +10,19 @@ * 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 + * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package:: xDirectory * @subpackage:: admin * @since: 2.5.0 - * @author:: Magic.Shao <mag...@gm...> - Susheng Yang <ezs...@gm...> + * @author:: XOOPS Development Team * @version:: $Id $ **/ -echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>"; -echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->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(); +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_XFORMS_FOOTER . "\n" + ."</div>"; -############################################################################### -## See license.txt ## -############################################################################### -// $version = number_format($xoopsModule->getVar('version')/100, 2); -// $version = !substr($version, -1, 1) ? substr($version, 0, 3) : $version; - -//$credits = "<div style='text-align: right; font-size: x-small; margin-top: 15px;'>Powered by <a href='about.php'>xforms ".$version."</a>"; -//echo $credits; - -// $version_check = preg_match('/2\.0\./', XOOPS_VERSION) || preg_match('/2\.3\./', XOOPS_VERSION) ; -// if( !$version_check ){ - // echo '<br /><span style="color: #F00;"><b>'._AM_XOOPS_VERSION_WRONG.'</b></span>'; -// } - -// echo '</div>'; +xoops_cp_footer(); \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/admin_header.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -10,7 +10,7 @@ * 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 + * @license:: {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package:: XoopsPartners * @subpackage:: admin * @since:: 2.5.0 @@ -18,46 +18,34 @@ * @version:: $Id $ **/ -require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; -require_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; -require '../../../include/cp_header.php'; + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; + include '../include/common.php'; define('xforms_ADMIN_URL', xforms_URL.'admin/main.php'); include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.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; - } +global $xoopsModule; -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); -$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); -$myts =& MyTextSanitizer::getInstance(); +//if functions.php file exist +require_once dirname(dirname(__FILE__)) . '/include/functions.php'; -if ($xoopsUser) { - $moduleperm_handler =& xoops_gethandler('groupperm'); - if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) { - redirect_header(XOOPS_URL, 1, _NOPERM); - exit(); - } -} else { - redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM); - exit(); -} +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); -if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { - include_once(XOOPS_ROOT_PATH."/class/template.php"); - $xoopsTpl = new XoopsTpl(); -} +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); -//xoops_cp_header(); - -//Load languages -xoops_loadLanguage('admin', $xoopsModule->getVar("dirname")); -xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname")); -xoops_loadLanguage('main', $xoopsModule->getVar("dirname")); \ No newline at end of file +if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){ + include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + }else{ + redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false); + } \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/admin/elements.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/elements.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -74,9 +74,9 @@ echo '<td class="even" rowspan="2" align="center">'.$text_order->render()."</td>\n"; echo '<td class="even" rowspan="2" align="center">'.$check_display->render().$hidden_id->render()."</td>\n"; echo '<td class="even" align="center" nowrap="nowrap" rowspan="2"> - <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathImageIcon.'/edit.png title='._EDIT.'></a> - <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'&clone=1"><img src='.$pathImageIcon.'/editcopy.png title='._CLONE.'></a> - <a href="editelement.php?op=delete&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathImageIcon.'/delete.png title='._DELETE.'></a></td>'; + <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathIcon16.'/edit.png title='._EDIT.'></a> + <a href="editelement.php?op=edit&ele_id='.$id.'&form_id='.$form_id.'&clone=1"><img src='.$pathIcon16.'/editcopy.png title='._CLONE.'></a> + <a href="editelement.php?op=delete&ele_id='.$id.'&form_id='.$form_id.'"><img src='.$pathIcon16.'/delete.png title='._DELETE.'></a></td>'; echo '</tr>'; echo '<tr><td class="even" colspan="2">'.$ele_value->render()."</td>\n</tr>"; } Modified: XoopsModules/xforms/branches/mamba/xforms/admin/main.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -45,14 +45,14 @@ <td class="odd"><a target="_blank" href="'.xforms_URL.'?form_id='.$id.'">'.$f->getVar('form_title').'</a></td> <td class="odd" align="center">'.$sendto.'</td> <td class="odd" align="center"> - <a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'"><img src='.$pathImageIcon.'/edit.png title=' - ._AM_FORM_ACTION_EDITFORM.'></a> - <a href="elements.php?form_id='.$id.'"><img src='.$pathImageIcon.'/1day.png title=' - ._AM_FORM_ACTION_EDITELEMENT.'></a> - <a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'"><img src='.$pathImageIcon.'/editcopy.png title=' - ._AM_FORM_ACTION_CLONE.'></a> - <a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'"><img src='.$pathImageIcon.'/delete.png title=' - ._DELETE.'></a> + <a href="'.xforms_ADMIN_URL.'?op=edit&form_id='.$id.'"><img src='.$pathIcon16.'/edit.png title=' + ._AM_FORM_ACTION_EDITFORM.'alt='._AM_FORM_ACTION_EDITFORM.'></a> + <a href="elements.php?form_id='.$id.'"><img src='.$pathIcon16.'/1day.png title=' + ._AM_FORM_ACTION_EDITELEMENT.'alt='._AM_FORM_ACTION_EDITELEMENT.'></a> + <a href="'.xforms_ADMIN_URL.'?op=edit&clone=1&form_id='.$id.'"><img src='.$pathIcon16.'/editcopy.png title=' + ._AM_FORM_ACTION_CLONE.'alt='._AM_FORM_ACTION_CLONE.'></a> + <a href="'.xforms_ADMIN_URL.'?op=delete&form_id='.$id.'"><img src='.$pathIcon16.'/delete.png title=' + ._DELETE.'alt='._DELETE.'></a> '.$ids->render().'</td> </tr>'; } Modified: XoopsModules/xforms/branches/mamba/xforms/admin/menu.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/admin/menu.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/admin/menu.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -30,31 +30,31 @@ $module_handler =& xoops_gethandler('module'); $xoopsModule =& XoopsModule::getByDirname('xforms'); $moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageAdmin = $moduleInfo->getInfo('icons32'); +$pathIcon32 = $moduleInfo->getInfo('icons32'); $adminmenu = array(); $i = 1; $adminmenu[$i]['title'] = _MI_xforms_ADMENU0 ; $adminmenu[$i]['link'] = 'admin/index.php' ; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/home.png' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ; $i++; $adminmenu[$i]['title'] = _MI_xforms_ADMENU1 ; $adminmenu[$i]['link'] = 'admin/main.php' ; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/manage.png' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/manage.png' ; $i++; $adminmenu[$i]['title'] = _MI_xforms_ADMENU2 ; $adminmenu[$i]['link'] = 'admin/main.php?op=edit'; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/add.png' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/add.png' ; $i++; $adminmenu[$i]['title'] = _MI_xforms_ADMENU3 ; $adminmenu[$i]['link'] = 'admin/editelement.php' ; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/insert_table_row.png' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/insert_table_row.png' ; $i++; $adminmenu[$i]['title'] = _MI_xforms_ADMENU4 ; $adminmenu[$i]['link'] = 'admin/main.php?op=liaise_import' ; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/compfile.png' ; +$adminmenu[$i]['icon'] = $pathIcon32.'/compfile.png' ; $i++; $adminmenu[$i]['title'] = _MI_xforms_ADMENU5; $adminmenu[$i]['link'] = "admin/about.php"; -$adminmenu[$i]['icon'] = '../../'.$pathImageAdmin.'/about.png'; \ No newline at end of file +$adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2011-12-27 16:48:16 UTC (rev 8594) @@ -1,6 +1,6 @@ 1.21 Mamba (2011-07-18) ================================= -- updated to the XOOPS 2.5.x UGU (using ModuleAdmin class) +- updated to the XOOPS 2.5.x GUI (using ModuleAdmin class) 1.20 Dylian (2010-6-30 ================================= Modified: XoopsModules/xforms/branches/mamba/xforms/docs/install.txt =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/docs/install.txt 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/docs/install.txt 2011-12-27 16:48:16 UTC (rev 8594) @@ -1,6 +1,6 @@ INSTALL/UNISTALL ================= -No special measures necessary, follow the standard installation process \x96 extract the xoopspartners folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. +No special measures necessary, follow the standard installation process \x96 extract the /xforms folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i) \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/docs/lang_diff.txt 2011-12-27 16:48:16 UTC (rev 8594) @@ -24,11 +24,6 @@ define("_AM_XPARTNERS_ABOUT_DESCRIPTION", "Description: "); define("_AM_XPARTNERS_EMPTYDATABASE", "There is nothing to sort. Please add some Partners first!"); -// Configuration -define("_AM_XPARTNERS_CONFIG_CHECK","Configuration Check"); -define("_AM_XPARTNERS_CONFIG_PHP","Minimum PHP required: %s (your version is %s)"); -define("_AM_XPARTNERS_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)"); - define("_AM_XPARTNERS_ACTIONS", "Actions"); define("_AM_XPARTNERS_INVALIDID", "No partner exists with this ID"); Modified: XoopsModules/xforms/branches/mamba/xforms/docs/readme.txt =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/docs/readme.txt 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/docs/readme.txt 2011-12-27 16:48:16 UTC (rev 8594) @@ -13,7 +13,7 @@ Install/uninstall ------------------ -No special measures necessary, follow the standard installation process \x96 extract the xoopspartners folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. +No special measures necessary, follow the standard installation process \x96 extract the /xforms folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. Detailed instructions on installing modules are available in the XOOPS Operations Manual (http://goo.gl/adT2i) Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/include/form_execute.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -27,7 +27,7 @@ } // BUG FIX (Captcha wasn't checked) if ( $xoopsModuleConfig['captcha'] ) { - xoops_load("captcha"); + xoops_load("xoopscaptcha"); $xoopsCaptcha = XoopsCaptcha::getInstance(); if (!$xoopsCaptcha->verify()) { $err[] = $xoopsCaptcha->getMessage(); @@ -165,7 +165,7 @@ }else{ $template_dir = xforms_ROOT_PATH."language/english/mail_template"; } -$xoopsMailer = getMailer(); +$xoopsMailer = xoops_getMailer(); $xoopsMailer->setTemplateDir($template_dir); $xoopsMailer->setTemplate('xforms.tpl'); $xoopsMailer->setSubject(sprintf(_xforms_MSG_SUBJECT, $myts->stripSlashesGPC($form->getVar('form_title')))); Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -106,4 +106,9 @@ define("_AM_IMPORT_FAILED", "xForms has failed importing all liaise forms."); define("_AM_IMPORT_NFND", "Liaise is not found on your system!"); -?> \ No newline at end of file +//ModuleAdmin +define('_AM_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)'); +define("_AM_MARQUEE_BGCOLOR_SHORT","Background color"); + +// Text for Admin footer +define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>"); \ No newline at end of file Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/help/help.html =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/language/english/help/help.html 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/language/english/help/help.html 2011-12-27 16:48:16 UTC (rev 8594) @@ -12,7 +12,7 @@ xForms is a module for XOOPS offers widely customizable contact forms. xForms generates different kind of form elements e.g. text areas, check boxes for webmasters to create their "Contact Us" forms by desire. Submitted information can be sent by email or through the private message system of XOOPS, and received by selected user group. <h4 class="odd">Install/uninstall</h4> - No special measures necessary, follow the standard installation process – extract the xoopspartners folder into the + No special measures necessary, follow the standard installation process – extract the /xforms folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. <br/><br/> Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a> </p> Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php =================================================================== --- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2011-12-27 15:46:03 UTC (rev 8593) +++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2011-12-27 16:48:16 UTC (rev 8594) @@ -14,17 +14,19 @@ $modversion['official'] = 0; $modversion['image'] = "images/xforms.png"; $modversion['dirname'] = "xforms"; -$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses'; -$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16'; -$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32'; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; //about -$modversion['release_date'] = '2011/07/16'; +$modversion['release_date'] = '2011/12/12'; $modversion["module_website_url"] = "http://www.xoops.org/"; $modversion["module_website_name"] = "XOOPS"; -$modversion["module_status"] = "Beta"; +$modversion["module_status"] = "RC"; $modversion['min_php']='5.2'; $modversion['min_xoops']="2.5"; +$modversion['min_admin']='1.1'; +$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7'); // Sql file (must contain sql generated by phpMyAdmin or phpPgAdmin) // All tables should not have any prefix! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 15:46:09
|
Revision: 8593 http://xoops.svn.sourceforge.net/xoops/?rev=8593&view=rev Author: beckmi Date: 2011-12-27 15:46:03 +0000 (Tue, 27 Dec 2011) Log Message: ----------- creating Boox branch @ Basic Module Pack Added Paths: ----------- XoopsModules/modulepacks/basicmodulepack/trunk/modules/boox/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2011-12-27 15:45:25
|
Revision: 8592 http://xoops.svn.sourceforge.net/xoops/?rev=8592&view=rev Author: beckmi Date: 2011-12-27 15:45:16 +0000 (Tue, 27 Dec 2011) Log Message: ----------- updating folder structure Added Paths: ----------- XoopsModules/boox/trunk/boox/admin/ XoopsModules/boox/trunk/boox/blocks/ XoopsModules/boox/trunk/boox/class/ XoopsModules/boox/trunk/boox/docs/ XoopsModules/boox/trunk/boox/images/ XoopsModules/boox/trunk/boox/include/ XoopsModules/boox/trunk/boox/language/ XoopsModules/boox/trunk/boox/sql/ XoopsModules/boox/trunk/boox/templates/ XoopsModules/boox/trunk/boox/xoops_version.php Removed Paths: ------------- XoopsModules/boox/trunk/admin/ XoopsModules/boox/trunk/blocks/ XoopsModules/boox/trunk/class/ XoopsModules/boox/trunk/docs/ XoopsModules/boox/trunk/images/ XoopsModules/boox/trunk/include/ XoopsModules/boox/trunk/language/ XoopsModules/boox/trunk/sql/ XoopsModules/boox/trunk/templates/ XoopsModules/boox/trunk/xoops_version.php Copied: XoopsModules/boox/trunk/boox/xoops_version.php (from rev 8591, XoopsModules/boox/trunk/xoops_version.php) =================================================================== --- XoopsModules/boox/trunk/boox/xoops_version.php (rev 0) +++ XoopsModules/boox/trunk/boox/xoops_version.php 2011-12-27 15:45:16 UTC (rev 8592) @@ -0,0 +1,118 @@ +<?php +/** + * **************************************************************************** + * boox - MODULE FOR XOOPS + * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com) + * + * 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 Hervé Thouzard (http://www.herve-thouzard.com) + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License + * @package boox + * @author Hervé Thouzard (http://www.herve-thouzard.com) + * + * Version : $Id: + * **************************************************************************** + */ + +if (!defined('XOOPS_ROOT_PATH')) { + die("XOOPS root path not defined"); +} + +$modversion['name'] = _MI_BOOX_NAME; +$modversion['version'] = 1.71; +$modversion['description'] = _MI_BOOX_DESC; +$modversion['credits'] = 'wilson'; +$modversion['author'] = 'Hervé Thouzard (http://www.herve-thouzard.com)'; +$modversion['license'] = 'GNU GPL 2.0'; +$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; +$modversion['help'] = 'page=help'; +$modversion['official'] = 0; +$modversion['image'] = 'images/boox_logo.png'; +$modversion['dirname'] = 'boox'; + +$modversion['official'] = 0; +$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; +$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; +$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; + +//about +$modversion["demo_site_url"] = ''; +$modversion["demo_site_name"] = ''; +$modversion["module_website_url"] = 'http://xoops.org'; +$modversion["module_website_name"] = 'XOOPS'; +$modversion["release"] = '0'; +$modversion["module_status"] = 'RC'; +$modversion['release_date'] = '2011/12/12'; +$modversion['min_php'] = '5.2'; +$modversion['min_xoops'] = '2.5.0'; +$modversion['min_admin']='1.1'; +//$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7'); + +$modversion['sqlfile']['mysql'] = ''; + + +// Admin things +$modversion['hasAdmin'] = 1; +$modversion['adminindex'] = 'admin/index.php'; +$modversion['adminmenu'] = 'admin/menu.php'; +$modversion['system_menu'] = 1; + +// Templates + +// Blocks + +// Menu +$modversion['hasMain'] = 0; + +// Search +$modversion['hasSearch'] = 0; + +// Comments +$modversion['hasComments'] = 0; + + +/** + * Where do you want to save your files ? + */ +$i=0; +$modversion['config'][$i]['name'] = 'foldertosave'; +$modversion['config'][$i]['title'] = '_MI_BOOX_OPT0'; +$modversion['config'][$i]['description'] = '_MI_BOOX_OPT0_DSC'; +$modversion['config'][$i]['formtype'] = 'textbox'; +$modversion['config'][$i]['valuetype'] = 'text'; +$modversion['config'][$i]['default'] = XOOPS_UPLOAD_PATH; + +/** + * Which editor to use ? + */ +$i++; +$modversion['config'][$i]['name'] = 'form_options'; +$modversion['config'][$i]['title'] = "_MI_BOOX_FORM_OPTIONS"; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'select'; +$modversion['config'][$i]['valuetype'] = 'text'; +$modversion['config'][$i]['default'] = 'dhtml'; +xoops_load('xoopseditorhandler'); +$modversion['config'][$i]['options'] = array_flip(xoopsEditorHandler::getList()); + +/** + * Trim file's content before to save it ? + */ +$i++; +$modversion['config'][$i]['name'] = 'trimcontent'; +$modversion['config'][$i]['title'] = '_MI_BOOX_OPT1'; +$modversion['config'][$i]['description'] = '_MI_BOOX_OP1_DSC'; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 0; + + +// Notifications +$modversion['hasNotification'] = 0; +?> \ No newline at end of file Deleted: XoopsModules/boox/trunk/xoops_version.php =================================================================== --- XoopsModules/boox/trunk/xoops_version.php 2011-12-27 15:42:34 UTC (rev 8591) +++ XoopsModules/boox/trunk/xoops_version.php 2011-12-27 15:45:16 UTC (rev 8592) @@ -1,118 +0,0 @@ -<?php -/** - * **************************************************************************** - * boox - MODULE FOR XOOPS - * Copyright (c) Hervé Thouzard (http://www.herve-thouzard.com) - * - * 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 Hervé Thouzard (http://www.herve-thouzard.com) - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License - * @package boox - * @author Hervé Thouzard (http://www.herve-thouzard.com) - * - * Version : $Id: - * **************************************************************************** - */ - -if (!defined('XOOPS_ROOT_PATH')) { - die("XOOPS root path not defined"); -} - -$modversion['name'] = _MI_BOOX_NAME; -$modversion['version'] = 1.71; -$modversion['description'] = _MI_BOOX_DESC; -$modversion['credits'] = 'wilson'; -$modversion['author'] = 'Hervé Thouzard (http://www.herve-thouzard.com)'; -$modversion['license'] = 'GNU GPL 2.0'; -$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/"; -$modversion['help'] = 'page=help'; -$modversion['official'] = 0; -$modversion['image'] = 'images/boox_logo.png'; -$modversion['dirname'] = 'boox'; - -$modversion['official'] = 0; -$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin'; -$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16'; -$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32'; - -//about -$modversion["demo_site_url"] = ''; -$modversion["demo_site_name"] = ''; -$modversion["module_website_url"] = 'http://xoops.org'; -$modversion["module_website_name"] = 'XOOPS'; -$modversion["release"] = '0'; -$modversion["module_status"] = 'RC'; -$modversion['release_date'] = '2011/12/12'; -$modversion['min_php'] = '5.2'; -$modversion['min_xoops'] = '2.5.0'; -$modversion['min_admin']='1.1'; -//$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7'); - -$modversion['sqlfile']['mysql'] = ''; - - -// Admin things -$modversion['hasAdmin'] = 1; -$modversion['adminindex'] = 'admin/index.php'; -$modversion['adminmenu'] = 'admin/menu.php'; -$modversion['system_menu'] = 1; - -// Templates - -// Blocks - -// Menu -$modversion['hasMain'] = 0; - -// Search -$modversion['hasSearch'] = 0; - -// Comments -$modversion['hasComments'] = 0; - - -/** - * Where do you want to save your files ? - */ -$i=0; -$modversion['config'][$i]['name'] = 'foldertosave'; -$modversion['config'][$i]['title'] = '_MI_BOOX_OPT0'; -$modversion['config'][$i]['description'] = '_MI_BOOX_OPT0_DSC'; -$modversion['config'][$i]['formtype'] = 'textbox'; -$modversion['config'][$i]['valuetype'] = 'text'; -$modversion['config'][$i]['default'] = XOOPS_UPLOAD_PATH; - -/** - * Which editor to use ? - */ -$i++; -$modversion['config'][$i]['name'] = 'form_options'; -$modversion['config'][$i]['title'] = "_MI_BOOX_FORM_OPTIONS"; -$modversion['config'][$i]['description'] = ''; -$modversion['config'][$i]['formtype'] = 'select'; -$modversion['config'][$i]['valuetype'] = 'text'; -$modversion['config'][$i]['default'] = 'dhtml'; -xoops_load('xoopseditorhandler'); -$modversion['config'][$i]['options'] = array_flip(xoopsEditorHandler::getList()); - -/** - * Trim file's content before to save it ? - */ -$i++; -$modversion['config'][$i]['name'] = 'trimcontent'; -$modversion['config'][$i]['title'] = '_MI_BOOX_OPT1'; -$modversion['config'][$i]['description'] = '_MI_BOOX_OP1_DSC'; -$modversion['config'][$i]['formtype'] = 'yesno'; -$modversion['config'][$i]['valuetype'] = 'int'; -$modversion['config'][$i]['default'] = 0; - - -// Notifications -$modversion['hasNotification'] = 0; -?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |