Changeset 2124

Timestamp:

Oct 6, 2007, 8:41:18 AM (17 years ago)

Author:

rub

Message:

Resolved 0000759: email unique for each user

Fix bug of last commit 2115

Location:

trunk

Files:

• include/functions_user.inc.php (modified) (3 diffs)
• install.php (modified) (1 diff)
• profile.php (modified) (1 diff)

trunk/include/functions_user.inc.php

@@ -34 +34 @@
 // If the mail address doesn't correspond, an error message is returned.
 // 
-function validate_mail_address($mail_address)
+function validate_mail_address($user_id, $mail_address)
 {
   global $conf;
 
   if (empty($mail_address) and
-      !($conf['obligatory_user_mail_address'] and in_array(script_basename(), array('register', 'profile'))))
+      !($conf['obligatory_user_mail_address'] and 
+      in_array(script_basename(), array('register', 'profile'))))
   {
     return '';
@@ -56 +57 @@
 from '.USERS_TABLE.'
 where upper('.$conf['user_fields']['email'].') = upper(\''.$mail_address.'\')
+'.(is_numeric($user_id) ? 'and '.$conf['user_fields']['id'].' != \''.$user_id.'\'' : '').'
 ;';
     list($count) = mysql_fetch_array(pwg_query($query));
@@ -85 +87 @@
     array_push($errors, l10n('reg_err_login5'));
   }
-  $mail_error = validate_mail_address($mail_address);
+  $mail_error = validate_mail_address(null, $mail_address);
   if ('' != $mail_error)
   {

trunk/install.php

@@ -269 +269 @@
   else 
   {
-    $error_mail_address = validate_mail_address($admin_mail);
+    $error_mail_address = validate_mail_address(null, $admin_mail);
     if (!empty($error_mail_address))
       array_push( $errors, $error_mail_address );

trunk/profile.php

@@ -116 +116 @@
   if (isset($_POST['mail_address']))
   {
-    $mail_error = validate_mail_address($_POST['mail_address']);
+    // if $_POST and $userdata have are same email
+    // validate_mail_address allows, however, to check email
+    $mail_error = validate_mail_address($userdata['id'], $_POST['mail_address']);
     if (!empty($mail_error))
     {