Minahito
minah****@users*****
2006年 8月 18日 (金) 18:10:51 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.67 xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.68 --- xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php:1.1.2.67 Fri Aug 18 12:54:11 2006 +++ xoops2jp/html/modules/base/kernel/Legacy_Controller.class.php Fri Aug 18 18:10:51 2006 @@ -1,7 +1,7 @@ <?php /** * @package Legacy - * @version $Id: Legacy_Controller.class.php,v 1.1.2.67 2006/08/18 03:54:11 minahito Exp $ + * @version $Id: Legacy_Controller.class.php,v 1.1.2.68 2006/08/18 09:10:51 minahito Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -787,6 +787,8 @@ { if (!is_object($this->mXoopsUser)) { $this->mCheckLogin->call(new XCube_Ref($this->mXoopsUser)); + + $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); if(is_object($this->mXoopsUser)) { // RMV-NOTIFY @@ -811,8 +813,6 @@ } } - $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); - $this->executeRedirect($url, 1, XCube_Utils::formatMessage(_MD_BASE_MESSAGE_LOGIN_SUCCESS, $this->mXoopsUser->get('uname'))); } else { @@ -821,7 +821,7 @@ // // Fall back process for login fail. // - $this->executeRedirect(XOOPS_URL . "/user.php", 1, _US_INCORRECTLOGIN); + $this->executeRedirect(XOOPS_URL . "/user.php", 1, _MD_BASE_ERROR_INCORRECTLOGIN); } } else { @@ -839,11 +839,14 @@ $successFlag = false; $xoopsUser =& $this->getXoopsUser(); + if (is_object($xoopsUser)) { + $this->mRoot->mLanguageManager->loadModuleMessageCatalog('base'); + $this->mLogout->call(new XCube_Ref($successFlag), $xoopsUser); if ($successFlag) { XCube_DelegateUtils::call("Site.Logout.Success", $xoopsUser); - $this->executeRedirect(XOOPS_URL, 1, array(_US_LOGGEDOUT, _US_THANKYOUFORVISIT)); + $this->executeRedirect(XOOPS_URL, 1, array(_MD_BASE_MESSAGE_LOGGEDOUT, _MD_BASE_MESSAGE_THANKYOUFORVISIT)); } else { XCube_DelegateUtils::call("Site.Logout.Fail", $xoopsUser); @@ -873,7 +876,7 @@ */ function setStrategy(&$strategy) { - if($strategy->mStatusFlag != $this->_mStrategy->mStatusFlag) { + if ($strategy->mStatusFlag != $this->_mStrategy->mStatusFlag) { $this->_mStrategy =& $strategy; //