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

minor fixes in Domains.add; added more tests

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-01 19:41:57 +01:00
parent 02616d3080
commit 601d16b17c
2 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ class Domains extends ApiCommand implements ResourceEntity
*/
public function add()
{
if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
if ($this->isAdmin()) {
if ($this->getUserDetail('domains_used') < $this->getUserDetail('domains') || $this->getUserDetail('domains') == '-1') {
// parameters
@@ -325,7 +325,10 @@ class Domains extends ApiCommand implements ResourceEntity
}
$ipandports = array();
if (! empty($p_ipandport) && ! is_array($p_ipandports)) {
if (! empty($p_ipandports) && is_numeric($p_ipandports)) {
$p_ipandports = array($p_ipandports);
}
if (! empty($p_ipandports) && ! is_array($p_ipandports)) {
$p_ipandports = unserialize($p_ipandports);
}