aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-25 15:15:53 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-25 15:15:53 +0000
commite7cbcfe874d663703a4f6d36974aa8eb19a59c58 (patch)
tree869419df21717eb48599fe429350636bad0da249 /phpBB/includes/mcp/mcp_main.php
parentd1ae8c52a4fc4ab88f34347962ac667a0365f8a9 (diff)
downloadforums-e7cbcfe874d663703a4f6d36974aa8eb19a59c58.tar
forums-e7cbcfe874d663703a4f6d36974aa8eb19a59c58.tar.gz
forums-e7cbcfe874d663703a4f6d36974aa8eb19a59c58.tar.bz2
forums-e7cbcfe874d663703a4f6d36974aa8eb19a59c58.tar.xz
forums-e7cbcfe874d663703a4f6d36974aa8eb19a59c58.zip
some fixes.
David, could you check the pass_complex expressions? They are: .* PASS_TYPE_ANY (any characters are allowed, no check) [a-zA-Z] PASS_TYPE_CASE (password must contain alphanumerics) [a-zA-Z0-9] PASS_TYPE_ALPHA (password must contain alphanumerics and numbers) [a-zA-Z\W] PASS_TYPE_SYMBOL (password must contain alphanumers, numbers and symbols) At the moment the pass complexity check is done within validate_password(), but the expressions are wrong. :) git-svn-id: file:///svn/phpbb/trunk@6317 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php13
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index b77c3e4451..fe1047db79 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -207,9 +207,18 @@ function lock_unlock($action, $ids)
$l_prefix = 'POST';
}
- if (!($forum_id = check_ids($ids, $table, $sql_id, array('f_user_lock', 'm_lock'))))
+ if (!($forum_id = check_ids($ids, $table, $sql_id, array('m_lock'))))
{
- return;
+ // Make sure that for f_user_lock only the lock action is triggered.
+ if ($action != 'lock')
+ {
+ return;
+ }
+
+ if (!($forum_id = check_ids($ids, $table, $sql_id, array('f_user_lock'))))
+ {
+ return;
+ }
}
$redirect = request_var('redirect', $user->data['session_page']);