fix for full restore

outroll · Oct 21, 2013 · 525d706 · 525d706
1 parent bfa6598
commit 525d706
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/web/schedule/restore/index.php b/web/schedule/restore/index.php
@@ -23,17 +23,21 @@
 if ($_GET['type'] == 'udir') $udir = escapeshellarg($_GET['object']);
 
 if (!empty($_GET['type'])) {
-    exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
-    if ($return_var == 0) {
-        $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
-    } else {
-        $_SESSION['restore_msg'] = implode('<br>', $output);
-        if (empty($_SESSION['restore_msg'])) {
-            $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
-        }
-        if ($return_var == 4) {
-            $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
-        }
+    $restore_cmd = VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir;
+} else {
+    $restore_cmd = VESTA_CMD."v-schedule-user-restore ".$user." ".$backup;
+}
+
+exec ($restore_cmd, $output, $return_var);
+if ($return_var == 0) {
+    $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
+} else {
+    $_SESSION['restore_msg'] = implode('<br>', $output);
+    if (empty($_SESSION['restore_msg'])) {
+        $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
+    }
+    if ($return_var == 4) {
+        $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
     }
 }
 

diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html
@@ -2,7 +2,7 @@
                 <tr>
                     <td style="padding: 12px 8px">
                         <div class="submenu-button-block">
-                            <button class="submenu-button" onclick="location.href='/schedule/restore/'"> <?php print __('Restore All');?> </button>
+                            <button class="submenu-button" onclick="location.href='/schedule/restore/?backup=<?php echo $_GET['backup'] ?>'"> <?php print __('Restore All');?> </button>
                         </div>
                         <div class="submenu-search-block">
                             <form action="/search/" method="get">