set version to 0.10.9 for upcoming maintenance release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

actions/admin/settings/120.system.php

@@ -253,7 +253,23 @@ return array(
 					'type' => 'hiddenString',
 					'default' => '',
 					'save_method' => 'storeSettingField'
-				)
+				),
+				'system_apply_specialsettings_default' => array(
+					'label' => $lng['serversettings']['apply_specialsettings_default'],
+					'settinggroup' => 'system',
+					'varname' => 'apply_specialsettings_default',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
+				'system_apply_phpconfigs_default' => array(
+					'label' => $lng['serversettings']['apply_phpconfigs_default'],
+					'settinggroup' => 'system',
+					'varname' => 'apply_phpconfigs_default',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+				),
 			)
 		)
 	)

actions/admin/settings/131.ssl.php

@@ -150,10 +150,10 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'letsencryptca',
 					'type' => 'option',
-					'default' => 'testing',
+					'default' => 'production',
 					'option_mode' => 'one',
 					'option_options' => array(
-						'testing' => 'https://acme-staging' . (\Froxlor\Settings::Get('system.leapiversion') == '2' ? '-v02' : '') . '.api.letsencrypt.org (Test)',
+						'testing' => 'https://acme-staging-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Test)',
 						'production' => 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org (Live)'
 					),
 					'save_method' => 'storeSettingField'

admin_domains.php

@@ -64,47 +64,20 @@ if ($page == 'domains' || $page == 'overview') {
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
 		$searchcode = $paging->getHtmlSearchCode($lng);
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
-		$domain_array = array();
-
-		foreach ($result['list'] as $row) {
-
-			formatDomainEntry($row, $idna_convert);
-
-			if (! isset($domain_array[$row['domain']])) {
-				$domain_array[$row['domain']] = $row;
-			} else {
-				$domain_array[$row['domain']] = array_merge($row, $domain_array[$row['domain']]);
-			}
-
-			if (isset($row['aliasdomainid']) && $row['aliasdomainid'] != null && isset($row['aliasdomain']) && $row['aliasdomain'] != '') {
-				if (! isset($domain_array[$row['aliasdomain']])) {
-					$domain_array[$row['aliasdomain']] = array();
-				}
-				$domain_array[$row['aliasdomain']]['domainaliasid'] = $row['id'];
-				$domain_array[$row['aliasdomain']]['domainalias'] = $row['domain'];
-			}
-		}
-
-		/**
-		 * We need ksort/krsort here to make sure idna-domains are also sorted correctly
-		 */
-		if ($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') {
-			ksort($domain_array);
-		} elseif ($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') {
-			krsort($domain_array);
-		}
 
 		$count = 0;
-		foreach ($domain_array as $row) {
+		foreach ($result['list'] as $row) {
-
+			formatDomainEntry($row, $idna_convert);
-			if (isset($row['domain']) && $row['domain'] != '') {
+			$row['customername'] = \Froxlor\User::getCorrectFullUserDetails($row);
-				$row['customername'] = \Froxlor\User::getCorrectFullUserDetails($row);
+			$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($row);
+			// display a nice list of IP's if it's not an alias for another domain
-				// display a nice list of IP's
+			if (isset($row['aliasdomainid']) && $row['aliasdomainid'] != null && isset($row['aliasdomain']) && $row['aliasdomain'] != '') {
+				$row['ipandport'] = sprintf($lng['domains']['isaliasdomainof'], $row['aliasdomain']);
+			} else {
 				$row['ipandport'] = str_replace("\n", "<br />", $row['ipandport']);
-				eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";");
-				$count ++;
 			}
+			eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";");
+			$count++;
 		}
 
 		$domainscount = $paging->getEntries();
@@ -409,7 +382,7 @@ if ($page == 'domains' || $page == 'overview') {
 			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				try {
 					// remove ssl ip/ports if set is empty
-					if (isset($_POST['ssl_ipandport']) && empty($_POST['ssl_ipandport'])) {
+					if (!isset($_POST['ssl_ipandport']) || empty($_POST['ssl_ipandport'])) {
 						$_POST['remove_ssl_ipandport'] = true;
 					}
 					Domains::getLocal($userinfo, $_POST)->update();

customer_domains.php

@@ -42,7 +42,8 @@ if ($page == 'overview') {
 	if ($action == '') {
 		$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains");
 		$fields = array(
-			'd.domain' => $lng['domains']['domainname']
+			'd.domain' => $lng['domains']['domainname'],
+			'd.aliasdomain' => $lng['domains']['aliasdomain']
 		);
 		try {
 			// get total count
@@ -71,19 +72,24 @@ if ($page == 'overview') {
 			if ($row['parentdomainid'] == '0' && $row['caneditdomain'] == '1') {
 				$parentdomains_count ++;
 			}
-			$domain_array[$row['parentdomainid']][] = $row;
+			$domain_array[$row['parentdomainname']][] = $row;
 		}
 
-		if (isset($domain_array[0])) {
+		foreach ($domain_array as $parentdomain => $sdomains) {
-			foreach ($domain_array[0] as $pdomain) {
+			// PARENTDOMAIN
-				// PARENTDOMAIN
+			if (Settings::Get('system.awstats_enabled') == '1') {
-				$row = \Froxlor\PhpHelper::htmlentitiesArray($pdomain);
+				$statsapp = 'awstats';
-				if (Settings::Get('system.awstats_enabled') == '1') {
+			} else {
-					$statsapp = 'awstats';
+				$statsapp = 'webalizer';
-				} else {
+			}
-					$statsapp = 'webalizer';
+			$row = [
-				}
+				'domain' => $idna_convert->decode($parentdomain)
-				eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_delimiter") . "\";");
+			];
+			eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_delimiter") . "\";");
+
+			foreach ($sdomains as $domain) {
+				$row = \Froxlor\PhpHelper::htmlentitiesArray($domain);
+
 				// show docroot nicely
 				if (strpos($row['documentroot'], $userinfo['documentroot']) === 0) {
 					$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['documentroot']));
@@ -94,23 +100,6 @@ if ($page == 'overview') {
 					$show_ssledit = true;
 				}
 				eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";");
-
-				// every domain below the parentdomain
-				if (isset($domain_array[$pdomain['id']])) {
-					$mydomains = $domain_array[$pdomain['id']];
-					foreach ($mydomains as $row) {
-						// show docroot nicely
-						if (strpos($row['documentroot'], $userinfo['documentroot']) === 0) {
-							$row['documentroot'] = \Froxlor\FileDir::makeCorrectDir(str_replace($userinfo['documentroot'], "/", $row['documentroot']));
-						}
-						// get ssl-ips if activated
-						$show_ssledit = false;
-						if (Settings::Get('system.use_ssl') == '1' && \Froxlor\Domain\Domain::domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1' && $row['letsencrypt'] == 0) {
-							$show_ssledit = true;
-						}
-						eval("\$domains.=\"" . \Froxlor\UI\Template::getTemplate("domains/domains_domain") . "\";");
-					}
-				}
 			}
 		}
 

install/froxlor.sql

@@ -660,6 +660,8 @@ opcache.interned_strings_buffer'),
 	('system', 'errorlog_level', 'warn'),
 	('system', 'leecc', '0'),
 	('system', 'froxloraliases', ''),
+	('system', 'apply_specialsettings_default', '1'),
+	('system', 'apply_phpconfigs_default', '1'),
 	('api', 'enabled', '0'),
 	('2fa', 'enabled', '1'),
 	('panel', 'decimal_places', '4'),
@@ -694,8 +696,8 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'is_configured', '0'),
-	('panel', 'version', '0.10.6'),
+	('panel', 'version', '0.10.9'),
-	('panel', 'db_version', '201911130');
+	('panel', 'db_version', '201911220');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;

install/updates/froxlor/0.10/update_0.10.inc.php

@@ -482,3 +482,26 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.5')) {
 	showUpdateStep("Updating from 0.10.5 to 0.10.6", false);
 	\Froxlor\Froxlor::updateToVersion('0.10.6');
 }
+
+if (\Froxlor\Froxlor::isDatabaseVersion('201911130')) {
+	showUpdateStep("Adding new settings for domain edit form default values");
+	Settings::AddNew("system.apply_specialsettings_default", '1');
+	Settings::AddNew("system.apply_phpconfigs_default", '1');
+	lastStepStatus(0);
+	\Froxlor\Froxlor::updateToDbVersion('201911220');
+}
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.6')) {
+	showUpdateStep("Updating from 0.10.6 to 0.10.7", false);
+	\Froxlor\Froxlor::updateToVersion('0.10.7');
+}
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.7')) {
+	showUpdateStep("Updating from 0.10.7 to 0.10.8", false);
+	\Froxlor\Froxlor::updateToVersion('0.10.8');
+}
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.8')) {
+	showUpdateStep("Updating from 0.10.8 to 0.10.9", false);
+	\Froxlor\Froxlor::updateToVersion('0.10.9');
+}

