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

add testsuite parameter to phpunit to respect our required test-order; minor fixes in Domains- and SubDomains Command

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-27 18:07:43 +01:00
parent 75bc6d32ab
commit 2bf5e90a77
4 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -706,7 +706,6 @@ class Domains extends ApiCommand implements ResourceEntity
Database::pexecute($ins_stmt, $ins_data, true, true);
$domainid = Database::lastInsertId();
$ins_data['id'] = $domainid;
$domain_ins_data = $ins_data;
unset($ins_data);
$upd_stmt = Database::prepare("
@@ -747,7 +746,12 @@ class Domains extends ApiCommand implements ResourceEntity
inserttask('4');
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added domain '" . $domain . "'");
return $this->response(200, "successfull", $domain_ins_data);
$json_result = Domains::getLocal($this->getUserData(), array(
'domainname' => $domain
))->get();
$result = json_decode($json_result, true)['data'];
return $this->response(200, "successfull", $result);
}
}
throw new Exception("No more resources available", 406);