Merge branch 'xxxx-cleanup' into 'develop'

Collection of minor cleanup commits

See merge request ispconfig/ispconfig3!1679

Author: Till Brehm

.gitignore

@@ -1,5 +1,6 @@
 .idea
 /nbproject/private/
+.vscode
 .phplint-cache
 *.swp
 

docs/autoinstall_samples/autoinstall.conf_sample.php

@@ -61,7 +61,7 @@
 $autoupdate['ispconfig_postfix_ssl_symlink'] = 'y';
 $autoupdate['ispconfig_pureftpd_ssl_symlink'] = 'y';
 
-/* These are for service-detection (defaulting to old behaviour where alle changes were automatically accepted) */
+/* These are for service-detection (defaulting to old behaviour where all changes were automatically accepted) */
 $autoupdate['svc_detect_change_mail_server'] = 'yes'; // yes (default), no
 $autoupdate['svc_detect_change_web_server'] = 'yes'; // yes (default), no
 $autoupdate['svc_detect_change_dns_server'] = 'yes'; // yes (default), no

docs/autoinstall_samples/autoinstall.ini.sample

@@ -60,7 +60,7 @@ ignore_hostname_dns=n
 ispconfig_postfix_ssl_symlink=y
 ispconfig_pureftpd_ssl_symlink=y
 
-; These are for service-detection (defaulting to old behaviour where alle changes were automatically accepted)
+; These are for service-detection (defaulting to old behaviour where all changes were automatically accepted)
 svc_detect_change_mail_server=yes
 svc_detect_change_web_server=yes
 svc_detect_change_dns_server=yes

interface/lib/classes/db_mysql.inc.php

@@ -825,12 +825,13 @@ public function datalogDelete($tablename, $index_field, $index_value) {
 		return true;
 	}
 
-	//** Deletes a record and saves the changes into the datalog
+	// Updates a datalog record to store an error state.
 	public function datalogError($errormsg) {
 		global $app;
 
-		if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) $this->query("UPDATE sys_datalog set error = ? WHERE datalog_id = ?", $errormsg, $app->modules->current_datalog_id);
-
+		if(isset($app->modules->current_datalog_id) && $app->modules->current_datalog_id > 0) {
+			$this->query("UPDATE sys_datalog set error = ? WHERE datalog_id = ?", $errormsg, $app->modules->current_datalog_id);
+		}
 		return true;
 	}
 
@@ -844,7 +845,11 @@ public function datalogStatus($login = '') {
 			$login = $_SESSION['s']['user']['username'];
 		}
 
-		$result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable FROM sys_datalog, server WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated GROUP BY sys_datalog.dbtable, sys_datalog.action", $login);
+		$result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable
+				FROM sys_datalog, server
+				WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = ? AND sys_datalog.datalog_id > server.updated
+				GROUP BY sys_datalog.dbtable, sys_datalog.action",
+			$login);
 		foreach($result as $row) {
 			if(!$row['dbtable'] || in_array($row['dbtable'], array('aps_instances', 'aps_instances_settings', 'mail_access', 'mail_content_filter'))) continue; // ignore some entries, maybe more to come
 			$return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable'])); $return['count'] += $row['cnt'];

interface/web/dns/lib/lang/ar_dns_slave.lng

@@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list
 $wb['server_id_error_empty'] = 'No server selected';
 $wb['origin_error_empty'] = 'Zone empty.';
 $wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
 $wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';

interface/web/dns/lib/lang/ar_dns_soa.lng

@@ -17,7 +17,7 @@ $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DN
 $wb['server_id_error_empty'] = 'No server selected';
 $wb['origin_error_empty'] = 'Zone empty.';
 $wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';

interface/web/dns/lib/lang/bg_dns_soa.lng

@@ -17,7 +17,7 @@ $wb['no_zone_perm'] = 'Вие намате права да добавяте за
 $wb['server_id_error_empty'] = 'Няма избран сървър';
 $wb['origin_error_empty'] = 'Зоната е празна.';
 $wb['origin_error_unique'] = 'Вече има такъв запис в тази зона.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS запис ае в грешен формат.';
 $wb['mbox_error_empty'] = 'Полето с емайл е празно.';
 $wb['mbox_error_regex'] = 'Полето е емайл е в грешен формат.';

interface/web/dns/lib/lang/en_dns_slave.lng

@@ -10,7 +10,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list
 $wb['server_id_error_empty'] = 'No server selected';
 $wb['origin_error_empty'] = 'Zone empty.';
 $wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
 $wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';

interface/web/dns/lib/lang/en_dns_soa.lng

@@ -20,7 +20,7 @@ $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DN
 $wb['server_id_error_empty'] = 'No server selected';
 $wb['origin_error_empty'] = 'Zone empty.';
 $wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['mbox_error_empty'] = 'Email is empty.';
 $wb['mbox_error_regex'] = 'Email format invalid.';

interface/web/dns/lib/lang/fi_dns_slave.lng

@@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list
 $wb['server_id_error_empty'] = 'No server selected';
 $wb['origin_error_empty'] = 'Zone empty.';
 $wb['origin_error_unique'] = 'There is already a record for this zone.';
-$wb['origin_error_regex'] = 'Zone has a invalid format.';
+$wb['origin_error_regex'] = 'Zone has an invalid format.';
 $wb['ns_error_regex'] = 'NS has a invalid format.';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
 $wb['ipv4_form_txt'] = 'Separate multiple IPs with commas';