lib/Froxlor/Api/ApiCommand.php

@@ -331,15 +331,30 @@ abstract class ApiCommand extends ApiParameter
 	 *
 	 * @param array $sql_orderby
 	 *        	optional array with index = fieldname and value = ASC|DESC
+	 * @param boolean $append
+	 *        	optional append to ORDER BY clause rather then create new one, default false [internal]
 	 *
 	 * @return string
 	 */
-	protected function getOrderBy()
+	protected function getOrderBy($append = false)
 	{
 		$orderby = $this->getParam('sql_orderby', true, array());
 		$order = "";
 		if (! empty($orderby)) {
-			$order .= " ORDER BY ";
+			if ($append) {
+				$order .= ", ";
+			} else {
+				$order .= " ORDER BY ";
+			}
+
+			$nat_fields = [
+				'`c`.`loginname`',
+				'`a`.`loginname`',
+				'`adminname`',
+				'`databasename`',
+				'`username`'
+			];
+
 			foreach ($orderby as $field => $by) {
 				$sortfield = explode('.', $field);
 				foreach ($sortfield as $id => $sfield) {
@@ -359,7 +374,7 @@ abstract class ApiCommand extends ApiParameter
 				])) {
 					$by = 'ASC';
 				}
-				if (\Froxlor\Settings::Get('panel.natsorting') == 1) {
+				if (\Froxlor\Settings::Get('panel.natsorting') == 1 && in_array($field, $nat_fields)) {
 					// Acts similar to php's natsort(), found in one comment at http://my.opera.com/cpr/blog/show.dml/160556
 					$order .= "CONCAT( IF( ASCII( LEFT( " . $field . ", 5 ) ) > 57,
 					LEFT( " . $field . ", 1 ), 0 ),

lib/Froxlor/Api/Commands/Certificates.php

@@ -209,7 +209,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou
 		} else {
 			$certs_stmt_query .= "1 ";
 		}
-		$certs_stmt = Database::prepare($certs_stmt_query . $this->getSearchWhere($query_fields) . $this->getOrderBy() . $this->getLimit());
+		$certs_stmt = Database::prepare($certs_stmt_query . $this->getSearchWhere($query_fields, true) . $this->getOrderBy() . $this->getLimit());
 		$qry_params = array_merge($qry_params, $query_fields);
 		Database::pexecute($certs_stmt, $qry_params, true, true);
 		$result = array();

lib/Froxlor/Api/Commands/Domains.php

@@ -865,7 +865,7 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn
 	 * @param bool $include_specialsettings
 	 *        	optional, whether or not to include non-ssl specialsettings in the generated ssl-vhost, default false
 	 * @param bool $specialsettingsforsubdomains
-	 *        	optional, whether to apply specialsettings to all subdomains of this domain, default 0 (false)
+	 *        	optional, whether to apply specialsettings to all subdomains of this domain, default is read from setting system.apply_specialsettings_default
 	 * @param bool $notryfiles
 	 *        	optional, [nginx only] do not generate the default try-files directive, default 0 (false)
 	 * @param bool $writeaccesslog
@@ -877,7 +877,7 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn
 	 * @param bool $phpenabled
 	 *        	optional, whether php is enabled for this domain, default 0 (false)
 	 * @param bool $phpsettingsforsubdomains
-	 *        	optional, whether to apply php-setting to apply to all subdomains of this domain, default 0 (false)
+	 *        	optional, whether to apply php-setting to apply to all subdomains of this domain, default is read from setting system.apply_phpconfigs_default
 	 * @param bool $openbasedir
 	 *        	optional, whether to activate openbasedir restriction for this domain, default 0 (false)
 	 * @param int $phpsettingid
@@ -947,13 +947,13 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn
 			$specialsettings = $this->getParam('specialsettings', true, $result['specialsettings']);
 			$ssl_specialsettings = $this->getParam('ssl_specialsettings', true, $result['ssl_specialsettings']);
 			$include_specialsettings = $this->getBoolParam('include_specialsettings', true, $result['include_specialsettings']);
-			$ssfs = $this->getBoolParam('specialsettingsforsubdomains', true, 0);
+			$ssfs = $this->getBoolParam('specialsettingsforsubdomains', true, \Froxlor\Settings::Get('system.apply_specialsettings_default'));
 			$notryfiles = $this->getBoolParam('notryfiles', true, $result['notryfiles']);
 			$writeaccesslog = $this->getBoolParam('writeaccesslog', true, $result['writeaccesslog']);
 			$writeerrorlog = $this->getBoolParam('writeerrorlog', true, $result['writeerrorlog']);
 			$documentroot = $this->getParam('documentroot', true, $result['documentroot']);
 			$phpenabled = $this->getBoolParam('phpenabled', true, $result['phpenabled']);
-			$phpfs = $this->getBoolParam('phpsettingsforsubdomains', true, 0);
+			$phpfs = $this->getBoolParam('phpsettingsforsubdomains', true, \Froxlor\Settings::Get('system.apply_phpconfigs_default'));
 			$openbasedir = $this->getBoolParam('openbasedir', true, $result['openbasedir']);
 			$phpsettingid = $this->getParam('phpsettingid', true, $result['phpsettingid']);
 			$mod_fcgid_starter = $this->getParam('mod_fcgid_starter', true, $result['mod_fcgid_starter']);

lib/Froxlor/Api/Commands/IpsAndPorts.php

@@ -540,7 +540,7 @@ class IpsAndPorts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour
 			));
 
 			$result_checkdomain_stmt = Database::prepare("
-				SELECT `id_domain` as `id` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id
+				SELECT `id_domain` FROM `" . TABLE_DOMAINTOIP . "` WHERE `id_ipandports` = :id
 			");
 			$result_checkdomain = Database::pexecute_first($result_checkdomain_stmt, array(
 				'id' => $id

lib/Froxlor/Api/Commands/SubDomains.php

@@ -767,13 +767,14 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc
 
 		// prepare select statement
 		$domains_stmt = Database::prepare("
-			SELECT " . implode(",", $select_fields) . ", `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias`
+			SELECT " . implode(",", $select_fields) . ", IF(`d`.`parentdomainid` > 0, `pd`.`domain`, `d`.`domain`) AS `parentdomainname`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias`
 			FROM `" . TABLE_PANEL_DOMAINS . "` `d`
 			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id`
 			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id`
+			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `pd` ON `pd`.`id`=`d`.`parentdomainid`
 			WHERE `d`.`customerid` IN (" . implode(', ', $customer_ids) . ")
 			AND `d`.`email_only` = '0'
-			AND `d`.`id` NOT IN (" . implode(', ', $customer_stdsubs) . ")" . $this->getSearchWhere($query_fields, true) . $this->getOrderBy() . $this->getLimit());
+			AND `d`.`id` NOT IN (" . implode(', ', $customer_stdsubs) . ")" . $this->getSearchWhere($query_fields, true) . " GROUP BY `d`.`id` ORDER BY `parentdomainname` " . $this->getOrderBy(true) . $this->getLimit());
 
 		$result = array();
 		Database::pexecute($domains_stmt, $query_fields, true, true);
@@ -839,8 +840,6 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc
 		$domains_stmt = Database::prepare("
 			SELECT COUNT(*) as num_subdom
 			FROM `" . TABLE_PANEL_DOMAINS . "` `d`
-			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id`
-			LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id`
 			WHERE `d`.`customerid` IN (" . implode(', ', $customer_ids) . ")
 			AND `d`.`email_only` = '0'
 			AND `d`.`id` NOT IN (" . implode(', ', $customer_stdsubs) . ")

lib/Froxlor/Api/Commands/SysLog.php

@@ -203,7 +203,7 @@ class SysLog extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt
 				];
 			}
 			$params['trunc'] = $truncatedate;
-			Database::execute($result_stmt, $params, true, true);
+			Database::pexecute($result_stmt, $params, true, true);
 			$this->logger()->logAction($this->isAdmin() ? \Froxlor\FroxlorLogger::ADM_ACTION : \Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "[API] truncated the froxlor syslog");
 			return $this->response(200, "successfull", true);
 		}

lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php

@@ -84,7 +84,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
 				)
 		");
 		$customer_ssl = $certificates_stmt->fetchAll(\PDO::FETCH_ASSOC);
-		if (!$customer_ssl) {
+		if (! $customer_ssl) {
 			$customer_ssl = array();
 		}
 
@@ -96,7 +96,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
 				(`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY) OR `expirationdate` IS NULL)
 			");
 			$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
-			if (!$froxlor_ssl) {
+			if (! $froxlor_ssl) {
 				$froxlor_ssl = array();
 			}
 		}
@@ -126,7 +126,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
 
 		self::checkInstall();
 
-		self::$apiserver = 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory';
+		self::$apiserver = 'https://acme-'.(Settings::Get('system.letsencryptca') == 'testing' ? 'staging-' : '').'v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory';
 
 		FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Requesting/renewing Let's Encrypt certificates");
 
@@ -339,6 +339,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
 			if ($force) {
 				$acmesh_cmd .= " --force";
 			}
+			if (defined('CRON_DEBUG_FLAG')) {
+				$acmesh_cmd .= " --debug";
+			}
 
 			$acme_result = \Froxlor\FileDir::safe_exec($acmesh_cmd);
 			// debug output of acme.sh run

lib/Froxlor/Cron/Http/Nginx.php

@@ -537,7 +537,7 @@ class Nginx extends HttpConfigBase
 				}
 
 				if ($domain['ssl_specialsettings'] != '' && $ssl_vhost == true) {
-					$vhost_content .= $this->processSpecialConfigTemplate($domain['ssl_specialsettings'], $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n";
+					$vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate($domain['ssl_specialsettings'], $domain, $domain['ip'], $domain['port'], $ssl_vhost));
 				}
 
 				if ($_vhost_content != '') {
@@ -549,7 +549,7 @@ class Nginx extends HttpConfigBase
 				}
 
 				if (Settings::Get('system.default_sslvhostconf') != '' && $ssl_vhost == true) {
-					$vhost_content .= $this->processSpecialConfigTemplate(Settings::Get('system.default_sslvhostconf'), $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n";
+					$vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate(Settings::Get('system.default_sslvhostconf'), $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n");
 				}
 			}
 		}
@@ -562,6 +562,8 @@ class Nginx extends HttpConfigBase
 	{
 		// Remove windows linebreaks
 		$vhost = str_replace("\r", "\n", $vhost);
+		// remove comments
+		$vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost)));
 		// Break blocks into lines
 		$vhost = str_replace(array(
 			"{",

lib/Froxlor/Cron/Traffic/TrafficCron.php

@@ -137,7 +137,11 @@ class TrafficCron extends \Froxlor\Cron\FroxlorCron
 					$mysqlusage_all[$row_database['customerid']] = 0;
 				}
 				// sum up result
-				$mysqlusage_all[$row_database['customerid']] += floatval($mysql_usage_row['customerusage']);
+				if ($mysql_usage_row) {
+					$mysqlusage_all[$row_database['customerid']] += floatval($mysql_usage_row['customerusage']);
+				} else {
+					\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_WARNING, "Cannot get usage for database " . $row_database['databasename'] . ".");
+				}
 			} else {
 				\Froxlor\FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_WARNING, "Seems like the database " . $row_database['databasename'] . " had been removed manually.");
 			}

