Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8614] XoopsModules/xortify/releases/3.00/htdocs/modules/ xortify
|
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.
|
