Without it it caused: Column 'sys_userid' in where clause is ambiguous

Re-fix "Re-add mergeconflict code from !1790 Show last access information for mail users - frontendonly"

This reverts commit bfd05fe4.

Up to e318f995: Merge branch '6358-DNS-rr-sort-fix' into 'develop'

Conflicts solved with `git merge --squash origin/develop -X theirs`:

Merge conflict in interface/lib/lang/??.lng
Merge conflict in interface/web/admin/lib/lang/??_system_config.lng
Merge conflict in interface/web/dns/dns_dmarc_edit.php
Merge conflict in interface/web/mail/lib/lang/de_mail_user.lng
Merge conflict in interface/web/mail/templates/mail_user_list.htm
Merge conflict in interface/web/sites/web_vhost_domain_edit.php
Merge conflict in server/plugins-available/rspamd_plugin.inc.php

Squashed commit of the following:

commit e318f995
Merge: b6390d6c 9d62b68a
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Mar 7 20:54:25 2024 +0000

    Merge branch '6358-DNS-rr-sort-fix' into 'develop'

    Should fix the dns rr sort bug #6358

    Closes #6358

    See merge request ispconfig/ispconfig3!1855

commit b6390d6c...

E.g. https://git.ispconfig.org/ispconfig/Modules/-/tree/master/check_ispconfig?ref_type=heads

Apply 1802: All ISPConfig files have execute bit set after installation. This is unnecessary and confusing.

commit 012fb402
Merge: 5794207b 93680219
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 10 17:57:13 2023 +0000

    Merge branch '6618-accidental-quotes-around-record' into 'develop'

    Remove accidental quotes around a record, #6618

    Closes #6618

    See merge request ispconfig/ispconfig3!1828

commit 93680219
Author: Helmo <rink@initfour.nl>
Date:   Sun Dec 10 17:57:12 2023 +0000

    Remove accidental quotes around a record, #6618

commit 5794207b
Merge: 8c464f7a e3057ac5
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 3 18:40:32 2023 +0000

    Merge branch '6542_copy_email_to_clipboard' into 'develop'

    6542_copy_to_clipboard_with_css_class

    See merge request ispconfig/ispconfig3!1809

commit 8c464f7a
Merge: 69e2449c b9ece509
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 3 18:39:04 2023 +0000

    Merge branch '6595_php_deprecated_warning_letsencrypt' into 'develop'

    6595_php_deprecated_warning_letsencrypt

    See merge request ispconfig/ispconfig3!1820

commit 69e2449c
Merge: 0157f1ae c1f39c0c
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 3 18:38:13 2023 +0000

    Merge branch '6584-dns-any-not-allowed-in-also_notify-bind-restart-fail' into 'develop'

    Resolve "DNS - any not allowed in also_notify [bind restart fail]"

    Closes #6584

    See merge request ispconfig/ispconfig3!1819

commit 0157f1ae
Merge: 1901ab2a 6d8c2dbf
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 3 18:36:33 2023 +0000

    Merge branch '6606_de_mail_user_german_lang_fix' into 'develop'

    6606_de_mail_user_german_lang_fix

    Closes #6606

    See merge request ispconfig/ispconfig3!1825

commit 1901ab2a
Merge: 9539e9b9 e1adb40d
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Dec 3 18:35:35 2023 +0000

    Merge branch 'default-mysql-remote-ip' into 'develop'

    Enable Default Remote IP for MySQL user regardless of the database and web server

    See merge request ispconfig/ispconfig3!1744

commit 6d8c2dbf
Author: Johannes Koschier <hannes@cheat.at>
Date:   Fri Nov 17 08:24:47 2023 +0000

    6606_de_mail_user_german_lang_fix

commit e3057ac5
Author: Johannes Koschier <hannes@cheat.at>
Date:   Tue Nov 7 19:00:09 2023 +0000

    6542_copy_to_clipboard_with_css_class

commit 9539e9b9
Merge: 46edad9c c830ae5e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Nov 2 15:26:14 2023 +0000

    Merge branch '6599-issue-in-ajax_get_json-php-when-dkim_strength-0' into 'develop'

    Resolve "Issue in ajax_get_json.php when $dkim_strength = 0"

    Closes #6599

    See merge request ispconfig/ispconfig3!1823

