Skip to content
  1. Oct 08, 2024
  3. Oct 01, 2024
  5. Sep 30, 2024
    • Helmo's avatar
      Squashed commit of the following (merging in origin/develop): · 4d2934a5
      Helmo authored 
      commit a07d9a07
Merge: 1169dfe9 153a59f8
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Sep 22 08:53:24 2024 +0000

    Merge branch '6766-database-prefix-is-not-working-correctly' into 'develop'

    Resolve "Database prefix is not working correctly"

    Closes #6766

    See merge request ispconfig/ispconfig3!1944

commit 153a59f8
Author: Till <t.brehm@ispconfig.org>
Date:   Sun Sep 22 10:44:06 2024 +0200

    Revert "De-duplicate onBeforeUpdate and onBeforeInsert"

    This reverts commit ba12d61b.

commit 1169dfe9
Merge: c4adbe90 43986d87
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sun Sep 22 06:28:12 2024 +0000

    Merge branch 'mysql_sha2' into 'develop'

    feat(mysql): Support the caching_sha2_password auth for newer MySQL servers

    Closes #6702 and #6695

    See merge request ispconfig/ispconfig3!1936

commit c4adbe90
Merge: a1d84058 4b20cfc0
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Sep 7 09:22:43 2024 +0000

    Merge branch 'SGr33n-develop-patch-58297' into 'develop'

    When update ISPConfig, if a custom port is set for the apps vhost domain, then it returns to the default 8081, only on the config file (remains custom on the web panel)

    Closes #5932

    See merge request ispconfig/ispconfig3!1939

commit a1d84058
Merge: 461a5bc6 24813061
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Sep 7 09:21:54 2024 +0000

    Merge branch 'develop' into 'develop'

    Create two new events in the remote lib to allow loading custom plugin fields.

    See merge request ispconfig/ispconfig3!1943

commit 24813061
Author: Michael <mepstein@mediabox.cl>
Date:   Fri Sep 6 20:06:12 2024 -0400

    Create two new events in the remote lib to allow loading custom plugin fields.

commit 461a5bc6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Aug 8 13:27:29 2024 +0000

    Update CONTRIBUTING.md

commit 4a49e012
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Aug 8 10:54:58 2024 +0000

    Update CONTRIBUTING.md

commit 0db3ec53
Merge: 29c4115d 264129f6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Aug 6 15:30:26 2024 +0000

    Merge branch '3.2.12p1' into 'develop'

    Merge changes from 3.2.12p1 into develop

    Closes #6754, #6755, and #6727

    See merge request ispconfig/ispconfig3!1941

commit 4b20cfc0
Author: Sergio <sdefalco@gmail.com>
Date:   Thu Aug 1 13:42:18 2024 +0000

    Fix #5932

commit 29c4115d
Merge: c865f18f c93ce2ac
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jul 26 14:18:04 2024 +0000

    Merge branch '6754-datalog' into 'develop'

    fix stored XSS issue in data log history detail page

    Closes #6754

    See merge request ispconfig/ispconfig3!1938

commit 43986d87
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 17:33:36 2024 +0200

    Reformat code & make it PHP 5.4 compatible. #6754

commit b4274a9c
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 06:26:20 2024 +0200

    mysql_clientdb_plugin: refactor & fix many bugs #6754

commit fa21a45e
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Tue Jul 23 02:10:21 2024 +0200

    Support the caching_sha2_password auth for newer MySQL servers #6754

commit c93ce2ac
Author: Daniel Jagszent <daniel@jagszent.de>
Date:   Thu Jul 25 06:48:20 2024 +0200

    fix stored XSS issue in data log history detail page

    fixes #6754

commit c865f18f
Merge: d228f63f 0e6d59da
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Fri Jul 19 09:53:43 2024 +0000

    Merge branch 'misc-updates' into 'develop'

    Misc updates

    See merge request ispconfig/ispconfig3!1935

commit 0e6d59da
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:35:38 2024 +0200

    Add missing name field, used in the delete query three lines down.

commit a80ceba9
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:23:12 2024 +0200

    Improve pattern match to not match things like webmail.example.com

    Such a website symlink would trigger warnings such as:
    Undefined array key "webmail.example.com" in /usr/local/ispconfig/server/lib/classes/cron.d/100-monitor_hd_quota.inc.php on line 124

commit 05defde3
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:22:16 2024 +0200

    fix indent

commit 07d0a0f7
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu Jul 18 23:22:01 2024 +0200

    Fix PHP Deprecated:  Creation of dynamic property cronjob_quota_notify::$_tools is deprecated in

commit ecfdb111
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jun 9 15:30:39 2024 +0200

    typo calculare

