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

4
build.xml
View File

@@ -194,6 +194,8 @@
taskname="phpunit"> taskname="phpunit">
<arg value="--configuration" /> <arg value="--configuration" />
<arg path="${basedir}/phpunit.xml" /> <arg path="${basedir}/phpunit.xml" />
<arg value="--testsuite" />
<arg value="froxlor" />
</exec> </exec>
<property name="phpunit.done" value="true" /> <property name="phpunit.done" value="true" />
@@ -205,6 +207,8 @@
<exec executable="${phpunit}" failonerror="true" taskname="phpunit"> <exec executable="${phpunit}" failonerror="true" taskname="phpunit">
<arg value="--configuration" /> <arg value="--configuration" />
<arg path="${basedir}/phpunit.xml" /> <arg path="${basedir}/phpunit.xml" />
<arg value="--testsuite" />
<arg value="froxlor" />
<arg value="--no-coverage" /> <arg value="--no-coverage" />
</exec> </exec>

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); Database::pexecute($ins_stmt, $ins_data, true, true);
$domainid = Database::lastInsertId(); $domainid = Database::lastInsertId();
$ins_data['id'] = $domainid; $ins_data['id'] = $domainid;
$domain_ins_data = $ins_data;
unset($ins_data); unset($ins_data);
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
@@ -747,7 +746,12 @@ class Domains extends ApiCommand implements ResourceEntity
inserttask('4'); inserttask('4');
$this->logger()->logAction(ADM_ACTION, LOG_WARNING, "[API] added domain '" . $domain . "'"); $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); throw new Exception("No more resources available", 406);

20
lib/classes/api/commands/class.SubDomains.php
View File

@@ -330,7 +330,7 @@ class SubDomains extends ApiCommand implements ResourceEntity
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added subdomain '" . $completedomain . "'"); $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_INFO, "[API] added subdomain '" . $completedomain . "'");
$json_result = Subdomains::getLocal($this->getUserData(), array( $json_result = SubDomains::getLocal($this->getUserData(), array(
'id' => $subdomain_id 'id' => $subdomain_id
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
@@ -597,23 +597,9 @@ class SubDomains extends ApiCommand implements ResourceEntity
inserttask('4'); inserttask('4');
// reduce subdomain-usage-counter // reduce subdomain-usage-counter
$stmt = Database::prepare(" Customers::decreaseUsage($customer_id, 'subdomains_used');
UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
SET `subdomains_used` = `subdomains_used` - 1
WHERE `customerid` = :customerid
");
Database::pexecute($stmt, array(
"customerid" => $customer_id
), true, true);
// update admin usage // update admin usage
$stmt = Database::prepare(" Admins::decreaseUsage(($this->isAdmin() ? $customer['adminid'] : $this->getUserDetail('adminid')), 'subdomains_used');
UPDATE `" . TABLE_PANEL_ADMINS . "`
SET `subdomains_used` = `subdomains_used` - 1
WHERE `adminid` = :adminid
");
Database::pexecute($stmt, array(
"adminid" => ($this->isAdmin() ? $customer['adminid'] : $this->getUserDetail('adminid'))
), true, true);
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_WARNING, "[API] deleted subdomain '" . $result['domain'] . "'"); $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_WARNING, "[API] deleted subdomain '" . $result['domain'] . "'");
return $this->response(200, "successfull", $result); return $this->response(200, "successfull", $result);

3
phpunit.xml
View File

@@ -11,8 +11,9 @@
<directory>tests/Global</directory> <directory>tests/Global</directory>
<directory>tests/Admins</directory> <directory>tests/Admins</directory>
<directory>tests/Customers</directory> <directory>tests/Customers</directory>
<directory>tests/SubDomains</directory>
<directory>tests/IpsAndPorts</directory> <directory>tests/IpsAndPorts</directory>
<directory>tests/Domains</directory>
<directory>tests/SubDomains</directory>
<directory>tests/Ftps</directory> <directory>tests/Ftps</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>