lib/Froxlor/Database/Manager/DbManagerMySQL.php

@@ -78,36 +78,35 @@ class DbManagerMySQL
 	public function grantPrivilegesTo($username = null, $password = null, $access_host = null, $p_encrypted = false, $update = false)
 	{
 		if (! $update) {
-			// mysql8 compatibility
+			// create user
-			if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '8.0.11', '>=')) {
+			if ($p_encrypted) {
-				// create user
+				if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.0', '<')) {
+					$stmt = Database::prepare("
+						CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY PASSWORD :password
+					");
+				} else {
+					$stmt = Database::prepare("
+						CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED WITH mysql_native_password AS :password
+					");
+				}
+			} else {
 				$stmt = Database::prepare("
 					CREATE USER '" . $username . "'@'" . $access_host . "' IDENTIFIED BY :password
 				");
-				Database::pexecute($stmt, array(
-					"password" => $password
-				));
-				// grant privileges
-				$stmt = Database::prepare("
-					GRANT ALL ON `" . $username . "`.* TO :username@:host
-				");
-				Database::pexecute($stmt, array(
-					"username" => $username,
-					"host" => $access_host
-				));
-			} else {
-				// grant privileges
-				$stmt = Database::prepare("
-					GRANT ALL PRIVILEGES ON `" . $username . "`.* TO :username@:host IDENTIFIED BY :password
-				");
-				Database::pexecute($stmt, array(
-					"username" => $username,
-					"host" => $access_host,
-					"password" => $password
-				));
 			}
+			Database::pexecute($stmt, array(
+				"password" => $password
+			));
+			// grant privileges
+			$stmt = Database::prepare("
+				GRANT ALL ON `" . $username . "`.* TO :username@:host
+			");
+			Database::pexecute($stmt, array(
+				"username" => $username,
+				"host" => $access_host
+			));
 		} else {
-			// set passoword
+			// set password
 			if (version_compare(Database::getAttribute(\PDO::ATTR_SERVER_VERSION), '5.7.6', '<')) {
 				if ($p_encrypted) {
 					$stmt = Database::prepare("SET PASSWORD FOR :username@:host = :password");
@@ -115,7 +114,11 @@ class DbManagerMySQL
 					$stmt = Database::prepare("SET PASSWORD FOR :username@:host = PASSWORD(:password)");
 				}
 			} else {
-				$stmt = Database::prepare("ALTER USER :username@:host IDENTIFIED BY :password");
+				if ($p_encrypted) {
+					$stmt = Database::prepare("ALTER USER :username@:host IDENTIFIED WITH mysql_native_password AS :password");
+				} else {
+					$stmt = Database::prepare("ALTER USER :username@:host IDENTIFIED BY :password");
+				}
 			}
 			Database::pexecute($stmt, array(
 				"username" => $username,
@@ -158,7 +161,6 @@ class DbManagerMySQL
 			), false);
 		}
 
-		
 		$drop_stmt = Database::prepare("DROP DATABASE IF EXISTS `" . $dbname . "`");
 		Database::pexecute($drop_stmt);
 	}
@@ -247,7 +249,7 @@ class DbManagerMySQL
 			if ($user_only == false) {
 				if (! isset($allsqlusers[$row['User']]) || ! is_array($allsqlusers[$row['User']])) {
 					$allsqlusers[$row['User']] = array(
-						'password' => $row['Password'],
+						'password' => $row['Password'] ?? $row['authentication_string'],
 						'hosts' => array()
 					);
 				}

lib/Froxlor/Froxlor.php

@@ -7,10 +7,10 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '0.10.6';
+	const VERSION = '0.10.9';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
-	const DBVERSION = '201911130';
+	const DBVERSION = '201911220';
 
 	// Distribution branding-tag (used for Debian etc.)
 	const BRANDING = '';

lib/Froxlor/UI/Pagination.php

@@ -82,7 +82,8 @@ class Pagination
 			// add default ordering by given fields
 			if (count($fields) > 0) {
 				$orderfields = array_keys($fields);
-				$this->addOrderBy($orderfields[0]);
+				$this->sortfield = $orderfields[0];
+				$this->addOrderBy($orderfields[0], $this->sortorder);
 			}
 		}
 
@@ -285,15 +286,22 @@ class Pagination
 				$stop = $pages;
 			}
 
-			$pagingcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;pageno=1">&laquo;</a> <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) - 1) == 0 ? '1' : intval($this->pageno) - 1) . '">&lt;</a>&nbsp;';
+			// check for possible sorting values and keep it
+			$orderstr = '';
+			if (!empty($this->sortfield)) {
+				$fieldname = htmlspecialchars($this->sortfield);
+				$orderstr .= '&amp;sortfield=' . $fieldname . '&amp;sortorder=' . $this->sortorder;
+			}
+
+			$pagingcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;pageno=1' . $orderstr . '">&laquo;</a> <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) - 1) == 0 ? '1' : intval($this->pageno) - 1) . $orderstr . '">&lt;</a>&nbsp;';
 			for ($i = $start; $i <= $stop; $i ++) {
 				if ($i != $this->pageno) {
-					$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . $i . '">' . $i . '</a>&nbsp;';
+					$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . $i . $orderstr . '">' . $i . '</a>&nbsp;';
 				} else {
 					$pagingcode .= ' <strong>' . $i . '</strong>&nbsp;';
 				}
 			}
-			$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) + 1) > $pages ? $pages : intval($this->pageno) + 1) . '">&gt;</a> <a href="' . $baseurl . '&amp;pageno=' . $pages . '">&raquo;</a>';
+			$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) + 1) > $pages ? $pages : intval($this->pageno) + 1) . $orderstr . '">&gt;</a> <a href="' . $baseurl . '&amp;pageno=' . $pages . $orderstr . '">&raquo;</a>';
 		} else {
 			$pagingcode = '';
 		}

