Changeset 21633 for extensions/UserAdvManager/branches/2.50/include/functions.inc.php

Timestamp:

Mar 17, 2013, 2:08:54 PM (11 years ago)

Author:

Eric

Message:

merge r21598, r21606, r21611 and r21612 from trunk to branch 2.50

File:

• extensions/UserAdvManager/branches/2.50/include/functions.inc.php (modified) (10 diffs)

extensions/UserAdvManager/branches/2.50/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']);
 }
 
@@ -2629 +2614 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'"
   OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
@@ -2704 +2690 @@
     ON u.'.$conf['user_fields']['id'].' = ui.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
 ORDER BY ui.registration_date ASC;';
@@ -2744 +2731 @@
     ON u.'.$conf['user_fields']['id'].' = lv.user_id
 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
 ORDER BY lv.lastvisit ASC;';
 
@@ -2791 +2779 @@
     ON u.'.$conf['user_fields']['id'].' = lv.user_id
 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
 ORDER BY lv.lastvisit ASC;';
 
@@ -2827 +2816 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND u.username NOT LIKE "16"
   AND u.username NOT LIKE "18"
@@ -3086 +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;
@@ -3104 +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