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

re-read admin/customer when adding/updating so we return the fields from the table, not the placeholders of the prepared-statement

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-25 17:03:49 +01:00
parent 0958d07f23
commit f32a1921c5
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,7 +280,13 @@ class Admins extends ApiCommand implements ResourceEntity
$adminid = Database::lastInsertId(); $adminid = Database::lastInsertId();
$ins_data['adminid'] = $adminid; $ins_data['adminid'] = $adminid;
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added admin '" . $loginname . "'"); $this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added admin '" . $loginname . "'");
return $this->response(200, "successfull", $ins_data);
// get all admin-data for return-array
$json_result = Admins::getLocal($this->getUserData(), array(
'id' => $adminid
))->get();
$result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result);
} }
} }
throw new Exception("Not allowed to execute given command.", 403); throw new Exception("Not allowed to execute given command.", 403);
@@ -540,9 +546,14 @@ class Admins extends ApiCommand implements ResourceEntity
WHERE `adminid` = :adminid WHERE `adminid` = :adminid
"); ");
Database::pexecute($upd_stmt, $upd_data, true, true); Database::pexecute($upd_stmt, $upd_data, true, true);
$this->logger()->logAction(ADM_ACTION, LOG_INFO, "[API] edited admin '" . $result['loginname'] . "'"); $this->logger()->logAction(ADM_ACTION, LOG_INFO, "[API] edited admin '" . $result['loginname'] . "'");
return $this->response(200, "successfull", $upd_data);
// get all admin-data for return-array
$json_result = Admins::getLocal($this->getUserData(), array(
'id' => $adminid
))->get();
$result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result);
} }
} }
throw new Exception("Not allowed to execute given command.", 403); throw new Exception("Not allowed to execute given command.", 403);
@@ -647,6 +658,8 @@ class Admins extends ApiCommand implements ResourceEntity
Database::pexecute($result_stmt, array( Database::pexecute($result_stmt, array(
'id' => $id 'id' => $id
), true, true); ), true, true);
// set the new value for result-array
$result['loginfail_count'] = 0;
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] unlocked admin '" . $result['loginname'] . "'"); $this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] unlocked admin '" . $result['loginname'] . "'");
return $this->response(200, "successfull", $result); return $this->response(200, "successfull", $result);

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

@@ -430,7 +430,6 @@ class Customers extends ApiCommand implements ResourceEntity
} }
$this->logger()->logAction(ADM_ACTION, LOG_INFO, "[API] added customer '" . $loginname . "'"); $this->logger()->logAction(ADM_ACTION, LOG_INFO, "[API] added customer '" . $loginname . "'");
$customer_ins_data = $ins_data;
unset($ins_data); unset($ins_data);
// insert task to create homedir etc. // insert task to create homedir etc.
@@ -644,9 +643,13 @@ class Customers extends ApiCommand implements ResourceEntity
$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] automatically sent password to user '" . $loginname . "'"); $this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] automatically sent password to user '" . $loginname . "'");
} }
} }
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added customer '" . $loginname . "'"); $this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added customer '" . $loginname . "'");
return $this->response(200, "successfull", $customer_ins_data);
$json_result = Customers::getLocal($this->getUserData(), array(
'loginname' => $loginname
))->get();
$result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result);
} }
throw new Exception("No more resources available", 406); throw new Exception("No more resources available", 406);
} }
@@ -1197,7 +1200,11 @@ class Customers extends ApiCommand implements ResourceEntity
} }
} }
return $this->response(200, "successfull", $upd_data); $json_result = Customers::getLocal($this->getUserData(), array(
'loginname' => $result['customerid']
))->get();
$result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result);
} }
/** /**
@@ -1478,6 +1485,8 @@ class Customers extends ApiCommand implements ResourceEntity
Database::pexecute($result_stmt, array( Database::pexecute($result_stmt, array(
'id' => $id 'id' => $id
), true, true); ), true, true);
// set the new value for result-array
$result['loginfail_count'] = 0;
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] unlocked customer '" . $result['loginname'] . "'"); $this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] unlocked customer '" . $result['loginname'] . "'");
return $this->response(200, "successfull", $result); return $this->response(200, "successfull", $result);