Merge origin/develop between...

Merge origin/develop between 941b192a...510ace76

https://git.ispconfig.org/helmo/ispconfig3/-/compare/941b192a829f9b1d7b5c95a0d28253bd96d5faa8...510ace7666d68e105316dfe5fd6572b5fed23db5?from_project_id=427&straight=false

Squashed commit of the following:

commit 510ace76
Merge: 835302e9 2bbbc5d8
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Apr 17 15:08:15 2023 +0000

    Merge branch '6480-db-operator' into 'develop'

    Resolve "wrong databases are shown when selecting a server."

    Closes #6480

    See merge request ispconfig/ispconfig3!1712

commit 2bbbc5d8
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Apr 16 23:24:02 2023 +0200

    Fix db field operator in all other list files, #6480

commit 925dac26
Author: Tom <tom@unknown>
Date:   Fri Apr 14 14:13:59 2023 +0200

    Fix db field operator, #6480

commit 835302e9
Merge: f8923da0 03bce823
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 14:53:27 2023 +0000

    Merge branch '6484-Add-Simplified-Chinese-language' into 'develop'

    Add Simplified Chinese translations for ISPConfig

    Closes #6484

    See merge request ispconfig/ispconfig3!1707

commit f8923da0
Merge: ba91d914 3ddebfe9
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 09:32:29 2023 +0000

    Merge branch '2558-two-factor-authentication-followup' into 'develop'

    Extend Two-factor authentication

    Closes #2558

    See merge request ispconfig/ispconfig3!1594

commit ba91d914
Merge: 694612e3 ace15083
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:49:27 2023 +0000

    Merge branch '6431-rspamd-user-config-deleted-on-mail-user-changes' into 'develop'

    fixes #6431 // make sure config file is deleted only during spamfilter_user event.

    Closes #6431

    See merge request ispconfig/ispconfig3!1674

commit 694612e3
Merge: f4fe9544 bc034728
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:41:23 2023 +0000

    Merge branch '6294-paste-email' into 'develop'

    Paste email address to select mail domain

    Closes #6294

    See merge request ispconfig/ispconfig3!1571

commit f4fe9544
Merge: 0b34b06d 39d95d16
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:34:40 2023 +0000

    Merge branch '6446-le-warning' into 'develop'

    Early return when no LE domains remain, #6446

    Closes #6446

    See merge request ispconfig/ispconfig3!1685

commit 0b34b06d
Merge: 8efadcb5 9b603507
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:22:28 2023 +0000

    Merge branch '6485-nginx-php-fpm-workaround' into 'develop'

    simplify redhat os detection for the Nginx EL workaround

    Closes #6485

    See merge request ispconfig/ispconfig3!1708

commit 9b603507
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:14:24 2023 +0000

    Update nginx_plugin.inc.php

commit 8efadcb5
Merge: 0e1b36ad 19a7aaec
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:10:32 2023 +0000

    Merge branch 'develop' into 'develop'

    Improve client circle page

    See merge request ispconfig/ispconfig3!1710

commit 0e1b36ad
Merge: ab87ccdf c7a6bddf
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:04:00 2023 +0000

    Merge branch '6416-undefined-constant-loglevel_warning-in-usr-local-ispconfig-server-plugins-available' into 'develop'

    Resolve "Undefined constant "LOGLEVEL_WARNING" in /usr/local/ispconfig/server/plugins-available/mysql_clientdb_plugin.inc.php:283"

    Closes #6416

    See merge request ispconfig/ispconfig3!1667

commit ab87ccdf
Merge: f512e03c 4d2b2f5d
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 06:02:52 2023 +0000

    Merge branch 'feature/use-php-from-path-in-server-sh' into 'develop'

    Use PHP from path in server.sh

    See merge request ispconfig/ispconfig3!1676

commit c7a6bddf
Author: Till <t.brehm@ispconfig.org>
Date:   Fri Apr 14 07:55:21 2023 +0200

    Replaced LOGLEVEL_WARNING with LOGLEVEL_WARN

commit f512e03c
Merge: e35532a6 502a66bb
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Apr 14 05:31:41 2023 +0000

    Merge branch 'develop' into 'develop'

    gentoo specific updates

    See merge request ispconfig/ispconfig3!1664

