Changeset 12551 for extensions/UserAdvManager/branches/2.30/admin/UAM_admin.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/admin/UAM_admin.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.30/admin/UAM_admin.php

@@ -269 +269 @@
     $Backup_File = UAM_PATH.'/include/backup/UAM_dbbackup.sql';
 
-    if (file_exists($Backup_File))
-    {
-      $restore = UAM_Restore_backup_file();
-      if(empty($restore))
+    if (file_exists($Backup_File) and $file = file($Backup_File, FILE_IGNORE_NEW_LINES) and !empty($file))
+    {
+      // Check backup file version
+      // -------------------------
+      if ($file[0] == "-- ".$version." --")
       {
-        array_push($page['infos'], l10n('UAM_Restoration_OK'));
+        $restore = UAM_Restore_backup_file();
+        if(empty($restore))
+        {
+          array_push($page['infos'], l10n('UAM_Restoration_OK'));
+        }
+        else
+        {
+          array_push($page['errors'], l10n('UAM_Restoration_NOK'));
+        }
       }
-      else
-      {
-        array_push($page['errors'], l10n('UAM_Restoration_NOK'));
-      }
+      else array_push($page['errors'], l10n('UAM_Bad_version_backup'));
     }
     else