maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix in Admins.update; code-format Customers ApiCommand

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-25 21:26:51 +01:00
parent 5c330505ea
commit ae42e87a64
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/api/commands/class.Admins.php
View File

@@ -555,7 +555,7 @@ class Admins extends ApiCommand implements ResourceEntity
// get all admin-data for return-array // get all admin-data for return-array
$json_result = Admins::getLocal($this->getUserData(), array( $json_result = Admins::getLocal($this->getUserData(), array(
'id' => $adminid 'id' => $result['adminid']
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result); return $this->response(200, "successfull", $result);

8
lib/classes/api/commands/class.Customers.php
View File

@@ -247,14 +247,18 @@ class Customers extends ApiCommand implements ResourceEntity
$loginname_check_stmt = Database::prepare(" $loginname_check_stmt = Database::prepare("
SELECT `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname` = :login SELECT `loginname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname` = :login
"); ");
$loginname_check = Database::pexecute_first($loginname_check_stmt, array('login' => $loginname), true, true); $loginname_check = Database::pexecute_first($loginname_check_stmt, array(
'login' => $loginname
), true, true);
// Check if an admin with the loginname already exists // Check if an admin with the loginname already exists
// do not check via api as we skip any permission checks for this task // do not check via api as we skip any permission checks for this task
$loginname_check_admin_stmt = Database::prepare(" $loginname_check_admin_stmt = Database::prepare("
SELECT `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname` = :login SELECT `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname` = :login
"); ");
$loginname_check_admin = Database::pexecute_first($loginname_check_admin_stmt, array('login' => $loginname), true, true); $loginname_check_admin = Database::pexecute_first($loginname_check_admin_stmt, array(
'login' => $loginname
), true, true);
if (strtolower($loginname_check['loginname']) == strtolower($loginname) || strtolower($loginname_check_admin['loginname']) == strtolower($loginname)) { if (strtolower($loginname_check['loginname']) == strtolower($loginname) || strtolower($loginname_check_admin['loginname']) == strtolower($loginname)) {
standard_error('loginnameexists', $loginname, true); standard_error('loginnameexists', $loginname, true);