commit d228f63f
Merge: 5db4716d 1ed3fbd4
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:34:50 2024 +0000

    Merge branch 'develop' into 'develop'

    Change database username length to 32 from 16

    See merge request ispconfig/ispconfig3!1925

commit 5db4716d
Merge: 845de722 62a6d8d2
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:33:59 2024 +0000

    Merge branch '6737-Remove-space-before-comma-in-master.cf-at-smtpd_client_restrictions' into 'develop'

    Space before comma in postfix master configuration file at smtpd_client_restrictions, #6737

    Closes #6737

    See merge request ispconfig/ispconfig3!1930

commit 845de722
Merge: f83f54f5 952f58af
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:33:21 2024 +0000

    Merge branch '6736-remove-double-comma-in-master.cf-at-smtpd_helo_restrictions' into 'develop'

    Update 3 files

    Closes #6736

    See merge request ispconfig/ispconfig3!1932

commit f83f54f5
Merge: 929aea65 b0b0e6dc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Thu Jul 11 17:32:36 2024 +0000

    Merge branch '6739-correct-indentation-of-serveralias-in-apache-vhost-files' into 'develop'

    Indentation wrong on ServerAlias with apache vhosts, #6739

    Closes #6739

    See merge request ispconfig/ispconfig3!1933

commit b0b0e6dc
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 08:14:56 2024 +0000

    Update apache2_plugin.inc.php

commit 952f58af
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:47:48 2024 +0000

    Update file gentoo_postfix.conf.master

commit 62a6d8d2
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:46:35 2024 +0000

    Update 4 files

    - /install/tpl/debian_postfix.conf.master
    - /install/tpl/fedora_postfix.conf.master
    - /install/tpl/gentoo_postfix.conf.master
    - /install/tpl/opensuse_postfix.conf.master

commit 32bcf809
Author: C V <cv-web@4-werk.de>
Date:   Wed Jul 10 06:30:35 2024 +0000

    Update 3 files

    - /install/tpl/debian_postfix.conf.master
    - /install/tpl/fedora_postfix.conf.master
    - /install/tpl/opensuse_postfix.conf.master

commit 929aea65
Merge: 3ab3c288 d19cc6bd
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Tue Jul 9 11:47:35 2024 +0000

    Merge branch '6735-prettify-rspamd_antivirus.conf.master' into 'develop'

    Prettify for easy readability, #6735

    Closes #6735

    See merge request ispconfig/ispconfig3!1929

commit d19cc6bd
Author: C V <cv-web@4-werk.de>
Date:   Tue Jul 9 10:23:46 2024 +0000

    Prettify for easy readability

commit 3ab3c288
Merge: 257664f7 3e8e99d6
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jul 8 09:13:10 2024 +0000

    Merge branch '6729-cleanup-comment' into 'develop'

    Cleanup comment we generated, #6729

    Closes #6729

    See merge request ispconfig/ispconfig3!1928

commit 257664f7
Merge: 8fbb9525 0a40c5cc
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Mon Jul 8 09:11:36 2024 +0000

    Merge branch '6731-placeholder' into 'develop'

    Fix placeholder use for empty config, #6698

    Closes #6698

    See merge request ispconfig/ispconfig3!1926

commit 3e8e99d6
Author: Herman van Rink <rink@initfour.nl>
Date:   Sun Jul 7 15:16:33 2024 +0200

    Cleanup comment we generated, #6729

commit 8fbb9525
Merge: bcb8eb1e c9ff28a7
Author: Till Brehm <tbrehm@ispconfig.org>
Date:   Sat Jul 6 15:40:49 2024 +0000

    Merge branch '6733-external-cname' into 'develop'

    Warn about CNAME target missing, #6733

    Closes #6733

    See merge request ispconfig/ispconfig3!1927

commit c9ff28a7
Author: Herman van Rink <rink@initfour.nl>
Date:   Fri Jul 5 22:52:20 2024 +0200

    Warn about CNAME target missing, #6733

commit 0a40c5cc
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Jul 3 14:49:32 2024 +0200

    Fix placeholder use for empty config, #6731

commit 1ed3fbd4
Author: Wulff D. Heiss <styx@brr-nb>
Date:   Wed Jul 3 12:02:07 2024 +0200

    Change database username length to 32 from 16
      4d2934a5
  7. Sep 13, 2024
  9. Sep 10, 2024
    • Helmo's avatar
      Cleanup merge conflict · 6d3aaca2
      Helmo authored
      6d3aaca2
    • Helmo's avatar
      Squashed commit of the following: 6501-php-ssh-cron branch · 094a027f
      Helmo authored 
      commit 59ac3299
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Thu Apr 4 15:48:59 2024 +0200

    Remove unneeded tpl initiation in shelluser_jailkit_plugin.inc.php

