Minahito
minah****@users*****
2005年 12月 26日 (月) 18:19:52 JST
Index: xoops2jp/html/kernel/XCube_Controller.class.php
diff -u xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.1 xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.2
--- xoops2jp/html/kernel/XCube_Controller.class.php:1.1.2.1 Thu Nov 24 18:28:24 2005
+++ xoops2jp/html/kernel/XCube_Controller.class.php Mon Dec 26 18:19:52 2005
@@ -97,7 +97,8 @@
$this->_processPreBlockFilter(); // What's !?
- $this->mRoot->setLanguageManager($this->_createLanguageManager());
+ $languageManager =& $this->_createLanguageManager();
+ $this->mRoot->setLanguageManager($languageManager);
$this->_processHostAbstractLayer();
@@ -131,17 +132,10 @@
*/
function _setupErrorHandler()
{
- //
- // TODO Depens on legacy.
- //
- require_once XOOPS_ROOT_PATH.'/class/errorhandler.php';
- $this->mErrorHandler=&XoopsErrorHandler::getInstance();
- $this->mErrorHandler->activate(true);
}
function _setupEnvironment()
{
- require_once XOOPS_ROOT_PATH."/include/version.php";
}
/**
@@ -150,12 +144,6 @@
*/
function _setupLogger()
{
- //
- // TODO Depens on legacy.
- //
- require_once XOOPS_ROOT_PATH.'/class/logger.php';
- $this->mLogger=&XoopsLogger::instance();
- $this->mLogger->startTime();
}
/**
@@ -164,21 +152,6 @@
*/
function _setupDB()
{
- //
- // TODO Depens on legacy.
- //
- if(!defined('XOOPS_XMLRPC'))
- define('XOOPS_DB_CHKREF', 1);
- else
- define('XOOPS_DB_CHKREF', 0);
-
- require_once XOOPS_ROOT_PATH.'/class/database/databasefactory.php';
-
- if ($_SERVER['REQUEST_METHOD'] != 'POST' || !xoops_refcheck(XOOPS_DB_CHKREF)) {
- define('XOOPS_DB_PROXY', 1);
- }
-
- $this->mDB =& XoopsDatabaseFactory::getDatabaseConnection();
}
/**
@@ -191,11 +164,6 @@
function _setupConfig()
{
- //
- // TODO Depens on legacy.
- //
- $configHandler=&xoops_gethandler('config');
- $this->mConfig=&$configHandler->getConfigsByCat(XOOPS_CONF);
}
/**
@@ -204,19 +172,6 @@
*/
function _setupDebugger()
{
- error_reporting(0);
-
- //
- // TODO Depens on base.
- //
- require_once XOOPS_BASE_PATH."/class/debug/XoopsDebugManager.class.php";
-
- $debug_mode = $this->mConfig['debug_mode'];
- if(defined("OH_MY_GOD_HELP_ME"))
- $debug_mode = XOOPS_DEBUG_PHP;
-
- $this->mDebugger=&XoopsDebuggerManager::getInstance($this->mConfig['debug_mode']);
- $this->mDebugger->setup();
}
function &_createLanguageManager()
@@ -239,19 +194,6 @@
*/
function _setupSession()
{
- global $xoopsDB;
-
- $sessionHandler=&xoops_gethandler('session');
-
- session_set_save_handler(
- array(&$sessionHandler,"open"),
- array(&$sessionHandler,"close"),
- array(&$sessionHandler, 'read'),
- array(&$sessionHandler, 'write'),
- array(&$sessionHandler, 'destroy'),
- array(&$sessionHandler, 'gc'));
-
- session_start();
}
function _setupUser()
@@ -332,7 +274,7 @@
// TODO Now, I done for working admin panel.
//
$this->mRenderSystem->prepare();
-
+
$this->_setupBlock();
$this->_processBlock();
}