diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:32:27 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:32:27 +0000 |
| commit | f80594bb7f7dab7b55a73d93edc28341eec84b0b (patch) | |
| tree | 2d86f276c2966e562047cd925f548aaa164db111 /phpBB/common.php | |
| parent | 6f25a26ba403eeaddc9e445d551d2fbc7478fcc6 (diff) | |
| download | forums-f80594bb7f7dab7b55a73d93edc28341eec84b0b.tar forums-f80594bb7f7dab7b55a73d93edc28341eec84b0b.tar.gz forums-f80594bb7f7dab7b55a73d93edc28341eec84b0b.tar.bz2 forums-f80594bb7f7dab7b55a73d93edc28341eec84b0b.tar.xz forums-f80594bb7f7dab7b55a73d93edc28341eec84b0b.zip | |
Included message.php _and_ error.php
git-svn-id: file:///svn/phpbb/trunk@539 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 08bff322de..44066cb6a8 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -59,6 +59,7 @@ $images['latest_reply'] = "$url_images/latest_reply.gif"; include('includes/template.inc'); include('includes/error.'.$phpEx); +include('includes/message.'.$phpEx); include('includes/sessions.'.$phpEx); include('includes/auth.'.$phpEx); include('includes/functions.'.$phpEx); @@ -73,8 +74,7 @@ $user_ip = encode_ip(($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_A // This is also the first DB query/connect // $sql = "SELECT * - FROM ".CONFIG_TABLE." - WHERE selected = 1"; + FROM " . CONFIG_TABLE; if(!$result = $db->sql_query($sql)) { // @@ -89,16 +89,20 @@ if(!$result = $db->sql_query($sql)) $board_config['default_lang'] = "english"; $board_config['gzip_compress'] = 0; - // Our template class hasn't been instantiated - // so we do it here. - $template = new Template("templates/Default"); - - error_die(SQL_QUERY, "Could not query config information.", __LINE__, __FILE__); + message_die(SQL_QUERY, "Could not query config information", "", __LINE__, __FILE__); } else { +/* + while($row = $db->sql_fetchrow($result)) + { + $board_config[$row['config_var_name']] = stripslashes($row['config_var_value']); + } +*/ + $config = $db->sql_fetchrow($result); + $board_config['board_disable'] = $config['board_disable']; $board_config['sitename'] = stripslashes($config['sitename']); $board_config['allow_html'] = $config['allow_html']; $board_config['allow_bbcode'] = $config['allow_bbcode']; @@ -106,6 +110,7 @@ else $board_config['allow_sig'] = $config['allow_sig']; $board_config['allow_namechange'] = $config['allow_namechange']; $board_config['allow_avatar_local'] = $config['allow_avatar_local']; + $board_config['allow_avatar_remote'] = $config['allow_avatar_local']; $board_config['allow_avatar_upload'] = $config['allow_avatar_upload']; $board_config['require_activation'] = $config['require_activation']; $board_config['override_user_themes'] = $config['override_themes']; @@ -125,8 +130,14 @@ else $board_config['avatar_path'] = $config['avatar_path']; $board_config['prune_enable'] = $config['prune_enable']; $board_config['gzip_compress'] = $config['gzip_compress']; + } -include('language/lang_'.$board_config['default_lang'].'.'.$phpEx); +include('language/lang_' . $board_config['default_lang'] . '.'.$phpEx); + +if($board_config['board_disable']) +{ + message_die(GENERAL_MESSAGE, $lang['Board_disable'], $lang['Information']); +} -?> +?>
\ No newline at end of file |