commit 32e546f7
Merge: e7cab975 bf791d47
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Wed Apr 3 16:11:32 2024 +0200

    Merge remote-tracking branch 'helmo/6501-php-ssh-cron' into 6501-php-ssh-cron

commit bf791d47
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Apr 3 16:01:21 2024 +0200

    Move /etc/alternatives/php code to update_jailkit_chroot()

commit f1627daf
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Apr 3 15:54:28 2024 +0200

    Make sure we have a clean $options for each iteration

commit e7cab975
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 31 15:31:59 2024 +0200

    Use the more appropriate is_array instead of !empty

commit 2f0e632a
Merge: 62afa4f3 b2e68414
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sat Mar 30 11:02:53 2024 +0100

    Resolve merge conflict

commit 62afa4f3
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Mar 13 16:25:11 2024 +0100

    Match on files, not dirs

commit c476308e
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 16:43:32 2024 +0100

    Use  instead of

commit 1ac5be95
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 15:06:35 2024 +0100

    Source .bashrc from the ~/.profile file

commit 5ceb256a
Merge: 32bbf9a3 e318f995
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Mar 10 12:13:58 2024 +0100

    Merge branch 'develop' into 6501-php-ssh-cron

commit 32bbf9a3
Author: Herman van Rink <rink@initfour.nl>
Date:   Wed Mar 6 15:52:57 2024 +0100

    Indents

commit 559320ed
Merge: d2b8a4ea 0d1297b6
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Mar 4 16:25:38 2024 +0100

    Resolved merge conflict

commit d2b8a4ea
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Mar 4 15:53:22 2024 +0100

    Update of branch:
    - Use alternatives for jailed shell accounts in Debian/Ubuntu systems instead of an alias
    - Made the file /etc/bash.bashrc obsolete
    - command_format updated so that the domain placeholder can be used for wget commands
    - Introduction of the .bashrc.d directory for shell users so that they can extend their Bash environment more flexibly and easily via resource files
    - Minor refactoring and other changes

commit b78a8eb5
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Feb 11 00:15:52 2024 +0100

    Revert div

commit 4f6eb2c2
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Feb 11 00:13:37 2024 +0100

    Transform the domain placeholder in command_format function

commit 50266744
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Thu Feb 8 00:17:14 2024 +0100

    Load tpl in _setup_jailkit_chroot
    Check prior creating symlinks in SFTP home directory if the symlinks already exists

commit 242f3c94
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 28 21:24:16 2024 +0100

    Update reloadCronPlaceholders()

commit 4058fa9c
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 28 16:50:20 2024 +0100

    Fix issue #6633
    Jailkit update on every cron change
    Patch by WHO

commit 3f1f82ce
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Tue Jan 23 16:32:01 2024 +0100

    Load and display a hint for the user if no web_domain has been created or assigned by the user

commit 8d58b896
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 22:21:10 2024 +0100

    Select and load placeholder data of the first existing domain

commit fd9b8930
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 15:17:18 2024 +0100

    Don't check permissions of the web when a user wants to create a new cronjob

commit 3315b7dc
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 13:35:15 2024 +0100

    Removed unnecessary GET

commit 3d74e935
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Mon Jan 22 13:32:58 2024 +0100

    Fixed jquery controlled chroot/full placeholders

commit cb23b734
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 21 16:51:28 2024 +0100

    Update the placeholders when changing domains
    However, detection of cron_type needs some work

commit 3ac0d7c0
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 14 12:09:37 2024 +0100

    Backported the patches:
    [PATCH] Add placeholder values, update command_hint_txt to match
    [PATCH] Handle chrooted sites

commit 86f21484
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Jan 14 12:07:32 2024 +0100

    remove debug line

commit 8543fd1c
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sat Jan 13 11:45:27 2024 +0100

    clean up of php-ssh-cron branch

commit 1f1350c5
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Fri Dec 8 12:23:50 2023 +0100

    Clean up

commit eec29823
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Wed Nov 29 13:35:32 2023 +0100

    Revert changes

commit fc96c644
Author: Michael Seevogel <git@michaelseevogel.de>
Date:   Sun Nov 19 20:47:05 2023 +0100

    Add current PHP enhancements (WiP)
      094a027f
  11. Sep 06, 2024
  13. Jul 26, 2024
  15. Jul 18, 2024
  17. Jun 22, 2024
  19. Jun 20, 2024
  21. Jun 19, 2024
  23. Jun 18, 2024
  25. Jun 16, 2024
  27. Jun 15, 2024
  29. Jun 14, 2024
  31. Jun 13, 2024