Commit: 3057f07453c6dcaff1587f203c8c3a220294de62 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Révision: 3057f07453c6dcaff1587f203c8c3a220294de62 (tree)
• l'heure: 2011-11-16 22:15:09
• Auteur: nbuy <nbuy@704c...>
• Commiter: nbuy

Message de Log

revise for speedup

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1055 704cf05f-ae62-4b0e-a484-234ee0250e75

Change Summary

• modified: html/modules/legacy/kernel/Legacy_Controller.class.php
• modified: html/modules/legacy/kernel/object.php

Modification

--- a/html/modules/legacy/kernel/Legacy_Controller.class.php
+++ b/html/modules/legacy/kernel/Legacy_Controller.class.php
@@ -264,7 +264,7 @@ class Legacy_Controller extends XCube_Controller
 	    $arr = localtime($iTime);
 	    $arr[5] += 1900; 
 	    $arr[4]++;
-	    $iTztime = gmmktime($arr[2], $arr[1], $arr[0], $arr[4], $arr[3], $arr[5], $arr[8]);
+	    $iTztime = gmmktime($arr[2], $arr[1], $arr[0], $arr[4], $arr[3], $arr[5]);
 	    $offset = doubleval(($iTztime-$iTime)/(60*60));
 	    $zonelist = 
 	    array
@@ -775,17 +775,15 @@ class Legacy_Controller extends XCube_Controller
 				$dir = XOOPS_ROOT_PATH . '/modules/' . $mod_dir . $dirname . '/';
 				if(is_dir($dir)) {
 					$files = glob($dir.'*.class.php');
-					if (is_array($files)) {
+					if ($files) {
 						foreach($files as $file) {
 							require_once $file;
-							if (preg_match("/(\w+)\.class\.php/", $file, $matches)) {
-								$className = ucfirst($mod_dir) . "_" . $matches[1];
+								$className = ucfirst($mod_dir) . "_" . basename($file, '.class.php');
 						
 								if (XC_CLASS_EXISTS($className) && !isset($this->_mLoadedFilterNames[$className])) {
 									$this->_mLoadedFilterNames[$className] = true;
 									$this->addActionFilter(new $className($this));
 								}
-							}
 						}
 					}
 				}

--- a/html/modules/legacy/kernel/object.php
+++ b/html/modules/legacy/kernel/object.php
@@ -61,7 +61,7 @@ class XoopsSimpleObject extends AbstractXoopsObject
 			'data_type' => $dataType,
 			'value' => null,
 			'required' => $required ? true : false,
-			'maxlength' => $size ? intval($size) : null
+			'maxlength' => $size ? (int)$size : null
 		);
 		
 		$this->assignVar($key, $value);
@@ -75,28 +75,23 @@ class XoopsSimpleObject extends AbstractXoopsObject
 		switch ($vars['data_type']) {
 			case XOBJ_DTYPE_BOOL:
 				$vars['value'] = $value ? 1 : 0;
-				break;
+				return;
 
 			case XOBJ_DTYPE_INT:
-				$vars['value'] = $value !== null ? intval($value) : null;
-				break;
+				$vars['value'] = $value !== null ? (int)$value : null;
+				return;
 
 			case XOBJ_DTYPE_FLOAT:
-				$vars['value'] = $value !== null ? floatval($value) : null;
-				break;
+				$vars['value'] = $value !== null ? (float)$value : null;
+				return;
 
 			case XOBJ_DTYPE_STRING:
-				if ($vars['maxlength'] !== null && strlen($value) > $vars['maxlength']) {
-					$vars['value'] = xoops_substr($value, 0, $vars['maxlength'], null);
-				}
-				else {
-					$vars['value'] = $value;
-				}
-				break;
+				$vars['value'] = ($vars['maxlength'] !== null && strlen($value) > $vars['maxlength']) ? xoops_substr($value, 0, $vars['maxlength'], null) : $value;
+				return;
 
 			case XOBJ_DTYPE_TEXT:
 				$vars['value'] = $value;
-				break;
+				return;
 		}
 	}
 	
@@ -157,20 +152,17 @@ class XoopsSimpleObject extends AbstractXoopsObject
 			case XOBJ_DTYPE_BOOL:
 			case XOBJ_DTYPE_INT:
 			case XOBJ_DTYPE_FLOAT:
-				$value = $vars['value'];
-				break;
+				return $vars['value'];
 
 			case XOBJ_DTYPE_STRING:
 				$root =& XCube_Root::getSingleton();
 				$textFilter =& $root->getTextFilter();
-				$value = $textFilter->toShow($vars['value']);
-				break;
+				return $textFilter->toShow($vars['value']);
 
 			case XOBJ_DTYPE_TEXT:
 				$root =& XCube_Root::getSingleton();
 				$textFilter =& $root->getTextFilter();
-				$value = $textFilter->toShowTarea($vars['value'], 0, 1, 1, 1, 1);
-				break;
+				return $textFilter->toShowTarea($vars['value'], 0, 1, 1, 1, 1);
 		}
 		
 		return $value;