From 1c979d5a21e1b9c8e9db4a54f1a1573003fad9dd Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 10 Feb 2015 16:12:47 +0100 Subject: [PATCH] fix move-customer-to-admin Signed-off-by: Michael Kaufmann (d00p) --- admin_customers.php | 2 +- .../froxlor/function.moveCustomerToAdmin.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/admin_customers.php b/admin_customers.php index 090b9ac5..0d360b1d 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -1040,7 +1040,7 @@ if ($page == 'customers' */ $available_admins_stmt = Database::prepare(" SELECT * FROM `" . TABLE_PANEL_ADMINS . "` - WHERE (`customers` = '-1' OR `customers` < `customers_used`)" + WHERE (`customers` = '-1' OR `customers` > `customers_used`)" ); Database::pexecute($available_admins_stmt); $admin_select = makeoption("-----", 0, true, true, true); diff --git a/lib/functions/froxlor/function.moveCustomerToAdmin.php b/lib/functions/froxlor/function.moveCustomerToAdmin.php index 8e3ad1d7..189fb44e 100644 --- a/lib/functions/froxlor/function.moveCustomerToAdmin.php +++ b/lib/functions/froxlor/function.moveCustomerToAdmin.php @@ -10,6 +10,9 @@ * @return true on sucess, error-message on failure */ function moveCustomerToAdmin($id = 0, $adminid = 0) { + + global $log; + if ($id <= 0 || $adminid <= 0) { return "no valid id's given"; } @@ -23,12 +26,14 @@ function moveCustomerToAdmin($id = 0, $adminid = 0) { 'cid' => $id ) ); + $log->logAction(ADM_ACTION, LOG_INFO, "moved user #" . $id . " from admin/reseller #".$cAdmin['adminid']." to admin/reseller #".$adminid); + // Update customer entry $updCustomer_stmt = Database::prepare ( " UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `adminid` = :adminid WHERE `customerid` = :cid " ); Database::pexecute ( $updCustomer_stmt, array ( - 'adminid' => $cAdmin ['adminid'], + 'adminid' => $adminid, 'cid' => $id ) ); @@ -37,7 +42,7 @@ function moveCustomerToAdmin($id = 0, $adminid = 0) { UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `adminid` = :adminid WHERE `customerid` = :cid " ); Database::pexecute ( $updDomains_stmt, array ( - 'adminid' => $cAdmin ['adminid'], + 'adminid' => $adminid, 'cid' => $id ) ); @@ -46,7 +51,7 @@ function moveCustomerToAdmin($id = 0, $adminid = 0) { UPDATE `" . TABLE_PANEL_TICKETS . "` SET `adminid` = :adminid WHERE `customerid` = :cid " ); Database::pexecute ( $updTickets_stmt, array ( - 'adminid' => $cAdmin ['adminid'], + 'adminid' => $adminid, 'cid' => $id ) );