提交: 6ebaff06c1a7ca7e27d028c51a495e5b11275724 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• 修订版: 6ebaff06c1a7ca7e27d028c51a495e5b11275724 (tree)
• 时间: 2011-11-21 23:06:39
• 作者: nbuy <nbuy@704c...>
• Commiter: nbuy

Log Message

add Module config loading flag for speedup

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

更改概述

• modified: html/modules/legacy/admin/blocks/AdminSideMenu.class.php
• modified: html/modules/legacy/class/Legacy_Utils.class.php
• modified: html/modules/legacy/kernel/Legacy_Module.class.php

差异

--- a/html/modules/legacy/admin/blocks/AdminSideMenu.class.php
+++ b/html/modules/legacy/admin/blocks/AdminSideMenu.class.php
@@ -101,9 +101,9 @@ class Legacy_AdminSideMenu extends Legacy_AbstractBlockProcedure
 		
 		$handler =& xoops_gethandler('module');
 		
-		while($row = $db->fetchArray($result)) {
-			$xoopsModule =& $handler->get($row['mid']);
-			$module =& Legacy_Utils::createModule($xoopsModule);
+		while(list($mid) = $db->fetchRow($result)) {
+			$xoopsModule = & $handler->get($mid);
+			$module =& Legacy_Utils::createModule($xoopsModule, false);
 
 			$this->mModules[] =& $module;
 			unset($module);

--- a/html/modules/legacy/class/Legacy_Utils.class.php
+++ b/html/modules/legacy/class/Legacy_Utils.class.php
@@ -54,14 +54,14 @@ class Legacy_Utils
 	 * @param XoopsModule $module
 	 * @return Legacy_Module
 	 */
-	function &createModule($module)
+	function &createModule($module, $loadConfig=true)
 	{
 		$instance = null;
 
 		//
 		// TODO need cache here?
 		//
-		XCube_DelegateUtils::call('Legacy_Utils.CreateModule', new XCube_Ref($instance), $module);
+		XCube_DelegateUtils::call('Legacy_Utils.CreateModule', new XCube_Ref($instance), $module, $loadConfig);
 		
 		if (is_object($instance) && is_a($instance, 'Legacy_AbstractModule')) {
 			return $instance;
@@ -81,10 +81,10 @@ class Legacy_Utils
 		}
 		
 		if (XC_CLASS_EXISTS($className)) {
-			$instance = new $className($module);
+			$instance = new $className($module, $loadConfig);
 		}
 		else {
-			$instance = new Legacy_ModuleAdapter($module);
+			$instance = new Legacy_ModuleAdapter($module, $loadConfig);
 		}
 		
 		return $instance;

--- a/html/modules/legacy/kernel/Legacy_Module.class.php
+++ b/html/modules/legacy/kernel/Legacy_Module.class.php
@@ -71,11 +71,11 @@ class Legacy_AbstractModule
      *     Basically, only Legacy_Controller and its utility functions should call the
      *     constructor.
      */
-    function Legacy_AbstractModule(&$module)
+    function Legacy_AbstractModule(&$module, $loadConfig=true)
     {
         $this->setXoopsModule($module);
         
-        if ($module->get('hasconfig') == 1 || $module->get('hascomments') == 1 || $module->get('hasnotification') == 1) {
+        if ($loadConfig && ($module->get('hasconfig') == 1 || $module->get('hascomments') == 1 || $module->get('hasnotification') == 1)) {
             $handler =& xoops_gethandler('config');
             $this->setModuleConfig($handler->getConfigsByCat(0, $module->get('mid')));
         }
@@ -399,9 +399,9 @@ class Legacy_ModuleAdapter extends Legacy_AbstractModule
      */
     var $mAdminMenu = null;
     
-    function Legacy_ModuleAdapter($module)
+    function Legacy_ModuleAdapter($module, $loadConfig=true)
     {
-        parent::Legacy_AbstractModule($module);
+        parent::Legacy_AbstractModule($module, $loadConfig);
     }
 
     /**
@@ -606,7 +606,7 @@ class Legacy_ModuleAdapter extends Legacy_AbstractModule
             return $this->mAdminMenu;
         }
         
-        $dmy =& $this->mXoopsModule->getInfo();
+        $info =& $this->mXoopsModule->getInfo();
         $root =& XCube_Root::getSingleton();
 
         //
@@ -614,8 +614,8 @@ class Legacy_ModuleAdapter extends Legacy_AbstractModule
         //
         $this->mXoopsModule->loadAdminMenu();
         if ($this->mXoopsModule->get('hasnotification')
-            || ($this->mXoopsModule->getInfo('config') && is_array($this->mXoopsModule->getInfo('config')))
-            || ($this->mXoopsModule->getInfo('comments') && is_array($this->mXoopsModule->getInfo('comments')))) {
+            || ($info['config'] && is_array($info['config']))
+            || ($info['comments'] && is_array($info['comments']))) {
                 $this->mXoopsModule->adminmenu[] = array(
                     'link' => $root->mController->getPreferenceEditUrl($this->mXoopsModule),
                     'title' => _PREFERENCES,
@@ -631,9 +631,10 @@ class Legacy_ModuleAdapter extends Legacy_AbstractModule
         $this->_mAdminMenuLoadedFlag = true;
         
         if ($this->mXoopsModule->adminmenu) {
+			$dirname = $this->mXoopsModule->get('dirname');
             foreach ($this->mXoopsModule->adminmenu as $menu) {
                 if (!isset($menu['absolute']) || (isset($menu['absolute']) && $menu['absolute'] != true)) {
-                    $menu['link'] = XOOPS_MODULE_URL . '/' . $this->mXoopsModule->get('dirname') . '/' . $menu['link'];
+                    $menu['link'] = XOOPS_MODULE_URL . '/' . $dirname . '/' . $menu['link'];
                 }
                 $this->mAdminMenu[] = $menu;
             }