Changeset 10707

Timestamp:

Apr 30, 2011, 9:13:57 PM (13 years ago)

Author:

Eric

Message:

r10706 merged from trunk to branch 2.20

Location:

extensions/UserAdvManager/branches/2.20

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/upgradedb.inc.php (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• maintain.inc.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.20/changelog.txt.php

@@ -245 +245 @@
 
 -- 2.20.5 : Bug 2287 fixed - The UAM block for PWG_Stuffs is correctly displayed (stuffs_module directory was missing)
+
+-- 2.20.6 : Improve database update process
+            Bug 2289 fixed - "Password in clear text in the information email" was working in a reverse logic
 */
 ?>

extensions/UserAdvManager/branches/2.20/include/functions.inc.php

@@ -858 +858 @@
   if (isset($conf_UAM[0]) and $conf_UAM[0] == 'true')
   {
-    if (isset($conf_UAM[35]) and $conf_UAM[35] == 'false') // Allow display of clear password in email
+    if (isset($conf_UAM[35]) and $conf_UAM[35] == 'true') // Allow display of clear password in email
     {
       $infos1 = array(

extensions/UserAdvManager/branches/2.20/include/upgradedb.inc.php

@@ -31 +31 @@
   $plugin =  PluginInfos(UAM_PATH);
   $version = $plugin['version'];
-  
-  // Update plugin version 
+
+  // Update plugin version in #_config table
   $query = '
 UPDATE '.CONFIG_TABLE.'
@@ -41 +41 @@
 
   pwg_query($query);
+
+
+// Check #_plugin table consistency
+// Only useful if a previous version upgrade has not worked correctly (rare case)
+  $query = '
+SELECT version
+  FROM '.PLUGINS_TABLE.'
+WHERE id = "UserAdvManager"
+;';
+  
+  $data = pwg_db_fetch_assoc(pwg_query($query));
+  
+  if (empty($data['version']) or $data['version'] <> $version)
+  {
+    $query = '
+UPDATE '.PLUGINS_TABLE.'
+SET version="'.$version.'"
+WHERE id = "UserAdvManager"
+LIMIT 1
+;';
+
+    pwg_query($query);
+  }
 }
 

extensions/UserAdvManager/branches/2.20/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.20.5
+Version: 2.20.6
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216

extensions/UserAdvManager/branches/2.20/maintain.inc.php

@@ -254 +254 @@
   }
 
+  // Update plugin version number in #_config table and check consistency of #_plugins table
   UAM_version_update();