Minahito
minah****@users*****
2006年 1月 11日 (水) 12:31:27 JST
Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.2 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.3
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.2 Mon Dec 26 18:19:52 2005
+++ xoops2jp/html/kernel/XCube_Controller.class.php Wed Jan 11 12:31:27 2006
@@ -61,12 +61,16 @@
*/
var $mActionStrategy=null;
- function XCube_Controller(&$root)
+ function XCube_Controller()
{
- $this->mRoot=&$root;
$this->mBlockChain=array();
$this->mFilterChain=array();
}
+
+ function prepare(&$root)
+ {
+ $this->mRoot=&$root;
+ }
/**
* @access public
@@ -92,7 +96,7 @@
$this->_setupDB();
$this->_setupConfig();
-
+
$this->_setupDebugger();
$this->_processPreBlockFilter(); // What's !?
@@ -232,7 +236,7 @@
if($this->mModuleController->isModuleProcess()) {
if(!$this->mModuleController->isActive())
- exit(); ///< @todo
+ die('NOT ACTIVE'); ///< @todo
if(!$this->mModuleController->isPermission())
XCube_Utils::redirectHeader(XOOPS_URL,1,_NOPERM); // TODO Depens on const message catalog.
@@ -273,7 +277,12 @@
//
// TODO Now, I done for working admin panel.
//
- $this->mRenderSystem->prepare();
+ $renderSystem =& $this->mRoot->getRenderSystem($this->mModuleController->getDependRenderSystem());
+
+ // TODO
+ $this->mRenderSystem =& $renderSystem;
+
+ $this->mRenderSystem->prepare($this);
$this->_setupBlock();
$this->_processBlock();
@@ -351,11 +360,11 @@
/**
* Create and setup RenderSystem.
+ * @deprecated
*/
function _setupRenderSystem()
{
- $this->mRenderSystem=new XCube_RenderSystem($this);
- $this->mRenderSystem->setup();
+ // TODO remove this method.
}
/**