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

enhance ApiCommand::getParam() to specify required and optional parameter

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-19 08:59:24 +01:00
parent 532551263d
commit 133af365bd
4 changed files with 283 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/classes/api/abstract.ApiCommand.php
View File

@@ -34,7 +34,7 @@ abstract class ApiCommand
$this->initMail(); $this->initMail();
if ($this->debug) { if ($this->debug) {
$this->logger()->logAction(LOG_ERROR, LOG_DEBUG, "[API] ".get_called_class().": ".json_encode($params, JSON_UNESCAPED_SLASHES)); $this->logger()->logAction(LOG_ERROR, LOG_DEBUG, "[API] " . get_called_class() . ": " . json_encode($params, JSON_UNESCAPED_SLASHES));
} }
} }
@@ -146,22 +146,73 @@ abstract class ApiCommand
} }
/** /**
* receive field from parameter-list * get specific parameter from the parameterlist;
* check for existence and != empty if needed.
* Maybe more in the future
* *
* @param string $param * @param string $param
* parameter to get out of the request-parameter list
* @param bool $optional
* default: false
* @param mixed $default * @param mixed $default
* set if param is not found * value which is returned if optional=true and param is not set
* *
* @throws Exception * @throws Exception
* @return mixed * @return mixed
*/ */
protected function getParam($param = null, $default = null) protected function getParam($param = null, $optional = false, $default = '')
{ {
if (isset($this->cmd_params[$param])) { // does it exist?
return $this->cmd_params[$param]; if (! isset($this->cmd_params[$param])) {
if ($optional === false) {
// get module + function for better error-messages
$inmod = $this->getModFunctionString();
throw new Exception('Requested parameter "' . $param . '" could not be found for "' . $inmod . '"', 404);
} }
return $default; return $default;
} }
// is it empty? - test really on string, as value 0 is being seen as empty by php
if ($this->cmd_params[$param] === "") {
if ($optional === false) {
// get module + function for better error-messages
$inmod = $this->getModFunctionString();
throw new Exception('Requested parameter "' . $param . '" is empty where it should not be for "' . $inmod . '"', 406);
}
return '';
}
// everything else is fine
return $this->cmd_params[$param];
}
/**
* returns "module::function()" for better error-messages (missing parameter etc.)
* makes debugging a whole lot more comfortable
*
* @return string
*/
private function getModFunctionString()
{
$_c = get_called_class();
$level = 2;
if (version_compare(PHP_VERSION, "5.4.0", "<")) {
$t = debug_backtrace();
} else {
$t = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
}
while (true) {
$c = $t[$level]['class'];
$f = $t[$level]['function'];
if ($c != get_called_class()) {
$level ++;
if ($level > 5) {
break;
}
continue;
}
return $c . ':' . $f;
}
}
/** /**
* update value of parameter * update value of parameter

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

@@ -76,89 +76,90 @@ class Customers extends ApiCommand implements ResourceEntity
if ($this->getUserDetail('customers_used') < $this->getUserDetail('customers') || $this->getUserDetail('customers') == '-1') { if ($this->getUserDetail('customers_used') < $this->getUserDetail('customers') || $this->getUserDetail('customers') == '-1') {
$idna_convert = new idna_convert_wrapper(); $idna_convert = new idna_convert_wrapper();
$name = validate($this->getParam('name'), 'name', '', '', array(), true); $name = validate($this->getParam('name', true, ''), 'name', '', '', array(), true);
$firstname = validate($this->getParam('firstname'), 'first name', '', '', array(), true); $firstname = validate($this->getParam('firstname', true, ''), 'first name', '', '', array(), true);
$company = validate($this->getParam('company'), 'company', '', '', array(), true); $company_required = (empty($name) && empty($first));
$street = validate($this->getParam('street'), 'street', '', '', array(), true); $company = validate($this->getParam('company', $company_required, ''), 'company', '', '', array(), true);
$zipcode = validate($this->getParam('zipcode'), 'zipcode', '/^[0-9 \-A-Z]*$/', '', array(), true); $street = validate($this->getParam('street', true, ''), 'street', '', '', array(), true);
$city = validate($this->getParam('city'), 'city', '', '', array(), true); $zipcode = validate($this->getParam('zipcode', true, ''), 'zipcode', '/^[0-9 \-A-Z]*$/', '', array(), true);
$phone = validate($this->getParam('phone'), 'phone', '/^[0-9\- \+\(\)\/]*$/', '', array(), true); $city = validate($this->getParam('city', true, ''), 'city', '', '', array(), true);
$fax = validate($this->getParam('fax'), 'fax', '/^[0-9\- \+\(\)\/]*$/', '', array(), true); $phone = validate($this->getParam('phone', true, ''), 'phone', '/^[0-9\- \+\(\)\/]*$/', '', array(), true);
$fax = validate($this->getParam('fax', true, ''), 'fax', '/^[0-9\- \+\(\)\/]*$/', '', array(), true);
$email = $idna_convert->encode(validate($this->getParam('email'), 'email', '', '', array(), true)); $email = $idna_convert->encode(validate($this->getParam('email'), 'email', '', '', array(), true));
$customernumber = validate($this->getParam('customernumber'), 'customer number', '/^[A-Za-z0-9 \-]*$/Di', '', array(), true); $customernumber = validate($this->getParam('customernumber', true, ''), 'customer number', '/^[A-Za-z0-9 \-]*$/Di', '', array(), true);
$def_language = validate($this->getParam('def_language'), 'default language', '', '', array(), true); $def_language = validate($this->getParam('def_language', true, ''), 'default language', '', '', array(), true);
$gender = intval_ressource($this->getParam('gender', 0)); $gender = intval_ressource($this->getParam('gender', true, 0));
$custom_notes = validate(str_replace("\r\n", "\n", $this->getParam('custom_notes', '')), 'custom_notes', '/^[^\0]*$/', '', array(), true); $custom_notes = validate(str_replace("\r\n", "\n", $this->getParam('custom_notes', true, '')), 'custom_notes', '/^[^\0]*$/', '', array(), true);
$custom_notes_show = $this->getParam('custom_notes_show', 0); $custom_notes_show = $this->getParam('custom_notes_show', true, 0);
$diskspace = intval_ressource($this->getParam('diskspace', 0)); $diskspace = intval_ressource($this->getParam('diskspace', true, 0));
if ($this->getParam('diskspace_ul', 0) == -1) { if ($this->getParam('diskspace_ul', true, 0) == -1) {
$diskspace = - 1; $diskspace = - 1;
} }
$traffic = doubleval_ressource($this->getParam('traffic', 0)); $traffic = doubleval_ressource($this->getParam('traffic', true, 0));
if ($this->getParam('traffic_ul', 0) == -1) { if ($this->getParam('traffic_ul', true, 0) == -1) {
$traffic = - 1; $traffic = - 1;
} }
$subdomains = intval_ressource($this->getParam('subdomains', 0)); $subdomains = intval_ressource($this->getParam('subdomains', true, 0));
if ($this->getParam('subdomains_ul', 0) == -1) { if ($this->getParam('subdomains_ul', true, 0) == -1) {
$subdomains = - 1; $subdomains = - 1;
} }
$emails = intval_ressource($this->getParam('emails', 0)); $emails = intval_ressource($this->getParam('emails', true, 0));
if ($this->getParam('emails_ul', 0) == -1) { if ($this->getParam('emails_ul', true, 0) == -1) {
$emails = - 1; $emails = - 1;
} }
$email_accounts = intval_ressource($this->getParam('email_accounts', 0)); $email_accounts = intval_ressource($this->getParam('email_accounts', true, 0));
if ($this->getParam('email_accounts_ul', 0) == -1) { if ($this->getParam('email_accounts_ul', true, 0) == -1) {
$email_accounts = - 1; $email_accounts = - 1;
} }
$email_forwarders = intval_ressource($this->getParam('email_forwarders', 0)); $email_forwarders = intval_ressource($this->getParam('email_forwarders', true, 0));
if ($this->getParam('email_forwarders_ul', 0) == -1) { if ($this->getParam('email_forwarders_ul', true, 0) == -1) {
$email_forwarders = - 1; $email_forwarders = - 1;
} }
if (Settings::Get('system.mail_quota_enabled') == '1') { if (Settings::Get('system.mail_quota_enabled') == '1') {
$email_quota = validate($this->getParam('email_quota', 0), 'email_quota', '/^\d+$/', 'vmailquotawrong', array( $email_quota = validate($this->getParam('email_quota', true, 0), 'email_quota', '/^\d+$/', 'vmailquotawrong', array(
'0', '0',
'' ''
), true); ), true);
if ($this->getParam('email_quota_ul', 0) == -1) { if ($this->getParam('email_quota_ul', true, 0) == -1) {
$email_quota = - 1; $email_quota = - 1;
} }
} else { } else {
$email_quota = - 1; $email_quota = - 1;
} }
$email_imap = $this->getParam('email_imap', 0); $email_imap = $this->getParam('email_imap', true, 0);
$email_pop3 = $this->getParam('email_pop3', 0); $email_pop3 = $this->getParam('email_pop3', true, 0);
$ftps = intval_ressource($this->getParam('ftps', 0)); $ftps = intval_ressource($this->getParam('ftps', true, 0));
if ($this->getParam('ftps_ul', 0) == -1) { if ($this->getParam('ftps_ul', true, 0) == -1) {
$ftps = - 1; $ftps = - 1;
} }
if (Settings::Get('ticket.enabled') == '1') { if (Settings::Get('ticket.enabled') == '1') {
$tickets = intval_ressource($this->getParam('tickets', 0)); $tickets = intval_ressource($this->getParam('tickets', true, 0));
if ($this->getParam('tickets_ul', 0) == -1) { if ($this->getParam('tickets_ul', true, 0) == -1) {
$tickets = - 1; $tickets = - 1;
} }
} else { } else {
$tickets = - 1; $tickets = - 1;
} }
$mysqls = intval_ressource($this->getParam('mysqls', 0)); $mysqls = intval_ressource($this->getParam('mysqls', true, 0));
if ($this->getParam('mysqls_ul', 0) == -1) { if ($this->getParam('mysqls_ul', true, 0) == -1) {
$mysqls = - 1; $mysqls = - 1;
} }
$createstdsubdomain = $this->getParam('createstdsubdomain', 0); $createstdsubdomain = $this->getParam('createstdsubdomain', true, 0);
$password = validate($this->getParam('new_customer_password', ''), 'password', '', '', array(), true); $password = validate($this->getParam('new_customer_password', true, ''), 'password', '', '', array(), true);
// only check if not empty, // only check if not empty,
// cause empty == generate password automatically // cause empty == generate password automatically
if ($password != '') { if ($password != '') {
@@ -170,20 +171,20 @@ class Customers extends ApiCommand implements ResourceEntity
$gender = 0; $gender = 0;
} }
$sendpassword = $this->getParam('sendpassword', 0); $sendpassword = $this->getParam('sendpassword', true, 0);
$phpenabled = $this->getParam('phpenabled', 0); $phpenabled = $this->getParam('phpenabled', true, 0);
$allowed_phpconfigs = array(); $allowed_phpconfigs = array();
if (! empty($this->getParam('allowed_phpconfigs', array())) && is_array($this->getParam('allowed_phpconfigs'))) { if (! empty($this->getParam('allowed_phpconfigs', true, array())) && is_array($this->getParam('allowed_phpconfigs', true, array()))) {
foreach ($this->getParam('allowed_phpconfigs') as $allowed_phpconfig) { foreach ($this->getParam('allowed_phpconfigs', true, array()) as $allowed_phpconfig) {
$allowed_phpconfig = intval($allowed_phpconfig); $allowed_phpconfig = intval($allowed_phpconfig);
$allowed_phpconfigs[] = $allowed_phpconfig; $allowed_phpconfigs[] = $allowed_phpconfig;
} }
} }
$perlenabled = $this->getParam('perlenabled', 0); $perlenabled = $this->getParam('perlenabled', true, 0);
$dnsenabled = $this->getParam('dnsenabled', 0); $dnsenabled = $this->getParam('dnsenabled', true, 0);
$store_defaultindex = $this->getParam('store_defaultindex', 0); $store_defaultindex = $this->getParam('store_defaultindex', true, 0);
$diskspace = $diskspace * 1024; $diskspace = $diskspace * 1024;
$traffic = $traffic * 1024 * 1024; $traffic = $traffic * 1024 * 1024;
@@ -212,7 +213,7 @@ class Customers extends ApiCommand implements ResourceEntity
standard_error('emailiswrong', $email, true); standard_error('emailiswrong', $email, true);
} else { } else {
if ($this->getParam('new_loginname', '') != '') { if ($this->getParam('new_loginname', true, '') != '') {
$accountnumber = intval(Settings::Get('system.lastaccountnumber')); $accountnumber = intval(Settings::Get('system.lastaccountnumber'));
$loginname = validate($this->getParam('new_loginname'), 'loginname', '/^[a-z][a-z0-9\-_]+$/i', '', array(), true); $loginname = validate($this->getParam('new_loginname'), 'loginname', '/^[a-z][a-z0-9\-_]+$/i', '', array(), true);
@@ -672,6 +673,7 @@ class Customers extends ApiCommand implements ResourceEntity
* delete a customer entry by id * delete a customer entry by id
* *
* @param int $id customer-id * @param int $id customer-id
* @param bool $delete_userfiles optional, default false
* *
* @throws Exception * @throws Exception
* @return array * @return array
@@ -680,6 +682,7 @@ class Customers extends ApiCommand implements ResourceEntity
{ {
if ($this->isAdmin()) { if ($this->isAdmin()) {
$id = $this->getParam('id'); $id = $this->getParam('id');
$delete_userfiles = $this->getParam('delete_userfiles', true, 0);
$json_result = Customers::getLocal($this->getUserData(), array( $json_result = Customers::getLocal($this->getUserData(), array(
'id' => $id 'id' => $id
@@ -872,7 +875,7 @@ class Customers extends ApiCommand implements ResourceEntity
// Using nameserver, insert a task which rebuilds the server config // Using nameserver, insert a task which rebuilds the server config
inserttask('4'); inserttask('4');
if ($this->getParam('delete_userfiles', 0) == 1) { if ($delete_userfiles == 1) {
// insert task to remove the customers files from the filesystem // insert task to remove the customers files from the filesystem
inserttask('6', $result['loginname']); inserttask('6', $result['loginname']);
} }

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

@@ -40,8 +40,10 @@ class Domains extends ApiCommand implements ResourceEntity
/** /**
* return a domain entry by id * return a domain entry by id
* *
* @param int $id domain-id * @param int $id
* @param boolean $no_std_subdomain optional, default false * domain-id
* @param boolean $no_std_subdomain
* optional, default false
* *
* @throws Exception * @throws Exception
* @return array * @return array
@@ -50,7 +52,7 @@ class Domains extends ApiCommand implements ResourceEntity
{ {
if ($this->isAdmin()) { if ($this->isAdmin()) {
$id = $this->getParam('id'); $id = $this->getParam('id');
$no_std_subdomain = $this->getParam('no_std_subdomain', false); $no_std_subdomain = $this->getParam('no_std_subdomain', true, false);
$this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] get domain #" . $id); $this->logger()->logAction(ADM_ACTION, LOG_NOTICE, "[API] get domain #" . $id);
$result_stmt = Database::prepare(" $result_stmt = Database::prepare("
SELECT `d`.*, `c`.`customerid` SELECT `d`.*, `c`.`customerid`
@@ -78,11 +80,50 @@ class Domains extends ApiCommand implements ResourceEntity
if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) { if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
if ($this->getUserDetail('domains_used') < $this->getUserDetail('domains') || $this->getUserDetail('domains') == '-1') { if ($this->getUserDetail('domains_used') < $this->getUserDetail('domains') || $this->getUserDetail('domains') == '-1') {
if ($this->getParam('domain') == Settings::Get('system.hostname')) { // parameters
$p_domain = $this->getParam('domain');
$customerid = intval($this->getParam('customerid'));
$p_ipandports = $this->getParam('ipandport');
// optional parameters
$adminid = intval($this->getParam('adminid', true, $this->getUserDetail('adminid')));
$subcanemaildomain = $this->getParam('subcanemaildomain', true, 0);
$isemaildomain = $this->getParam('isemaildomain', true, 0);
$email_only = $this->getParam('email_only', true, 0);
$serveraliasoption = $this->getParam('selectserveralias', true, 0);
$speciallogfile = $this->getParam('speciallogfile', true, 0);
$aliasdomain = intval($this->getParam('alias', true, 0));
$issubof = intval($this->getParam('issubof', true, 0));
$registration_date = trim($this->getParam('registration_date', true, ''));
$termination_date = trim($this->getParam('termination_date', true, ''));
$caneditdomain = $this->getParam('caneditdomain', true, 0);
$isbinddomain = $this->getParam('isbinddomain', true, 0);
$zonefile = $this->getParam('zonefile', true, '');
$dkim = intval($this->getParam('dkim', true, 0));
$specialsettings = $this->getParam('specialsettings', true, '');
$notryfiles = $this->getParam('notryfiles', true, 0);
$documentroot = $this->getParam('documentroot', true, '');
$phpenabled = $this->getParam('phpenabled', true, 0);
$openbasedir = $this->getParam('openbasedir', true, 0);
$phpsettingid = $this->getParam('phpsettingid', true, 1);
$mod_fcgid_starter = $this->getParam('mod_fcgid_starter', true, - 1);
$mod_fcgid_maxrequests = $this->getParam('mod_fcgid_maxrequests', true, - 1);
$ssl_redirect = $this->getParam('ssl_redirect', true, 0);
$letsencrypt = $this->getParam('letsencrypt', true, 0);
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, array());
$http2 = $this->getParam('http2', true, 0);
$hsts_maxage = $this->getParam('hsts_maxage', true, 0);
$hsts_sub = $this->getParam('hsts_sub', true, 0);
$hsts_preload = $this->getParam('hsts_preload', true, 0);
$ocsp_stapling = $this->getParam('ocsp_stapling', true, 0);
// validation
if ($p_domain == Settings::Get('system.hostname')) {
standard_error('admin_domain_emailsystemhostname', '', true); standard_error('admin_domain_emailsystemhostname', '', true);
} }
if (substr($this->getParam('domain'), 0, 4) == 'xn--') { if (substr($p_domain, 0, 4) == 'xn--') {
standard_error('domain_nopunycode', '', true); standard_error('domain_nopunycode', '', true);
} }
@@ -90,7 +131,7 @@ class Domains extends ApiCommand implements ResourceEntity
$domain = $idna_convert->encode(preg_replace(array( $domain = $idna_convert->encode(preg_replace(array(
'/\:(\d)+$/', '/\:(\d)+$/',
'/^https?\:\/\//' '/^https?\:\/\//'
), '', validate($this->getParam('domain'), 'domain'))); ), '', validate($p_domain, 'domain')));
// Check whether domain validation is enabled and if, validate the domain // Check whether domain validation is enabled and if, validate the domain
if (Settings::Get('system.validate_domain') && ! validateDomain($domain)) { if (Settings::Get('system.validate_domain') && ! validateDomain($domain)) {
@@ -100,15 +141,6 @@ class Domains extends ApiCommand implements ResourceEntity
), '', true); ), '', true);
} }
$subcanemaildomain = $this->getParam('subcanemaildomain', 0);
$isemaildomain = $this->getParam('isemaildomain', 0);
$email_only = $this->getParam('email_only', 0);
$serveraliasoption = $this->getParam('selectserveralias', 0);
$speciallogfile = $this->getParam('speciallogfile', 0);
$aliasdomain = intval($this->getParam('alias'));
$issubof = intval($this->getParam('issubof'));
$customerid = intval($this->getParam('customerid'));
$customer_stmt = Database::prepare(" $customer_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "`
WHERE `customerid` = :customerid " . ($this->getUserDetail('customers_see_all') ? '' : " AND `adminid` = :adminid")); WHERE `customerid` = :customerid " . ($this->getUserDetail('customers_see_all') ? '' : " AND `adminid` = :adminid"));
@@ -125,8 +157,6 @@ class Domains extends ApiCommand implements ResourceEntity
} }
if ($this->getUserDetail('customers_see_all') == '1') { if ($this->getUserDetail('customers_see_all') == '1') {
$adminid = intval($this->getParam('adminid'));
$admin_stmt = Database::prepare(" $admin_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_ADMINS . "` SELECT * FROM `" . TABLE_PANEL_ADMINS . "`
WHERE `adminid` = :adminid AND (`domains_used` < `domains` OR `domains` = '-1')"); WHERE `adminid` = :adminid AND (`domains_used` < `domains` OR `domains` = '-1')");
@@ -150,7 +180,6 @@ class Domains extends ApiCommand implements ResourceEntity
} }
$documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix); $documentroot = makeCorrectDir($customer['documentroot'] . $path_suffix);
$registration_date = trim($this->getParam('registration_date', ''));
$registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array( $registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array(
'0000-00-00', '0000-00-00',
'0', '0',
@@ -160,7 +189,6 @@ class Domains extends ApiCommand implements ResourceEntity
$registration_date = null; $registration_date = null;
} }
$termination_date = trim($this->getParam('termination_date', ''));
$termination_date = validate($termination_date, 'termination_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array( $termination_date = validate($termination_date, 'termination_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array(
'0000-00-00', '0000-00-00',
'0', '0',
@@ -171,31 +199,23 @@ class Domains extends ApiCommand implements ResourceEntity
} }
if ($this->getUserDetail('change_serversettings') == '1') { if ($this->getUserDetail('change_serversettings') == '1') {
$caneditdomain = $this->getParam('caneditdomain', 0);
$isbinddomain = '0';
$zonefile = '';
if (Settings::Get('system.bind_enable') == '1') { if (Settings::Get('system.bind_enable') == '1') {
$isbinddomain = $this->getParam('isbinddomain', 0); $zonefile = validate($zonefile, 'zonefile', '', '', array(), true);
$zonefile = validate($this->getParam('zonefile', ''), 'zonefile', '', '', array(), true); } else {
$isbinddomain = 0;
$zonefile = '';
} }
$dkim = intval($this->getParam('dkim', 0)); $specialsettings = validate(str_replace("\r\n", "\n", $specialsettings), 'specialsettings', '/^[^\0]*$/', '', array(), true);
validate($documentroot, 'documentroot', '', '', array(), true);
$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings', '')), 'specialsettings', '/^[^\0]*$/', '', array(), true);
$notryfiles = $this->getParam('notryfiles', 0);
validate($this->getParam('documentroot', ''), 'documentroot', '', '', array(), true);
// If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings, // If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
// set default path to subdomain or domain name // set default path to subdomain or domain name
if ($this->getParam('documentroot', '') != '') { if ($documentroot != '') {
if (substr($this->getParam('documentroot'), 0, 1) != '/' && ! preg_match('/^https?\:\/\//', $this->getParam('documentroot'))) { if (substr($documentroot, 0, 1) != '/' && ! preg_match('/^https?\:\/\//', $documentroot)) {
$documentroot .= '/' . $this->getParam('documentroot'); $documentroot .= '/' . $documentroot;
} else {
$documentroot = $this->getParam('documentroot');
} }
} elseif ($this->getParam('documentroot', '') == '' && Settings::Get('system.documentroot_use_default_value') == 1) { } elseif ($documentroot == '' && Settings::Get('system.documentroot_use_default_value') == 1) {
$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain); $documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain);
} }
} else { } else {
@@ -212,11 +232,7 @@ class Domains extends ApiCommand implements ResourceEntity
if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') { if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') {
$phpenabled = $this->getParam('phpenabled', 0);
$openbasedir = $this->getParam('openbasedir', 0);
if ((int) Settings::Get('system.mod_fcgid') == 1 || (int) Settings::Get('phpfpm.enabled') == 1) { if ((int) Settings::Get('system.mod_fcgid') == 1 || (int) Settings::Get('phpfpm.enabled') == 1) {
$phpsettingid = $this->getParam('phpsettingid', 1);
$phpsettingid_check_stmt = Database::prepare(" $phpsettingid_check_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`
WHERE `id` = :phpsettingid"); WHERE `id` = :phpsettingid");
@@ -229,11 +245,11 @@ class Domains extends ApiCommand implements ResourceEntity
} }
if ((int) Settings::Get('system.mod_fcgid') == 1) { if ((int) Settings::Get('system.mod_fcgid') == 1) {
$mod_fcgid_starter = validate($this->getParam('mod_fcgid_starter', - 1), 'mod_fcgid_starter', '/^[0-9]*$/', '', array( $mod_fcgid_starter = validate($mod_fcgid_starter, 'mod_fcgid_starter', '/^[0-9]*$/', '', array(
'-1', '-1',
'' ''
), true); ), true);
$mod_fcgid_maxrequests = validate($this->getParam('mod_fcgid_maxrequests', - 1), 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array( $mod_fcgid_maxrequests = validate($mod_fcgid_maxrequests, 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array(
'-1', '-1',
'' ''
), true); ), true);
@@ -282,12 +298,12 @@ class Domains extends ApiCommand implements ResourceEntity
} }
$ipandports = array(); $ipandports = array();
if (! empty($this->getParam('ipandport')) && ! is_array($this->getParam('ipandport'))) { if (! empty($p_ipandport) && ! is_array($p_ipandports)) {
$this->updateParam('ipandport', unserialize($this->getParam('ipandport'))); $p_ipandports = unserialize($p_ipandports);
} }
if (! empty($this->getParam('ipandport')) && is_array($this->getParam('ipandport'))) { if (! empty($p_ipandports) && is_array($p_ipandports)) {
foreach ($this->getParam('ipandport') as $ipandport) { foreach ($p_ipandports as $ipandport) {
$ipandport = intval($ipandport); $ipandport = intval($ipandport);
$ipandport_check_stmt = Database::prepare(" $ipandport_check_stmt = Database::prepare("
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "`
@@ -306,18 +322,16 @@ class Domains extends ApiCommand implements ResourceEntity
} }
} }
if (Settings::Get('system.use_ssl') == "1" && ! empty($this->getParam('ssl_ipandport'))) { if (Settings::Get('system.use_ssl') == "1" && ! empty($p_ssl_ipandports)) {
$ssl_redirect = $this->getParam('ssl_redirect', 0);
$letsencrypt = $this->getParam('letsencrypt', 0);
$ssl_ipandports = array(); $ssl_ipandports = array();
if (! empty($this->getParam('ssl_ipandport')) && ! is_array($this->getParam('ssl_ipandport'))) { if (! empty($p_ssl_ipandports) && ! is_array($p_ssl_ipandports)) {
$this->updateParam('ssl_ipandport', unserialize($this->getParam('ssl_ipandport'))); $p_ssl_ipandports = unserialize($p_ssl_ipandports);
} }
// Verify SSL-Ports // Verify SSL-Ports
if (! empty($this->getParam('ssl_ipandport')) && is_array($this->getParam('ssl_ipandport'))) { if (! empty($p_ssl_ipandports) && is_array($p_ssl_ipandports)) {
foreach ($this->getParam('ssl_ipandport') as $ssl_ipandport) { foreach ($p_ssl_ipandports as $ssl_ipandport) {
if (trim($ssl_ipandport) == "") { if (trim($ssl_ipandport) == "") {
continue; continue;
} }
@@ -341,14 +355,6 @@ class Domains extends ApiCommand implements ResourceEntity
$ssl_ipandports[] = $ssl_ipandport; $ssl_ipandports[] = $ssl_ipandport;
} }
} }
$http2 = $this->getParam('http2', 0);
// HSTS
$hsts_maxage = $this->getParam('hsts_maxage', 0);
$hsts_sub = $this->getParam('hsts_sub', 0);
$hsts_preload = $this->getParam('hsts_preload', 0);
// OCSP stapling
$ocsp_stapling = $this->getParam('ocsp_stapling', 0);
} else { } else {
$ssl_redirect = 0; $ssl_redirect = 0;
$letsencrypt = 0; $letsencrypt = 0;
@@ -717,23 +723,57 @@ class Domains extends ApiCommand implements ResourceEntity
public function update() public function update()
{ {
if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) { if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
// parameters
$id = $this->getParam('id'); $id = $this->getParam('id');
// get requested domain
$json_result = Domains::getLocal($this->getUserData(), array( $json_result = Domains::getLocal($this->getUserData(), array(
'id' => $id, 'id' => $id,
'no_std_subdomain' => true 'no_std_subdomain' => true
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$customer_stmt = Database::prepare(" // optional parameters
SELECT * FROM " . TABLE_PANEL_CUSTOMERS . " WHERE `customerid` = :customerid $p_domain = $this->getParam('domain', true, $result['domain']);
"); $p_ipandports = $this->getParam('ipandport', true, array());
$customer = Database::pexecute_first($customer_stmt, array( $customerid = intval($this->getParam('customerid', true, $result['customerid']));
'customerid' => $result['customerid'] $adminid = intval($this->getParam('adminid', true, $result['adminid']));
));
$customerid = $this->getParam('customerid', $result['customerid']); $subcanemaildomain = $this->getParam('subcanemaildomain', true, $result['subcanemaildomain']);
$isemaildomain = $this->getParam('isemaildomain', true, $result['isemaildomain']);
$email_only = $this->getParam('email_only', true, $result['email_only']);
$p_serveraliasoption = $this->getParam('selectserveralias', true, - 1);
$speciallogfile = $this->getParam('speciallogfile', true, $result['speciallogfile']);
$speciallogverified = $this->getParam('speciallogverified', true, 0);
$aliasdomain = intval($this->getParam('alias', true, $result['aliasdomain']));
$issubof = intval($this->getParam('issubof', true, $result['ismainbutsubto']));
$registration_date = trim($this->getParam('registration_date', true, $result['registration_date']));
$termination_date = trim($this->getParam('termination_date', true, $result['termination_date']));
$caneditdomain = $this->getParam('caneditdomain', true, $result['caneditdomain']);
$isbinddomain = $this->getParam('isbinddomain', true, $result['isbinddomain']);
$zonefile = $this->getParam('zonefile', true, $result['zonefile']);
$dkim = intval($this->getParam('dkim', true, $result['dkim']));
$specialsettings = $this->getParam('specialsettings', true, $result['specialsettings']);
$ssfs = $this->getParam('specialsettingsforsubdomains', true, 0);
$notryfiles = $this->getParam('notryfiles', true, $result['notryfiles']);
$documentroot = $this->getParam('documentroot', true, $result['documentroot']);
$phpenabled = $this->getParam('phpenabled', true, $result['phpenabled']);
$phpfs = $this->getParam('phpsettingsforsubdomains', true, 0);
$openbasedir = $this->getParam('openbasedir', true, $result['openbasedir']);
$phpsettingid = $this->getParam('phpsettingid', true, $result['phpsettingid']);
$mod_fcgid_starter = $this->getParam('mod_fcgid_starter', true, $result['mod_fcgid_starter']);
$mod_fcgid_maxrequests = $this->getParam('mod_fcgid_maxrequests', true, $result['mod_fcgid_maxrequests']);
$ssl_redirect = $this->getParam('ssl_redirect', true, $result['ssl_redirect']);
$letsencrypt = $this->getParam('letsencrypt', true, $result['letsencrypt']);
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, array());
$http2 = $this->getParam('http2', true, $result['http2']);
$hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts_maxage']);
$hsts_sub = $this->getParam('hsts_sub', true, $result['hsts_sub']);
$hsts_preload = $this->getParam('hsts_preload', true, $result['hsts_preload']);
$ocsp_stapling = $this->getParam('ocsp_stapling', true, $result['ocsp_stapling']);
// handle change of customer (move domain from customer to customer)
if ($customerid > 0 && $customerid != $result['customerid'] && Settings::Get('panel.allow_domain_change_customer') == '1') { if ($customerid > 0 && $customerid != $result['customerid'] && Settings::Get('panel.allow_domain_change_customer') == '1') {
$customer_stmt = Database::prepare(" $customer_stmt = Database::prepare("
@@ -755,7 +795,12 @@ class Domains extends ApiCommand implements ResourceEntity
$params['adminid'] = $this->getUserDetail('adminid'); $params['adminid'] = $this->getUserDetail('adminid');
} }
$customer = Database::pexecute_first($customer_stmt, $params, true, true); // get domains customer
$json_result = Customers::getLocal($this->getUserData(), array(
'id' => $result['customerid']
))->get();
$customer = json_decode($json_result, true)['data'];
if (empty($customer) || $customer['customerid'] != $customerid) { if (empty($customer) || $customer['customerid'] != $customerid) {
standard_error('customerdoesntexist', '', true); standard_error('customerdoesntexist', '', true);
} }
@@ -763,17 +808,9 @@ class Domains extends ApiCommand implements ResourceEntity
$customerid = $result['customerid']; $customerid = $result['customerid'];
} }
$customer_stmt = Database::prepare(" // handle change of admin (move domain from admin to admin)
SELECT * FROM " . TABLE_PANEL_ADMINS . " WHERE `adminid` = :adminid
");
$admin = Database::pexecute_first($customer_stmt, array(
'adminid' => $result['adminid']
), true, true);
if ($this->getUserDetail('customers_see_all') == '1') { if ($this->getUserDetail('customers_see_all') == '1') {
$adminid = $this->getParam('adminid', $result['adminid']);
if ($adminid > 0 && $adminid != $result['adminid'] && Settings::Get('panel.allow_domain_change_admin') == '1') { if ($adminid > 0 && $adminid != $result['adminid'] && Settings::Get('panel.allow_domain_change_admin') == '1') {
$admin_stmt = Database::prepare(" $admin_stmt = Database::prepare("
@@ -794,11 +831,6 @@ class Domains extends ApiCommand implements ResourceEntity
$adminid = $result['adminid']; $adminid = $result['adminid'];
} }
$aliasdomain = $this->getParam('alias', $result['aliasdomain']);
$issubof = $this->getParam('issubof', $result['ismainbutsubto']);
$subcanemaildomain = $this->getParam('subcanemaildomain', $result['subcanemaildomain']);
$caneditdomain = $this->getParam('caneditdomain', $result['caneditdomain']);
$registration_date = $this->getParam('registration_date', $result['registration_date']);
$registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array( $registration_date = validate($registration_date, 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array(
'0000-00-00', '0000-00-00',
'0', '0',
@@ -807,7 +839,6 @@ class Domains extends ApiCommand implements ResourceEntity
if ($registration_date == '0000-00-00') { if ($registration_date == '0000-00-00') {
$registration_date = null; $registration_date = null;
} }
$termination_date = $this->getParam('termination_date', $result['termination_date']);
$termination_date = validate($termination_date, 'termination_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array( $termination_date = validate($termination_date, 'termination_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array(
'0000-00-00', '0000-00-00',
'0', '0',
@@ -817,39 +848,31 @@ class Domains extends ApiCommand implements ResourceEntity
$termination_date = null; $termination_date = null;
} }
$isemaildomain = $this->getParam('isemaildomain', $result['isemaildomain']);
$email_only = $this->getParam('email_only', $result['email_only']);
$serveraliasoption = '2'; $serveraliasoption = '2';
if ($result['iswildcarddomain'] == '1') { if ($result['iswildcarddomain'] == '1') {
$serveraliasoption = '0'; $serveraliasoption = '0';
} elseif ($result['wwwserveralias'] == '1') { } elseif ($result['wwwserveralias'] == '1') {
$serveraliasoption = '1'; $serveraliasoption = '1';
} }
if (! empty($this->getParam('selectserveralias'))) { if ($p_serveraliasoption > - 1) {
$serveraliasoption = intval($this->getParam('selectserveralias')); $serveraliasoption = $p_serveraliasoption;
} }
$speciallogfile = $this->getParam('speciallogfile', $result['speciallogfile']);
if ($this->getUserDetail('change_serversettings') == '1') { if ($this->getUserDetail('change_serversettings') == '1') {
if (Settings::Get('system.bind_enable') != '1') {
$zonefile = validate($zonefile, 'zonefile', '', '', array(), true);
} else {
$isbinddomain = $result['isbinddomain']; $isbinddomain = $result['isbinddomain'];
$zonefile = $result['zonefile']; $zonefile = $result['zonefile'];
if (Settings::Get('system.bind_enable') == '1') {
$isbinddomain = $this->getParam('isbinddomain', $result['isbinddomain']);
$zonefile = validate($this->getParam('zonefile', $result['zonefile']), 'zonefile', '', '', array(), true);
} }
if (Settings::Get('dkim.use_dkim') == '1') { if (Settings::Get('dkim.use_dkim') != '1') {
$dkim = $this->getParam('dkim', $result['dkim']);
} else {
$dkim = $result['dkim']; $dkim = $result['dkim'];
} }
$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings', $result['specialsettings'])), 'specialsettings', '/^[^\0]*$/', '', array(), true); $specialsettings = validate(str_replace("\r\n", "\n", $specialsettings), 'specialsettings', '/^[^\0]*$/', '', array(), true);
$ssfs = $this->getParam('specialsettingsforsubdomains', 0); $documentroot = validate($documentroot, 'documentroot', '', '', array(), true);
$notryfiles = $this->getParam('notryfiles', $result['notryfiles']);
$documentroot = validate($this->getParam('documentroot', $result['documentroot']), 'documentroot', '', '', array(), true);
if ($documentroot == '') { if ($documentroot == '') {
// If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings, // If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
@@ -874,17 +897,9 @@ class Domains extends ApiCommand implements ResourceEntity
$documentroot = $result['documentroot']; $documentroot = $result['documentroot'];
} }
// @TODO unsure whether this will still work
$speciallogverified = $this->getParam('speciallogverified', 0);
if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') { if ($this->getUserDetail('caneditphpsettings') == '1' || $this->getUserDetail('change_serversettings') == '1') {
$phpenabled = $this->getParam('phpenabled', $result['phpenabled']);
$openbasedir = $this->getParam('openbasedir', $result['openbasedir']);
$phpfs = $this->getParam('phpsettingsforsubdomains', 0);
if ((int) Settings::Get('system.mod_fcgid') == 1 || (int) Settings::Get('phpfpm.enabled') == 1) { if ((int) Settings::Get('system.mod_fcgid') == 1 || (int) Settings::Get('phpfpm.enabled') == 1) {
$phpsettingid = $this->getParam('phpsettingid', $result['phpsettingid']);
$phpsettingid_check_stmt = Database::prepare(" $phpsettingid_check_stmt = Database::prepare("
SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :phpid SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = :phpid
"); ");
@@ -897,11 +912,11 @@ class Domains extends ApiCommand implements ResourceEntity
} }
if ((int) Settings::Get('system.mod_fcgid') == 1) { if ((int) Settings::Get('system.mod_fcgid') == 1) {
$mod_fcgid_starter = validate($this->getParam('mod_fcgid_starter', $result['mod_fcgid_starter']), 'mod_fcgid_starter', '/^[0-9]*$/', '', array( $mod_fcgid_starter = validate($mod_fcgid_starter, 'mod_fcgid_starter', '/^[0-9]*$/', '', array(
'-1', '-1',
'' ''
), true); ), true);
$mod_fcgid_maxrequests = validate($this->getParam('mod_fcgid_maxrequests', $result['mod_fcgid_maxrequests']), 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array( $mod_fcgid_maxrequests = validate($mod_fcgid_maxrequests, 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array(
'-1', '-1',
'' ''
), true); ), true);
@@ -925,15 +940,15 @@ class Domains extends ApiCommand implements ResourceEntity
} }
$ipandports = array(); $ipandports = array();
if (! empty($this->getParam('ipandport')) && ! is_array($this->getParam('ipandport'))) { if (! empty($p_ipandports) && ! is_array($p_ipandports)) {
$this->updateParam('ipandport', unserialize($this->getParam('ipandport'))); $p_ipandports = unserialize($p_ipandports);
} }
if (! empty($this->getParam('ipandport')) && is_array($this->getParam('ipandport'))) { if (! empty($p_ipandports) && is_array($p_ipandports)) {
$ipandport_check_stmt = Database::prepare(" $ipandport_check_stmt = Database::prepare("
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :ipandport SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :ipandport
"); ");
foreach ($this->getParam('ipandport') as $ipandport) { foreach ($p_ipandports as $ipandport) {
if (trim($ipandport) == "") { if (trim($ipandport) == "") {
continue; continue;
} }
@@ -949,20 +964,18 @@ class Domains extends ApiCommand implements ResourceEntity
} }
} }
if (Settings::Get('system.use_ssl') == '1' && ! empty($this->getParam('ssl_ipandport'))) { if (Settings::Get('system.use_ssl') == '1' && ! empty($p_ssl_ipandports)) {
$ssl = 1; // if ssl is set and != 0, it can only be 1 $ssl = 1; // if ssl is set and != 0, it can only be 1
$ssl_redirect = $this->getParam('ssl_redirect', $result['ssl_redirect']);
$letsencrypt = $this->getParam('letsencrypt', $result['letsencrypt']);
$ssl_ipandports = array(); $ssl_ipandports = array();
if (! empty($this->getParam('ssl_ipandport')) && ! is_array($this->getParam('ssl_ipandport'))) { if (! empty($p_ssl_ipandports) && ! is_array($p_ssl_ipandports)) {
$this->updateParam('ssl_ipandport', unserialize($this->getParam('ssl_ipandport'))); $p_ssl_ipandports = unserialize($p_ssl_ipandports);
} }
if (! empty($this->getParam('ssl_ipandport')) && is_array($this->getParam('ssl_ipandport'))) { if (! empty($p_ssl_ipandports) && is_array($p_ssl_ipandports)) {
$ssl_ipandport_check_stmt = Database::prepare(" $ssl_ipandport_check_stmt = Database::prepare("
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :ipandport SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = :ipandport
"); ");
foreach ($this->getParam('ssl_ipandport') as $ssl_ipandport) { foreach ($p_ssl_ipandports as $ssl_ipandport) {
if (trim($ssl_ipandport) == "") { if (trim($ssl_ipandport) == "") {
continue; continue;
} }
@@ -980,14 +993,6 @@ class Domains extends ApiCommand implements ResourceEntity
$ssl_ipandports[] = $ssl_ipandport; $ssl_ipandports[] = $ssl_ipandport;
} }
} }
$http2 = $this->getParam('http2', $result['http2']);
// HSTS
$hsts_maxage = $this->getParam('hsts_maxage', $result['hsts_maxage']);
$hsts_sub = $this->getParam('hsts_sub', $result['hsts_sub']);
$hsts_preload = $this->getParam('hsts_preload', $result['hsts_preload']);
// OCSP stapling
$ocsp_stapling = $this->getParam('ocsp_stapling', $result['ocsp_stapling']);
} else { } else {
$ssl_redirect = 0; $ssl_redirect = 0;
$letsencrypt = 0; $letsencrypt = 0;
@@ -1304,7 +1309,6 @@ class Domains extends ApiCommand implements ResourceEntity
$_update_data = array(); $_update_data = array();
$ssfs = $this->getParam('specialsettingsforsubdomains', 0);
if ($ssfs == 1) { if ($ssfs == 1) {
$_update_data['specialsettings'] = $specialsettings; $_update_data['specialsettings'] = $specialsettings;
$upd_specialsettings = ", `specialsettings` = :specialsettings "; $upd_specialsettings = ", `specialsettings` = :specialsettings ";
@@ -1404,7 +1408,6 @@ class Domains extends ApiCommand implements ResourceEntity
// if php config is to be set for all subdomains, check here // if php config is to be set for all subdomains, check here
$update_phpconfig = ''; $update_phpconfig = '';
$phpfs = $this->getParam('phpsettingsforsubdomains', 0);
if ($phpfs == 1) { if ($phpfs == 1) {
$_update_data['phpsettingid'] = $phpsettingid; $_update_data['phpsettingid'] = $phpsettingid;
$update_phpconfig = ", `phpsettingid` = :phpsettingid"; $update_phpconfig = ", `phpsettingid` = :phpsettingid";
@@ -1520,7 +1523,9 @@ class Domains extends ApiCommand implements ResourceEntity
/** /**
* delete a domain entry by id * delete a domain entry by id
* *
* @param int $id domain-id * @param int $id
* domain-id
* @param bool $delete_mainsubdomains optional, remove also domains that are subdomains of this domain but added as main domains; default false
* *
* @throws Exception * @throws Exception
* @return array * @return array
@@ -1529,6 +1534,7 @@ class Domains extends ApiCommand implements ResourceEntity
{ {
if ($this->isAdmin()) { if ($this->isAdmin()) {
$id = $this->getParam('id'); $id = $this->getParam('id');
$remove_subbutmain_domains = $this->getParam('delete_mainsubdomains', true, 0);
$json_result = Domains::getLocal($this->getUserData(), array( $json_result = Domains::getLocal($this->getUserData(), array(
'id' => $id, 'id' => $id,
@@ -1538,8 +1544,7 @@ class Domains extends ApiCommand implements ResourceEntity
// check for deletion of main-domains which are logically subdomains, #329 // check for deletion of main-domains which are logically subdomains, #329
$rsd_sql = ''; $rsd_sql = '';
$remove_subbutmain_domains = $this->getParam('delete_userfiles', 0) ? 1 : 0; if ($remove_subbutmain_domains) {
if ($remove_subbutmain_domains == 1) {
$rsd_sql .= " OR `ismainbutsubto` = :id"; $rsd_sql .= " OR `ismainbutsubto` = :id";
} }

55
lib/classes/api/commands/class.IpsAndPorts.php
View File

@@ -58,25 +58,26 @@ class IpsAndPorts extends ApiCommand implements ResourceEntity
public function add() public function add()
{ {
if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) { if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) {
$ip = validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true); $ip = validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true);
$port = validate($this->getParam('port'), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array( $port = validate($this->getParam('port', true, 80), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array(
'stringisempty', 'stringisempty',
'myport' 'myport'
), array(), true); ), array(), true);
$listen_statement = ! empty($this->getParam('listen_statement')) ? 1 : 0; $listen_statement = ! empty($this->getParam('listen_statement', true, 0)) ? 1 : 0;
$namevirtualhost_statement = ! empty($this->getParam('namevirtualhost_statement')) ? 1 : 0; $namevirtualhost_statement = ! empty($this->getParam('namevirtualhost_statement', true, 0)) ? 1 : 0;
$vhostcontainer = ! empty($this->getParam('vhostcontainer')) ? 1 : 0; $vhostcontainer = ! empty($this->getParam('vhostcontainer', true, 0)) ? 1 : 0;
$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings')), 'specialsettings', '/^[^\0]*$/', '', array(), true); $specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings', true, '')), 'specialsettings', '/^[^\0]*$/', '', array(), true);
$vhostcontainer_servername_statement = ! empty($this->getParam('vhostcontainer_servername_statement')) ? 1 : 0; $vhostcontainer_servername_statement = ! empty($this->getParam('vhostcontainer_servername_statement', true, 1)) ? 1 : 0;
$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain')), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true); $default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain', true, '')), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true);
$docroot = validate($this->getParam('docroot'), 'docroot', '', '', array(), true); $docroot = validate($this->getParam('docroot', true, ''), 'docroot', '', '', array(), true);
if ((int) Settings::Get('system.use_ssl') == 1) { if ((int) Settings::Get('system.use_ssl') == 1) {
$ssl = ! empty($this->getParam('ssl')) ? intval($this->getParam('ssl')) : 0; $ssl = ! empty($this->getParam('ssl', true, 0)) ? intval($this->getParam('ssl', true, 0)) : 0;
$ssl_cert_file = validate($this->getParam('ssl_cert_file'), 'ssl_cert_file', '', '', array(), true); $ssl_cert_file = validate($this->getParam('ssl_cert_file', $ssl, ''), 'ssl_cert_file', '', '', array(), true);
$ssl_key_file = validate($this->getParam('ssl_key_file'), 'ssl_key_file', '', '', array(), true); $ssl_key_file = validate($this->getParam('ssl_key_file', $ssl, ''), 'ssl_key_file', '', '', array(), true);
$ssl_ca_file = validate($this->getParam('ssl_ca_file'), 'ssl_ca_file', '', '', array(), true); $ssl_ca_file = validate($this->getParam('ssl_ca_file', true, ''), 'ssl_ca_file', '', '', array(), true);
$ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile'), 'ssl_cert_chainfile', '', '', array(), true); $ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile', true, ''), 'ssl_cert_chainfile', '', '', array(), true);
} else { } else {
$ssl = 0; $ssl = 0;
$ssl_cert_file = ''; $ssl_cert_file = '';
@@ -192,25 +193,25 @@ class IpsAndPorts extends ApiCommand implements ResourceEntity
))->get(); ))->get();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$ip = validate_ip2($this->getParam('ip', $result['ip']), false, 'invalidip', false, false, false, true); $ip = validate_ip2($this->getParam('ip', true, $result['ip']), false, 'invalidip', false, false, false, true);
$port = validate($this->getParam('port', $result['port']), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array( $port = validate($this->getParam('port', true, $result['port']), 'port', '/^(([1-9])|([1-9][0-9])|([1-9][0-9][0-9])|([1-9][0-9][0-9][0-9])|([1-5][0-9][0-9][0-9][0-9])|(6[0-4][0-9][0-9][0-9])|(65[0-4][0-9][0-9])|(655[0-2][0-9])|(6553[0-5]))$/Di', array(
'stringisempty', 'stringisempty',
'myport' 'myport'
), array(), true); ), array(), true);
$listen_statement = $this->getParam('listen_statement', $result['listen_statement']); $listen_statement = $this->getParam('listen_statement', true, $result['listen_statement']);
$namevirtualhost_statement = $this->getParam('namevirtualhost_statement', $result['namevirtualhost_statement']); $namevirtualhost_statement = $this->getParam('namevirtualhost_statement', true, $result['namevirtualhost_statement']);
$vhostcontainer = $this->getParam('vhostcontainer', $result['vhostcontainer']); $vhostcontainer = $this->getParam('vhostcontainer', true, $result['vhostcontainer']);
$specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings', $result['specialsettings'])), 'specialsettings', '/^[^\0]*$/', '', array(), true); $specialsettings = validate(str_replace("\r\n", "\n", $this->getParam('specialsettings', true, $result['specialsettings'])), 'specialsettings', '/^[^\0]*$/', '', array(), true);
$vhostcontainer_servername_statement = $this->getParam('vhostcontainer_servername_statement', $result['vhostcontainer_servername_statement']); $vhostcontainer_servername_statement = $this->getParam('vhostcontainer_servername_statement', true, $result['vhostcontainer_servername_statement']);
$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain', $result['default_vhostconf_domain'])), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true); $default_vhostconf_domain = validate(str_replace("\r\n", "\n", $this->getParam('default_vhostconf_domain',true, $result['default_vhostconf_domain'])), 'default_vhostconf_domain', '/^[^\0]*$/', '', array(), true);
$docroot = validate($this->getParam('docroot', $result['docroot']), 'docroot', '', '', array(), true); $docroot = validate($this->getParam('docroot', true, $result['docroot']), 'docroot', '', '', array(), true);
if ((int) Settings::Get('system.use_ssl') == 1) { if ((int) Settings::Get('system.use_ssl') == 1) {
$ssl = $this->getParam('ssl', $result['ssl']); $ssl = $this->getParam('ssl', true, $result['ssl']);
$ssl_cert_file = validate($this->getParam('ssl_cert_file', $result['ssl_cert_file']), 'ssl_cert_file', '', '', array(), true); $ssl_cert_file = validate($this->getParam('ssl_cert_file', $ssl, $result['ssl_cert_file']), 'ssl_cert_file', '', '', array(), true);
$ssl_key_file = validate($this->getParam('ssl_key_file', $result['ssl_key_file']), 'ssl_key_file', '', '', array(), true); $ssl_key_file = validate($this->getParam('ssl_key_file', $ssl, $result['ssl_key_file']), 'ssl_key_file', '', '', array(), true);
$ssl_ca_file = validate($this->getParam('ssl_ca_file', $result['ssl_ca_file']), 'ssl_ca_file', '', '', array(), true); $ssl_ca_file = validate($this->getParam('ssl_ca_file', true, $result['ssl_ca_file']), 'ssl_ca_file', '', '', array(), true);
$ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile', $result['ssl_cert_chainfile']), 'ssl_cert_chainfile', '', '', array(), true); $ssl_cert_chainfile = validate($this->getParam('ssl_cert_chainfile', true, $result['ssl_cert_chainfile']), 'ssl_cert_chainfile', '', '', array(), true);
} else { } else {
$ssl = 0; $ssl = 0;
$ssl_cert_file = ''; $ssl_cert_file = '';