Changeset 20514 for extensions/UserAdvManager/trunk/include/functions.inc.php

Timestamp:

Feb 1, 2013, 10:37:38 PM (11 years ago)

Author:

Eric

Message:

Bug 2829 fixed - Users add manually by admins are considered as valid by default. Admins or users don't have to validated the registration.

File:

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

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -137 +137 @@
     $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
 
+    // No validation needed when admins add users - users are considered as valid by default
+    // -------------------------------------------------------------------------------------
+    if (isset($page['page']) and ($page['page'] != 'user_list'))
+    {
     if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
     {
@@ -168 +172 @@
       }
     }
+  }
   }
 }
@@ -2001 +2006 @@
     if ( $conf['guest_access'] )
     {
-      return( get_absolute_root_url().'?key='.$Confirm_Mail_ID.'&userid='.$user_id);
+      return(get_absolute_root_url().'?key='.$Confirm_Mail_ID.'&userid='.$user_id);
     }
     else
     {
-      return( get_absolute_root_url().'identification.php?key='.$Confirm_Mail_ID.'&userid='.$user_id);
+      return(get_absolute_root_url().'identification.php?key='.$Confirm_Mail_ID.'&userid='.$user_id);
     }
   }
@@ -2111 +2116 @@
     if ( $conf['guest_access'] )
     {
-      return( get_absolute_root_url().'?key='.$Confirm_Mail_ID.'&userid='.$user_id);
+      return(get_absolute_root_url().'?key='.$Confirm_Mail_ID.'&userid='.$user_id);
     }
     else
     {
-      return( get_absolute_root_url().'identification.php?key='.$Confirm_Mail_ID.'&userid='.$user_id);
+      return(get_absolute_root_url().'identification.php?key='.$Confirm_Mail_ID.'&userid='.$user_id);
     }
   }