commit c830ae5e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Nov 2 15:17:27 2023 +0000

    Fixes issue #6599

commit 46edad9c
Merge: b28c39db 4593d5eb
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 28 10:46:55 2023 +0000

    Merge branch '6597-typo-in-tform_base-inc-php' into 'develop'

    Resolve "Typo in tform_base.inc.php"

    Closes #6597

    See merge request ispconfig/ispconfig3!1822

commit 4593d5eb
Author: Thom <thom@amsterdamtech.nl>
Date:   Fri Oct 27 16:54:37 2023 +0200

    Fix typo (#6597)

commit b28c39db
Merge: 79db22f9 1d027303
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Oct 26 10:25:39 2023 +0000

    Merge branch 'branch-3-2-11-p1' into 'develop'

    Fixes #6596 improve language file editor input validation

    Closes #6596

    See merge request ispconfig/ispconfig3!1821

commit 1d027303
Author: Till <t.brehm@ispconfig.org>
Date:   Thu Oct 26 12:06:05 2023 +0200

    Fixes #6596 improve language file editor input validation

commit b9ece509
Author: Johannes Koschier <hannes@cheat.at>
Date:   Tue Oct 24 09:29:48 2023 +0000

    6595_php_deprecated_warning_letsencrypt

commit 79db22f9
Merge: 7a2fadda fd6f638b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 10:08:23 2023 +0000

    Merge branch '6518-remove-default-rbl-entry-for-spamhaus' into 'develop'

    Resolve "Remove default RBL entry for Spamhaus"

    Closes #6518

    See merge request ispconfig/ispconfig3!1817

commit 7a2fadda
Merge: 3b435194 cf312f0c
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 10:07:56 2023 +0000

    Merge branch '6330-rescue-core-module-for-apache-seems-to-be-broken' into 'develop'

    Resolve "Rescue core module for apache seems to be broken"

    Closes #6330

    See merge request ispconfig/ispconfig3!1818

commit c1f39c0c
Author: Thom <thom@amsterdamtech.nl>
Date:   Sat Oct 21 11:49:36 2023 +0200

    Do not allow the value `any` for also_notify (#6584)

commit cf312f0c
Author: Thom <thom@amsterdamtech.nl>
Date:   Sat Oct 21 11:28:33 2023 +0200

    Add start and stop as valid systemd actions (#6330)

commit fd6f638b
Author: Thom <thom@amsterdamtech.nl>
Date:   Sat Oct 21 11:21:52 2023 +0200

    Remove default RBL entry for Spamhaus (#6518)

commit 3b435194
Merge: da24a4f5 cd17083b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 09:12:14 2023 +0000

    Merge branch 'revert-da24a4f5' into 'develop'

    Revert HTML support for autoresponder

    See merge request ispconfig/ispconfig3!1816

commit cd17083b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 09:02:54 2023 +0000

    Revert "Merge branch 'develop' into 'develop'"

    This reverts merge request !1812

commit da24a4f5
Merge: 55c935c0 3aab298c
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 08:33:59 2023 +0000

    Merge branch 'develop' into 'develop'

    Implements #6582 Autoresponder in HTML format

    Closes #6582

    See merge request ispconfig/ispconfig3!1812

commit 3aab298c
Author: Riccardo Leonardi <riccardo@xtsystem.it>
Date:   Sat Oct 21 08:33:59 2023 +0000

    Implements #6582 Autoresponder in HTML format

commit 55c935c0
Merge: c2945688 e5a9f19e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 07:58:19 2023 +0000

    Merge branch 'CronDeprecatedWarnings_Clamav_Mem' into 'develop'

    Fixes PHP warnings in monitor for mem and clamav

    See merge request ispconfig/ispconfig3!1810

commit e5a9f19e
Author: Nathaniel Mitchell <nephi.aust@gmail.com>
Date:   Sat Oct 21 07:58:19 2023 +0000

    Fixes PHP warnings in monitor for mem and clamav

commit c2945688
Merge: 496864a8 ecc9b9e7
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 21 07:49:47 2023 +0000

    Merge branch '6593-database-connection-breaks-when-reconfiguring-the-master-database-details-on-master-or-single' into 'develop'

    Resolve "Database connection breaks when reconfiguring the master database details on master or single node"

    Closes #6593

    See merge request ispconfig/ispconfig3!1815

commit ecc9b9e7
Author: Till <t.brehm@ispconfig.org>
Date:   Sat Oct 21 09:41:10 2023 +0200

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

    This reverts commit a8d78f68.

commit 496864a8
Merge: 769bf053 b4abe786
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 14 10:19:56 2023 +0000

    Merge branch '6589-caa-record-for-subdomain-none-is-added-when-auto-subdomain-is-set-to-none' into 'develop'

    Resolve "CAA record for subdomain 'none' is added when auto subdomain is set to none"

    Closes #6589

    See merge request ispconfig/ispconfig3!1814

commit b4abe786
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Oct 14 10:11:21 2023 +0000

    Update system_config_dns_ca_plugin.inc.php

commit 769bf053
Merge: 2315b812 7c2bb882
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Oct 3 12:07:42 2023 +0000

    Merge branch '6585-php-warning-undefined-array-key-ip-in-tmp-update_runner-sh-mqxkxglcyo-install-lib' into 'develop'

    Resolve "PHP Warning:  Undefined array key "ip" in /tmp/update_runner.sh.MQXkxglcyo/install/lib/installer_base.lib.php on line 2995"

    Closes #1813 and #6585

    See merge request ispconfig/ispconfig3!1813

commit 7c2bb882
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Oct 3 11:59:04 2023 +0000

    Fixes #1813

commit 2315b812
Merge: 28ade7ee f81d3f2b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Sep 28 19:18:16 2023 +0000

    Merge branch '6581-nginx-plugin-phpfpm-reload-mode-support' into 'develop'

    Use PHP-FPM reload mode from server configuration when nginx_plugin ask for a...

    Closes #6581

    See merge request ispconfig/ispconfig3!1811

commit f81d3f2b
Author: Manoa Ratefiarison <manoaratefy@gmail.com>
Date:   Tue Sep 26 07:30:13 2023 +0000

    Use PHP-FPM reload mode from server configuration when nginx_plugin ask for a PHP-FPM reload (Fixes #6581)

commit 28ade7ee
Merge: 09d19774 9c2cbd07
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Sep 22 09:35:56 2023 +0000

    Merge branch 'develop-patch-ed7f' into 'develop'

    Fix typo in french translation

    See merge request ispconfig/ispconfig3!1808

commit 9c2cbd07
Author: Jonas <22-jnsc@users.noreply.git.ispconfig.org>
Date:   Fri Sep 22 09:35:56 2023 +0000

    Fix typo in french translation

commit 09d19774
Merge: 127f3296 ba07b9d1
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 20 11:21:13 2023 +0000

    Merge branch 'develop' into 'develop'

    Added ignores for VSCode (missing items)

    See merge request ispconfig/ispconfig3!1806

commit ba07b9d1
Author: Nathaniel Mitchell <nephi.aust@gmail.com>
Date:   Wed Sep 20 11:21:13 2023 +0000

    Added ignores for VSCode (missing items)

commit 127f3296
Merge: eccdad35 6aff4fde
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 20 09:45:41 2023 +0000

    Merge branch '6580-interface_base_url' into 'develop'

    Allow overriding the interface_base_url for password reset mails, #6580

    Closes #6580

    See merge request ispconfig/ispconfig3!1807

commit 6aff4fde
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Sep 19 22:09:44 2023 +0200

    Allow overriding the interface_base_url for password reset mails, #6580

commit eccdad35
Merge: a25dd9bc 11e59c89
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Sep 14 16:32:29 2023 +0000

    Merge branch '6575-fix-dns-dmarc-validation' into 'develop'

    Updated validation for DNS DMARC creation/update fixes #6575

    Closes #6575

    See merge request ispconfig/ispconfig3!1804

commit 11e59c89
Author: Pyte C <accounts@pytech.de>
Date:   Thu Sep 14 16:32:29 2023 +0000

    Updated validation for DNS DMARC creation/update fixes #6575

commit a25dd9bc
Merge: de2879c0 af5bdb6b
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Sep 14 16:25:06 2023 +0000

    Merge branch '6574-avoid-no-crontab-for' into 'develop'

    Avoid "no crontab for ..." message

    Closes #6574

    See merge request ispconfig/ispconfig3!1803

commit af5bdb6b
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Sat Sep 9 18:31:17 2023 +0300

    Avoid "no crontab for ..." message

commit de2879c0
Merge: 3a18fe7f 2482e0e3
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Sep 9 05:38:54 2023 +0000

    Merge branch '6572-$issued_successfully' into 'develop'

    Undefined variable $issued_successfully

    Closes #6572

    See merge request ispconfig/ispconfig3!1801

commit 2482e0e3
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Fri Sep 8 22:02:08 2023 +0300

    Undefined variable $issued_successfully

commit 3a18fe7f
Merge: 93d72697 261f8963
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Sep 8 12:07:16 2023 +0000

    Merge branch '6569-apache2-fcgid.conf' into 'develop'

    apache2 fcgid.conf should place new argument inside IfModule

    Closes #6569

    See merge request ispconfig/ispconfig3!1799

commit 93d72697
Merge: 17813374 63a0b0f4
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Sep 8 12:06:05 2023 +0000

    Merge branch '6570-apache2-NameVirtualHost' into 'develop'

    apache2 adding commented NameVirtualHost lines makes no sense

    Closes #6570

    See merge request ispconfig/ispconfig3!1800

commit 63a0b0f4
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Fri Sep 8 13:21:01 2023 +0300

    apache2 adding commented NameVirtualHost lines makes no sense

commit 261f8963
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Fri Sep 8 13:18:11 2023 +0300

    apache2 fcgid.conf should place new argument inside IfModule

commit 17813374
Merge: cf19610c c36a5e5d
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:52:20 2023 +0000

    Merge branch 'missing-lang' into 'develop'

    Add missing translation strings datalog_status_(i|u|d)_client

    See merge request ispconfig/ispconfig3!1792

commit cf19610c
Merge: 8e11b0c2 d8083bb8
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:51:14 2023 +0000

    Merge branch '6564-master.cf-Debian-12' into 'develop'

    master.cf changed on Debian 12 aka Bookworm

    Closes #6564

    See merge request ispconfig/ispconfig3!1794

commit 8e11b0c2
Merge: 9fb01cb5 c3ead725
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:50:45 2023 +0000

    Merge branch '6565-configure_dovecot()' into 'develop'

    configure_dovecot() in installer is creating master.cf~2

    Closes #6565

    See merge request ispconfig/ispconfig3!1795

commit 9fb01cb5
Merge: 0e929747 235f2e36
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:50:12 2023 +0000

    Merge branch '6566-rspamd' into 'develop'

    rspamd configuration files have execute bit set

    Closes #6566

    See merge request ispconfig/ispconfig3!1796

commit 0e929747
Merge: e6594513 b6eb85f9
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:49:34 2023 +0000

    Merge branch '6567-jailkit-backup' into 'develop'

    jailkit wrong file backup'ed

    Closes #6567

    See merge request ispconfig/ispconfig3!1797

commit e6594513
Merge: 7c9b2065 73a09424
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Sep 6 08:49:00 2023 +0000

    Merge branch '6568-jailkit-php8.2' into 'develop'

    jailkit php 8.2 references wrong directory

    Closes #6568

    See merge request ispconfig/ispconfig3!1798

commit 73a09424
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Tue Sep 5 17:45:21 2023 +0300

    jailkit php 8.2 references wrong directory

commit b6eb85f9
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Tue Sep 5 17:38:25 2023 +0300

    jailkit wrong file backup'ed

commit 235f2e36
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Mon Sep 4 14:14:01 2023 +0300

    rspamd configuration files have execute bit set

commit c3ead725
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Mon Sep 4 00:33:20 2023 +0300

    configure_dovecot() in installer is creating master.cf~2

commit d8083bb8
Author: Dr. Yves Kreis <yves@hosting-skills.lu>
Date:   Sun Sep 3 19:19:14 2023 +0300

    master.cf changed on Debian 12 aka Bookworm

commit c36a5e5d
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Aug 20 22:52:55 2023 +0200

    Add missing translation strings datalog_status_(i|u|d)_domain

commit eea78ec0
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Aug 20 22:47:59 2023 +0200

    Add missing translation strings datalog_status_(c|u|d)_client

commit 7c9b2065
Merge: 774d7709 7c9ecfff
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Aug 7 14:31:05 2023 +0000

    Merge branch '6554-user-and-group-warnings-during-ispconfig-update' into 'develop'

    Resolve "User and group warnings during ISPConfig update"

    Closes #6554

    See merge request ispconfig/ispconfig3!1786

commit 774d7709
Merge: dab6683b 7ca2f4d1
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Aug 7 14:18:26 2023 +0000

    Merge branch 'master' into 'develop'

    change adduser to usermod -a -G in install/dist/lib/gentoo.lib.php

    See merge request ispconfig/ispconfig3!1787

commit 7c9ecfff
Author: Till <t.brehm@ispconfig.org>
Date:   Mon Aug 7 16:13:23 2023 +0200

    Fixes adduser warnings during update.

commit 7ca2f4d1
Author: dachris1 <chris@seeya.at>
Date:   Mon Aug 7 16:06:43 2023 +0200

    install/dist/lib/gentoo.lib.php

    there are some parts where a user is added to a group with "adduser" command.
    changed "adduser" to "usermod -a -G" since there is no "adduser" in gentoo.

commit dab6683b
Merge: 6eba52b0 85fa5d55
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:37:13 2023 +0000

    Merge branch '6549-switching-form-tabs-does-not-work-when-opening-website-form-from-dashboard' into 'develop'

    Resolve "Switching form tabs does not work when opening website form from dashboard"

    Closes #6549

    See merge request ispconfig/ispconfig3!1783

commit 6eba52b0
Merge: 0040ca46 b8929250
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:32:30 2023 +0000

    Merge branch '6521_database_list_sort_on_dbuser_column' into 'develop'

    6521_database_list_sort_on_dbuser_column

    See merge request ispconfig/ispconfig3!1756

commit 0040ca46
Merge: cb586056 93628b09
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:30:26 2023 +0000

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

    Fixed regex pattern for dkim_selector #6459

    Closes #6459

    See merge request ispconfig/ispconfig3!1769

commit cb586056
Merge: 1731a995 67084ffe
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:25:18 2023 +0000

    Merge branch '6532_prevent_change_event_option' into 'develop'

    6532_prevent_change_event_option

    Closes #6532

    See merge request ispconfig/ispconfig3!1763

commit 1731a995
Merge: f3b12918 2513df3f
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:22:27 2023 +0000

    Merge branch '6521_database_list_sort_on_dbuser_column_admin' into 'develop'

    Fix sorting of the database list by user, #6521

    See merge request ispconfig/ispconfig3!1773

commit f3b12918
Merge: 58589c24 402759bd
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:21:03 2023 +0000

    Merge branch '6495-client-language-translation' into 'develop'

    Add language_error_empty to the language files, #6495

    See merge request ispconfig/ispconfig3!1774

commit 58589c24
Merge: 7b215c24 63e55482
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:20:42 2023 +0000

    Merge branch '6495-client-language-as-required' into 'develop'

    Setting the language as a required field when creating a client

    Closes #6495

    See merge request ispconfig/ispconfig3!1719

commit 63e55482
Author: Adam <adam@freshost.cz>
Date:   Fri Aug 4 16:20:41 2023 +0000

    Setting the language as a required field when creating a client

commit 7b215c24
Merge: cd64ab6b ab8dc77a
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:18:28 2023 +0000

    Merge branch '6550-mysql-user-password-not-updated-when-changing-it-from-ispconfig' into 'develop'

    Resolve "ISPConfig does not show red blinking dot when MySQL user password is changed"

    Closes #1782 and #6550

    See merge request ispconfig/ispconfig3!1782

commit cd64ab6b
Merge: a6d95dff b3735ebc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:18:07 2023 +0000

    Merge branch '6545-page-title-content-specific' into 'develop'

    Generalize the form title to be content aware, #6545

    See merge request ispconfig/ispconfig3!1775

commit 85fa5d55
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:14:59 2023 +0000

    Fixes #6549

commit ab8dc77a
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 16:08:37 2023 +0000

    Fixed issue #1782

commit a6d95dff
Merge: c053973c 9b92212e
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Aug 4 15:52:21 2023 +0000

    Merge branch '6551-improve-php-8-2-support' into 'develop'

    Resolve "Improve PHP 8.2 support"

    Closes #6551

    See merge request ispconfig/ispconfig3!1781

commit 9b92212e
Author: Till <t.brehm@ispconfig.org>
Date:   Fri Aug 4 17:39:16 2023 +0200

    Fixed various PHP 8.2 related warnings.

commit c053973c
Merge: c3c4fbcf d675db60
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Aug 3 18:02:11 2023 +0000

    Merge branch 'master' into 'develop'

    dovecot2.conf.master for gentoo

    See merge request ispconfig/ispconfig3!1780

commit d675db60
Author: dachris1 <chris@seeya.at>
Date:   Thu Aug 3 16:27:23 2023 +0200

    dovecot2.conf.master for gentoo

commit c3c4fbcf
Merge: 476b8e84 b9837790
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Wed Aug 2 20:16:59 2023 +0000

    Merge branch '6527-add-support-for-debian-12' into 'develop'

    Resolve "Add support for Debian 12"

    Closes #6527

    See merge request ispconfig/ispconfig3!1777

commit b9837790
Author: Till <t.brehm@ispconfig.org>
Date:   Wed Aug 2 14:40:56 2023 +0200

    PHP 8.2 fix

commit 841e96d4
Author: Till <t.brehm@ispconfig.org>
Date:   Wed Aug 2 14:25:37 2023 +0200

    Fixed some php 8.2 warnings

commit cd17793e
Author: Till <t.brehm@ispconfig.org>
Date:   Wed Aug 2 12:59:29 2023 +0200

    Add support for Debian 12.

commit b3735ebc
Author: Herman van Rink <rink@initfour.nl>
Date:   Tue Jul 25 22:59:10 2023 +0200

    Generalize the form title to be content aware, #6545

commit 402759bd
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 23 23:19:27 2023 +0200

    Add language_error_empty to the language files, #6495

    In addition to !1719

commit 2513df3f
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 23 21:39:28 2023 +0200

    Fix sorting of the database list by user, #6521

commit 93628b09
Author: Demian <demian@pytech.de>
Date:   Fri Jul 7 09:17:29 2023 +0200

    Add new error message for invalid dkim slector #6459

    As the regex condition changed, the error message for invalid did too.
    Lanuage files for en/de/es are now state the new rules for a valid selector.

commit c6159a27
Author: Demian <demian@pytech.de>
Date:   Fri Jul 7 09:12:04 2023 +0200

    Fixed regex pattern for dkim_selector #6459

    Changed the regex pattern for dkim_selectors again. We now follow
    the DKIMCore technical specification as stated on the website:

    A selector is a string of no more than 63 lower-case alphanumeric characters (a-z or 0-9) followed by a period “.”, followed by another string of no more than 63 lower-case alphanumeric characters.

commit 67084ffe
Author: Johannes Koschier <hannes@cheat.at>
Date:   Fri Jun 23 07:29:36 2023 +0000

    6532_prevent_change_event_option

commit b8929250
Author: Johannes Koschier <hannes@cheat.at>
Date:   Wed Jun 7 09:35:53 2023 +0000

    6521_database_list_sort_on_dbuser_column

commit e1adb40d
Author: Branislav Viest <info@branoviest.com>
Date:   Tue May 23 11:59:47 2023 +0200

    Added check if default configuration is set

commit 4d302738
Author: Branislav Viest <info@branoviest.com>
Date:   Tue May 23 11:53:22 2023 +0200

    Configure Default mysql remote server regardless where website and database are created

ispconfig/ispconfig3!1790 (diffs)

This reverts commit ebfcf15a.

This reverts commit d45ab41b.

Up to:
commit 87e02a00
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 30 15:38:45 2023 +0200

    cleanup

   1e6ca895..c1d83cb4  5374-mail-last-accessed -> 5374-mail-last-accessed
   3ce8e22d..3ba072a2  6552-mail_quota_show -> 6552-mail_quota_show
   0d933fcc..e24a5449  6553-email_show_aliases -> 6553-email_show_aliases

commit 74efda9d
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jul 29 11:55:50 2023 +0200

    Do not show data from other users when viewing the client dashboard as an admin

commit eee2d246
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 2 00:02:36 2023 +0200

    Support reseller in dashboard

commit 4c2c3391
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jul 1 23:54:32 2023 +0200

    Add an extra utility function is_reseller

commit 97418859
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 18 20:34:42 2023 +0200

    Rework dashlet code

    - Move translations more to the frontend code

commit e406c48c
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Jul 29 11:20:28 2023 +0200

    Revert "Fixes #6528 Account limit incorrectly informed in dashboard"

    This reverts commit 224a5966.