From c517ec19a0bb2201bd5cd6c9dbf5005aeb427970 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 11 Sep 2018 17:11:52 -0600
Subject: [PATCH] added delete

---
 classes/admincontroller.php                                  | 2 +-
 .../forms/fields/backupshistory/backupshistory.html.twig     | 5 ++++-
 themes/grav/templates/partials/backups-button.html.twig      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index 1971c1b3..66435fb7 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -1391,7 +1391,7 @@ class AdminController extends AdminBaseController
      *
      * @return bool
      */
-    protected function taskDeleteBackup()
+    protected function taskBackupDelete()
     {
         $param_sep = $this->grav['config']->get('system.param_sep', ':');
         if (!$this->authorizeTask('backup', ['admin.maintenance', 'admin.super'])) {
diff --git a/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig b/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig
index 5a0a95f9..e160c046 100644
--- a/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig
+++ b/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig
@@ -1,3 +1,4 @@
+{% set delete_url = uri.addNonce(base_url_relative ~ "/backup.json/backup:%BACKUP_FILE/task" ~ config.system.param_sep ~ 'backupDelete', 'admin-form', 'admin-nonce') %}
 <table class="backups-history noflex">
     <thead>
     <tr>
@@ -10,6 +11,8 @@
     </thead>
     <tbody>
     {% for backup in backups %}
+        {% set encoded_name = backup.filename|base64_encode|url_encode %}
+        {% set backup_delete = delete_url|replace({'%BACKUP_FILE': encoded_name}) %}
         <tr>
             <td>{{ loop.index }}</td>
             <td style="white-space: nowrap;"> <i class="fa fa-clock-o"></i> {{ backup.date }}</td>
@@ -17,7 +20,7 @@
             <td class="right pad">{{ backup.size|nicefilesize }}</td>
             <td class="right pad">
                 <a class="button button-small hint--bottom" href="{{ grav.backups.getBackupDownloadUrl(backup.path, admin.base) }}" data-hint="Download"><i class="fa fa-download"></i></a>
-                <a class="button button-small danger hint--bottom" data-hint="Delete"><i class="fa fa-close"></i></a>
+                <span class="button button-small danger hint--bottom" data-hint="Delete" data-ajax="{{ backup_delete }}"><i class="fa fa-close"></i></span>
             </td>
         </tr>
     {% endfor %}
diff --git a/themes/grav/templates/partials/backups-button.html.twig b/themes/grav/templates/partials/backups-button.html.twig
index ae3366bb..5a367b84 100644
--- a/themes/grav/templates/partials/backups-button.html.twig
+++ b/themes/grav/templates/partials/backups-button.html.twig
@@ -2,7 +2,7 @@
     {% set profiles = grav.backups.getBackupProfiles() %}
     {% set backup_url = uri.addNonce(base_url_relative ~ "/backup.json/id:%BACKUP_ID/task" ~ config.system.param_sep ~ 'backup', 'admin-form', 'admin-nonce') %}
     {% if profiles|length > 1 %}
-    <button class="button" href="#modal" data-remodal-target="modal" data-ajax="{{ backup_url|replace({'%BACKUP_ID':'0'}) }}">
+    <button class="button" data-ajax="{{ backup_url|replace({'%BACKUP_ID':'0'}) }}">
         <i class="fa fa-life-ring"></i> {{ "PLUGIN_ADMIN.BACKUP_NOW"|tu }}
     </button>
     <button type="button" class="button dropdown-toggle" data-toggle="dropdown">