[xoops-cvslog 3404] CVS update: xoops2jp/html/modules/base/kernel

Back to archive index

Minahito minah****@users*****
2006年 7月 1日 (土) 16:26:04 JST


Index: xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.43 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.44
--- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.43	Wed Jun 28 14:46:18 2006
+++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php	Sat Jul  1 16:26:04 2006
@@ -271,9 +271,21 @@
 
 	function _processModuleController()
 	{
-		if(parent::_processModuleController()) {
-			$GLOBALS['xoopsModule']=&$this->mModuleController->mModuleObject;			// TODO
-			$GLOBALS['xoopsModuleConfig']=$this->mModuleController->getConfig();
+		$this->mModuleController->prepare();
+
+		if ($this->mModuleController->isModuleProcess()) {
+			if (!$this->mModuleController->isActive()) {
+				die('NOT ACTIVE');	///< @todo
+			}
+
+   			if (!$this->mModuleController->hasPermission()) {
+				XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM);	// TODO Depens on const message catalog.
+   			}
+
+			$this->mModuleController->setupLanguage();
+			
+			$GLOBALS['xoopsModule'] =& $this->mModuleController->mModuleObject;			// TODO
+			$GLOBALS['xoopsModuleConfig'] = $this->mModuleController->getConfig();
 		}
 	}
 
@@ -799,7 +811,6 @@
 	{
 		require_once XOOPS_BASE_PATH . "/kernel/Legacy_ModuleController.class.php";
 		$controller->mModuleController =& new Legacy_ModuleController($controller);
-		$controller->mModuleController->prepare();
 	}
 
 	function setupRenderSystem(&$controller)
@@ -861,7 +872,6 @@
 	{
 		require_once XOOPS_BASE_PATH . "/class/Legacy_AdminModuleController.class.php";
 		$controller->mModuleController =& new Legacy_AdminModuleController($controller);
-		$controller->mModuleController->prepare();
 	}
 
 	function setupRenderSystem(&$controller)


xoops-cvslog メーリングリストの案内
Back to archive index