From 72672888014ae327d9831e2b56b13eb82d2bddd5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 13 Jul 2023 15:40:07 +0800
Subject: [PATCH] * Refactor restore backup.

---
 module/backup/config/action.php | 11 ++++++-----
 module/backup/control.php       |  7 ++-----
 module/backup/ui/index.html.php |  2 --
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/module/backup/config/action.php b/module/backup/config/action.php
index 378c10f617..0b8e8b485d 100644
--- a/module/backup/config/action.php
+++ b/module/backup/config/action.php
@@ -11,11 +11,12 @@ $config->backup->actionList['rmPHPHeader']['hint']        = $lang->backup->rmPHP
 $config->backup->actionList['rmPHPHeader']['url']         = helper::createLink('backup', 'rmPHPHeader', 'file={name}');
 $config->backup->actionList['rmPHPHeader']['data-toggle'] = 'modal';
 
-$config->backup->actionList['restore']['icon']        = 'restart';
-$config->backup->actionList['restore']['text']        = $lang->backup->restore;
-$config->backup->actionList['restore']['hint']        = $lang->backup->restore;
-$config->backup->actionList['restore']['url']         = array('module' => 'backup', 'method' => 'restore', 'params' => 'file={name}');
-$config->backup->actionList['restore']['data-toggle'] = 'modal';
+$config->backup->actionList['restore']['icon']         = 'restart';
+$config->backup->actionList['restore']['text']         = $lang->backup->restore;
+$config->backup->actionList['restore']['hint']         = $lang->backup->restore;
+$config->backup->actionList['restore']['url']          = array('module' => 'backup', 'method' => 'restore', 'params' => 'file={name}');
+$config->backup->actionList['restore']['className']    = 'ajax-submit';
+$config->backup->actionList['restore']['data-confirm'] = $lang->backup->confirmRestore;
 
 $config->backup->actionList['delete']['icon']         = 'trash';
 $config->backup->actionList['delete']['text']         = $lang->delete;
diff --git a/module/backup/control.php b/module/backup/control.php
index f6b4cc55ab..3923df0299 100644
--- a/module/backup/control.php
+++ b/module/backup/control.php
@@ -170,14 +170,11 @@ class backup extends control
      * Restore.
      *
      * @param  string $fileName
-     * @param  string $confirm  yes|no
      * @access public
      * @return void
      */
-    public function restore($fileName, $confirm = 'no')
+    public function restore($fileName)
     {
-        if($confirm == 'no') return $this->send(array('result' => 'fail', 'message' => $this->lang->backup->confirmRestore));
-
         set_time_limit(0);
 
         /* Restore database. */
@@ -215,7 +212,7 @@ class backup extends control
             if(!$result->result) return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->backup->error->restoreFile, $result->error)));
         }
 
-        return $this->send(array('result' => 'success', 'message' => $this->lang->backup->success->restore));
+        return $this->send(array('result' => 'success', 'callback' => "zui.Modal.alert('{$this->lang->backup->success->restore}')"));
     }
 
     /**
diff --git a/module/backup/ui/index.html.php b/module/backup/ui/index.html.php
index edb10826ad..2514832732 100644
--- a/module/backup/ui/index.html.php
+++ b/module/backup/ui/index.html.php
@@ -12,9 +12,7 @@ namespace zin;
 
 jsvar('backup', $lang->backup->common);
 jsvar('rmPHPHeader', $lang->backup->rmPHPHeader);
-jsvar('confirmRestore', $lang->backup->confirmRestore);
 jsvar('restore', $lang->backup->restore);
-jsvar('backupTimeout', $lang->backup->error->timeout);
 
 featureBar
 (