diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-13 16:14:37 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-13 16:14:37 +0000 |
| commit | ea983410993371bcc63e1a120fe17bed964f5f08 (patch) | |
| tree | 5bb1cc1bd365b04ba40aba256c9a4b82982a691e /phpBB/common.php | |
| parent | 79d57c449fc190ce693d2ecfdbb0dc36e8e82be7 (diff) | |
| download | forums-ea983410993371bcc63e1a120fe17bed964f5f08.tar forums-ea983410993371bcc63e1a120fe17bed964f5f08.tar.gz forums-ea983410993371bcc63e1a120fe17bed964f5f08.tar.bz2 forums-ea983410993371bcc63e1a120fe17bed964f5f08.tar.xz forums-ea983410993371bcc63e1a120fe17bed964f5f08.zip | |
Changes to include location + some other misc stuff
git-svn-id: file:///svn/phpbb/trunk@646 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index ffb430440e..6be5420e13 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -23,9 +23,8 @@ ***************************************************************************/ // -// Define some basic configuration arrays -// this also prevents malicious rewriting -// of language array values via URI params +// Define some basic configuration arrays this also prevents +// malicious rewriting of language array values via URI params // $board_config = Array(); $userdata = Array(); @@ -33,38 +32,45 @@ $theme = Array(); $images = Array(); $lang = Array(); -include('config.'.$phpEx); -include('includes/constants.'.$phpEx); +if(empty($phpbb_root_path)) +{ + $phpbb_root_path = "./"; +} +include($phpbb_root_path . 'config.'.$phpEx); +include($phpbb_root_path . 'includes/constants.'.$phpEx); +include($phpbb_root_path . 'includes/template.inc'); +include($phpbb_root_path . 'includes/error.'.$phpEx); +include($phpbb_root_path . 'includes/message.'.$phpEx); +include($phpbb_root_path . 'includes/sessions.'.$phpEx); +include($phpbb_root_path . 'includes/auth.'.$phpEx); +include($phpbb_root_path . 'includes/functions.'.$phpEx); +include($phpbb_root_path . 'includes/db.'.$phpEx); +// +// This would probably be best moved to a template +// specific file, eg "images.tpl" +// $url_images = "images"; + $images['quote'] = "$url_images/icon_quote.gif"; $images['edit'] = "$url_images/icon_edit.gif"; -$images['search_icon'] = "$url_images/search_icon.gif"; +$images['search_icon'] = "$url_images/icon_search.gif"; $images['profile'] = "$url_images/icon_profile.gif"; $images['privmsg'] = "$url_images/icon_pm.gif"; $images['email'] = "$url_images/icon_email.gif"; -$images['delpost'] = "$url_images/edit.gif"; +$images['delpost'] = "$url_images/icon_delete.gif"; $images['ip'] = "$url_images/icon_ip.gif"; $images['www'] = "$url_images/icon_www.gif"; $images['icq'] = "$url_images/icon_icq_add.gif"; $images['aim'] = "$url_images/icon_aim.gif"; $images['yim'] = "$url_images/icon_yim.gif"; $images['msnm'] = "$url_images/icon_msnm.gif"; -$images['posticon'] = "$url_images/posticon.gif"; +$images['posticon'] = "$url_images/icon_minipost.gif"; $images['folder'] = "$url_images/folder.gif"; -$images['new_folder'] = "$url_images/red_folder.gif"; -$images['latest_reply'] = "$url_images/latest_reply.gif"; +$images['new_folder'] = "$url_images/folder_new.gif"; +$images['latest_reply'] = "$url_images/icon_latest_reply.gif"; $images['locked_folder'] = "$url_images/folder_lock.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); -include('includes/db.'.$phpEx); - // // Obtain and encode users IP // @@ -140,7 +146,13 @@ else $board_config['smtp_host'] = $config['smtp_host']; } -include('language/lang_' . $board_config['default_lang'] . '.'.$phpEx); +// +// This doesn't need to be here, it's only neccesary +// for the following if loop because a language file +// will be loaded post-session initialisation (or the default +// English one will load if a CRITICAL_ERROR occurs) +// +include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '.'.$phpEx); if($board_config['board_disable']) { |