[xoops-svn] SF.net SVN: xoops-svn:[12022] XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs /modules/xortify/cron/serverup.php

[<wis...@us...>]

Revision: 12022
          http://sourceforge.net/p/xoops/svn/12022
Author:   wishcraft
Date:     2013-09-10 20:19:43 +0000 (Tue, 10 Sep 2013)
Log Message:
-----------
Xortify Client 4.15 for XOOPS 2.5.6 & 2.6 & The XOOPS Client 2 Series for XOOPS 2.5 & 2.6 (Production Copy)

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php

Modified: XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php	2013-09-10 20:15:20 UTC (rev 12021)
+++ XoopsCore/branches/2.6.x/2.6.0_xortify/htdocs/modules/xortify/cron/serverup.php	2013-09-10 20:19:43 UTC (rev 12022)
@@ -43,36 +43,42 @@
 	/*
 	 * Retrieve URL Source for Data and analysis
 	 */
-	function xortify_getURLData($URI, $curl=false) {
+	function xortify_getURLData($URI, $search='', $curl=false) {
 		$ret = '';
-		try {
-			switch ($curl) {
-				case true:
-					if (!$ch = curl_init($URI)) {
-						trigger_error('Could not intialise CURL file: '.$url);
-						return false;
+		foreach(array('http://'=>'https://', 'https://'=>'http://') as $prot => $protto) {
+			$URI = str_replace($prot, $protto, $uri);
+			try {
+				switch ($curl) {
+					case true:
+						if (!$ch = curl_init($URI)) {
+							trigger_error('Could not intialise CURL file: '.$url);
+							return false;
+						}
+						$cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie'; 
+				
+						curl_setopt($ch, CURLOPT_HEADER, 0);
+						curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+						curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_connecttimeout']);
+						curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig']['curl_timeout']);
+						curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
+						curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
+						$ret = curl_exec($ch);
+						curl_close($ch);
+						break;
+					case false:
+						$ret = file_get_contents($uri);
+						break;
+					
 					}
-					$cookies = XOOPS_VAR_PATH.'/cache/xoops_cache/croncurl_'.md5($URI).'.cookie'; 
-			
-					curl_setopt($ch, CURLOPT_HEADER, 0);
-					curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies); 
-					curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); 
-					curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_connecttimeout', 'xortify'));
-					curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['xoops']->getModuleConfig('curl_timeout', 'xortify'));
-					curl_setopt($ch, CURLOPT_USERAGENT, XORTIFY_USER_AGENT);
-					$ret = curl_exec($ch);
-					curl_close($ch);
-					break;
-				case false:
-					$ret = file_get_contents($uri);
-					break;
 				
+			} catch(Exception $e) {
+				echo 'Exception: "'.$e."\n";
 			}
-		}
-		catch(Exception $e) {
-			echo 'Exception: "'.$e."\n";
+			if ($found = (strpos(strtolower($ret), strtolower($search))>0)) {
+				return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);
+			}
 		}	
-		return $ret;
+		return array('value'=>$ret, 'prot'=>$protto, 'protwas'=>$prot, 'found'=>$found);	
 	}
 	
 	if (!isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['_preloader']))
@@ -104,18 +110,18 @@
 		include_once XOOPS_ROOT_PATH . DS . 'include' . DS . 'version.php';
 	}
 	
-	define('XORTIFY_USER_AGENT', 'Mozilla/5.0 (PHP - '.PHP_VERSION.') '.(defined('XOOPS_VERSION')?constant('XOOPS_VERSION').' ':'').'- Xortify 4.02');
-	define("SERVER1", 'http://xortify.com/unban/?op=unban');
-	define("SERVER2", 'http://xortify.xoops.org/unban/?op=unban');
-	define("SERVER3", 'http://xortify.chronolabs.coop/unban/?op=unban');
-	define("REPLACE", 'unban/?op=unban');
-	define("SEARCHFOR", 'Solve Puzzel:');
 	define("SOAP", 'soap/');
 	define("CURL", 'curl/');
 	define("JSON", 'json/');
 	define("SERIAL", 'serial/');
 	define("XML", 'xml/');
 	define("REST", 'api/');
+	define("XREST", "xrest/");
+	define("XSOAP", 'xsoap/');
+	define("XCURL", 'xcurl/');
+	define("XJSON", 'xjson/');
+	define("XSERIAL", 'xserial/');
+	define("XXML", 'xxml/');
 	
 	include_once $xoops->path('class/cache/xoopscache.php');
 	
@@ -134,50 +140,49 @@
 			$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $config_handler->getConfigList($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid'));
 		if ($servers = XoopsCache::read('server_list_xortify')) {
 			foreach($servers as $sid => $server) {
-				$source = xortify_getURLData($server['server'], $nativecurl);
-				if (strpos(strtolower($source), strtolower($server['search']))>0) {
+				$source = xortify_getURLData($server['server'], $server['search'], $nativecurl);
+				if ($source['found']==true) {
 					$serverup=true;
-					echo 'Server '.$sid.' is UP - check @ '.$server['server'];
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_urisoap'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SOAP, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSOAP, $server['server']):str_replace($server['replace'], SOAP, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_uricurl'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], CURL, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XCURL, $server['server']):str_replace($server['replace'], CURL, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_urijson'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], JSON, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XJSON, $server['server']):str_replace($server['replace'], JSON, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_uriserial'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], SERIAL, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XSERIAL, $server['server']):str_replace($server['replace'], SERIAL, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_urixml'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], XML, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XXML, $server['server']):str_replace($server['replace'], XML, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}
 					$criteria = new CriteriaCompo(new Criteria('conf_modid', $GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['module']->getVar('mid')));
 					$criteria->add(new Criteria('conf_name', 'xortify_urirest'));
 					$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'] = $configitem_handler->getObjects($criteria);
 					if (isset($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0])) {
-						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($server['replace'], REST, $server['server']));
+						$GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0]->setVar('conf_value', str_replace($source['protwas'], $source['prot'], strtolower(strpos($server['server'], 'module/')>0?str_replace($server['replace'], XREST, $server['server']):str_replace($server['replace'], REST, $server['server']))));
 						$configitem_handler->insert($GLOBALS['xortify'][XORTIFY_INSTANCE_KEY]['moduleConfig'][0], true);
 					}				
 				}