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

Timestamp:

Mar 16, 2013, 5:43:15 PM (11 years ago)

Author:

Eric

Message:

Bug 2871 fixed - Improved process : User registration is confirmed by default when user is added by an admin and "confirmation of registration for admins" is set to OFF

File:

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

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

@@ -2303 +2303 @@
 
                                                 // Set UAM_validated field to True in #_users table
-                                                $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$data['user_id'].'
-;';
-                                                pwg_query($query);
+            SetValidated($data['user_id']);
 
                                                 // Refresh user's category cache
@@ -2395 +2390 @@
 
           // Set UAM_validated field to True in #_users table
-          $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$data['user_id'].'
-;';
-          pwg_query($query);
+          SetValidated($data['user_id']);
 
           // Refresh user's category cache
@@ -2493 +2483 @@
 
                 // Set UAM_validated field to True in #_users table
-                $query = '
-UPDATE '.USERS_TABLE.'
-SET UAM_validated = "true"
-WHERE id = '.$id.'
-;';
-                pwg_query($query);
+                SetValidated($data['user_id']);
 }
 
@@ -3091 +3076 @@
   $result = pwg_db_fetch_assoc(pwg_query($query));
 
-  if($result['UAM_validated'] == 'true')
+  if($result['UAM_validated'] == 'true' or is_null($result['UAM_validated']))
   {
     return true;
@@ -3109 +3094 @@
 UPDATE '.USERS_TABLE.'
 SET UAM_validated = "false"
+WHERE id = '.$user_id.'
+LIMIT 1
+;';
+
+  pwg_query($query);
+}
+
+
+/**
+ * SetValidated
+ * Set UAM_validated field to true in #_users table
+ * 
+ **/
+function SetValidated($user_id)
+{
+  $query ='
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "true"
 WHERE id = '.$user_id.'
 LIMIT 1