commit e35532a6
Merge: 6524493d 62a6d04f
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 11:04:35 2023 +0000

    Merge branch '6471-use-mod-remoteip-in-new-apache-versions' into 'develop'

    Include minor number in apache version for vhost.conf.master, #6471

    Closes #6471

    See merge request ispconfig/ispconfig3!1700

commit 6524493d
Merge: 3aeea7ed 07d37a4a
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 11:02:50 2023 +0000

    Merge branch '6462-root-owner' into 'develop'

    account root should be owned by root, #6462

    Closes #6462

    See merge request ispconfig/ispconfig3!1693

commit 3aeea7ed
Merge: a2f2eb3e 27fea5f2
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:59:09 2023 +0000

    Merge branch '6438-php81-deprecation' into 'develop'

    Fix php 8.1 deprecation warnings

    Closes #6438

    See merge request ispconfig/ispconfig3!1682

commit a2f2eb3e
Merge: 7009315e 2e8f525e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:57:33 2023 +0000

    Merge branch '6444-php82' into 'develop'

    Fix php 8.2 deprecation warnings, #6444

    Closes #6444

    See merge request ispconfig/ispconfig3!1684

commit 7009315e
Merge: 03346dbb a8d78f68
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:56:44 2023 +0000

    Merge branch '6435-slave-root-master' into 'develop'

    Move asking to sql root to the place where its needed,

    Closes #6435

    See merge request ispconfig/ispconfig3!1680

commit 03346dbb
Merge: 291809c4 cc39cc61
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:55:03 2023 +0000

    Merge branch '6424-Notifications-to-reseller-and-clients-not-working' into 'develop'

    FIX: Notifications to reseller and clients not working Issue #6424

    Closes #6424

    See merge request ispconfig/ispconfig3!1672

commit 291809c4
Merge: 5055c537 bb088056
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:53:31 2023 +0000

    Merge branch 'xxxx-cleanup' into 'develop'

    Collection of minor cleanup commits

    See merge request ispconfig/ispconfig3!1679

commit 5055c537
Merge: 6b890e99 f5defafc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Apr 12 09:51:37 2023 +0000

    Merge branch '6436-dns-records-tab' into 'develop'

    Default to the records tab for found dns zones, #6436

    Closes #6436

    See merge request ispconfig/ispconfig3!1681

commit 19a7aaec
Author: flo <fk@blinkenbox.coop>
Date:   Fri Apr 7 23:36:53 2023 +0200

    Improve client circle page

commit 6b890e99
Merge: 7fa44a03 507478ca
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Mar 31 16:12:58 2023 +0000

    Merge branch '6486-wrong-database-name-variable-used-in-rspamd-plugin' into 'develop'

    Resolve "Wrong database name variable used in Rspamd plugin"

    Closes #6486

    See merge request ispconfig/ispconfig3!1709

commit 507478ca
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Mar 31 16:05:09 2023 +0000

    Update rspamd_plugin.inc.php

commit a080b1cd
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Wed Mar 29 21:10:10 2023 +0200

    simplify redhat os detection for the Nginx EL workaround

commit 03bce823
Author: 妙正灰 <ivmmvobe@mf8.biz>
Date:   Wed Mar 29 01:48:36 2023 +0800

    Add Simplified Chinese translations for ISPConfig

commit 7fa44a03
Merge: 4052ec76 56c5fc58
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Mar 27 15:59:09 2023 +0000

    Merge branch '6481-replication-failed-with-uncaught-error-undefined-constant-dbtable' into 'develop'

    Resolve "replication failed with Uncaught Error: Undefined constant "dbtable""

    Closes #6481

    See merge request ispconfig/ispconfig3!1706

commit 56c5fc58
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Mar 27 15:51:07 2023 +0000

    Update modules.inc.php

commit 4052ec76
Merge: 35d97907 8e5c13bc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Mar 24 18:07:13 2023 +0000

    Merge branch '6452-uncaught-typeerror-array_merge-argument-1-must-be-of-type-array-bool-given-in' into 'develop'

    Resolve "Uncaught TypeError: array_merge(): Argument 1 must be of type array, bool given in shelluser_base_plugin.inc.php:480"

    Closes #6452

    See merge request ispconfig/ispconfig3!1689

commit 8e5c13bc
Merge: e3f14f75 35d97907
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Mar 24 17:59:05 2023 +0000

    Merge branch 'develop' into '6452-uncaught-typeerror-array_merge-argument-1-must-be-of-type-array-bool-given-in'

    # Conflicts:
    #   server/lib/classes/file.inc.php

