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

Fixed typos, added isset() to produce less PHP notices and changed addslashes() to the corresponding dbal function

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3948 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-04-24 18:23:35 +00:00
parent b939242c3a
commit 5f58f0ff71
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/session.php
View file

@ -244,7 +244,7 @@ class session
if ($this->session_id == '' || !$db->sql_query($sql) || !$db->sql_affectedrows()) if ($this->session_id == '' || !$db->sql_query($sql) || !$db->sql_affectedrows())
{ {
$db->sql_return_on_error(false); $db->sql_return_on_error(false);
$this->session_id = md5(uniqid($user_ip)); $this->session_id = md5(uniqid($this->ip));
$sql = "INSERT INTO " . SESSIONS_TABLE . " $sql = "INSERT INTO " . SESSIONS_TABLE . "
(session_id, session_user_id, session_last_visit, session_start, session_time, session_ip, session_browser, session_page, session_allow_viewonline) (session_id, session_user_id, session_last_visit, session_start, session_time, session_ip, session_browser, session_page, session_allow_viewonline)
@ -508,7 +508,7 @@ class user extends session
class auth class auth
{ {
var $founder = false; var $founder = false;
var $acl = array(); var $acl = array('global' => '', 'local' => '');
var $option = array(); var $option = array();
var $acl_options = array(); var $acl_options = array();
@ -553,12 +553,13 @@ class auth
for($i = 0; $i < $global_chars; $i++) for($i = 0; $i < $global_chars; $i++)
{ {
$this->acl['global'] .= str_pad(decbin(ord($userdata['user_permissions']{$i})), 8, 0, STR_LEFT_PAD); $this->acl['global'] .= str_pad(decbin(ord($userdata['user_permissions']{$i})), 8, 0, STR_PAD_LEFT);
} }
for ($i = $global_chars; $i < strlen($userdata['user_permissions']); $i += $local_chars) for ($i = $global_chars; $i < strlen($userdata['user_permissions']); $i += $local_chars)
{ {
$forum_id = (ord($userdata['user_permissions']{$i}) << 8) + ord($userdata['user_permissions']{$i + 1}); $forum_id = (ord($userdata['user_permissions']{$i}) << 8) + ord($userdata['user_permissions']{$i + 1});
$this->acl['local'][$forum_id] = '';
for ($j = $i + 2; $j < $i + $local_chars; $j++) for ($j = $i + 2; $j < $i + $local_chars; $j++)
{ {
$this->acl['local'][$forum_id] .= str_pad(decbin(ord($userdata['user_permissions']{$j})), 8, 0, STR_PAD_LEFT); $this->acl['local'][$forum_id] .= str_pad(decbin(ord($userdata['user_permissions']{$j})), 8, 0, STR_PAD_LEFT);
@ -576,6 +577,7 @@ class auth
if (!isset($cache[$f][$opt])) if (!isset($cache[$f][$opt]))
{ {
$cache[$f][$opt] = FALSE;
if (isset($this->acl_options['global'][$opt])) if (isset($this->acl_options['global'][$opt]))
{ {
$cache[$f][$opt] = $this->acl['global']{$this->acl_options['global'][$opt]}; $cache[$f][$opt] = $this->acl['global']{$this->acl_options['global'][$opt]};
@ -646,7 +648,7 @@ class auth
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if ($this->acl[$row['forum_id']][$row['auth_option']] !== ACL_NO) if (isset($this->acl[$row['forum_id']][$row['auth_option']]) && $this->acl[$row['forum_id']][$row['auth_option']] !== ACL_NO)
{ {
$this->acl[$row['forum_id']][$row['auth_option']] = $row['min_setting']; $this->acl[$row['forum_id']][$row['auth_option']] = $row['min_setting'];
} }
@ -661,6 +663,11 @@ class auth
foreach ($this->acl as $f => $auth_ary) foreach ($this->acl as $f => $auth_ary)
{ {
if (!is_array($auth_ary))
{
continue;
}
$holding = array(); $holding = array();
$option_set = array(); $option_set = array();
@ -677,6 +684,7 @@ class auth
$hold_str = 'local_hold'; $hold_str = 'local_hold';
} }
foreach ($this->acl_options[$ary_key] as $opt => $id) foreach ($this->acl_options[$ary_key] as $opt => $id)
{ {
if (!empty($auth_ary[$opt])) if (!empty($auth_ary[$opt]))
@ -718,7 +726,7 @@ class auth
unset($local_hold); unset($local_hold);
$sql = "UPDATE " . USERS_TABLE . " $sql = "UPDATE " . USERS_TABLE . "
SET user_permissions = '" . addslashes($userdata['user_permissions']) . "' SET user_permissions = '" . $db->sql_escape($userdata['user_permissions']) . "'
WHERE user_id = " . $userdata['user_id']; WHERE user_id = " . $userdata['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
} }