Changeset 941:6f519f7bf9fc for admin

Timestamp:

10/30/12 13:51:52 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Split update and backup files management on two tabs, #fixes #1253

File:

• admin/update.php (modified) (8 diffs)

admin/update.php

@@ -42 +42 @@
 $step = in_array($step,array('check','download','backup','unzip')) ? $step : '';
 
+$default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'update';
+if (!empty($_POST['backup_file'])) {
+     $default_tab = 'files';
+}
+
 $archives = array();
 foreach (files::scanDir(DC_BACKUP_PATH) as $v) {
@@ -48 +53 @@
      }
 }
+if (!empty($archives)) {
+     $archives = array_reverse($archives);
+} else {
+     $default_tab = 'update';
+}
 
 # Revert or delete backup file
@@ -61 +71 @@
                     throw new Exception(sprintf(__('Unable to delete file %s'),html::escapeHTML($b_file)));
                }
-               http::redirect($p_url);
+               http::redirect($p_url.'?tab=files');
           }
           
@@ -69 +79 @@
                $zip->unzipAll(DC_BACKUP_PATH.'/');
                @unlink(DC_BACKUP_PATH.'/'.$b_file);
-               http::redirect($p_url);
+               http::redirect($p_url.'?tab=files');
           }
      }
@@ -157 +167 @@
 /* DISPLAY Main page
 -------------------------------------------------------- */
-dcPage::open(__('Dotclear update'));
+dcPage::open(__('Dotclear update'),
+     (!$step ? dcPage::jsPageTabs($default_tab) : '')
+);
 
 if (!$core->error->flag()) {
@@ -165 +177 @@
 if (!$step)
 {
+     echo '<div class="multi-part" id="update" title="'.__('Dotclear update').'">';
      if (empty($new_v))
      {
@@ -183 +196 @@
           '</form>';
      }
+     echo '</div>';
      
      if (!empty($archives))
      {
+          echo '<div class="multi-part" id="files" title="'.__('Manage backup files').'">';
+
           echo
           '<h3>'.__('Update backup files').'</h3>'.
@@ -208 +224 @@
           $core->formNonce().'</p>'.
           '</form>';
+
+          echo '</div>';
      }
 }