commit 35d97907
Merge: 05b848e7 30a569ba
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Mar 10 14:21:39 2023 +0000

    Merge branch 'display-servername' into 'develop'

    fixes displaying server_name in single server setups

    Closes #6474

    See merge request ispconfig/ispconfig3!1701

commit 62a6d04f
Author: Andreas Palm <ap@ewsp.de>
Date:   Fri Mar 10 15:06:25 2023 +0100

    make #6471 backwards compatible by keeping the old variable

commit 05b848e7
Merge: 6f6b9489 942b3cb0
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Mar 9 14:29:21 2023 +0000

    Merge branch '6475-sql-query-builder-in-listform_actions-inc-php-failure' into 'develop'

    Resolve "SQL query builder in listform_actions.inc.php failure"

    Closes #6475

    See merge request ispconfig/ispconfig3!1702

commit 942b3cb0
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Mar 9 13:46:43 2023 +0000

    Update interface/lib/classes/listform_actions.inc.php

commit 30a569ba
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Thu Mar 9 14:04:48 2023 +0100

    fixes displaying server_name in single server setups

commit 6f6b9489
Merge: e952f094 667212e8
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Mar 9 08:37:40 2023 +0000

    Merge branch '6434-vim-insert' into 'develop'

    Fix stale i character, #6434

    Closes #6434

    See merge request ispconfig/ispconfig3!1678

commit e952f094
Merge: 4590e73c f818412d
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Mar 9 08:34:10 2023 +0000

    Merge branch '6451-data-check-fields' into 'develop'

    Selecting a dnssec algorithm should imply wanting to sign the zone, #6451

    Closes #6451

    See merge request ispconfig/ispconfig3!1688

commit 4590e73c
Merge: 8770f3a0 fc675e26
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Mar 7 21:31:38 2023 +0000

    Merge branch '6449-domain-status' into 'develop'

    Show mail_domain status in list on mail_user_edit, #6449

    Closes #6449

    See merge request ispconfig/ispconfig3!1686

commit 8770f3a0
Merge: dd8b2ab4 94a926f0
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Mar 7 21:30:09 2023 +0000

    Merge branch '6450-show-dnssec-status' into 'develop'

    Show DNSSEC status in soa list

    Closes #6450

    See merge request ispconfig/ispconfig3!1687

commit dd8b2ab4
Merge: 81ad2131 e042d3ea
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Mar 6 17:58:56 2023 +0000

    Merge branch '6433-safe-delete-warning' into 'develop'

    Avoid a warning is the dir does not exist

    Closes #6433

    See merge request ispconfig/ispconfig3!1677

commit 81ad2131
Merge: 969a78d0 1955d826
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Mar 6 17:57:08 2023 +0000

    Merge branch '6345-fix-dns-zone-import' into 'develop'

    fix checkDomainModuleDomain call on dns zone imports #6345

    Closes #6345

    See merge request ispconfig/ispconfig3!1695

commit 969a78d0
Merge: efb5a55a 280c16b9
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Mar 6 17:56:19 2023 +0000

    Merge branch '6459-fix-dkim-selector-regex' into 'develop'

    Fixed regex for dkim_selector to match only valid entires #6459

    Closes #6459

    See merge request ispconfig/ispconfig3!1692

commit 5e9a4fec
Author: Andreas Palm <ap@ewsp.de>
Date:   Tue Feb 28 22:49:24 2023 +0100

    include minor number in apache version for vhost.conf.master, #6471

commit efb5a55a
Merge: d340266d 344b6bc6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Feb 19 08:16:08 2023 +0000

    Merge branch '6463-new-lines' into 'develop'

    Initialize new_lines array, #6463

    Closes #6463

    See merge request ispconfig/ispconfig3!1694

commit d340266d
Merge: 45acbb42 7632c8ea
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Feb 18 18:26:17 2023 +0000

    Merge branch 'add-docs-for-remote-call-monitor-jobqueue-count' into 'develop'

    Add docs for remote call monitor_jobqueue_count()

    See merge request ispconfig/ispconfig3!1696

commit 45acbb42
Merge: dbeb110d 537caeb2
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Feb 18 18:25:30 2023 +0000

    Merge branch 'Petar-develop-patch-53672' into 'develop'

    BUG doman>domain web_childdomain.tform.php

    See merge request ispconfig/ispconfig3!1697

