mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Allow ACP access if install/ is present and display the generic board disabled message otherwise so that a user does not know the reason for it being disabled
git-svn-id: file:///svn/phpbb/trunk@6276 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f5cabf864c
commit
560c570823
4 changed files with 18 additions and 3 deletions
|
@ -11,6 +11,7 @@
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
define('IN_PHPBB', 1);
|
define('IN_PHPBB', 1);
|
||||||
|
define('ADMIN_START', 1);
|
||||||
define('NEED_SID', true);
|
define('NEED_SID', true);
|
||||||
|
|
||||||
// Include files
|
// Include files
|
||||||
|
|
|
@ -11,6 +11,13 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- ENDIF -->
|
<!-- ENDIF -->
|
||||||
|
|
||||||
|
<!-- IF S_REMOVE_INSTALL -->
|
||||||
|
<div class="errorbox">
|
||||||
|
<h3>{L_WARNING}</h3>
|
||||||
|
<p>{L_REMOVE_INSTALL}</p>
|
||||||
|
</div>
|
||||||
|
<!-- ENDIF -->
|
||||||
|
|
||||||
<table cellspacing="1">
|
<table cellspacing="1">
|
||||||
<caption>{L_FORUM_STATS}</caption>
|
<caption>{L_FORUM_STATS}</caption>
|
||||||
<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
|
<col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" />
|
||||||
|
|
|
@ -191,10 +191,11 @@ unset($dbpasswd);
|
||||||
$config = $cache->obtain_config();
|
$config = $cache->obtain_config();
|
||||||
$dss_seeded = false;
|
$dss_seeded = false;
|
||||||
|
|
||||||
// Warn about install/ directory
|
// Disable board if the install/ directory is still present
|
||||||
if (file_exists($phpbb_root_path . 'install'))
|
if (file_exists($phpbb_root_path . 'install') && !defined('ADMIN_START'))
|
||||||
{
|
{
|
||||||
trigger_error('REMOVE_INSTALL');
|
$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
|
||||||
|
trigger_error($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
|
@ -456,6 +456,12 @@ class acp_main
|
||||||
$template->assign_var('S_DEBUG_EXTRA', true);
|
$template->assign_var('S_DEBUG_EXTRA', true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Warn if install is still present
|
||||||
|
if (file_exists($phpbb_root_path . 'install'))
|
||||||
|
{
|
||||||
|
$template->assign_var('S_REMOVE_INSTALL', true);
|
||||||
|
}
|
||||||
|
|
||||||
$this->tpl_name = 'acp_main';
|
$this->tpl_name = 'acp_main';
|
||||||
$this->page_title = 'ACP_MAIN';
|
$this->page_title = 'ACP_MAIN';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue