Changeset 17891 for extensions/UserAdvManager/trunk

Timestamp:

Sep 13, 2012, 6:49:31 PM (12 years ago)

Author:

Eric

Message:

New field in #_users table is filled with exclusion of Guest user ans AC users but includes admins and webmaster users.

Excluding admins and webmaster from connection rejection. So they can always connect the gallery ;-)

Location:

extensions/UserAdvManager/trunk/include

Files:

• functions.inc.php (modified) (1 diff)
• upgradedb.inc.php (modified) (1 diff)

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

@@ -105 +105 @@
 
   // Perform user logout after registration if not validated
-  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']))
+  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and is_webmaster())
   {
     invalidate_user_cache();

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

@@ -652 +652 @@
   // Fill UAM_validated column with correct information for registered and validated  users
   // --------------------------------------------------------------------------------------
-  $query = '
-SELECT DISTINCT u.id AS id
+                
+                // It goes for everybody registered in the gallery except for Guest and AC users (16 and 18)
+  $query = '
+SELECT DISTINCT u.id AS id, u.username AS username
 FROM '.USERS_TABLE.' AS u
-  INNER JOIN '.USER_INFOS_TABLE.' AS ui
-    ON u.id = ui.user_id
-  LEFT JOIN '.USER_GROUP_TABLE.' AS ug
-    ON u.id = ug.user_id
-WHERE u.id <> 2';
-
-        if ($conf_UAM[3] <> '-1' and $conf_UAM[4] == '-1')
-  {
-    $query.= '
-  AND ug.group_id = '.$conf_UAM[3];
-  }
-  if ($conf_UAM[3] == '-1' and $conf_UAM[4] <> '-1')
-  {
-    $query.= '
-  AND ui.status = \''.$conf_UAM[4]."'";
-  }
-  if ($conf_UAM[3] <> '-1' and $conf_UAM[4] <> '-1')
-  {
-    $query.= '
-  AND ug.group_id = '.$conf_UAM[3];
-  }
-  $query.= ';';
-
-        $result = pwg_query($query);
-
-  while($row = mysql_fetch_array($result))
-  {
-    $query = '
+                INNER JOIN '.USER_INFOS_TABLE.' AS ui
+                                ON u.id = ui.user_id
+                LEFT JOIN '.USER_GROUP_TABLE.' AS ug
+                                ON u.id = ug.user_id
+WHERE u.id != 2
+                AND u.username != \'16\'
+                AND u.username != \'18\'';
+
+                if ($conf_UAM[3] <> '-1' and $conf_UAM[4] == '-1')
+                {
+                                $query.= '
+AND ug.group_id = '.$conf_UAM[3];
+                }
+                if ($conf_UAM[3] == '-1' and $conf_UAM[4] <> '-1')
+                {
+                                $query.= '
+AND ui.status = \''.$conf_UAM[4]."'";
+                }
+                if ($conf_UAM[3] <> '-1' and $conf_UAM[4] <> '-1')
+                {
+                                $query.= '
+AND ug.group_id = '.$conf_UAM[3];
+                }
+                $query.= ';';
+
+                $result = pwg_query($query);
+
+                while($row = mysql_fetch_array($result))
+                {
+                                $query = '
 UPDATE '.USERS_TABLE.'
 SET UAM_validated=true
-WHERE id = "'.$row['id'].'"
-;';
-    pwg_query($query);
-  }
+WHERE id = '.$row['id'].'
+;';
+                                pwg_query($query);
+                }
+
+                // It goes to Webmaster too
+                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated=true
+WHERE id = 1
+;';
+                pwg_query($query);
 }
 ?>