diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-09 22:17:55 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-04-09 22:17:55 +0000 |
| commit | c17e275080d8b1834016d80687ccd5a4ecc674a7 (patch) | |
| tree | c5715eac921d5fb50feb3155d3589b99c3f0d5a2 /phpBB/includes/session.php | |
| parent | e5e9fd9cbacaec04f0df45c0c05a3944c3d47e74 (diff) | |
| download | forums-c17e275080d8b1834016d80687ccd5a4ecc674a7.tar forums-c17e275080d8b1834016d80687ccd5a4ecc674a7.tar.gz forums-c17e275080d8b1834016d80687ccd5a4ecc674a7.tar.bz2 forums-c17e275080d8b1834016d80687ccd5a4ecc674a7.tar.xz forums-c17e275080d8b1834016d80687ccd5a4ecc674a7.zip | |
Weekly update: MCP templates. Forms renamed to 'main', added mcp_jumpbox.html for easy jumping and mcp_foruminfo.html.
Not too happy with HTML though =" templates\subSilver\mcp_forum.html templates\subSilver\mcp_foruminfo.html templates\subSilver\mcp_front.html templates\subSilver\mcp_header.html templates\subSilver\mcp_jumpbox.html templates\subSilver\mcp_move.html templates\subSilver\mcp_post.html templates\subSilver\mcp_viewip.html templates\subSilver\mcp_viewlogs.html
git-svn-id: file:///svn/phpbb/trunk@3800 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 102ecd46b6..50af672441 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -181,15 +181,16 @@ class session $autologin = ''; $this->data['user_id'] = $user_id = ANONYMOUS; } - + + // Is user banned? Are they excluded? if (!$this->data['user_founder']) { $banned = false; - $sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end - FROM ' . BANLIST_TABLE . ' - WHERE ban_end >= ' . time() . ' - OR ban_end = 0'; + $sql = "SELECT ban_ip, ban_userid, ban_email, ban_exclude + FROM " . BANLIST_TABLE . " + WHERE ban_end >= $current_time + OR ban_end = 0"; $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -217,17 +218,10 @@ class session if ($banned) { - // Initiate environment ... since it won't be set at this stage - $this->setup(); - - // Determine which message to output - $till_date = (!empty($row['ban_end'])) ? $this->format_date($row['ban_end']) : ''; - $message = (!empty($row['ban_end'])) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; - - $message = sprintf($this->lang[$message], $till_date, '<a href="mailto:' . $config['board_contact'] . '">', '</a>'); - // More internal HTML ... :D - $message .= (!empty($row['ban_show_reason'])) ? '<br /><br />' . sprintf($this->lang['BOARD_BAN_REASON'], $row['ban_show_reason']) : ''; - trigger_error($message); + // TODO + // Note that at present this doesn't surround the administrator + // text with an appropriate URL + trigger_error('BOARD_BANNED'); } } @@ -396,7 +390,7 @@ class user extends session $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; $this->date_format = $config['default_dateformat']; $this->timezone = $config['board_timezone'] * 3600; - $this->dst = $config['board_dst'] * 3600; + $this->dst = 0; if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { @@ -515,8 +509,6 @@ class auth { global $db, $cache; - $this->founder = ($userdata['user_founder']) ? true : false; - if (!($this->acl_options = $cache->get('acl_options'))) { $sql = "SELECT auth_value, is_global, is_local @@ -571,6 +563,7 @@ class auth // Look up an option function acl_get($opt, $f = 0) { + return TRUE; static $cache; if (!isset($cache[$f][$opt])) @@ -585,7 +578,7 @@ class auth } } - return ($this->founder) ? true : $cache[$f][$opt]; + return $cache[$f][$opt]; } function acl_gets() |