lib/Froxlor/UI/Paging.php

@@ -0,0 +1,520 @@
+<?php
+namespace Froxlor\UI;
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author Froxlor team <team@froxlor.org> (2010-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Classes
+ *         
+ */
+
+/**
+ * Class to manage paging system
+ *
+ * @package Functions
+ */
+class Paging
+{
+
+	/**
+	 * Userinfo
+	 *
+	 * @var array
+	 */
+	private $userinfo = array();
+
+	/**
+	 * MySQL-Table
+	 *
+	 * @var string
+	 */
+	private $table = '';
+
+	/**
+	 * Fields with description which should be selectable
+	 *
+	 * @var array
+	 */
+	private $fields = array();
+
+	/**
+	 * Entries per page
+	 *
+	 * @var int
+	 */
+	private $entriesperpage = 0;
+
+	/**
+	 * Number of entries of table
+	 *
+	 * @var int
+	 */
+	private $entries = 0;
+
+	/**
+	 * Sortorder, asc or desc
+	 *
+	 * @var string
+	 */
+	public $sortorder = 'asc';
+
+	/**
+	 * Sortfield
+	 *
+	 * @var string
+	 */
+	public $sortfield = '';
+
+	/**
+	 * Searchfield
+	 *
+	 * @var string
+	 */
+	private $searchfield = '';
+
+	/**
+	 * Searchtext
+	 *
+	 * @var string
+	 */
+	private $searchtext = '';
+
+	/**
+	 * Pagenumber
+	 *
+	 * @var int
+	 */
+	private $pageno = 0;
+
+	/**
+	 * Switch natsorting on/off
+	 *
+	 * @var bool
+	 */
+	private $natSorting = false;
+
+	private $limit = 0;
+
+	/**
+	 * Class constructor.
+	 * Loads settings from request or from userdata and saves them to session.
+	 *
+	 * @param
+	 *        	array userinfo
+	 * @param
+	 *        	string Name of Table
+	 * @param
+	 *        	array Fields, in format array( 'fieldname_in_mysql' => 'field_caption' )
+	 * @param
+	 *        	int *deprecated* entries per page
+	 * @param
+	 *        	bool *deprecated* Switch natsorting on/off (global, affects all calls of sort)
+	 * @param int $default_field
+	 *        	default sorting-field-index
+	 * @param string $default_order
+	 *        	default sorting order 'asc' or 'desc'
+	 *        	
+	 */
+	public function __construct($userinfo, $table, $fields, $entriesperpage = 0, $natSorting = false, $default_field = 0, $default_order = 'asc', $limit = 0)
+	{
+
+		// entries per page and natsorting-flag are not
+		// passed as parameter anymore, because these are
+		// from the settings anyway
+		$entriesperpage = \Froxlor\Settings::Get('panel.paging');
+		$natSorting = \Froxlor\Settings::Get('panel.natsorting');
+
+		$this->userinfo = $userinfo;
+
+		if (! is_array($this->userinfo['lastpaging'])) {
+			$this->userinfo['lastpaging'] = json_decode($this->userinfo['lastpaging'], true);
+		}
+
+		$this->table = $table;
+		$this->fields = $fields;
+		$this->entriesperpage = $entriesperpage;
+		$this->natSorting = $natSorting;
+		$checklastpaging = (isset($this->userinfo['lastpaging']['table']) && $this->userinfo['lastpaging']['table'] == $this->table);
+		$this->userinfo['lastpaging']['table'] = $this->table;
+
+		if (isset($_REQUEST['sortorder']) && (strtolower($_REQUEST['sortorder']) == 'desc' || strtolower($_REQUEST['sortorder']) == 'asc')) {
+			$this->sortorder = strtolower($_REQUEST['sortorder']);
+		} else {
+
+			if ($checklastpaging && isset($this->userinfo['lastpaging']['sortorder']) && (strtolower($this->userinfo['lastpaging']['sortorder']) == 'desc' || strtolower($this->userinfo['lastpaging']['sortorder']) == 'asc')) {
+				$this->sortorder = strtolower($this->userinfo['lastpaging']['sortorder']);
+			} else {
+				$this->sortorder = $default_order;
+			}
+		}
+
+		$this->userinfo['lastpaging']['sortorder'] = $this->sortorder;
+
+		if (isset($_REQUEST['sortfield']) && isset($fields[$_REQUEST['sortfield']])) {
+			$this->sortfield = $_REQUEST['sortfield'];
+		} else {
+			if ($checklastpaging && isset($this->userinfo['lastpaging']['sortfield']) && isset($fields[$this->userinfo['lastpaging']['sortfield']])) {
+				$this->sortfield = $this->userinfo['lastpaging']['sortfield'];
+			} else {
+				$fieldnames = array_keys($fields);
+				$this->sortfield = $fieldnames[$default_field];
+			}
+		}
+
+		$this->userinfo['lastpaging']['sortfield'] = $this->sortfield;
+
+		if (isset($_REQUEST['searchfield']) && isset($fields[$_REQUEST['searchfield']])) {
+			$this->searchfield = $_REQUEST['searchfield'];
+		} else {
+			if ($checklastpaging && isset($this->userinfo['lastpaging']['searchfield']) && isset($fields[$this->userinfo['lastpaging']['searchfield']])) {
+				$this->searchfield = $this->userinfo['lastpaging']['searchfield'];
+			} else {
+				$fieldnames = array_keys($fields);
+				$this->searchfield = $fieldnames[0];
+			}
+		}
+
+		$this->userinfo['lastpaging']['searchfield'] = $this->searchfield;
+
+		if (isset($_REQUEST['searchtext']) && (preg_match('/[-_@\p{L}\p{N}*.]+$/u', $_REQUEST['searchtext']) || $_REQUEST['searchtext'] === '')) {
+			$this->searchtext = trim($_REQUEST['searchtext']);
+		} else {
+			if ($checklastpaging && isset($this->userinfo['lastpaging']['searchtext']) && preg_match('/[-_@\p{L}\p{N}*.]+$/u', $this->userinfo['lastpaging']['searchtext'])) {
+				$this->searchtext = $this->userinfo['lastpaging']['searchtext'];
+			} else {
+				$this->searchtext = '';
+			}
+		}
+
+		$this->userinfo['lastpaging']['searchtext'] = $this->searchtext;
+
+		if (isset($_REQUEST['pageno']) && intval($_REQUEST['pageno']) != 0) {
+			$this->pageno = intval($_REQUEST['pageno']);
+		} else {
+			if ($checklastpaging && isset($this->userinfo['lastpaging']['pageno']) && intval($this->userinfo['lastpaging']['pageno']) != 0) {
+				$this->pageno = intval($this->userinfo['lastpaging']['pageno']);
+			} else {
+				$this->pageno = 1;
+			}
+		}
+
+		$this->userinfo['lastpaging']['pageno'] = $this->pageno;
+		$upd_stmt = \Froxlor\Database\Database::prepare("
+			UPDATE `" . TABLE_PANEL_SESSIONS . "` SET
+			`lastpaging` = :lastpaging
+			WHERE `hash` = :hash  AND `userid` = :userid
+			AND `ipaddress` = :ipaddr AND `useragent` = :ua
+			AND `adminsession` = :adminsession
+		");
+		$upd_data = array(
+			'lastpaging' => json_encode($this->userinfo['lastpaging']),
+			'hash' => $userinfo['hash'],
+			'userid' => $userinfo['userid'],
+			'ipaddr' => $userinfo['ipaddress'],
+			'ua' => $userinfo['useragent'],
+			'adminsession' => $userinfo['adminsession']
+		);
+		\Froxlor\Database\Database::pexecute($upd_stmt, $upd_data);
+
+		$this->limit = $limit;
+	}
+
+	/**
+	 * Sets number of entries and adjusts pageno if the number of entries doesn't correspond to the pageno.
+	 *
+	 * @param
+	 *        	int entries
+	 */
+	public function setEntries($entries)
+	{
+		$this->entries = $entries;
+
+		if (($this->pageno - 1) * $this->entriesperpage > $this->entries) {
+			$this->pageno = 1;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks if a row should be displayed or not, used in loops
+	 *
+	 * @param
+	 *        	int number of row
+	 * @return bool to display or not to display, that's the question
+	 */
+	public function checkDisplay($count)
+	{
+		$begin = (intval($this->pageno) - 1) * intval($this->entriesperpage);
+		$end = (intval($this->pageno) * intval($this->entriesperpage));
+		return (($count >= $begin && $count < $end) || $this->entriesperpage == 0);
+	}
+
+	/**
+	 * Returns condition code for sql query
+	 *
+	 * @param
+	 *        	bool should returned condition code start with WHERE (false) or AND (true)?
+	 * @return string the condition code
+	 */
+	public function getSqlWhere($append = false)
+	{
+		if ($this->searchtext != '') {
+			if ($append == true) {
+				$condition = ' AND ';
+			} else {
+				$condition = ' WHERE ';
+			}
+
+			$searchfield = explode('.', $this->searchfield);
+			foreach ($searchfield as $id => $field) {
+				if (substr($field, - 1, 1) != '`') {
+					$field .= '`';
+				}
+
+				if ($field[0] != '`') {
+					$field = '`' . $field;
+				}
+
+				$searchfield[$id] = $field;
+			}
+
+			$searchfield = implode('.', $searchfield);
+
+			$ops = array(
+				'<',
+				'>',
+				'='
+			);
+
+			// check if we use an operator or not
+			$useOper = 0;
+			$oper = "=";
+			if (in_array(substr($this->searchtext, 0, 1), $ops)) {
+				$useOper = 1;
+				$oper = substr($this->searchtext, 0, 1);
+			}
+
+			// check for diskspace and whether searchtext is a number
+			// in any other case the logical-operators would make no sense
+			if (strpos($searchfield, 'diskspace') > 0 && is_numeric(substr($this->searchtext, $useOper))) {
+				// anything with diskspace is *1024
+				$searchtext = ((int) substr($this->searchtext, $useOper)) * 1024;
+				$useOper = 1;
+			} elseif (strpos($searchfield, 'traffic') > 0 && is_numeric(substr($this->searchtext, $useOper))) {
+				// anything with traffic is *1024*1024
+				$searchtext = ((int) substr($this->searchtext, $useOper)) * 1024 * 1024;
+				$useOper = 1;
+			} else {
+				// any other field
+				$searchtext = substr($this->searchtext, $useOper);
+			}
+
+			if ($useOper == 1 && is_numeric(substr($this->searchtext, $useOper))) {
+				// now as we use >, < or = we use the given operator and not LIKE
+				$condition .= $searchfield . " " . $oper . " " . \Froxlor\Database\Database::quote($searchtext);
+			} else {
+				$searchtext = str_replace('*', '%', $this->searchtext);
+				// append wildcards if user did not enter any
+				if (strpos($searchtext, '%') === false)
+					$searchtext = '%' . $searchtext . '%';
+				$condition .= $searchfield . " LIKE " . \Froxlor\Database\Database::quote($searchtext);
+			}
+		} else {
+			$condition = '';
+		}
+
+		return $condition;
+	}
+
+	/**
+	 * Returns "order by"-code for sql query
+	 *
+	 * @param
+	 *        	bool Switch natsorting on/off (local, affects just this call)
+	 * @return string the "order by"-code
+	 */
+	public function getSqlOrderBy($natSorting = null)
+	{
+		$sortfield = explode('.', $this->sortfield);
+		foreach ($sortfield as $id => $field) {
+			if (substr($field, - 1, 1) != '`') {
+				$field .= '`';
+			}
+
+			if ($field[0] != '`') {
+				$field = '`' . $field;
+			}
+
+			$sortfield[$id] = $field;
+		}
+
+		$sortfield = implode('.', $sortfield);
+		$sortorder = strtoupper($this->sortorder);
+
+		if ($natSorting == true || ($natSorting === null && $this->natSorting == true)) {
+			// Acts similar to php's natsort(), found in one comment at http://my.opera.com/cpr/blog/show.dml/160556
+			$sortcode = "ORDER BY CONCAT( IF( ASCII( LEFT( " . $sortfield . ", 5 ) ) > 57,
+				LEFT( " . $sortfield . ", 1 ), 0 ),
+				IF( ASCII( RIGHT( " . $sortfield . ", 1 ) ) > 57,
+					LPAD( " . $sortfield . ", 255, '0' ),
+					LPAD( CONCAT( " . $sortfield . ", '-' ), 255, '0' )
+				)) " . $sortorder;
+		} else {
+			$sortcode = 'ORDER BY ' . $sortfield . ' ' . $sortorder;
+		}
+
+		return $sortcode;
+	}
+
+	/**
+	 * Currently not used
+	 *
+	 * @return string always empty
+	 */
+	public function getSqlLimit()
+	{
+		if ($this->limit > 0) {
+			$_offset = ($this->pageno - 1) * $this->limit;
+			return ' LIMIT ' . $_offset . ',' . $this->limit;
+		}
+		/**
+		 * currently not in use
+		 */
+		return '';
+	}
+
+	/**
+	 * Returns html code for sorting field
+	 *
+	 * @param
+	 *        	array Language array
+	 * @return string the html sortcode
+	 */
+	public function getHtmlSortCode($lng, $break = false)
+	{
+		$sortcode = '';
+		$fieldoptions = '';
+		$orderoptions = '';
+
+		foreach ($this->fields as $fieldname => $fieldcaption) {
+			$fieldoptions .= HTML::makeoption($fieldcaption, $fieldname, $this->sortfield, true, true);
+		}
+
+		$breakorws = ($break ? '<br />' : '&nbsp;');
+		foreach (array(
+			'asc' => $lng['panel']['ascending'],
+			'desc' => $lng['panel']['descending']
+		) as $sortordertype => $sortorderdescription) {
+			$orderoptions .= HTML::makeoption($sortorderdescription, $sortordertype, $this->sortorder, true, true);
+		}
+
+		eval("\$sortcode =\"" . Template::getTemplate("misc/htmlsortcode", '1') . "\";");
+		return $sortcode;
+	}
+
+	/**
+	 * Returns html code for sorting arrows
+	 *
+	 * @param
+	 *        	string URL to use as base for links
+	 * @param
+	 *        	string If set, only this field will be returned
+	 * @return mixed An array or a string (if field is set) of html code of arrows
+	 */
+	public function getHtmlArrowCode($baseurl, $field = '')
+	{
+		global $theme;
+
+		if ($field != '' && isset($this->fields[$field])) {
+			$baseurl = htmlspecialchars($baseurl);
+			$fieldname = htmlspecialchars($field);
+			eval("\$arrowcode =\"" . Template::getTemplate("misc/htmlarrowcode", '1') . "\";");
+		} else {
+			$baseurl = htmlspecialchars($baseurl);
+			$arrowcode = array();
+			foreach ($this->fields as $fieldname => $fieldcaption) {
+				$fieldname = htmlspecialchars($fieldname);
+				eval("\$arrowcode[\$fieldname] =\"" . Template::getTemplate("misc/htmlarrowcode", '1') . "\";");
+			}
+		}
+
+		return $arrowcode;
+	}
+
+	/**
+	 * Returns html code for searching field
+	 *
+	 * @param
+	 *        	array Language array
+	 * @return string the html searchcode
+	 */
+	public function getHtmlSearchCode($lng)
+	{
+		$searchcode = '';
+		$fieldoptions = '';
+		$searchtext = htmlspecialchars($this->searchtext);
+		foreach ($this->fields as $fieldname => $fieldcaption) {
+			$fieldoptions .= HTML::makeoption($fieldcaption, $fieldname, $this->searchfield, true, true);
+		}
+		eval("\$searchcode =\"" . Template::getTemplate("misc/htmlsearchcode", '1') . "\";");
+		return $searchcode;
+	}
+
+	/**
+	 * Returns html code for paging
+	 *
+	 * @param
+	 *        	string URL to use as base for links
+	 * @return string the html pagingcode
+	 */
+	public function getHtmlPagingCode($baseurl)
+	{
+		if ($this->entriesperpage == 0) {
+			return '';
+		} else {
+			$pages = intval($this->entries / $this->entriesperpage);
+		}
+
+		if ($this->entries % $this->entriesperpage != 0) {
+			$pages ++;
+		}
+
+		if ($pages > 1) {
+
+			$start = $this->pageno - 4;
+			if ($start < 1) {
+				$start = 1;
+			}
+
+			$stop = $this->pageno + 4;
+			if ($stop > $pages) {
+				$stop = $pages;
+			}
+
+			$pagingcode = '<a href="' . htmlspecialchars($baseurl) . '&amp;pageno=1">&laquo;</a> <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) - 1) == 0 ? '1' : intval($this->pageno) - 1) . '">&lt;</a>&nbsp;';
+			for ($i = $start; $i <= $stop; $i ++) {
+				if ($i != $this->pageno) {
+					$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . $i . '">' . $i . '</a>&nbsp;';
+				} else {
+					$pagingcode .= ' <strong>' . $i . '</strong>&nbsp;';
+				}
+			}
+			$pagingcode .= ' <a href="' . htmlspecialchars($baseurl) . '&amp;pageno=' . ((intval($this->pageno) + 1) > $pages ? $pages : intval($this->pageno) + 1) . '">&gt;</a> <a href="' . $baseurl . '&amp;pageno=' . $pages . '">&raquo;</a>';
+		} else {
+			$pagingcode = '';
+		}
+
+		return $pagingcode;
+	}
+}

lib/formfields/admin/domains/formfield.domains_edit.php

@@ -159,7 +159,7 @@ return array(
 							)
 						),
 						'value' => array(
-							'1'
+							\Froxlor\Settings::Get('system.apply_specialsettings_default') == 1 ? '1' : ''
 						)
 					),
 					'notryfiles' => array(
@@ -453,7 +453,7 @@ return array(
 							)
 						),
 						'value' => array(
-							'1'
+							\Froxlor\Settings::Get('system.apply_phpconfigs_default') == 1 ? '1' : ''
 						)
 					),
 					'mod_fcgid_starter' => array(

lng/english.lng.php

@@ -1853,7 +1853,7 @@ $lng['domains']['ssl_redirect_temporarilydisabled'] = "<br>The SSL redirect is t
 $lng['serversettings']['caa_entry']['title'] = 'Generate CAA DNS records';
 $lng['serversettings']['caa_entry']['description'] = 'Automatically generates CAA records for SSL-enabled domains that are using Let\'s Encrypt';
 $lng['serversettings']['caa_entry_custom']['title'] = 'Additional CAA DNS records';
-$lng['serversettings']['caa_entry_custom']['description']  = 'DNS Certification Authority Authorization (CAA) is an Internet security policy mechanism which allows domain name holders to indicate to certificate authorities<br>whether they are authorized to issue digital certificates for a particular domain name. It does this by means of a new "CAA" Domain Name System (DNS) resource record.<br><br>The content of this field will be included into the DNS zone directly (each line results in a CAA record).<br>If Let\'s Encrypt is enabled for this domain, this entry will always be added automatically and does not need to be added manually:<br><code>0 issue "letsencrypt.org"</code> (If domain is a wildcard domain, issuewild will be used instead).<br>To enable Incident Reporting, you can add an <code>iodef</code> record. An example for sending such report to <code>me@example.com</code> would be:<br><code>0 iodef "mailto:me@example.com"</code><br><br><strong>Attention:</strong> The code won\'t be checked for any errors. If it contains errors, your CAA records might not work!';
+$lng['serversettings']['caa_entry_custom']['description'] = 'DNS Certification Authority Authorization (CAA) is an Internet security policy mechanism which allows domain name holders to indicate to certificate authorities<br>whether they are authorized to issue digital certificates for a particular domain name. It does this by means of a new "CAA" Domain Name System (DNS) resource record.<br><br>The content of this field will be included into the DNS zone directly (each line results in a CAA record).<br>If Let\'s Encrypt is enabled for this domain, this entry will always be added automatically and does not need to be added manually:<br><code>0 issue "letsencrypt.org"</code> (If domain is a wildcard domain, issuewild will be used instead).<br>To enable Incident Reporting, you can add an <code>iodef</code> record. An example for sending such report to <code>me@example.com</code> would be:<br><code>0 iodef "mailto:me@example.com"</code><br><br><strong>Attention:</strong> The code won\'t be checked for any errors. If it contains errors, your CAA records might not work!';
 
 // Autoupdate
 $lng['admin']['autoupdate'] = 'Auto-Update';
@@ -2079,3 +2079,6 @@ $lng['admin']['ownsslvhostsettings'] = 'Own SSL vHost-settings';
 $lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Default SSL vHost-settings for every domain container';
 $lng['customer']['total_diskspace'] = 'Total diskspace (MiB)';
 $lng['admin']['domain_override_tls'] = 'Override system TLS settings';
+$lng['domains']['isaliasdomainof'] = 'Is aliasdomain for %s';
+$lng['serversettings']['apply_specialsettings_default']['title'] = 'Default value for "' . $lng['admin']['specialsettingsforsubdomains'] . "' setting when editing a domain";
+$lng['serversettings']['apply_phpconfigs_default']['title'] = 'Default value for "' . $lng['admin']['phpsettingsforsubdomains'] . "' setting when editing a domain";

lng/german.lng.php

@@ -1726,3 +1726,6 @@ $lng['admin']['ownsslvhostsettings'] = 'Eigene SSL vHost-Einstellungen';
 $lng['admin']['ipsandports']['ssl_default_vhostconf_domain'] = 'Standard SSL vHost-Einstellungen für jeden Domain-Container';
 $lng['customer']['total_diskspace'] = 'Gesamtspeicherplatz (MiB)';
 $lng['admin']['domain_override_tls'] = 'Überschreibe System TLS Einstellungen';
+$lng['domains']['isaliasdomainof'] = 'Ist Aliasdomain für %s';
+$lng['serversettings']['apply_specialsettings_default']['title'] = 'Standardwert für "' . $lng['admin']['specialsettingsforsubdomains'] . "' Einstellung beim Bearbeiten einer Domain";
+$lng['serversettings']['apply_phpconfigs_default']['title'] = 'Standardwert für "' . $lng['admin']['phpsettingsforsubdomains'] . "' Einstellung beim Bearbeiten einer Domain";

templates/Sparkle/admin/domains/domains_domain.tpl

@@ -41,8 +41,5 @@
 				</a>
 			</if>
 		</if>
-		<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
-			&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
-		</if>
 	</td>
 </tr>

tests/Mysqls/MysqlsTest.php

@@ -4,6 +4,7 @@ use PHPUnit\Framework\TestCase;
 use Froxlor\Api\Commands\Admins;
 use Froxlor\Api\Commands\Customers;
 use Froxlor\Api\Commands\Mysqls;
+use Froxlor\Database\Database;
 
 /**
  *
@@ -12,6 +13,8 @@ use Froxlor\Api\Commands\Mysqls;
  * @covers \Froxlor\Api\Commands\Mysqls
  * @covers \Froxlor\Api\Commands\Customers
  * @covers \Froxlor\Api\Commands\Admins
+ * @covers \Froxlor\Database\DbManager
+ * @covers \Froxlor\Database\Manager\DbManagerMySQL
  */
 class MysqlsTest extends TestCase
 {
@@ -36,7 +39,7 @@ class MysqlsTest extends TestCase
 		$result = json_decode($json_result, true)['data'];
 		$this->assertEquals('testdb', $result['description']);
 		$this->assertEquals(0, $result['dbserver']);
-		
+
 		// test connection
 		try {
 			$test_conn = new \PDO("mysql:host=127.0.0.1", 'test1sql1', $newPwd);
@@ -166,4 +169,39 @@ class MysqlsTest extends TestCase
 		$result = json_decode($json_result, true)['data'];
 		$this->assertEquals('test1sql1', $result['databasename']);
 	}
+
+	/**
+	 *
+	 * @depends testCustomerMysqlsAdd
+	 */
+	public function testGetAllSqlUsers()
+	{
+		\Froxlor\Database\Database::needRoot(true);
+		$dbm = new \Froxlor\Database\DbManager(\Froxlor\FroxlorLogger::getInstanceOf());
+		$users = $dbm->getManager()->getAllSqlUsers(false);
+		foreach ($users as $user => $data) {
+			$this->assertNotEmpty($data['password'], 'No password for user "' . $user . '"');
+		}
+
+		if (TRAVIS_CI == 0) {
+			// just to be sure, not required for travis as the vm is fresh every time
+			Database::needRoot(true);
+			Database::query("DROP USER IF EXISTS froxlor010@10.0.0.10;");
+		}
+
+		// grant privileges to another host
+		$testdata = $users['froxlor010'];
+		$dbm->getManager()->grantPrivilegesTo('froxlor010', $testdata['password'], '10.0.0.10', true);
+
+		// select all entries from mysql.user for froxlor010 to compare password-hashes
+		$sel_stmt = Database::prepare("SELECT * FROM mysql.user WHERE `User` = :usr");
+		Database::pexecute($sel_stmt, [
+			'usr' => 'froxlor010'
+		]);
+		$results = $sel_stmt->fetchAll(\PDO::FETCH_ASSOC);
+		foreach ($results as $user) {
+			$passwd = $user['Password'] ?? $user['authentication_string'];
+			$this->assertEquals($testdata['password'], $passwd);
+		}
+	}
 }