Minahito
minah****@users*****
2006年 10月 15日 (日) 01:39:30 JST
Index: xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.1 xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.2
--- xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php:1.1.2.1 Sat Oct 14 23:55:24 2006
+++ xoops2jp/html/modules/legacy/kernel/Legacy_Controller.class.php Sun Oct 15 01:39:29 2006
@@ -11,13 +11,13 @@
define("LEGACY_XOOPS_MODULE_MANIFESTO_FILENAME", "xoops_version.php");
-require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_BlockProcedure.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/base/class/Legacy_Utils.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_Identity.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_RoleManager.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_BlockProcedure.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/class/Legacy_Utils.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_Identity.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_RoleManager.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_CacheInformation.class.php";
-require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_PublicControllerStrategy.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_CacheInformation.class.php";
+require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_PublicControllerStrategy.class.php";
/**
* This class is a virtual controller that has the compatibility with XOOPS 2.0.x.
@@ -143,7 +143,7 @@
}
if ($adminStateFlag) {
- require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_AdminControllerStrategy.class.php";
+ require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_AdminControllerStrategy.class.php";
$this->_mStrategy =& new Legacy_AdminControllerStrategy($this);
}
else {
@@ -210,7 +210,7 @@
require_once XOOPS_ROOT_PATH."/include/version.php";
require_once XOOPS_ROOT_PATH."/settings/definition.inc.php";
- define("XOOPS_BASE_PATH",XOOPS_MODULE_PATH."/".XOOPS_BASE_PROC_NAME);
+ define("XOOPS_LEGACY_PATH",XOOPS_MODULE_PATH."/".XOOPS_LEGACY_PROC_NAME);
require_once XOOPS_ROOT_PATH.'/include/functions.php';
@@ -219,8 +219,8 @@
require_once XOOPS_ROOT_PATH.'/class/token.php';
require_once XOOPS_ROOT_PATH."/class/module.textsanitizer.php";
- require_once XOOPS_BASE_PATH."/kernel/object.php"; // ToDo (here?)
- require_once XOOPS_BASE_PATH."/kernel/handler.php"; // ToDo
+ require_once XOOPS_LEGACY_PATH."/kernel/object.php"; // ToDo (here?)
+ require_once XOOPS_LEGACY_PATH."/kernel/handler.php"; // ToDo
require_once XOOPS_ROOT_PATH."/core/XCube_Utils.class.php"; // ToDo
require_once XOOPS_ROOT_PATH.'/class/xoopssecurity.php';
@@ -359,7 +359,7 @@
}
}
elseif (substr($urlInfo[0], 0, 9) == 'admin.php') {
- $dirname = 'base';
+ $dirname = 'legacy';
}
}
@@ -490,7 +490,7 @@
*/
function _setupLanguage()
{
- require_once XOOPS_BASE_PATH."/kernel/Legacy_LanguageManager.class.php";
+ require_once XOOPS_LEGACY_PATH."/kernel/Legacy_LanguageManager.class.php";
$language = null;
@@ -537,7 +537,7 @@
*/
function &_createLanguageManager($language)
{
- require_once XOOPS_BASE_PATH . "/kernel/Legacy_LanguageManager.class.php";
+ require_once XOOPS_LEGACY_PATH . "/kernel/Legacy_LanguageManager.class.php";
$languageManager = null;
@@ -598,7 +598,7 @@
{
error_reporting(0);
- require_once XOOPS_BASE_PATH . "/class/DebuggerManager.class.php";
+ require_once XOOPS_LEGACY_PATH . "/class/DebuggerManager.class.php";
$debug_mode = $this->mRoot->mContext->mXoopsConfig['debug_mode'];
if (defined("OH_MY_GOD_HELP_ME")) {
@@ -826,7 +826,7 @@
{
$delegateManager =& parent::_createDelegateManager();
- $file = XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_EventFunctions.class.php";
+ $file = XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_EventFunctions.class.php";
$delegateManager->add('Legacypage.Notifications.Access', 'Legacy_EventFunction::notifications', $file);
$delegateManager->add('Legacyfunction.Notifications.Select', 'Legacy_EventFunction::notifications_select', $file);
@@ -843,7 +843,7 @@
{
$serviceManager =& parent::_createServiceManager();
- require_once XOOPS_ROOT_PATH . "/modules/base/service/LegacySearchService.class.php";
+ require_once XOOPS_ROOT_PATH . "/modules/legacy/service/LegacySearchService.class.php";
$searchService =& new Legacy_SearchService();
$searchService->prepare();
@@ -863,7 +863,7 @@
if (!is_object($this->mRoot->mContext->mXoopsUser)) {
$this->mCheckLogin->call(new XCube_Ref($this->mRoot->mContext->mXoopsUser));
- $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
+ $this->mRoot->mLanguageManager->loadModuleMessageCatalog('legacy');
if(is_object($this->mRoot->mContext->mXoopsUser)) {
// RMV-NOTIFY
@@ -888,7 +888,7 @@
}
}
- $this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_BASE_MESSAGE_LOGIN_SUCCESS, $this->mRoot->mContext->mXoopsUser->get('uname')));
+ $this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_LEGACY_MESSAGE_LOGIN_SUCCESS, $this->mRoot->mContext->mXoopsUser->get('uname')));
}
else {
XCube_DelegateUtils::call("Site.CheckLogin.Fail", new XCube_Ref($this->mRoot->mContext->mXoopsUser));
@@ -896,7 +896,7 @@
//
// Fall back process for login fail.
//
- $this->executeRedirect(XOOPS_URL . "/user.php", 1, _MD_BASE_ERROR_INCORRECTLOGIN);
+ $this->executeRedirect(XOOPS_URL . "/user.php", 1, _MD_LEGACY_ERROR_INCORRECTLOGIN);
}
}
else {
@@ -916,12 +916,12 @@
if (is_object($xoopsUser)) {
- $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base');
+ $this->mRoot->mLanguageManager->loadModuleMessageCatalog('legacy');
$this->mLogout->call(new XCube_Ref($successFlag), $xoopsUser);
if ($successFlag) {
XCube_DelegateUtils::call("Site.Logout.Success", $xoopsUser);
- $this->executeRedirect(XOOPS_URL . '/', 1, array(_MD_BASE_MESSAGE_LOGGEDOUT, _MD_BASE_MESSAGE_THANKYOUFORVISIT));
+ $this->executeRedirect(XOOPS_URL . '/', 1, array(_MD_LEGACY_MESSAGE_LOGGEDOUT, _MD_LEGACY_MESSAGE_THANKYOUFORVISIT));
}
else {
XCube_DelegateUtils::call("Site.Logout.Fail", $xoopsUser);
@@ -1212,7 +1212,7 @@
function &_createContext()
{
- require_once XOOPS_ROOT_PATH . "/modules/base/kernel/Legacy_HttpContext.class.php";
+ require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_HttpContext.class.php";
$context =& new Legacy_HttpContext();
$request =& new XCube_HttpRequest();