[xoops-svn] SF.net SVN: xoops:[8528] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<be...@us...>]

Revision: 8528
          http://xoops.svn.sourceforge.net/xoops/?rev=8528&view=rev
Author:   beckmi
Date:     2011-12-21 08:28:26 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
reverting Xortify

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/Frameworks/moduleclasses/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/xortify.php

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/xortify.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/xortify.php	2011-12-19 15:54:31 UTC (rev 8527)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/preloads/xortify.php	2011-12-21 08:28:26 UTC (rev 8528)
@@ -1,55 +0,0 @@
-<?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

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php	2011-12-19 15:54:31 UTC (rev 8527)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/xortify/admin/index.php	2011-12-21 08:28:26 UTC (rev 8528)
@@ -437,7 +437,7 @@
 		for($key=0;$key<=4;$key++) {
 			switch ($key) {
 				case 2:
-					$donationform[$key] =  sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), '', strtoupper($GLOBALS['xortifyModule']->getVar('dirname')),  strtoupper($GLOBALS['xortifyModule']->getVar('dirname')). ' '.$GLOBALS['xortifyModule']->getVar('name'));
+					$donationform[$key] =  sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xortifyModule']->getVar('dirname')),  strtoupper($GLOBALS['xortifyModule']->getVar('dirname')). ' '.$GLOBALS['xortifyModule']->getVar('name'));
 					break;
 			}
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.