commit dbeb110d
Merge: 7d30386f bf853e67
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Feb 18 18:25:02 2023 +0000

    Merge branch 'Petar-develop-patch-91591' into 'develop'

    BUG doman>domain Update web_vhost_domain.tform.php

    See merge request ispconfig/ispconfig3!1698

commit bf853e67
Author: Petar <p3romk@gmail.com>
Date:   Tue Feb 14 07:52:05 2023 +0000

    BUG doman>domain Update web_vhost_domain.tform.php

commit 537caeb2
Author: Petar <p3romk@gmail.com>
Date:   Tue Feb 14 07:49:57 2023 +0000

    BUG doman>domain web_childdomain.tform.php

commit 7632c8ea
Author: Mladen B <mladen074@gmail.com>
Date:   Mon Feb 13 09:52:13 2023 +0000

    Add docs for remote call monitor_jobqueue_count()

commit 1955d826
Author: Demian <demian@pytech.de>
Date:   Thu Feb 9 15:48:21 2023 +0100

    fix checkDomainModuleDomain call on dns zone imports #6345

    before we handed over domain_name instead of domain_id to the checkDomainModuleDomain function,
    which resulted in nothing. This fixes the call by querying the database for the domain_id for
    the given domain_name.

commit 344b6bc6
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Feb 8 22:02:04 2023 +0100

    Initialize new_lines array, #6463

commit 07d37a4a
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Feb 8 21:41:53 2023 +0100

    account root should be owned by root, #6462

commit 280c16b9
Author: Demian <demian@pytech.de>
Date:   Tue Feb 7 08:35:37 2023 +0100

    Fixed regex to match the dkim_slector RFC compliant #6459

    The dkim_select can start with a number, but has to contain atleast
    1 letter and has to be between 1 and 63 characters long.

commit 38103c00
Author: Demian <demian@pytech.de>
Date:   Mon Feb 6 16:17:52 2023 +0100

    Fixed regex for dkim_selector to match only valid entires #6459

    before the regex matched empty entries and entries starting with a number.

commit 3ddebfe9
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Feb 1 16:56:05 2023 +0100

    Extra error when No mail address available to sent an OTP code to

commit 7cb697a8
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 19 13:36:11 2022 +0200

    Fix indend and add comment

commit 79770a89
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Feb 1 16:33:02 2023 +0100

    Add otp_email_override support

    UI is still to be implemented

commit 7d30386f
Merge: d53109aa 39b6810c
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jan 30 19:47:17 2023 +0000

    Merge branch '6458-let-s-encrypt-ssl-certs-not-issued-due-to-changed-cert-path-for-ecc-certs' into 'develop'

    Resolve "Let's Encrypt SSL certs not issued due to changed cert path for ECC certs"

    Closes #6458

    See merge request ispconfig/ispconfig3!1691

commit 39b6810c
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jan 30 19:38:45 2023 +0000

    Update install/lib/installer_base.lib.php

commit 27fea5f2
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Jan 27 22:32:51 2023 +0100

    Avoid Deprecation warning

    PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /usr/local/ispconfig/server/plugins-available/bind_plugin.inc.php on line 397

commit e3f14f75
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jan 20 10:19:10 2023 +0000

    Fixed Uncaught TypeError: array_merge(): Argument #1 must be of type array, bool given in /usr/local/ispconfig/server/plugins-available/shelluser_jailkit_plugin.inc.php:530

commit 79637839
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jan 20 10:13:31 2023 +0000

    Fixed Undefined variable $new_lines in /usr/local/ispconfig/server/lib/classes/file.inc.php on line 126

commit dddf3e5b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jan 20 06:14:53 2023 +0000

    Update server/plugins-available/shelluser_base_plugin.inc.php

commit f818412d
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Jan 18 15:38:50 2023 +0100

    Selecting a dnssec algarithm should imply wanting to sign the zone, #6451

commit 94a926f0
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Jan 18 14:31:33 2023 +0100

    Show DNSSEC status in soa list

commit fc675e26
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Jan 18 08:48:41 2023 +0100

    Show mail_domain status in list on mail_user_edit, #6449

commit 39d95d16
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Jan 17 13:58:27 2023 +0100

    Early return when no LE domains remain, #6446

