ISPConfig 3:c65925bd8d8c6fd93c47efc06bb7583c63f56155 commitshttps://git.ispconfig.org/ispconfig/ispconfig3/-/commits/c65925bd8d8c6fd93c47efc06bb7583c63f561552022-03-23T13:58:55+01:00https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c65925bd8d8c6fd93c47efc06bb7583c63f56155- move dev collection sql to update file2022-03-23T13:58:55+01:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1c231d2a81b9c8a6c69c201806b92c8c84d32982Merge branch '6307-remote-api-permissions-for-acme-proxy' into 'develop'2022-03-23T12:41:49+00:00Marius Burkardm.burkard@pixcept.de
remote api permissions for acme proxy
Closes #6307
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1585" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1585" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3360" data-project-path="ispconfig/ispconfig3" data-iid="1585" data-container="body" data-placement="top" title="remote api permissions for acme proxy" class="gfm gfm-merge_request">ispconfig/ispconfig3!1585</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d08ae171d09c682158c24f0de38973e6d751447eUpdate remote.conf.php, change # to //2022-03-23T12:32:59+00:00Marius Burkardm.burkard@pixcept.dehttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6d16621bca3a1e58578b5ed81a411bc77e4de24aApply 1 suggestion(s) to 1 file(s)2022-03-22T13:24:59+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ee8e8f4f344fa76764092cfdbc59cc859f744c74add acme proxy functions to remote api2022-03-21T17:39:42-06:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cab78c844931aa70a1ebe6acd9b3608bf3b0575eMerge branch '6306-incorrect-template-name-for-new-apparmor-template' into 'd...2022-03-21T12:39:46+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Incorrect template name for new AppArmor template"
Closes #6306
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1583" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1583" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3358" data-project-path="ispconfig/ispconfig3" data-iid="1583" data-container="body" data-placement="top" title='Resolve "Incorrect template name for new AppArmor template"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1583</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/817a2800460198eb812815868280c489d424a119Fix filename (add .master) (#6306)2022-03-21T12:30:48+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/db0c540950062ff56ac2202529ffbddc17bc9966Merge branch '6071-secondary-zones-dir' into 'develop'2022-03-21T10:44:57+00:00Marius Burkardm.burkard@pixcept.de
Add function to configure AppArmor (needed to allow use of /etc/bind for zone files) (#6701)
Closes #6071
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1582" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1582" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3357" data-project-path="ispconfig/ispconfig3" data-iid="1582" data-container="body" data-placement="top" title="Add function to configure AppArmor (needed to allow use of /etc/bind for zone files) (#6701)" class="gfm gfm-merge_request">ispconfig/ispconfig3!1582</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/cf9f51d0ce0387e0e9808e6a6d61aeccd0ffb71cMerge branch '6302-slightly-improved-debug-logging' into 'develop'2022-03-20T08:28:52+00:00Marius Burkardm.burkard@pixcept.de
feat: Add filename/line data to DEBUG messages
Closes #6302
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1580" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1580" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3347" data-project-path="ispconfig/ispconfig3" data-iid="1580" data-container="body" data-placement="top" title="feat: Add filename/line data to DEBUG messages" class="gfm gfm-merge_request">ispconfig/ispconfig3!1580</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/0ce6a64264ea119fd28943372067107d5013e315Merge branch '6302-slightly-improved-debug-logging' of...2022-03-19T21:11:51+00:00Gwyneth Llewelyngwyneth.llewelyn@gwynethllewelyn.netMerge branch '6302-slightly-improved-debug-logging' of git.ispconfig.org:GwynethLlewelyn/ispconfig3 into 6302-slightly-improved-debug-logging
https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/62974cc4060aca13465b1fd890b6d088f6282cb0Fix: make sure that 'file'/'line' are not empty2022-03-19T21:08:46+00:00Gwyneth Llewelyngwyneth.llewelyn@gwynethllewelyn.netThere may be no guarantee that `$caller[...]` is actually set, or that
either `file` or `line` are not empty.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d4429a7d8e93de864851b73da934279e3b0b5b1cGood point; I'd even use `!empty($caller['file']) && !empty($caller['line'])`...2022-03-19T20:59:09+00:00Marius Burkardm.burkard@pixcept.deGood point; I'd even use `!empty($caller['file']) && !empty($caller['line'])` to save a few cycles in the (improbable) case where both _may_ be set, but empty (thus making the whole exercise pointless...).https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c26713ccf7e29f7204d2cfffd37f8dcac5c8f4a0Add function to configure AppArmor (needed to allow use of /etc/bind for zone...2022-03-18T23:34:27+01:00Thom Polthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/60fa055c87ba0d0fd449703e74116375ff6105c1Merge branch '6270-allow-special-characters-in-folder-name-when-using-e-mail-...2022-03-18T12:34:02+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Allow special characters in folder name when using e-mail filter"
Closes #6270
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1581" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1581" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3356" data-project-path="ispconfig/ispconfig3" data-iid="1581" data-container="body" data-placement="top" title='Resolve "Allow special characters in folder name when using e-mail filter"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1581</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/d61be8a3dc096473994793938416db4ffd05be56Merge branch...2022-03-18T12:26:05+00:00Marius Burkardm.burkard@pixcept.deMerge branch '6301-delete-ssl-cert-symlinks-in-website-ssl-folder-when-acme-sh-is-used' into 'develop'
Resolve "Delete SSL cert symlinks in website ssl folder when acme.sh is used"
Closes #6301
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1578" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1578" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3341" data-project-path="ispconfig/ispconfig3" data-iid="1578" data-container="body" data-placement="top" title='Resolve "Delete SSL cert symlinks in website ssl folder when acme.sh is used"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1578</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/894d9c58a97aba697621fb538936d759471b1927Change regex to allow ' (#6270)2022-03-16T18:37:11+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/39c76960d925220ee6507ae47bb0357c93e9b07cfeat: Add filename/line data to DEBUG messages2022-03-15T19:40:55+00:00Gwyneth Llewelyngwyneth.llewelyn@gwynethllewelyn.netAlso, tried to clean up the code formatting according to the guidelines
_and_ added (most) entries for PHPDoc.https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/6ef85318c3d32e9c38cf5fda6e787debb3b06b31Update letsencrypt.inc.php2022-03-14T12:18:51+00:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8bb306efd1182e6a321e74a138e37785d84faff8Merge branch '6297-regression-update-jquery-broke-nginx-directive-snippet-lin...2022-03-13T07:41:48+00:00Marius Burkardm.burkard@pixcept.de
Update ispconfig.js
Closes #6297
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1577" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1577" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3339" data-project-path="ispconfig/ispconfig3" data-iid="1577" data-container="body" data-placement="top" title="Update ispconfig.js" class="gfm gfm-merge_request">ispconfig/ispconfig3!1577</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/993956a7e4c38bdc5570767e0259de4822faf556Update ispconfig.js2022-03-12T07:48:41+00:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/77fec95597526560bf1cbb74d75f309a51494270Merge branch 'develop' into 'develop'2022-03-09T16:30:31+00:00Marius Burkardm.burkard@pixcept.de
Develop
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1576" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1576" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3330" data-project-path="ispconfig/ispconfig3" data-iid="1576" data-container="body" data-placement="top" title="Develop" class="gfm gfm-merge_request">ispconfig/ispconfig3!1576</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/754c47105e29164a786b123bc79b884af8bc0a84Merge branch '6284-confidential-issue' into 'develop'2022-03-09T16:21:51+00:00Marius Burkardm.burkard@pixcept.de
6284 confidential issue
See merge request ispconfig-confidential/ispconfig3!7https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/e71e7738eed6348f5adbd529b6b8100804bf4281Merge branch '6266-add-socket-timeout-when-querying-eu-vat-id-verification-se...2022-03-09T08:59:39+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Add socket timeout when querying EU VAT-ID verification server"
Closes #6266
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1546" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1546" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3147" data-project-path="ispconfig/ispconfig3" data-iid="1546" data-container="body" data-placement="top" title='Resolve "Add socket timeout when querying EU VAT-ID verification server"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1546</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/de219355b8f71ffd492d12c806605738e1dc54c6Merge branch '6249-confidential-issue' into 'develop'2022-03-09T08:58:26+00:00Marius Burkardm.burkard@pixcept.de
Prevent unprivileged users from accessing or flushing the postfix mail queue
See merge request ispconfig-confidential/ispconfig3!6https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/1c9e4192d81da97677028b156d863efa88556e1fMerge branch '6296-confidential-issue' into 'develop'2022-03-09T08:52:27+00:00Marius Burkardm.burkard@pixcept.de
6296 confidential issue
See merge request ispconfig-confidential/ispconfig3!8https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/32aecc646b6cf5fd1c15de87249d52201728db0eUpdate validate_client.inc.php2022-03-09T08:50:54+00:00Till Brehmtbrehm@ispconfig.orghttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ddb6792686201f9e4d09efaec39326d23b0e475eMerge branch '6293-error-viewing-the-table-in-the-section-help-manage-questio...2022-03-09T08:30:44+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Error viewing the table in the section "help: manage question""
Closes #6293
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1560" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1560" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3277" data-project-path="ispconfig/ispconfig3" data-iid="1560" data-container="body" data-placement="top" title='Resolve "Error viewing the table in the section "help: manage question""' class="gfm gfm-merge_request">ispconfig/ispconfig3!1560</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/5962ae95bc109110ae2834b31f69eeda10494318Merge branch 'feature/admin_ip_whitelist_ipv6' into 'develop'2022-03-09T08:30:12+00:00Marius Burkardm.burkard@pixcept.de
Add IPv6 support for admin IP whitelist feature.
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1557" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1557" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3258" data-project-path="ispconfig/ispconfig3" data-iid="1557" data-container="body" data-placement="top" title="Add IPv6 support for admin IP whitelist feature." class="gfm gfm-merge_request">ispconfig/ispconfig3!1557</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c8c0fc4d4f850d527c534a189b889eb20c7ae099Merge branch '5928-remove-deprecated-bind-settings-from-template-config' into...2022-03-09T08:28:46+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Remove deprecated bind settings from template config"
Closes #5928
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1562" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1562" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3300" data-project-path="ispconfig/ispconfig3" data-iid="1562" data-container="body" data-placement="top" title='Resolve "Remove deprecated bind settings from template config"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1562</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/13810b5a213793d9cda5e83e1f9b2cab90062405Merge branch...2022-03-09T08:28:00+00:00Marius Burkardm.burkard@pixcept.deMerge branch '5948-add-redirect-to-https-for-ispconfig-interface-by-000-ispconfig-vhost-in-apache2' into 'develop'
Resolve "add redirect to https for ispconfig interface by 000-ispconfig.vhost in apache2"
Closes #5948
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1574" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1574" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3326" data-project-path="ispconfig/ispconfig3" data-iid="1574" data-container="body" data-placement="top" title='Resolve "add redirect to https for ispconfig interface by 000-ispconfig.vhost in apache2"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1574</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8244ab32b577650441851631b2a6e25675ac1d1bMerge branch '6246-missing-2-field_txt-in-de_dashlet_limits-lng' into 'develop'2022-03-09T08:26:08+00:00Marius Burkardm.burkard@pixcept.de
Resolve "Missing 2 $field_txt in de_dashlet_limits.lng"
Closes #6246
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1573" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1573" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3321" data-project-path="ispconfig/ispconfig3" data-iid="1573" data-container="body" data-placement="top" title='Resolve "Missing 2 $field_txt in de_dashlet_limits.lng"' class="gfm gfm-merge_request">ispconfig/ispconfig3!1573</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/512763167ef48fd96e0c60bacb07b265266ddbb7Remove the unlimited_txt string that is now included from the global lng file.2022-03-05T19:14:30+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/db636b5895d1b024100bb5d90914e4ba08781ad6Redirect error 400 (http request to https port) to https (#5948)2022-03-05T12:05:53+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/c4cd74fca6595da99d816c4d31a72fe93dc61175Improve PHP handler for apps vhost (#6296)2022-03-04T23:57:26+00:00Thomthom@amsterdamtech.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/a18e8bcecb84e965646cfbddaf9cbe5f6cb76735limit_mail_wblist_txt was missing for all languages _dashlet_limits.lng, #62462022-03-03T17:06:21+01:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/ad131a8ac87ff224c23ac5bf4686aee1bf395796Also include the global lng file, #62462022-03-03T16:21:58+01:00Herman van Rinkrink@initfour.nlhttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/8c2008dcfe028cf95efa505b10dd5fb9852a7970fix $app->system-> calls in system/ but not interface/2022-03-02T15:20:08-07:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/de80006ae2aa768ee051a0d537734e68651cff75fix include path2022-03-02T13:54:24-07:00Jesse Norelljesse@kci.nethttps://git.ispconfig.org/ispconfig/ispconfig3/-/commit/390d11601b82724de942c47aa5c947ac761551e0Merge branch 'courier-deprecated-warning' into 'develop'2022-03-02T07:32:17+00:00Marius Burkardm.burkard@pixcept.de
Add warning for Courier users
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1572" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1572" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3317" data-project-path="ispconfig/ispconfig3" data-iid="1572" data-container="body" data-placement="top" title="Add warning for Courier users" class="gfm gfm-merge_request">ispconfig/ispconfig3!1572</a>https://git.ispconfig.org/ispconfig/ispconfig3/-/commit/fff8f7f4cd643a03431c4f31a39f10a831e31399Merge branch '6290-detect-ispconfig-and-apps-port-by-file-existence' into 'de...2022-03-02T07:23:14+00:00Marius Burkardm.burkard@pixcept.de
Check if ISPConfig is configured with NGINX or with Apache instead of...
Closes #6290
See merge request <a href="/ispconfig/ispconfig3/-/merge_requests/1558" data-reference-type="merge_request" data-original="ispconfig/ispconfig3!1558" data-link="false" data-link-reference="false" data-project="1" data-merge-request="3262" data-project-path="ispconfig/ispconfig3" data-iid="1558" data-container="body" data-placement="top" title="Check if ISPConfig is configured with NGINX or with Apache instead of..." class="gfm gfm-merge_request">ispconfig/ispconfig3!1558</a>