NobuNobu
nobun****@users*****
2006年 4月 11日 (火) 17:39:08 JST
Index: xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php
diff -u xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.6 xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.7
--- xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php:1.1.2.6 Sun Apr 2 22:07:48 2006
+++ xoops2jp/html/modules/base/preload/SiteClose/SiteClose.class.php Tue Apr 11 17:39:07 2006
@@ -14,12 +14,15 @@
function callbackSiteLogin()
{
+ $retArray = XCube_Utils::checkSystemModules();
$accessAllowFlag = false;
if(!empty($_POST['xoops_login'])) {
- // Check!
+ if (is_array($retArray)) {
+ define('XOOPS_CPFUNC_LOADED',1);
+ }
require_once XOOPS_ROOT_PATH.'/include/checklogin.php';
return;
- }elseif(is_object($this->mController->mXoopsUser)) {
+ } elseif(is_object($this->mController->mXoopsUser)) {
foreach ($this->mController->mXoopsUser->getGroups() as $group) {
if (in_array($group, $this->mController->mConfig['closesite_okgrp']) || XOOPS_GROUP_ADMIN == $group) {
$accessAllowFlag = true;
@@ -29,7 +32,6 @@
}
// @todo Devide following lines to another preload file
if ($accessAllowFlag) {
- $retArray = XCube_Utils::checkSystemModules();
if (is_array($retArray)) {
if (in_array(XOOPS_GROUP_ADMIN, $this->mController->mXoopsUser->getGroups())) {
$GLOBALS['xoopsUser'] = $this->mController->mXoopsUser;
@@ -84,6 +86,7 @@
'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
));
///< @todo filebase template with absolute file path
+ $xoopsTpl->compile_check = true;
$xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_uninstall_modules.html');
exit();
} else if (!empty($_POST['cube_module_uninstallok'])) { //@todo use Ticket
@@ -99,8 +102,17 @@
$objects = $handler->getObjects();
$optionModules = array();
foreach($objects as $module) {
- if (!in_array($module->getVar('dirname'), $retArray['uninstalled'])) {
- $optionModules[] = $module->getVar('dirname');
+ $dirname = $module->getVar('dirname');
+ if (!in_array($dirname, $retArray['uninstalled'])) {
+ $optionModule['dirname'] = $dirname;
+ if (in_array($dirname, $retArray['recommended'])) {
+ $optionModule['checked'] = 'checked="checked"';
+ $optionModule['desc'] = _SYS_RECOMMENDED_MODULES;
+ } else {
+ $optionModule['checked'] = '';
+ $optionModule['desc'] = _SYS_OPTION_MODULES;
+ }
+ $optionModules[] = $optionModule;
}
}
require_once XOOPS_ROOT_PATH.'/class/template.php';
@@ -114,6 +126,7 @@
'xoops_imageurl' => XOOPS_THEME_URL.'/'.$this->mController->mConfig['theme_set'].'/',
));
///< @todo filebase template with absolute file path
+ $xoopsTpl->compile_check = true;
$xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_install_modules.html');
exit();
}
@@ -133,7 +146,7 @@
'lang_username' => _USERNAME,
'lang_password' => _PASSWORD,
'lang_siteclosemsg' => $this->mController->mConfig['closesite_text']));
- $xoopsTpl->xoops_setCaching(1);
+ $xoopsTpl->compile_check = true;
// @todo filebase template with absolute file path
$xoopsTpl->display(XOOPS_ROOT_PATH.'/modules/base/templates/legacy_site_closed.html');
exit();