From b0e11f5708819b19ccaac483b3696e905e4b4342 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 21 Dec 2018 17:00:54 +0100 Subject: [PATCH] and more and more and more Signed-off-by: Michael Kaufmann --- api_keys.php | 2 +- lib/Froxlor/Api/Commands/Admins.php | 6 +++--- lib/Froxlor/Api/Commands/Customers.php | 6 +++--- lib/Froxlor/Api/Commands/Domains.php | 2 +- lib/Froxlor/Api/Commands/EmailAccounts.php | 2 +- lib/Froxlor/Api/Commands/EmailForwarders.php | 2 +- lib/Froxlor/Api/Commands/Emails.php | 2 +- lib/Froxlor/Api/Commands/IpsAndPorts.php | 4 ++-- lib/Froxlor/Validate/Check.php | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api_keys.php b/api_keys.php index 6022c50a..d7a177d4 100644 --- a/api_keys.php +++ b/api_keys.php @@ -91,7 +91,7 @@ if ($action == 'delete') { $ip_list = array_map('trim', explode(",", $allowed_from)); $_check_list = $ip_list; foreach ($_check_list as $idx => $ip) { - if (validate_ip2($ip, true, 'invalidip', true, true) == false) { + if (\Froxlor\Validate\Validate::validate_ip2($ip, true, 'invalidip', true, true) == false) { unset($ip_list[$idx]); } } diff --git a/lib/Froxlor/Api/Commands/Admins.php b/lib/Froxlor/Api/Commands/Admins.php index 327b1ba1..289dba85 100644 --- a/lib/Froxlor/Api/Commands/Admins.php +++ b/lib/Froxlor/Api/Commands/Admins.php @@ -237,9 +237,9 @@ class Admins extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt } // Accounts which match systemaccounts are not allowed, filtering them elseif (preg_match('/^' . preg_quote(Settings::Get('customer.accountprefix'), '/') . '([0-9]+)/', $loginname)) { \Froxlor\UI\Response::standard_error('loginnameissystemaccount', Settings::Get('customer.accountprefix'), true); - } elseif (! validateUsername($loginname)) { + } elseif (! \Froxlor\Validate\Validate::validateUsername($loginname)) { \Froxlor\UI\Response::standard_error('loginnameiswrong', $loginname, true); - } elseif (! validateEmail($email)) { + } elseif (! \Froxlor\Validate\Validate::validateEmail($email)) { \Froxlor\UI\Response::standard_error('emailiswrong', $email, true); } else { @@ -504,7 +504,7 @@ class Admins extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt $theme = Settings::Get('panel.default_theme'); } - if (! validateEmail($email)) { + if (! \Froxlor\Validate\Validate::validateEmail($email)) { \Froxlor\UI\Response::standard_error('emailiswrong', $email, true); } else { diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php index 3830161e..fedc4584 100644 --- a/lib/Froxlor/Api/Commands/Customers.php +++ b/lib/Froxlor/Api/Commands/Customers.php @@ -300,7 +300,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource \Froxlor\UI\Response::standard_error('youcantallocatemorethanyouhave', '', true); } - if (! validateEmail($email)) { + if (! \Froxlor\Validate\Validate::validateEmail($email)) { \Froxlor\UI\Response::standard_error('emailiswrong', $email, true); } else { @@ -342,7 +342,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource if (strtolower($loginname_check['loginname']) == strtolower($loginname) || strtolower($loginname_check_admin['loginname']) == strtolower($loginname)) { \Froxlor\UI\Response::standard_error('loginnameexists', $loginname, true); - } elseif (! validateUsername($loginname, Settings::Get('panel.unix_names'), 14 - strlen(Settings::Get('customer.mysqlprefix')))) { + } elseif (! \Froxlor\Validate\Validate::validateUsername($loginname, Settings::Get('panel.unix_names'), 14 - strlen(Settings::Get('customer.mysqlprefix')))) { if (strlen($loginname) > 14 - strlen(Settings::Get('customer.mysqlprefix'))) { \Froxlor\UI\Response::standard_error('loginnameiswrong2', 14 - strlen(Settings::Get('customer.mysqlprefix')), true); } else { @@ -934,7 +934,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource 'stringisempty', 'emailadd' ), '', true); - } elseif (! validateEmail($email)) { + } elseif (!\Froxlor\Validate\Validate::validateEmail($email)) { \Froxlor\UI\Response::standard_error('emailiswrong', $email, true); } } diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index cac8b61e..d0d48de8 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -246,7 +246,7 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn ), '', \Froxlor\Validate\Validate::validate($p_domain, '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') && ! \Froxlor\Validate\Validate::validateDomain($domain)) { \Froxlor\UI\Response::standard_error(array( 'stringiswrong', 'mydomain' diff --git a/lib/Froxlor/Api/Commands/EmailAccounts.php b/lib/Froxlor/Api/Commands/EmailAccounts.php index a93e9ca9..08f7e002 100644 --- a/lib/Froxlor/Api/Commands/EmailAccounts.php +++ b/lib/Froxlor/Api/Commands/EmailAccounts.php @@ -100,7 +100,7 @@ class EmailAccounts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Reso // alternative email address to send info to if (Settings::Get('panel.sendalternativemail') == 1) { $alternative_email = $idna_convert->encode(\Froxlor\Validate\Validate::validate($alternative_email, 'alternative_email', '', '', array(), true)); - if (! validateEmail($alternative_email)) { + if (! \Froxlor\Validate\Validate::validateEmail($alternative_email)) { \Froxlor\UI\Response::standard_error('emailiswrong', $alternative_email, true); } } else { diff --git a/lib/Froxlor/Api/Commands/EmailForwarders.php b/lib/Froxlor/Api/Commands/EmailForwarders.php index 2978b42b..0b629542 100644 --- a/lib/Froxlor/Api/Commands/EmailForwarders.php +++ b/lib/Froxlor/Api/Commands/EmailForwarders.php @@ -70,7 +70,7 @@ class EmailForwarders extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Re // prepare destination $destination = trim($destination); - if (! validateEmail($destination)) { + if (! \Froxlor\Validate\Validate::validateEmail($destination)) { \Froxlor\UI\Response::standard_error('destinationiswrong', $destination, true); } elseif ($destination == $result['email']) { \Froxlor\UI\Response::standard_error('destinationalreadyexistasmail', $destination, true); diff --git a/lib/Froxlor/Api/Commands/Emails.php b/lib/Froxlor/Api/Commands/Emails.php index 860c55c5..f9c29ccb 100644 --- a/lib/Froxlor/Api/Commands/Emails.php +++ b/lib/Froxlor/Api/Commands/Emails.php @@ -86,7 +86,7 @@ class Emails extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt $email_full = $email_part . '@' . $domain; // validate it - if (! validateEmail($email_full)) { + if (! \Froxlor\Validate\Validate::validateEmail($email_full)) { \Froxlor\UI\Response::standard_error('emailiswrong', $email_full, true); } diff --git a/lib/Froxlor/Api/Commands/IpsAndPorts.php b/lib/Froxlor/Api/Commands/IpsAndPorts.php index 44f9fa54e..f01870e5 100644 --- a/lib/Froxlor/Api/Commands/IpsAndPorts.php +++ b/lib/Froxlor/Api/Commands/IpsAndPorts.php @@ -127,7 +127,7 @@ class IpsAndPorts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour { if ($this->isAdmin() && $this->getUserDetail('change_serversettings')) { - $ip = validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true); + $ip = \Froxlor\Validate\Validate::validate_ip2($this->getParam('ip'), false, 'invalidip', false, false, false, true); $port = \Froxlor\Validate\Validate::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', 'myport' @@ -302,7 +302,7 @@ class IpsAndPorts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour 'id' => $id )); - $ip = validate_ip2($this->getParam('ip', true, $result['ip']), false, 'invalidip', false, false, false, true); + $ip = \Froxlor\Validate\Validate::validate_ip2($this->getParam('ip', true, $result['ip']), false, 'invalidip', false, false, false, true); $port = \Froxlor\Validate\Validate::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', 'myport' diff --git a/lib/Froxlor/Validate/Check.php b/lib/Froxlor/Validate/Check.php index acb712fd..d6da9902 100644 --- a/lib/Froxlor/Validate/Check.php +++ b/lib/Froxlor/Validate/Check.php @@ -186,7 +186,7 @@ class Check } $returnvalue = array(); - if (validateUsername($newfieldvalue, Settings::Get('panel.unix_names'), 14 - strlen($allnewfieldvalues['customer_mysqlprefix'])) === true) { + if (Validate::validateUsername($newfieldvalue, Settings::Get('panel.unix_names'), 14 - strlen($allnewfieldvalues['customer_mysqlprefix'])) === true) { $returnvalue = array( FORMFIELDS_PLAUSIBILITY_CHECK_OK );