commit 2e8f525e
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Jan 16 21:48:28 2023 +0100

    Fix php 8.2 deprecation warnings, #6444

commit 4a099343
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 26 14:30:58 2022 +0100

    Fix loginc error, backup_download_dir was not initialized in time

    Fround by: PHP Deprecated:  is_dir(): Passing null to parameter #1 ($filename) of type string is deprecated in /usr/local/ispconfig/server/lib/classes/backup.inc.php on line 1311

commit a41468bf
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 26 14:21:36 2022 +0100

    Avoid Automatic conversion of false to array is deprecated in cron.d/200-logfiles.inc.php

commit 5bb6e37a
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 26 12:41:04 2022 +0100

    Avoid php8.1 warning about shell_exec returning NULL

commit bb088056
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 26 10:36:40 2022 +0100

    an before a vowel

commit f5defafc
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Dec 25 22:42:20 2022 +0100

    Default to the records tab for found dns zones, #6436

commit a8d78f68
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Dec 25 21:30:38 2022 +0100

    Move asking to sql root to the place where its needed,

commit 996a7d71
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Dec 25 19:17:08 2022 +0100

    Extend ignore file for vscode

commit 8be92ac9
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Nov 29 23:23:48 2022 +0100

    fix typo

commit 614e7bd6
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 26 22:22:19 2022 +0200

    Indent for readability

commit f9f235c1
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Apr 24 21:28:09 2022 +0200

    Fix comment + linewrap

commit 093ad504
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Apr 17 22:51:55 2022 +0200

    Extra api example usage

commit 667212e8
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Dec 24 23:37:17 2022 +0100

    Fix stale i character, #6434

commit e042d3ea
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Dec 23 21:53:31 2022 +0100

    Avoid a warning is the dir does not exist

commit 4d2b2f5d
Author: Webslice <webslice@bixels.nl>
Date:   Thu Dec 22 09:43:56 2022 +0100

    Use PHP from path in server.sh

commit ace15083
Author: Dimitri <de@niih.de>
Date:   Fri Dec 16 23:23:09 2022 +0000

    fixes #6431 // make sure config file is deleted only during spamfilter_user event.

commit 14032d88
Author: Dimitri <de@niih.de>
Date:   Fri Dec 16 23:20:06 2022 +0000

    Revert "Merge branch '6431-rspamd-user-config-deleted-on-mail-user-changes' into 'develop'"

    This reverts merge request !1

commit ff4988ae
Merge: d53109aa a5845b13
Author: Dimitri <de@niih.de>
Date:   Fri Dec 16 22:52:19 2022 +0000

    Merge branch '6431-rspamd-user-config-deleted-on-mail-user-changes' into 'develop'

    fixes #6431 // make sure config file is deleted only during spamfilter_user event.

    See merge request dimitri/ispconfig3!1

commit a5845b13
Author: Dimitri <de@niih.de>
Date:   Fri Dec 16 22:29:13 2022 +0000

    fixes #6431 // make sure config file is deleted only during spamfilter_user event.

commit d53109aa
Merge: 1d6b37d9 17629b61
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 16 17:50:53 2022 +0000

    Merge branch '6430-php8-unable-to-add-database-on-multiserver-setup-withs-eparate-db-server' into 'develop'

    Resolve "PHP8: Unable to add database on multiserver setup withs eparate DB server"

    Closes #6430

    See merge request ispconfig/ispconfig3!1673

commit 17629b61
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 16 16:01:10 2022 +0000

    Update interface/web/sites/database_edit.php

commit cc39cc61
Author: Krzysztof Baranowski <krzysiek@hostname.pl>
Date:   Wed Dec 14 17:50:49 2022 +0000

    Update 300-quota_notify.inc.php

    Add all clients to array, use data when needed.

commit 1d6b37d9
Merge: 29f90a26 b5b8a585
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 9 08:29:58 2022 +0000

    Merge branch '6417-quota-unlimited-zero-vs--1' into 'develop'

    Unlimited quota is stored as -1, not zero, #6417

    Closes #6417

    See merge request ispconfig/ispconfig3!1668

commit 29f90a26
Merge: 9220d195 77ab6dda
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 9 08:28:49 2022 +0000

    Merge branch '6418-usage-sort' into 'develop'

    Mark usage column for php sorting, #6418

    Closes #6418

    See merge request ispconfig/ispconfig3!1669

