From 169b1e71e41e3308bad3d63d5365fb584ba617a5 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 10 Sep 2018 21:41:02 -0600
Subject: [PATCH] initial backup dropdown integration

---
 classes/admincontroller.php                   | 27 ++++++++++---------
 .../partials/dashboard-maintenance.html.twig  | 16 ++++++++++-
 .../partials/tools-backups-titlebar.html.twig |  4 ++-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 5f2c6855..447d4eed 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -1,6 +1,7 @@
 <?php
 namespace Grav\Plugin\Admin;
 
+use Grav\Common\Backup\Backups;
 use Grav\Common\Cache;
 use Grav\Common\Config\Config;
 use Grav\Common\File\CompiledYamlFile;
@@ -1337,22 +1338,22 @@ class AdminController extends AdminBaseController
 
         $download = $this->grav['uri']->param('download');
 
-        if ($download) {
-            $file             = base64_decode(urldecode($download));
-            $backups_root_dir = $this->grav['locator']->findResource('backup://', true);
+        try {
+            if ($download) {
+                $file             = base64_decode(urldecode($download));
+                $backups_root_dir = $this->grav['locator']->findResource('backup://', true);
 
-            if (0 !== strpos($file, $backups_root_dir)) {
-                header('HTTP/1.1 401 Unauthorized');
-                exit();
+                if (0 !== strpos($file, $backups_root_dir)) {
+                    header('HTTP/1.1 401 Unauthorized');
+                    exit();
+                }
+
+                Utils::download($file, true);
             }
 
-            Utils::download($file, true);
-        }
-
-        $log = JsonFile::instance($this->grav['locator']->findResource("log://backup.log", true, true));
-
-        try {
-            $backup = ZipBackup::backup();
+            $log = JsonFile::instance($this->grav['locator']->findResource("log://backup.log", true, true));
+            $id = $this->grav['uri']->param('id', 0);
+            $backup = Backups::backup($id);
         } catch (\Exception $e) {
             $this->admin->json_response = [
                 'status'  => 'error',
diff --git a/themes/grav/templates/partials/dashboard-maintenance.html.twig b/themes/grav/templates/partials/dashboard-maintenance.html.twig
index 5de19271..2148b2c2 100644
--- a/themes/grav/templates/partials/dashboard-maintenance.html.twig
+++ b/themes/grav/templates/partials/dashboard-maintenance.html.twig
@@ -23,7 +23,21 @@
 
             <div class="flush-bottom button-bar">
                 <a class="button hidden" href="#" data-update-packages data-remodal-target="update-packages"  data-plugin-action="start-packages-update"><i class="fa fa-cloud-download"></i> {{ "PLUGIN_ADMIN.UPDATE"|tu }}</a>
-                <button data-ajax="{{ uri.addNonce(base_url_relative ~ '/backup.json/task' ~ config.system.param_sep ~ 'backup', 'admin-form', 'admin-nonce') }}" class="button"><i class="fa fa-database"></i> {{ "PLUGIN_ADMIN.BACKUP"|tu }}</button>
+
+                <div class="button-group">
+                    <button type="button" class="button disabled" href="#modal" data-remodal-target="modal">
+                        <i class="fa fa-life-saver"></i> {{ "PLUGIN_ADMIN.BACKUP"|tu }}
+                    </button><button type="button" class="button dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-caret-down"></i>
+                    </button>
+                    <ul class="dropdown-menu">
+                      {% for id, profile in grav.backups.getBackupProfiles() %}
+                          <li>
+                              <a data-ajax="{{ uri.addNonce(base_url_relative ~ '/backup.json/id:' ~ id ~ '/task' ~ config.system.param_sep ~ 'backup', 'admin-form', 'admin-nonce') }}" class="button">{{ profile.name }}</a>
+                          </li>
+                      {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
     </div>
diff --git a/themes/grav/templates/partials/tools-backups-titlebar.html.twig b/themes/grav/templates/partials/tools-backups-titlebar.html.twig
index e23e206a..b209263f 100644
--- a/themes/grav/templates/partials/tools-backups-titlebar.html.twig
+++ b/themes/grav/templates/partials/tools-backups-titlebar.html.twig
@@ -10,7 +10,9 @@
         </button>
         <ul class="dropdown-menu">
             {% for profile in grav.backups.getBackupProfiles() %}
-            <li><a class="button">{{ profile.name }}</a></li>
+            <li>
+                <a data-ajax="{{ uri.addNonce(base_url_relative ~ '/backup.json/id:0/task' ~ config.system.param_sep ~ 'backup', 'admin-form', 'admin-nonce') }}" class="button">{{ profile.name }}</a>
+            </li>
             {% endfor %}
         </ul>
     </div>