makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

making sure coding guidelines are met... ;)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5431 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-01-06 07:48:51 +00:00
parent ff86c423cf
commit a05d3c14d2
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/functions.php
View file

@ -1535,16 +1535,19 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
{ {
case E_NOTICE: case E_NOTICE:
case E_WARNING: case E_WARNING:
if (defined('DEBUG_EXTRA')) if (defined('DEBUG_EXTRA'))
{ {
if (!strstr($errfile, 'cache') && !strstr($errfile, 'template.php')) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.php') === false)
{ {
echo "<b>PHP Notice</b>: in file <b>$errfile</b> on line <b>$errline</b>: <b>$msg_text</b><br>"; echo "<b>PHP Notice</b>: in file <b>$errfile</b> on line <b>$errline</b>: <b>$msg_text</b><br>";
} }
} }
break;
break;
case E_USER_ERROR: case E_USER_ERROR:
if (isset($db)) if (isset($db))
{ {
$db->sql_close(); $db->sql_close();
@ -1583,14 +1586,14 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
echo ' </div>'; echo ' </div>';
echo ' </div>'; echo ' </div>';
echo ' <div id="page-footer">'; echo ' <div id="page-footer">';
echo ' Powered by phpBB &copy; '.date('Y').' <a href="http://www.phpbb.com/">phpBB Group</a>'; echo ' Powered by phpBB &copy; ' . date('Y') . ' <a href="http://www.phpbb.com/">phpBB Group</a>';
echo ' </div>'; echo ' </div>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
exit; exit;
break; break;
case E_USER_NOTICE: case E_USER_NOTICE:
@ -1600,6 +1603,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
{ {
$user->session_begin(); $user->session_begin();
} }
if (empty($user->lang)) if (empty($user->lang))
{ {
$user->setup(); $user->setup();
@ -1642,7 +1646,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
} }
exit; exit;
break; break;
} }
} }

8
phpBB/includes/session.php
View file

@ -382,21 +382,21 @@ class session
global $SID, $db, $config; global $SID, $db, $config;
$sql = 'DELETE FROM ' . SESSIONS_TABLE . " $sql = 'DELETE FROM ' . SESSIONS_TABLE . "
WHERE session_id = '" . $db->sql_escape($this->session_id) . "' WHERE session_id = '" . $db->sql_escape($this->session_id) . "'
AND session_user_id = " . (int) $this->data['user_id']; AND session_user_id = " . (int) $this->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
if ($this->data['user_id'] != ANONYMOUS) if ($this->data['user_id'] != ANONYMOUS)
{ {
// Delete existing session, update last visit info first! // Delete existing session, update last visit info first!
if ( !isset($this->data['session_time']) ) if (!isset($this->data['session_time']))
{ {
$this->data['session_time'] = time(); $this->data['session_time'] = time();
} }
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_lastvisit = ' . (int) $this->data['session_time'] . ' SET user_lastvisit = ' . (int) $this->data['session_time'] . '
WHERE user_id = ' . (int) $this->data['user_id']; WHERE user_id = ' . (int) $this->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
if ($this->cookie_data['k']) if ($this->cookie_data['k'])