Changeset 13842 for extensions/UserAdvManager/branches/2.40/include/functions.inc.php

Timestamp:

Mar 31, 2012, 6:39:21 PM (13 years ago)

Author:

Eric

Message:

r13841 merged from trunk
Bug 2603 fixed - Php notice when user changes his email in his profile if confirmation by email is set

File:

• extensions/UserAdvManager/branches/2.40/include/functions.inc.php (modified) (4 diffs)

extensions/UserAdvManager/branches/2.40/include/functions.inc.php

@@ -284 +284 @@
     if (isset($conf_UAM[38]) and $conf_UAM[38] == 'true' and UAM_check_pwgreset($user['id']))
     {
-      // if password not changed then pwdreset filed = true else pwdreset field = false
+      // if password not changed then pwdreset field = true else pwdreset field = false
       // ------------------------------------------------------------------------------
       if (!empty($_POST['use_new_pwd']))
@@ -346 +346 @@
         if ($_POST['mail_address'] != $current_email and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
         
-          SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
+          SetPermission($user['id']);// Set to "waiting" group or status until admin validation
           $confirm_mail_need = false;
       }
@@ -1595 +1595 @@
   }
 
-  if (!is_admin() and $conf_UAM[2] <> -1) // Set privacy level
+  if (!is_admin() and $conf_UAM[35] <> -1) // Set privacy level
   {
     $query = "
@@ -1601 +1601 @@
   (user_id, level)
 VALUES
-  ('".$user_id."', '".$conf_UAM[level]."')
+  ('".$user_id."', '".$conf_UAM[35]."')
 ;";
     pwg_query($query);