[xoops-cvslog 3493] CVS update: xoops2jp/html/modules/legacyRender/class

アーカイブの一覧に戻る

Minahito minah****@users*****
2006年 7月 10日 (月) 20:02:25 JST


Index: xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php
diff -u xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.4 xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.5
--- xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php:1.1.2.4	Mon Jul 10 15:08:41 2006
+++ xoops2jp/html/modules/legacyRender/class/ActionFrame.class.php	Mon Jul 10 20:02:25 2006
@@ -64,7 +64,12 @@
 			die();
 		}
 		
-		if (!$this->mAction->hasPerm($controller, $controller->getXoopsUser())) {
+		$handler =& xoops_gethandler('config');
+		$moduleConfig =& $handler->getConfigsByDirname('legacyRender');
+	
+		$this->mAction->prepare($controller, $controller->getXoopsUser(), $moduleConfig);
+
+		if (!$this->mAction->hasPermission($controller, $controller->getXoopsUser())) {
 			if ($this->mAdminFlag) {
 				$controller->executeForward(XOOPS_URL . "/admin.php");
 			}
@@ -73,8 +78,6 @@
 			}
 		}
 	
-		$this->mAction->prepare($controller, $controller->getXoopsUser());
-	
 		if (xoops_getenv("REQUEST_METHOD") == "POST") {
 			$viewStatus = $this->mAction->execute($controller, $controller->getXoopsUser());
 		}
@@ -122,12 +125,12 @@
 		$this->_mAdminFlag = $adminFlag;
 	}
 
-	function hasPerm(&$controller, &$xoopsUser)
+	function hasPermission(&$controller, &$xoopsUser)
 	{
 		return true;
 	}
 	
-	function prepare(&$controller, &$xoopsUser)
+	function prepare(&$controller, &$xoopsUser, $moduleConfig)
 	{
 	}
 


xoops-cvslog メーリングリストの案内
アーカイブの一覧に戻る