diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-29 13:00:54 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-29 13:00:54 +0000 |
| commit | 6f37638caee649060dc9f933af6773652a813035 (patch) | |
| tree | 897c7056941c2fc3452bd46053ee56115a6a82fc /phpBB/includes/session.php | |
| parent | 1c22e7a40728fde76b9b9e5afd168f8eb0313268 (diff) | |
| download | forums-6f37638caee649060dc9f933af6773652a813035.tar forums-6f37638caee649060dc9f933af6773652a813035.tar.gz forums-6f37638caee649060dc9f933af6773652a813035.tar.bz2 forums-6f37638caee649060dc9f933af6773652a813035.tar.xz forums-6f37638caee649060dc9f933af6773652a813035.zip | |
- fixing some very very nasty opera bugs by changing the clearing method we use.
- also properly apply preg_quote to some strings.
git-svn-id: file:///svn/phpbb/trunk@7808 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 35edf92749..9e70779556 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -884,13 +884,13 @@ class session { if (!is_array($user_ips)) { - $ip_banned = preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ips); + $ip_banned = preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips); } else { foreach ($user_ips as $user_ip) { - if (preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ip)) + if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ip)) { $ip_banned = true; break; @@ -901,7 +901,7 @@ class session if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) || $ip_banned || - (!empty($row['ban_email']) && preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#i', $user_email))) + (!empty($row['ban_email']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_email'], '#')) . '$#i', $user_email))) { if (!empty($row['ban_exclude'])) { @@ -917,7 +917,7 @@ class session { $ban_triggered_by = 'user'; } - else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ips)) + else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips)) { $ban_triggered_by = 'ip'; } |