Changeset 5593 for extensions/NBC_UserAdvManager/trunk/maintain.inc.php

Timestamp:

Apr 3, 2010, 3:33:04 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Code refactoring for Piwigo 2.1 compliance
• Bug 1508 fixed : Plugin displayed name doesn't show "nbc_" prefix any more
• Bug 1551 fixed : There was a problem on very first time installation
• Several translation fixes
• Template files storage : All admin's templates are now in a "template" directory with css file

File:

• extensions/NBC_UserAdvManager/trunk/maintain.inc.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/trunk/maintain.inc.php

@@ -2 +2 @@
 
 if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-if (!defined('UAM_ROOT')) {
-  define('UAM_ROOT',     dirname(__FILE__).'/');
+if (!defined('UAM_ROOT'))
+{
+  define('UAM_ROOT', dirname(__FILE__).'/');
 }
 
@@ -81 +82 @@
   clean_obsolete_files();
 
-
+/* Check if it's a blank installation */
+/* ********************************** */
+        $query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count1 = mysql_num_rows(pwg_query($query));
+  
+        $query1 = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count2 = mysql_num_rows(pwg_query($query1));
+
+/* If old params exist an upgrade is needed */
+/* **************************************** */
+  if ($count1 == 1 or $count2 == 1)
+  {
 /* Check for upgrade from 2.10 to 2.11 */
 /* *********************************** */
-        $query = '
+    $query = '
 SELECT *
   FROM '.CONFIG_TABLE.'
 WHERE param = "nbc_UserAdvManager_ConfirmMail"
 ;';
-  $count = mysql_num_rows(pwg_query($query)); 
-  
-        if ($count == 0)
-        {
-  /* upgrade from branch 2.10 to 2.11 */
-  /* ******************************** */
-                upgrade_210();
-        }
+    $count = mysql_num_rows(pwg_query($query)); 
+  
+    if ($count == 0)
+    {
+    /* upgrade from branch 2.10 to 2.11 */
+    /* ******************************** */
+      upgrade_210();
+    }
 
 
 /* Check for upgrade from 2.11 to 2.12 */
 /* *********************************** */
-  if (!table_exist(USER_LASTVISIT_TABLE))
-  {
-  /* upgrade from branch 2.11 to 2.12 */
-  /* ******************************** */
-                upgrade_211();
-  }
+    if (!table_exist(USER_LASTVISIT_TABLE))
+    {
+    /* upgrade from branch 2.11 to 2.12 */
+    /* ******************************** */
+                upgrade_211();
+    }
 
 
 /* Check for upgrade from 2.12 to 2.13 */
 /* *********************************** */
-  $query = '
-SELECT *
-FROM '.USER_CONFIRM_MAIL_TABLE.'
-;';
-
-  $result = pwg_query($query);
+    $fields = mysql_list_fields($conf['db_base'],USER_CONFIRM_MAIL_TABLE);
+    $nb_fields = mysql_num_fields($fields); 
+
+//  $query = '
+//SELECT *
+//FROM '.USER_CONFIRM_MAIL_TABLE.'
+//;';
+
+//  $result = pwg_query($query);
         
-        $numfields = mysql_num_fields($result);
-
-  if ($numfields < 6)
-  {
-  /* upgrade from branch 2.12 to 2.13 */
-  /* ******************************** */
-    upgrade_212();
-  }
+//      $numfields = mysql_num_fields($result);
+
+    if ($nb_fields < 6)
+    {
+    /* upgrade from branch 2.12 to 2.13 */
+    /* ******************************** */
+      upgrade_212();
+    }
 
 
 /* Serializing conf parameters - Available since 2.14.0 */
 /* **************************************************** */
-  if (unserialize($conf['nbc_UserAdvManager']) === false)
-  {
-  /* upgrade from branch 2.13 to 2.14 */
-  /* ******************************** */
-    upgrade_213();
-  }
-
+    if (unserialize($conf['nbc_UserAdvManager']) === false)
+    {
+    /* upgrade from branch 2.13 to 2.14 */
+    /* ******************************** */
+      upgrade_213();
+    }
+  
 
 /* Check for upgrade from 2.14.1 to 2.14.2 */
 /* *************************************** */
-        $query1 = '
+        $query1 = '
 SELECT param
   FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager"
+;';
+    $count1 = mysql_num_rows(pwg_query($query1));
+  
+    $query1 = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
 WHERE param = "nbc_UserAdvManager_ConfirmMail"
 ;';
-  $count1 = mysql_num_rows(pwg_query($query1));
-  
-        $query1 = '
-SELECT param
-  FROM '.CONFIG_TABLE.'
-WHERE param = "nbc_UserAdvManager_ConfirmMail"
-;';
-  $count2 = mysql_num_rows(pwg_query($query1)); 
-  
-        if ($count1 == 1 or $count2 == 1)
-        {
-  /* upgrade from branch 2.14.1 to 2.14.2 */
-  /* ************************************ */
-                upgrade_214_1();
-        }
+    $count2 = mysql_num_rows(pwg_query($query1)); 
+  
+    if ($count1 == 1 or $count2 == 1)
+    {
+    /* upgrade from branch 2.14.1 to 2.14.2 */
+    /* ************************************ */
+      upgrade_214_1();
+    }
+  }
 }
 
@@ -352 +376 @@
 
 /* Upgrading ConfirmMail options */
-  $conf_UAM2 = explode(';', $conf['UserAdvManager_ConfirmMail']);
-
-  $upgrade_UAM2 = array($conf_UAM2[0],$conf_UAM2[1],$conf_UAM2[2],$conf_UAM2[3],$conf_UAM2[4],'Thank you to have confirmed your email address and your registration on the gallery. Have fun !','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.');
-
   $query = '
-UPDATE '.CONFIG_TABLE.'
-  SET value = "'.addslashes(serialize($upgrade_UAM2)).'"
-  WHERE param = "UserAdvManager_ConfirmMail"
-;';
-  pwg_query($query);
+SELECT value
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_ConfirmMail"
+;';
+
+  $result = pwg_query($query);
+  $conf_UAM_ConfirmMail = pwg_db_fetch_assoc($result);
+    
+  $conf_ConfirmMail = unserialize($conf_UAM_ConfirmMail['value']);
+  
+  $conf_ConfirmMail[5] ='Thank you to have confirmed your email address and your registration on the gallery. Have fun !';
+  $conf_ConfirmMail[6] ='Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.';
+  
+  $update_conf = serialize($conf_ConfirmMail);
+    
+  $query = '
+      UPDATE '.CONFIG_TABLE.'
+                        SET value="'.addslashes($update_conf).'"
+                        WHERE param="UserAdvManager_ConfirmMail"
+                        LIMIT 1
+                ;';
+
+                pwg_query($query);
 }
 ?>