Changeset 6791 for extensions/Register_FluxBB/trunk

Timestamp:

Aug 22, 2010, 9:14:19 PM (14 years ago)

Author:

Eric

Message:

• Bug 1812 fixed - Compliance with FluxBB 1.4
• New version 2.2.4 hard coded

Location:

extensions/Register_FluxBB/trunk

Files:

• include/functions.inc.php (modified) (4 diffs)
• main.inc.php (modified) (2 diffs)
• obsolete.list (deleted)

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

@@ -66 +66 @@
 
   $o_default_user_group = pwg_db_fetch_assoc(pwg_query($query));
-  
-  $query = "
+
+// Check for FluxBB version 1.4.x and get the correct value
+  $query1 = "
+SELECT conf_value
+FROM ".FluxBB_CONFIG_TABLE."
+WHERE conf_name = 'o_default_timezone'
+;";
+
+  $count1 = pwg_db_num_rows(pwg_query($query1));
+
+// Check for FluxBB version 1.2.x and get the correct value
+  $query2 = "
 SELECT conf_value
 FROM ".FluxBB_CONFIG_TABLE."
@@ -73 +83 @@
 ;";
 
-  $o_server_timezone = pwg_db_fetch_assoc(pwg_query($query));
+  $count2 = pwg_db_num_rows(pwg_query($query2));
+  
+  if ($count1 == 1 and $count2 == 0)
+  {
+    $o_default_timezone = pwg_db_fetch_assoc(pwg_query($query1));
+  }
+  else if ($count1 == 0 and $count2 == 1)
+  {
+    $o_default_timezone = pwg_db_fetch_assoc(pwg_query($query2));
+  }
+  
   
   $query = "
@@ -97 +117 @@
   password, 
   email, 
-  ". ( isset($o_server_timezone['conf_value']) ? 'timezone' : '' ) .",
+  ". ( isset($o_default_timezone['conf_value']) ? 'timezone' : '' ) .",
   ". ( isset($o_default_lang['conf_value']) ? 'language' : '' ) .",
   ". ( isset($o_default_style['conf_value']) ? 'style' : '' ) .",
@@ -109 +129 @@
   '".$password."', 
         '".$adresse_mail."',
-  ". ( isset($o_server_timezone['conf_value']) ? "'".$o_server_timezone['conf_value']."'" : '' ) .",
+  ". ( isset($o_default_timezone['conf_value']) ? "'".$o_default_timezone['conf_value']."'" : '' ) .",
   ". ( isset($o_default_lang['conf_value']) ? "'".$o_default_lang['conf_value']."'" : '' ) .",
   ". ( isset($o_default_style['conf_value']) ? "'".$o_default_style['conf_value']."'" : '' ) .",

extensions/Register_FluxBB/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Register FluxBB
-Version: 2.2.3
+Version: 2.2.4
 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
@@ -52 +52 @@
 2.2.3     - 23/05/10  - Bug 1674 re-fixed : Bad link fixed
                       - Re-adding of German language that was missed at last release :-( (Thx to duke)
+
+2.2.4     - 22/08/10  - Bug 1812 fixed : Compliance with FluxBB 1.4
 --------------------------------------------------------------------------------
 */