Changeset 2503:fd451ccbaa59 for inc

Timestamp:

10/29/13 16:31:16 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2504:d81b0e204d62, 2506:39edf8aaacef

Message:

Request confirmation before restoring old installation archive (update.php), fixes #1823

File:

• inc/admin/lib.dc.page.php (modified) (8 diffs)

inc/admin/lib.dc.page.php

@@ -16 +16 @@
 class dcPage
 {
-     private static $loaded_js=array();
+     private static $loaded_js = array();
      private static $N_TYPES = array(
-          "success" => "success", 
-          "warning" => "warning-msg", 
-          "error" => "error", 
-          "message" => "message", 
+          "success" => "success",
+          "warning" => "warning-msg",
+          "error" => "error",
+          "message" => "message",
           "static" => "static-msg");
 
@@ -29 +29 @@
           global $core;
 
-          if ($core->blog && $core->auth->check($permissions,$core->blog->id))
-          {
+          if ($core->blog && $core->auth->check($permissions,$core->blog->id)) {
                return;
           }
@@ -114 +113 @@
           $user_ui_hide_std_favicon = $core->auth->user_prefs->interface->hide_std_favicon;
           if (!$user_ui_hide_std_favicon) {
-               echo 
+               echo
                '<link rel="icon" type="image/png" href="images/favicon96-login.png" />'.
                '<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />';
@@ -213 +212 @@
                $notifications = array();
           }
-          
+
           $n = array_merge($options,array('class' => $class,'ts' => time(), 'text' => $message));
           if ($type != "static") {
@@ -566 +565 @@
                     "</script>\n";
      }
-     
+
      public static function jsCommon()
      {
@@ -597 +596 @@
           self::jsVar('dotclear.img_menu_on','images/menu_on.png').
           self::jsVar('dotclear.img_menu_off','images/menu_off.png').
-          
+
           self::jsVar('dotclear.img_plus_theme_src','images/plus-theme.png').
           self::jsVar('dotclear.img_plus_theme_alt',__('uncover')).
@@ -677 +676 @@
           self::jsVar('dotclear.msg.confirm_delete_backup',
                __('Are you sure you want to delete this backup?')).
+          self::jsVar('dotclear.msg.confirm_revert_backup',
+               __('Are you sure you want to revert to this backup?')).
           self::jsVar('dotclear.msg.zip_file_content',
                __('Zip file content')).
@@ -746 +747 @@
                $default = "'".html::escapeJS($default)."'";
           }
-          
+
           return
           self::jsLoad('js/jquery/jquery.pageTabs.js').