aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-20 16:40:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-20 16:40:44 +0000
commit2774981b2ddcf0e6c7076a0371a4b8941199dec8 (patch)
treefee58e1507d218946b9b075f9cb7feb1fb265928
parente03fb0aafd34612cd81c16bc5e0fb1c4b7eda2a8 (diff)
downloadforums-2774981b2ddcf0e6c7076a0371a4b8941199dec8.tar
forums-2774981b2ddcf0e6c7076a0371a4b8941199dec8.tar.gz
forums-2774981b2ddcf0e6c7076a0371a4b8941199dec8.tar.bz2
forums-2774981b2ddcf0e6c7076a0371a4b8941199dec8.tar.xz
forums-2774981b2ddcf0e6c7076a0371a4b8941199dec8.zip
fix for bug #5490
- make sure bots are catched by the posting auth too. git-svn-id: file:///svn/phpbb/trunk@6619 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/functions_module.php5
-rw-r--r--phpBB/posting.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 556a4adaba..549c3bf16d 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -244,6 +244,7 @@ class p_master
case '(':
case '&&':
case '||':
+ case ',':
break;
default:
@@ -254,8 +255,12 @@ class p_master
break;
}
}
+
$module_auth = implode(' ', $tokens);
+ // Make sure $id seperation is working fine
+ $module_auth = str_replace(' , ', ',', $module_auth);
+
$is_auth = false;
eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z_]+)#', '#cfg_([a-z_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $this->acl_forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) $config[\'\\1\']'), $module_auth) . ');');
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 72151470d4..7b2695cefa 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -163,7 +163,7 @@ if ($post_data['forum_password'])
// Is the user able to read within this forum?
if (!$auth->acl_get('f_read', $forum_id))
{
- if ($user->data['is_registered'])
+ if ($user->data['user_id'] != ANONYMOUS)
{
trigger_error('USER_CANNOT_READ');
}