diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-17 18:41:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-17 18:41:49 +0000 |
| commit | a841fe70a8234bf158165105339e32aa5ceb75a2 (patch) | |
| tree | a3e85eb75ec6bb59b331bd830667532d4511a868 /phpBB/includes/acp/acp_users.php | |
| parent | 708113b790368fffbf57eb5b96c8132eda00ba9c (diff) | |
| download | forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.gz forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.bz2 forums-a841fe70a8234bf158165105339e32aa5ceb75a2.tar.xz forums-a841fe70a8234bf158165105339e32aa5ceb75a2.zip | |
ok, handled some bugs... the most important being validate_username (the variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o
git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 1929b1ece6..81bd8d6436 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -623,7 +623,6 @@ class acp_users 'email_confirm' => strtolower(request_var('email_confirm', '')), 'user_password' => request_var('user_password', '', true), 'password_confirm' => request_var('password_confirm', '', true), - 'warnings' => request_var('warnings', $user_row['user_warnings']), ); // Validation data - we do not check the password complexity setting here @@ -632,7 +631,6 @@ class acp_users array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), array('password')), 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - 'warnings' => array('num'), ); // Check username if altered @@ -641,7 +639,8 @@ class acp_users $check_ary += array( 'username' => array( array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username', $user_row['username'])), + array('username', $user_row['username']) + ), ); } @@ -670,7 +669,6 @@ class acp_users } // Which updates do we need to do? - $update_warning = ($user_row['user_warnings'] != $data['warnings']) ? true : false; $update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false; $update_password = ($data['user_password'] && $user_row['user_password'] != md5($data['user_password'])) ? true : false; $update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false; @@ -681,11 +679,6 @@ class acp_users if ($user_row['user_type'] != USER_FOUNDER || $user->data['user_type'] == USER_FOUNDER) { - if ($update_warning) - { - $sql_ary['user_warnings'] = $data['warnings']; - } - // Only allow founders updating the founder status... if ($user->data['user_type'] == USER_FOUNDER) { @@ -765,13 +758,6 @@ class acp_users $db->sql_query($sql); } - /** - * @todo adjust every data based in the number of user warnings - */ - if ($update_warning) - { - } - if ($update_username) { user_update_name($user_row['username'], $update_username); |