From 78c462c99fcb49eff01b7a78e3a98521a61e1493 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 19 Oct 2012 08:44:46 -0400
Subject: [PATCH] Fixed: FS#2489 - APS installer uninstallation problem Fixed: FS#2446 - APS Installer - Uninstall doesn't work
---
interface/web/sites/aps_do_operation.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/aps_do_operation.php b/interface/web/sites/aps_do_operation.php
index 033bece..c3362ae 100644
--- a/interface/web/sites/aps_do_operation.php
+++ b/interface/web/sites/aps_do_operation.php
@@ -27,7 +27,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
+
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
$app->load('aps_guicontroller');
@@ -72,6 +72,7 @@
$cid = $app->db->queryOneRecord("SELECT client_id FROM client WHERE username = '".$app->db->quote($_SESSION['s']['user']['username'])."';");
$client_id = $cid['client_id'];
}
+
// Assume that the given instance belongs to the currently calling client_id. Unimportant if status is admin
if(!$gui->isValidInstanceID($_GET['id'], $client_id, $is_admin)) die($app->lng('Invalid ID'));
@@ -79,8 +80,7 @@
$check = $app->db->queryOneRecord("SELECT id FROM aps_instances
WHERE id = ".$app->db->quote($_GET['id'])." AND
(instance_status = ".INSTANCE_SUCCESS." OR instance_status = ".INSTANCE_ERROR.");");
- if(!empty($check)) $gui->deleteInstance($_GET['id']);
-
+ if($check['id'] > 0) $gui->deleteInstance($_GET['id']);
echo $app->lng('Installation_remove');
}
else if($_GET['action'] == 'reinstall_instance')
--
Gitblit v1.9.1