From 093ad5040724af8e3ee4ba6be4e0565c4a9c5c5b Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 17 Apr 2022 22:51:55 +0200 Subject: [PATCH 1/6] Extra api example usage --- remoting_client/examples/sites_web_domain_get.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/remoting_client/examples/sites_web_domain_get.php b/remoting_client/examples/sites_web_domain_get.php index 7f5b22f6ac..47fe8cbd44 100644 --- a/remoting_client/examples/sites_web_domain_get.php +++ b/remoting_client/examples/sites_web_domain_get.php @@ -16,9 +16,14 @@ try { //* Set the function parameters. $domain_id = 2; + $domain_name = 'example.com'; + // Lookup by ID. $domain_record = $client->sites_web_domain_get($session_id, $domain_id); + // Lookup by name. + $domain_record = $client->sites_web_domain_get($session_id, array('domain' => $domain_name)); + print_r($domain_record); if($client->logout($session_id)) { -- GitLab From f9f235c1a9aaf8522959f22ac94084b3f87c5ca4 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 24 Apr 2022 21:28:09 +0200 Subject: [PATCH 2/6] Fix comment + linewrap --- interface/lib/classes/db_mysql.inc.php | 7 ++++--- server/lib/classes/db_mysql.inc.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 78eee8c997..6258b20f4d 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -825,12 +825,13 @@ class db 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; } diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php index 3096a5b062..f2299de343 100644 --- a/server/lib/classes/db_mysql.inc.php +++ b/server/lib/classes/db_mysql.inc.php @@ -825,12 +825,13 @@ class db 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; } -- GitLab From 614e7bd65c002819ed2117fd1294927ca6397742 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Thu, 26 May 2022 22:22:19 +0200 Subject: [PATCH 3/6] Indent for readability --- interface/lib/classes/db_mysql.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 6258b20f4d..9ae929136b 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -845,7 +845,11 @@ class db $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']; -- GitLab From 8be92ac9206d689b842692cde7e3cb9f4e70f533 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Tue, 29 Nov 2022 23:23:48 +0100 Subject: [PATCH 4/6] fix typo --- docs/autoinstall_samples/autoinstall.conf_sample.php | 2 +- docs/autoinstall_samples/autoinstall.ini.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/autoinstall_samples/autoinstall.conf_sample.php b/docs/autoinstall_samples/autoinstall.conf_sample.php index c8bf209f9f..c8c374e4f0 100644 --- a/docs/autoinstall_samples/autoinstall.conf_sample.php +++ b/docs/autoinstall_samples/autoinstall.conf_sample.php @@ -61,7 +61,7 @@ $autoupdate['ignore_hostname_dns'] = 'n'; $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 diff --git a/docs/autoinstall_samples/autoinstall.ini.sample b/docs/autoinstall_samples/autoinstall.ini.sample index bf47122074..9251d1eef0 100644 --- a/docs/autoinstall_samples/autoinstall.ini.sample +++ b/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 -- GitLab From 996a7d719f7a9ddaa4703584cea980e418cc3cdc Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Sun, 25 Dec 2022 19:17:08 +0100 Subject: [PATCH 5/6] Extend ignore file for vscode --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c49a12edc1..ef9abd3d60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea /nbproject/private/ +.vscode .phplint-cache *.swp -- GitLab From bb0880560339d825ad586de28d8d03c2a5020125 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Mon, 26 Dec 2022 10:36:40 +0100 Subject: [PATCH 6/6] an before a vowel --- interface/web/dns/lib/lang/ar_dns_slave.lng | 2 +- interface/web/dns/lib/lang/ar_dns_soa.lng | 2 +- interface/web/dns/lib/lang/bg_dns_soa.lng | 2 +- interface/web/dns/lib/lang/en_dns_slave.lng | 2 +- interface/web/dns/lib/lang/en_dns_soa.lng | 2 +- interface/web/dns/lib/lang/fi_dns_slave.lng | 2 +- interface/web/dns/lib/lang/hu_dns_slave.lng | 2 +- interface/web/dns/lib/lang/hu_dns_soa.lng | 2 +- interface/web/dns/lib/lang/ja_dns_slave.lng | 2 +- interface/web/dns/lib/lang/pt_dns_slave.lng | 2 +- interface/web/dns/lib/lang/ro_dns_slave.lng | 2 +- interface/web/dns/lib/lang/se_dns_slave.lng | 2 +- interface/web/dns/lib/lang/sk_dns_slave.lng | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/interface/web/dns/lib/lang/ar_dns_slave.lng b/interface/web/dns/lib/lang/ar_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/ar_dns_slave.lng +++ b/interface/web/dns/lib/lang/ar_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/ar_dns_soa.lng b/interface/web/dns/lib/lang/ar_dns_soa.lng index 4333c3793a..ae2e022195 100644 --- a/interface/web/dns/lib/lang/ar_dns_soa.lng +++ b/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.'; diff --git a/interface/web/dns/lib/lang/bg_dns_soa.lng b/interface/web/dns/lib/lang/bg_dns_soa.lng index c1e57edf8b..9e75200a63 100644 --- a/interface/web/dns/lib/lang/bg_dns_soa.lng +++ b/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'] = 'Полето е емайл е в грешен формат.'; diff --git a/interface/web/dns/lib/lang/en_dns_slave.lng b/interface/web/dns/lib/lang/en_dns_slave.lng index 4de10b2769..3cc0aec72c 100644 --- a/interface/web/dns/lib/lang/en_dns_slave.lng +++ b/interface/web/dns/lib/lang/en_dns_slave.lng @@ -10,7 +10,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/en_dns_soa.lng b/interface/web/dns/lib/lang/en_dns_soa.lng index a5f1adfae5..95a007fcd6 100644 --- a/interface/web/dns/lib/lang/en_dns_soa.lng +++ b/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.'; diff --git a/interface/web/dns/lib/lang/fi_dns_slave.lng b/interface/web/dns/lib/lang/fi_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/fi_dns_slave.lng +++ b/interface/web/dns/lib/lang/fi_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/hu_dns_slave.lng b/interface/web/dns/lib/lang/hu_dns_slave.lng index 7bc27e3a51..64174c0fc2 100644 --- a/interface/web/dns/lib/lang/hu_dns_slave.lng +++ b/interface/web/dns/lib/lang/hu_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng index fdabdd99c2..81c730de76 100644 --- a/interface/web/dns/lib/lang/hu_dns_soa.lng +++ b/interface/web/dns/lib/lang/hu_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.'; diff --git a/interface/web/dns/lib/lang/ja_dns_slave.lng b/interface/web/dns/lib/lang/ja_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/ja_dns_slave.lng +++ b/interface/web/dns/lib/lang/ja_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/pt_dns_slave.lng b/interface/web/dns/lib/lang/pt_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/pt_dns_slave.lng +++ b/interface/web/dns/lib/lang/pt_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/ro_dns_slave.lng b/interface/web/dns/lib/lang/ro_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/ro_dns_slave.lng +++ b/interface/web/dns/lib/lang/ro_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/se_dns_slave.lng b/interface/web/dns/lib/lang/se_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/se_dns_slave.lng +++ b/interface/web/dns/lib/lang/se_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; diff --git a/interface/web/dns/lib/lang/sk_dns_slave.lng b/interface/web/dns/lib/lang/sk_dns_slave.lng index 416e3d6e72..9e8aaa17f9 100644 --- a/interface/web/dns/lib/lang/sk_dns_slave.lng +++ b/interface/web/dns/lib/lang/sk_dns_slave.lng @@ -9,7 +9,7 @@ $wb['xfer_txt'] = 'Allow zone transfers to
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'; -- GitLab