Changeset 12551 for extensions/UserAdvManager/branches/2.30/include/functions.inc.php

Timestamp:

Nov 5, 2011, 3:48:21 PM (12 years ago)

Author:

Eric

Message:

Merged from trunk to branch 2.30
Bug 2455 fixed - Exclusion of specific users (généric and admins users) for password reset function.
Bug 2451 fixed - Unable to handle Sql errors but control of backup file validity have been enforced.

File:

• extensions/UserAdvManager/branches/2.30/include/functions.inc.php (modified) (4 diffs)

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

@@ -399 +399 @@
   // -----------------------------------------------------
   if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
-  {  
+  {
     $query ='
 SELECT user_id, status
@@ -426 +426 @@
     $data = pwg_db_fetch_assoc(pwg_query($query));
 
-    if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
+    if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
     {
       if (UAM_check_pwgreset($user['id']))
@@ -2800 +2800 @@
 {
   global $conf;
-  
+
+  $plugin =  PluginInfos(UAM_PATH);
+  $version = $plugin['version'];
+
   // Initial backup folder creation and file initialisation
   // ------------------------------------------------------
@@ -2810 +2813 @@
   $fp = fopen($Backup_File, 'w');
 
+  // Writing plugin version
+  $insertions = "-- ".$version." --\n\n";
+  fwrite($fp, $insertions);
 
   // Saving UAM specific tables