Changeset 1959:2c77682177b4 for plugins/importExport/inc

Timestamp:

09/19/13 23:18:37 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Plugin maintenance, small fixes and boss requests, addresses #999

File:

• plugins/importExport/inc/lib.ie.maintenance.php (modified) (8 diffs)

plugins/importExport/inc/lib.ie.maintenance.php

@@ -24 +24 @@
           $this->name = __('Database export');
           $this->task = __('Download database of current blog');
-          $this->step = __('Zip file ready to be downloaded.');
 
           $this->export_name = html::escapeHTML($this->core->blog->id.'-backup.txt');
@@ -32 +31 @@
      public function execute()
      {
-          // 1) Create zip file
-          if (!isset($_SESSION['export_file']) || !file_exists($_SESSION['export_file'])) {
-               // Bad hack to skip one step
-               $_POST['file_name'] = date('Y-m-d-H-i-').$this->export_name;
-               $_POST['file_zip'] = 1;
-
+          // Create zip file
+          if (!empty($_POST['file_name'])) {
                // This process make an http redirect
                $ie = new maintenanceDcExportFlat($this->core);
@@ -43 +38 @@
                $ie->process($this->export_type);
           }
-          // 2) Download zip file
+          // Go to step and show form
           else {
+               return 1;
+          }
+     }
+
+     public function step()
+     {
+          // Download zip file
+          if (isset($_SESSION['export_file']) && file_exists($_SESSION['export_file'])) {
                // Log task execution here as we sent file and stop script
                $this->log();
@@ -53 +56 @@
                $ie->process('ok');
           }
-
-          return null;
-     }
-
-     public function step()
-     {
-          return isset($_SESSION['export_file']) && file_exists($_SESSION['export_file']) ?
-               $this->step : null;
+          else {
+               return 
+               '<p><label for="file_name">'.__('File name:').'</label>'.
+               form::field('file_name', 50, 255, date('Y-m-d-H-i-').$this->export_name).
+               '</p>'.
+               '<p><label for="file_zip" class="classic">'.
+               form::checkbox('file_zip', 1).' '.
+               __('Compress file').'</label>'.
+               '</p>';
+          }
      }
 }
@@ -76 +81 @@
           $this->name = __('Database export');
           $this->task = __('Download database of all blogs');
-          $this->step = __('Zip file ready to be downloaded.');
 
           $this->export_name = 'dotclear-backup.txt';
@@ -84 +88 @@
      public function execute()
      {
-          // 1) Create zip file
-          if (!isset($_SESSION['export_file']) || !file_exists($_SESSION['export_file'])) {
-               // Bad hack to skip one step
-               $_POST['file_name'] = date('Y-m-d-H-i-').$this->export_name;
-               $_POST['file_zip'] = 1;
-
+          // Create zip file
+          if (!empty($_POST['file_name'])) {
                // This process make an http redirect
                $ie = new maintenanceDcExportFlat($this->core);
@@ -95 +95 @@
                $ie->process($this->export_type);
           }
-          // 2) Download zip file
+          // Go to step and show form
           else {
+               return 1;
+          }
+     }
+
+     public function step()
+     {
+          // Download zip file
+          if (isset($_SESSION['export_file']) && file_exists($_SESSION['export_file'])) {
                // Log task execution here as we sent file and stop script
                $this->log();
@@ -105 +113 @@
                $ie->process('ok');
           }
-
-          return null;
-     }
-
-     public function step()
-     {
-          return isset($_SESSION['export_file']) && file_exists($_SESSION['export_file']) ?
-               $this->step : null;
+          else {
+               return 
+               '<p><label for="file_name">'.__('File name:').'</label>'.
+               form::field('file_name', 50, 255, date('Y-m-d-H-i-').$this->export_name).
+               '</p>'.
+               '<p><label for="file_zip" class="classic">'.
+               form::checkbox('file_zip', 1).' '.
+               __('Compress file').'</label>'.
+               '</p>';
+          }
      }
 }