New version bump

Fix MySQL typo #2411

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+#### 2.301 (February 16, 2025)
+* Fix to check correctly if ProFTPD is installed #2410
+* Fix to properly escape HTML in date fields
+* Fix the line height of plain-text email body
+
 #### 2.300 (February 14, 2025)
 * Add multiple improvements to SSH Server module to support contemporary systems
 * Add support to configure SSH socket activation in SSH Server module in contemporary systems #2356

firewalld/save_forward.cgi

@@ -36,6 +36,7 @@ else {
 	my $dstaddr;
 	if (!$in{'dstaddr_def'}) {
 		&check_ipaddress($in{'dstaddr'}) ||
+		    &check_ip6address($in{'dstaddr'}) ||
 			&error($text{'forward_edstaddr'});
 		$dstaddr = $in{'dstaddr'};
 		}

gray-theme/unauthenticated/css/_iframe/quote.min.css

@@ -1 +1 @@
-body{font: 13px/1.231 arial,helvetica,clean,sans-serif;}body blockquote:not([style*="border-left"]){border-left:1px solid #ccc;margin-left:6px;margin-top:0;margin-bottom:0;padding-left:12px;}pre{white-space:break-spaces;margin:0 0 4px 0;font-size: 12px;line-height:0.6;padding-top:0.3em;}p{margin:0;line-height:1.333}p:has(>br:only-child){line-height:0.666!important;}
+body{font: 13px/1.231 arial,helvetica,clean,sans-serif;}body blockquote:not([style*="border-left"]){border-left:1px solid #ccc;margin-left:6px;margin-top:0;margin-bottom:0;padding-left:12px;}pre{white-space:break-spaces;margin:0 0 4px 0;font-size: 12px;line-height:1.5;padding-top:0.3em;}p{margin:0;line-height:1.333}p:has(>br:only-child){line-height:0.666!important;}

mailboxes/boxes-lib.pl

@@ -1471,7 +1471,8 @@ return $data;
 }
 
 # simplify_date(datestring, [format])
-# Given a date from an email header, convert to the user's preferred format
+# Given a date from an email header, convert to the user's preferred format and
+# return it as an HTML string
 sub simplify_date
 {
 local ($date, $fmt) = @_;
@@ -1494,12 +1495,12 @@ if ($u) {
 		}
 	}
 elsif ($date =~ /^(\S+),\s+0*(\d+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+)/) {
-	return "$2/$3/$4 $5:$6";
+	return &html_escape("$2/$3/$4 $5:$6");
 	}
 elsif ($date =~ /^0*(\d+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+)/) {
-	return "$1/$2/$3 $4:$5";
+	return &html_escape("$1/$2/$3 $4:$5");
 	}
-return $date;
+return &html_escape($date);
 }
 
 # simplify_from(from)

mailboxes/mailboxes-lib.pl

@@ -1221,7 +1221,7 @@ foreach my $mail (@mail) {
 		}
 
 	# Date and size columns
-	push(@cols, &eucconv_and_escape(&simplify_date($mail->{'header'}->{'date'})));
+	push(@cols, &simplify_date($mail->{'header'}->{'date'}));
 	push(@cols, &nice_size($mail->{'size'}, 1024));
 	$rowtds[$#cols] .= " data-sort=".&parse_mail_date($mail->{'header'}->{'date'});
 

mailboxes/view_mail.cgi

@@ -140,8 +140,7 @@ else {
 			&address_link($mail->{'header'}->{'cc'}));
 		}
 	print &ui_table_row($text{'mail_date'},
-		&eucconv_and_escape(
-                        &simplify_date($mail->{'header'}->{'date'})));
+		&simplify_date($mail->{'header'}->{'date'}));
 	print &ui_table_row($text{'mail_subject'},
 		&convert_header_for_display($mail->{'header'}->{'subject'}));
 	}

mysql/lang/en

@@ -9,7 +9,7 @@ index_pass=Password
 index_clear=Clear
 index_stop=Stop MySQL Server
 index_stopmsg=Click this button to stop the MySQL database server on your system. This will prevent any users or programs from accessing the database, including this Webmin module.
-index_restart=Resart MySQL Server
+index_restart=Restart MySQL Server
 index_restartmsg=Click this button to restart the MySQL database server on your system. All clients will be disconnected, and any configuration files will be reloaded.
 index_dbs=MySQL Databases
 index_add=Create a new database.

proftpd/index.cgi

@@ -5,7 +5,7 @@
 require './proftpd-lib.pl';
 
 # Check if proftpd is installed
-if (&has_command($config{'proftpd_path'})) {
+if (!&has_command($config{'proftpd_path'})) {
 	&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
 		&help_search_link("proftpd", "man", "doc", "google"));
 	print &text('index_eproftpd', "<tt>$config{'proftpd_path'}</tt>",

version

@@ -1 +1 @@
-2.300
+2.301