diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-08-12 15:37:28 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-08-12 15:37:28 +0000 |
| commit | 560c570823877b6fb3cb78e6ad0fdf26a1427f7f (patch) | |
| tree | b2afdcdd6e977aa07bf5e130176bb6d71f50b91b | |
| parent | f5cabf864c7bf29f5415a1ed315dc08b35f759c2 (diff) | |
| download | forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.gz forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.bz2 forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.tar.xz forums-560c570823877b6fb3cb78e6ad0fdf26a1427f7f.zip | |
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
| -rw-r--r-- | phpBB/adm/index.php | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 7 | ||||
| -rw-r--r-- | phpBB/common.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 6 |
4 files changed, 18 insertions, 3 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 0c317d3d4c..336afc0de1 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -11,6 +11,7 @@ /** */ define('IN_PHPBB', 1); +define('ADMIN_START', 1); define('NEED_SID', true); // Include files diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index d68e9d2547..a3a3e90c00 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -11,6 +11,13 @@ </div> <!-- ENDIF --> +<!-- IF S_REMOVE_INSTALL --> + <div class="errorbox"> + <h3>{L_WARNING}</h3> + <p>{L_REMOVE_INSTALL}</p> + </div> +<!-- ENDIF --> + <table cellspacing="1"> <caption>{L_FORUM_STATS}</caption> <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> diff --git a/phpBB/common.php b/phpBB/common.php index d52cf8c884..c69ee4395e 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -191,10 +191,11 @@ unset($dbpasswd); $config = $cache->obtain_config(); $dss_seeded = false; -// Warn about install/ directory -if (file_exists($phpbb_root_path . 'install')) +// Disable board if the install/ directory is still present +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); } ?>
\ No newline at end of file diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 81c265581b..bab08bc0ff 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -456,6 +456,12 @@ class acp_main $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->page_title = 'ACP_MAIN'; } |