Merge remote-tracking branch 'origin/main' into v2.2

install/froxlor.sql.php

@@ -733,7 +733,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
 	('panel', 'menu_collapsed', '1'),
-	('panel', 'version', '2.2.5'),
+	('panel', 'version', '2.2.6'),
 	('panel', 'db_version', '202412030');
 
 

install/updates/froxlor/update_2.2.inc.php

@@ -245,3 +245,8 @@ if (Froxlor::isDatabaseVersion('202411200')) {
 
 	Froxlor::updateToDbVersion('202412030');
 }
+
+if (Froxlor::isFroxlorVersion('2.2.5')) {
+	Update::showUpdateStep("Updating from 2.2.5 to 2.2.6", false);
+	Froxlor::updateToVersion('2.2.6');
+}

lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php

@@ -233,9 +233,7 @@ class AcmeSh extends FroxlorCron
 			");
 			$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
 			// also check for possible existing certificate
-			if (($froxlor_ssl && empty($froxlor_ssl['validtodate']))
-				|| (!$froxlor_ssl && !self::checkFsFilesAreNewer(Settings::Get('system.hostname'), date('Y-m-d H:i:s')))
-			) {
+			if (!$froxlor_ssl || empty($froxlor_ssl['validtodate'])) {
 				return true;
 			}
 		}

lib/Froxlor/Froxlor.php

@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.2.5';
+	const VERSION = '2.2.6';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202412030';

templates/Froxlor/assets/js/jquery/domains.js

@@ -67,6 +67,38 @@ export default function () {
 			});
 		}
 
+		// show warning if emaildomain option is set to disabled but was enabled
+		if ($('input[name=emaildomainverified]')) {
+			$('input[name=isemaildomain]').on('click', function () {
+				$('#emaildomainnote').remove();
+				$('#isemaildomain').removeClass('is-invalid');
+				$('#emaildomainverified').val(0);
+				const cFileName = window.location.pathname.substring(window.location.pathname.lastIndexOf("/")+1);
+				$.ajax({
+					url: cFileName + "?page=overview&action=jqEmaildomainNote",
+					type: "POST",
+					data: {
+						id: $('input[name=id]').val(), newval: +$('#isemaildomain').is(':checked')
+					},
+					dataType: "json",
+					async: false,
+					beforeSend: function (request) {
+						request.setRequestHeader('X-CSRF-TOKEN', document.querySelector('meta[name="csrf-token"]').getAttribute('content'));
+					},
+					success: function (json) {
+						if (json.changed) {
+							$('#isemaildomain').addClass('is-invalid');
+							$('#isemaildomain').parent().append(json.info);
+							$('#emaildomainverified').val(1);
+						}
+					},
+					error: function (a, b) {
+						console.log(a, b);
+					}
+				});
+			});
+		}
+
 		/**
 		 * email only domain - hide unnecessary/unused sections
 		 */