NobuNobu
nobun****@users*****
2006年 10月 8日 (日) 21:15:24 JST
Index: xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php diff -u xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.3 xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.4 --- xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php:1.1.2.6.2.3 Thu Oct 5 19:18:14 2006 +++ xoops2jp/html/modules/base/preload/Primary/SiteClose.class.php Sun Oct 8 21:15:23 2006 @@ -1,7 +1,7 @@ <?php /** * @package Legacy - * @version $Id: SiteClose.class.php,v 1.1.2.6.2.3 2006/10/05 10:18:14 minahito Exp $ + * @version $Id: SiteClose.class.php,v 1.1.2.6.2.4 2006/10/08 12:15:23 nobunobu Exp $ */ if (!defined('XOOPS_ROOT_PATH')) exit(); @@ -13,7 +13,7 @@ { function preBlockFilter() { - if (($this->mController->mConfig['closesite'] == 1) || is_array(Legacy_Utils::checkSystemModules())) { + if (($this->mRoot->mContext->getXoopsConfig('closesite') == 1) || is_array(Legacy_Utils::checkSystemModules())) { $this->mController->mSetupUser->add("Legacy_SiteClose::callbackSetupUser", XCUBE_DELEGATE_PRIORITY_FINAL); $this->mRoot->mDelegateManager->add("Site.CheckLogin.Success", array(&$this, "callbackCheckLoginSuccess")); } @@ -29,6 +29,7 @@ { $retArray = Legacy_Utils::checkSystemModules(); $accessAllowFlag = false; + $xoopsConfig = $controller->mRoot->mContext->getXoopsConfig(); if (!empty($_POST['xoops_login'])) { if (is_array($retArray)) { @@ -39,7 +40,7 @@ return; } elseif (is_object($context->mXoopsUser)) { foreach ($context->mXoopsUser->getGroups() as $group) { - if (in_array($group, $controller->mConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) { + if (in_array($group, $xoopsConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) { $accessAllowFlag = true; break; } @@ -97,9 +98,9 @@ $xoopsTpl =& new XoopsTpl(); $xoopsTpl->assign('cube_module_uninstall', htmlspecialchars($_GET['cube_module_uninstall'],ENT_QUOTES)); $xoopsTpl->assign( array( - 'xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']), + 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']), 'xoops_themecss' => xoops_getcss(), - 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/', + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', )); ///< @todo filebase template with absolute file path $xoopsTpl->compile_check = true; @@ -139,9 +140,9 @@ $xoopsTpl->assign('disabled',$retArray['disabled']); $xoopsTpl->assign('option',$optionModules); $xoopsTpl->assign(array( - 'xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']), + 'xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']), 'xoops_themecss' => xoops_getcss(), - 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/' + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/' )); ///< @todo filebase template with absolute file path $xoopsTpl->compile_check = true; @@ -156,13 +157,13 @@ if (!$accessAllowFlag) { require_once XOOPS_ROOT_PATH . '/class/template.php'; $xoopsTpl =& new XoopsTpl(); - $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($controller->mConfig['sitename']), + $xoopsTpl->assign(array('xoops_sitename' => htmlspecialchars($xoopsConfig['sitename']), 'xoops_themecss' => xoops_getcss(), - 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $controller->mConfig['theme_set'] . '/', + 'xoops_imageurl' => XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/', 'lang_login' => _LOGIN, 'lang_username' => _USERNAME, 'lang_password' => _PASSWORD, - 'lang_siteclosemsg' => $controller->mConfig['closesite_text'] + 'lang_siteclosemsg' => $xoopsConfig['closesite_text'] )); $xoopsTpl->compile_check = true;