Changeset 20592 for extensions/UserAdvManager/branches/2.41/include

Timestamp:

Feb 6, 2013, 9:08:29 PM (11 years ago)

Author:

Eric

Message:

r20591 merged from trunk to branch 2.41

Location:

extensions/UserAdvManager/branches/2.41/include

Files:

• constants.php (modified) (1 diff)
• functions.inc.php (modified) (3 diffs)
• upgradedb.inc.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.41/include/constants.php

@@ -1 +1 @@
 <?php
+
 global $prefixeTable;
 define('USER_CONFIRM_MAIL_TABLE', $prefixeTable.'user_confirm_mail');
 define('USER_LASTVISIT_TABLE', $prefixeTable.'user_lastvisit_check');
 define('UAM_OBSOLETE', 'obsolete.list');
+
 ?>

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

@@ -137 +137 @@
     $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
 
-    if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
-    {
-      // This is to set user to "waiting" group or status and without ConfirMail until admin validation
-      // ----------------------------------------------------------------------------------------------
-      SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
-      
-      // This is to set UAM_validated field to false in #_users table - Usefull if no "waiting" group or status is set
-      // -------------------------------------------------------------------------------------------------------------
-      SetUnvalidated($register_user['id']);
-
-      // This is to send the validation key by email to admins for their manual validation without having to connect the gallery
-      // -----------------------------------------------------------------------------------------------------------------------
-      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
-    }
-    // Sending registration confirmation by email
-    // ------------------------------------------
-    elseif (isset($conf_UAM[1]) and $conf_UAM[1] == 'true')
-    {
-      if (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'true')
-      {
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
-      }
-      elseif (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'false')
-      {
-        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
-      }
-      elseif (!is_admin())
-      {
+    // 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')
+      {
+        // This is to set user to "waiting" group or status and without ConfirMail until admin validation
+        // ----------------------------------------------------------------------------------------------
+        SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
+
+        // This is to set UAM_validated field to false in #_users table - Usefull if no "waiting" group or status is set
+        // -------------------------------------------------------------------------------------------------------------
+        SetUnvalidated($register_user['id']);
+
+        // This is to send the validation key by email to admins for their manual validation without having to connect the gallery
+        // -----------------------------------------------------------------------------------------------------------------------
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
+      }
+      // Sending registration confirmation by email
+      // ------------------------------------------
+      elseif (isset($conf_UAM[1]) and $conf_UAM[1] == 'true')
+      {
+        if (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'true')
+        {
+          SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true); 
+        }
+        elseif (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'false')
+        {
+          SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
+        }
+        elseif (!is_admin())
+        {
+          SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
+        }
       }
     }
@@ -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);
     }
   }

extensions/UserAdvManager/branches/2.41/include/upgradedb.inc.php

@@ -26 +26 @@
 /* even if no database upgrade is needed   */
 /* *************************************** */
+
 function UAM_version_update()
 {