Changeset 8072

Timestamp:

12/10/10 17:48:18 (2 years ago)

Author:

Eric

Message:

Bug 2053 fixed - Manual validation by admins wasn't working correctly

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (3 diffs)
• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

@@ -631 +631 @@
         
   if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local') and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
-  {   
+  {
 // +-----------------------------------------------------------------------+
 // |                           initialization                              |
@@ -640 +640 @@
         die('Hacking attempt!');
     }
-          
+
     include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
@@ -965 +965 @@
                 foreach ($collection as $user_id)
         {
-                                  $query = "
-SELECT id, username, mail_address
-  FROM ".USERS_TABLE."
-WHERE id = '".$user_id."'
-;";
-                                        
-                                        $data = pwg_db_fetch_assoc(pwg_query($query));
-                                
-                ForceValidation($data['id']);                           
+          ForceValidation($user_id);
         }
         array_push(

extensions/NBC_UserAdvManager/trunk/changelog.txt.php

@@ -212 +212 @@
 ***************************************
 -- 2.16.0 : Bug 1430 and 1840 fixed - Automated tasks are available to delete or downgrade ghost users with or without email notification
+            Bug 1585 fixed - UAM version is set in database to improve future upgrades
+            Bug 2011 fixed - Text fields are no longer locked if related option button is not set and saved. Now this fields and unused options are hidden
+            Bug 2046 fixed - Using Piwigo's $conf['insensitive_case_logon'] = true option works again with UAM
+            Bug 2053 fixed - Manual validation by admins wasn't working correctly
 
 */

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

@@ -363 +363 @@
   $page['filtered_users'] = get_ghosts_autotasks();
 
-  // Ghost accounts auto deletion
-  if ((isset($conf_UAM[22]) and $conf_UAM[22] == 'true') and (isset($conf_UAM[23]) and $conf_UAM[23] == 'true'))
   {       
                 foreach($page['filtered_users'] as $listed_user)
@@ -1426 +1424 @@
  * @param : User id
  * 
- * @return : Bool
- * 
  */
 function ForceValidation($id)
@@ -1436 +1432 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
-        
-  $query = "
-SELECT COUNT(*)
-  FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE user_id = '".$id."'
-;";
-  list($count) = pwg_db_fetch_row(pwg_query($query));
-
-  if ($count == 1)
-  {
-    $query = "
-SELECT user_id, status, date_check
-  FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE user_id = '".$id."'
-;";
-    $data = pwg_db_fetch_assoc(pwg_query($query));
-
-    if (!empty($data) and isset($data['user_id']) and !isset($data['date_check']))
-    {      
-                        list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-                        $query = "
+
+  if (isset($conf_UAM[1]) and $conf_UAM[1] == 'true')
+  {
+    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+
+                $query = "
 UPDATE ".USER_CONFIRM_MAIL_TABLE."
 SET date_check='".$dbnow."'
-WHERE user_id = '".$data['user_id']."'
+WHERE user_id = '".$id."'
+;";
+    pwg_query($query);
+             
+                if ($conf_UAM[2] <> -1)
+                {
+                        $query = "
+DELETE FROM ".USER_GROUP_TABLE."
+WHERE user_id = '".$id."'
+  AND group_id = '".$conf_UAM[2]."'
 ;";
                         pwg_query($query);
-             
-                        if ($conf_UAM[2] <> -1)
-                        {
-                                $query = "
+                }
+  
+                if ($conf_UAM[3] <> -1)
+                {
+                        $query = "
 DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$data['user_id']."'
-  AND group_id = '".$conf_UAM[2]."'
-;";
-                                pwg_query($query);
-                        }
-  
-                        if ($conf_UAM[3] <> -1)
-                        {
-                                $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$data['user_id']."'
+WHERE user_id = '".$id."'
   AND group_id = '".$conf_UAM[3]."'
-                                ;";
-                                pwg_query($query);
+;";
+      pwg_query($query);
         
-                                $query = "
+                        $query = "
 INSERT INTO ".USER_GROUP_TABLE."
   (user_id, group_id)
 VALUES
-  ('".$data['user_id']."', '".$conf_UAM[3]."')
-;";
-                                pwg_query($query);
-                        }
-
-                        if (($conf_UAM[4] <> -1 or isset($data['status'])))
-                        {
-                                $query = "
+  ('".$id."', '".$conf_UAM[3]."')
+;";
+                        pwg_query($query);
+    }
+
+                if ($conf_UAM[4] <> -1)
+                {
+                        $query = "
 UPDATE ".USER_INFOS_TABLE."
-SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
-WHERE user_id = '".$data['user_id']."'
-;";
-                                pwg_query($query);
-                        }
-                        // Refresh user's category cache
-                        invalidate_user_cache();
-                        return true;
+SET status = '".$conf_UAM[4]."'
+WHERE user_id = '".$id."'
+;";
+                        pwg_query($query);
                 }
-        }
+  }
+  elseif (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
+  {
+    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+
+    if ($conf_UAM[2] <> -1)
+    {
+                  $query = "
+DELETE FROM ".USER_GROUP_TABLE."
+WHERE user_id = '".$id."'
+  AND group_id = '".$conf_UAM[2]."'
+;";
+                  pwg_query($query);
+    }
+
+    if ($conf_UAM[3] <> -1)
+    {
+      $query = "
+DELETE FROM ".USER_GROUP_TABLE."
+WHERE user_id = '".$id."'
+  AND group_id = '".$conf_UAM[3]."'
+;";
+      pwg_query($query);
+        
+                  $query = "
+INSERT INTO ".USER_GROUP_TABLE."
+  (user_id, group_id)
+VALUES
+  ('".$id."', '".$conf_UAM[3]."')
+;";
+                  pwg_query($query);
+    }
+
+    if ($conf_UAM[4] <> -1)
+    {
+                  $query = "
+UPDATE ".USER_INFOS_TABLE."
+SET status = '".$conf_UAM[4]."'
+WHERE user_id = '".$id."'
+;";
+      pwg_query($query);
+    }
+  }
 }