commit 9220d195
Merge: 483cf6ff 697ce3b6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 9 08:28:12 2022 +0000

    Merge branch '6419-isset' into 'develop'

    PHP 8 strict fixes, #6419

    Closes #6419

    See merge request ispconfig/ispconfig3!1670

commit 483cf6ff
Merge: 9ab8755e da608f7f
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Dec 9 08:26:28 2022 +0000

    Merge branch 'sonority-develop-patch-76321' into 'develop'

    Fixed typo. Wrong "subjectAltName" with leading dot when using self-signed certificates.

    See merge request ispconfig/ispconfig3!1671

commit 9ab8755e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Dec 7 09:12:30 2022 +0000

    Update backup.inc.php fixed syntax error in log function in older PHP versions

commit b5b8a585
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Dec 6 23:03:34 2022 +0100

    -1 has no meaning for a mail_user quota, 0==unlimited and default.

commit 9648eaa8
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Dec 6 22:55:46 2022 +0100

    -1 has no meaning for a mail_user quota, 0==unlimited and default.

commit da608f7f
Author: Stephan Kellermayr <stephan.kellermayr@gmail.com>
Date:   Tue Dec 6 15:22:04 2022 +0000

    Fixed typo. Wrong "subjectAltName" with leading dot when using self-signed certificates.

commit 2133a988
Author: Herman van Rink <rink@initfour.nl>
Date:   Mon Dec 5 21:26:55 2022 +0100

    Revert unlimited quota check for email, dovecot forces this to be 0.

commit 697ce3b6
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Dec 4 22:53:09 2022 +0100

    PHP 8 strict fixes, #6419

commit 77ab6dda
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Dec 4 20:53:59 2022 +0100

    Mark usage column for php sorting, #6418

commit e11f336e
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Nov 27 22:51:13 2022 +0100

    tabs

commit 626ec513
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Nov 27 22:36:55 2022 +0100

    Unlimited quota is stored as -1, not zero, #6417

commit d0f92fc6
Merge: 7b15d049 d079b013
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Nov 24 18:53:18 2022 +0000

    Merge branch 'develop' into 'develop'

    APS deletion follows symlink

    See merge request ispconfig/ispconfig3!1666

commit d079b013
Author: clk <clk@teuto.net>
Date:   Thu Nov 24 13:27:32 2022 +0100

    Fixed file deletion bug

commit 502a66bb
Merge: 69c4da02 95377233
Author: Christian <chris@seeya.at>
Date:   Tue Nov 15 20:02:29 2022 +0000

    Merge branch 'develop' into 'develop'

    # Conflicts:
    #   install/dist/tpl/gentoo/apache_ispconfig.vhost.master

commit 69c4da02
Author: dachris1 <chris@seeya.at>
Date:   Tue Nov 15 20:12:06 2022 +0100

    updated based on debian config

    install/tpl/gentoo_postfix.conf.master
    updated based on debian config

commit f58ff87a
Author: dachris1 <chris@seeya.at>
Date:   Tue Nov 15 20:11:18 2022 +0100

    new config based on debian config

    added <IfModule mod_version.c> because gentoo has no mod version installed by default
    added <IfModule mod_proxy_fcgi.c>

commit 98f84fed
Author: dachris1 <chris@seeya.at>
Date:   Tue Nov 15 20:05:37 2022 +0100

    updated/added functions

    install/dist/lib/gentoo.lib.php
    updated functions:
    configure_postfix
    configure_dovecot
    install_ispconfig

    added configuration for pureftpd versions greater than 1.0.50

    added function get_host_ips() because gentoo does not provide IPs with "hostname --all-ip-addresses"

commit b81daafd
Author: dachris1 <chris@seeya.at>
Date:   Tue Nov 15 20:01:29 2022 +0100

    added gentoo specific code to keep symlinks in _getinitcommand

    server/lib/classes/system.inc.php
    added gentoo specific code to keep symlinks as init script. gentoo uses symlinks to start different php-fpm versions, but "realpath" kills these symlinks.

commit bc034728
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Aug 19 17:00:16 2022 +0200

    Restore onChange as an addition to OnPaste

    This could be refactorred into a function ...

commit 6d437a50
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Aug 17 21:04:51 2022 +0200

    Convert onChange to OnPaste

commit e5d54a65
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Feb 27 23:25:32 2022 +0100

    Paste email address to select mail domain