Changeset 6881 for extensions

Timestamp:

Sep 11, 2010, 7:09:44 PM (14 years ago)

Author:

Eric

Message:

Merge from Trunk to Branch 2.3
version 2.3.2 hard coded

File:

• extensions/Register_FluxBB/branches/2.3/main.inc.php (modified) (7 diffs)

extensions/Register_FluxBB/branches/2.3/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Register FluxBB
-Version: 2.3.1
+Version: 2.3.2
 Description: Link user registration from Piwigo to FluxBB forum (registration, password changing, deletion) - Original Nicco's NBC_LinkUser2PunBB plugin upgraded to Piwigo / Liez l'inscription des utilisateurs de Piwigo avec votre forum FluxBB - Portage du plugin NBC_LinkUser2PunBB de Nicco vers Piwigo
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=252
@@ -57 +57 @@
 2.3.0     - 28/08/10  - Bug 1434 fixed : Bridge between Register_FluxBB and UserAdvManager for new users validation
 
-2.3.1     - 31/08/10  - Bug 1825 fixed : Password corruption after Piwigo's profile page visit 
+2.3.1     - 31/08/10  - Bug 1825 fixed : Password corruption after Piwigo's profile page visit
+
+2.3.2     - 11/09/10  - Bug 1847 fixed : Admins and webmasters was not excluded from registration validation 
 --------------------------------------------------------------------------------
 */
@@ -150 +152 @@
   
   // Check if UAM is installed and if bridge is set - Exception for admins and webmasters
-  if (function_exists('FindAvailableConfirmMailID') and isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'true' and !is_admin() and !is_webmaster())
+  $query ='
+SELECT user_id, status
+FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$user['id'].'
+;';
+  $data = pwg_db_fetch_assoc(pwg_query($query));
+  
+  if ($data['status'] <> "admin" and $data['status'] <> "webmaster")
   {
-    $conf_UAM = unserialize($conf['UserAdvManager']);
+    if (function_exists('FindAvailableConfirmMailID') and isset($conf_Register_FluxBB[6]) and $conf_Register_FluxBB[6] == 'true')
+    {
+      $conf_UAM = unserialize($conf['UserAdvManager']);
     
-    // Getting unvalidated users group else Piwigo's default group
-    if (isset($conf_UAM[2]) and $conf_UAM[2] != '-1')
-    {
-      $Waitingroup = $conf_UAM[2];
-    }
-    else
-    {
-      $query = '
+      // Getting unvalidated users group else Piwigo's default group
+      if (isset($conf_UAM[2]) and $conf_UAM[2] != '-1')
+      {
+        $Waitingroup = $conf_UAM[2];
+      }
+      else
+      {
+        $query = '
 SELECT id
 FROM '.GROUPS_TABLE.'
@@ -167 +178 @@
 LIMIT 1
 ;';
-      $data = pwg_db_fetch_assoc(pwg_query($query));
-      $Waitingroup = $data['id'];
-    }
+        $data = pwg_db_fetch_assoc(pwg_query($query));
+        $Waitingroup = $data['id'];
+      }
     
-    // check if logged in user is in a Piwigo's validated or unvalidated users group
-    $query = '
+      // check if logged in user is in a Piwigo's validated or unvalidated users group
+      $query = '
 SELECT *
 FROM '.USER_GROUP_TABLE.'
@@ -178 +189 @@
 AND group_id = '.$Waitingroup.'
 ;';
-    $count = pwg_db_num_rows(pwg_query($query));
-
-    // Check if logged in user is in a FluxBB's unvalidated group
-    $query = "
+      $count = pwg_db_num_rows(pwg_query($query));
+
+      // Check if logged in user is in a FluxBB's unvalidated group
+      $query = "
 SELECT group_id
 FROM ".FluxBB_USERS_TABLE."
@@ -187 +198 @@
 ;";
 
-    $data = pwg_db_fetch_assoc(pwg_query($query));
-
-    // Logged in user switch to the default FluxBB's group if he'is validated
-    if ($count == 0 and $data['group_id'] = $conf_Register_FluxBB[7])
-    {
-      $query = "
+      $data = pwg_db_fetch_assoc(pwg_query($query));
+
+      // Logged in user switch to the default FluxBB's group if he'is validated
+      if ($count == 0 and $data['group_id'] = $conf_Register_FluxBB[7])
+      {
+        $query = "
 SELECT conf_value
 FROM ".FluxBB_CONFIG_TABLE."
@@ -198 +209 @@
 ;";
 
-      $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query));
+        $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query));
       
-      $query = "
+        $query = "
 UPDATE ".FluxBB_USERS_TABLE."
 SET group_id = ".$o_default_user_group['conf_value']." 
 WHERE id = ".FluxBB_Searchuser($user['id'])."
 ;";
-      pwg_query($query);
+        pwg_query($query);
+      }
     }
   }