From 2417c88ecd04df3b88df99a74e95d26f0c6a7a3c Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Sun, 6 Mar 2016 11:57:27 +0100
Subject: [PATCH] Generalize taskRemovePlugin into taskRemovePackage

---
 classes/controller.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/classes/controller.php b/classes/controller.php
index 19528ec2..0741ff7a 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -257,27 +257,28 @@ class AdminController
     }
 
     /**
-     * Handle removing a plugin
+     * Handle removing a package
      *
      * @return bool
      */
-    protected function taskRemovePlugin()
+    protected function taskRemovePackage()
     {
-        if (!$this->authorizeTask('uninstall plugin', ['admin.plugin', 'admin.super'])) {
+        $data = $this->post;
+        $package = isset($data['package']) ? $data['package'] : '';
+        $type = isset($data['type']) ? $data['type'] : '';
+
+        if (!$this->authorizeTask('uninstall ' . $type, ['admin.' . $type, 'admin.super'])) {
             $this->admin->json_response = ['status' => 'error', 'message' => 'Unauthorized'];
             return false;
         }
 
-        $data = $this->post;
-        $plugin = isset($data['plugin']) ? $data['plugin'] : '';
-
         require_once __DIR__ . '/gpm.php';
 
-        $dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($plugin);
+        $dependencies = $this->admin->dependenciesThatCanBeRemovedWhenRemoving($package);
 
         //TODO: uncomment to actually remove
         $result = true;
-        // $result = \Grav\Plugin\Admin\Gpm::uninstall($plugin, []);
+        // $result = \Grav\Plugin\Admin\Gpm::uninstall($package, []);
 
         if ($result) {
             $this->admin->json_response = ['status' => 'success', 'dependencies' => $dependencies, 'message' => $this->admin->translate('PLUGIN_ADMIN.UNINSTALL_SUCCESSFUL')];