From 3b27e5582086b1b581b6988ddba73f0b9cb360f6 Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Fri, 16 Feb 2018 21:48:04 +0100
Subject: [PATCH 1/6] report_header is removed from SA3

---
 spam/edit_report.cgi | 10 +++++-----
 spam/save_report.cgi |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi
index 33b39a553..27735c671 100755
--- a/spam/edit_report.cgi
+++ b/spam/edit_report.cgi
@@ -31,12 +31,12 @@ else {
 	$subject = &find("subject_tag", $conf);
 	print &ui_table_row($text{'report_subject'},
 		&opt_field("subject_tag", $subject, 15, "*****SPAM*****"));
-	}
+	$header = &find("report_header", $conf);
+	# Include report in headers
+	print &ui_table_row($text{'report_rheader'},
+		&yes_no_field("report_header", $header, 0));
 
-# Include report in headers
-$header = &find("report_header", $conf);
-print &ui_table_row($text{'report_rheader'},
-	&yes_no_field("report_header", $header, 0));
+	}
 
 # Terse report mode
 $terse = &find("use_terse_report", $conf);
diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index b34f1032c..da6cf39fa 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -35,8 +35,8 @@ if (&version_atleast(3.0)) {
 else {
 	&parse_yes_no($conf, "rewrite_subject");
 	&parse_opt($conf, "subject_tag", undef);
+	&parse_yes_no($conf, "report_header");
 	}
-&parse_yes_no($conf, "report_header");
 &parse_yes_no($conf, "use_terse_report");
 &parse_yes_no($conf, "fold_headers");
 &parse_yes_no($conf, "detailed_phrase_score");

From 281d10770e95d90dfe8209f7f646c693b8bae036 Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Fri, 16 Feb 2018 22:31:47 +0100
Subject: [PATCH 2/6] fix missing -e for echo

---
 update-from-repo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update-from-repo.sh b/update-from-repo.sh
index 8092ef845..25900cf71 100755
--- a/update-from-repo.sh
+++ b/update-from-repo.sh
@@ -249,7 +249,7 @@ fi
     do 
         if [[ -f ${TEMP}/${module} && ! -f  "${TARBALL}/$module" ]]; then
           module=`dirname $module`
-          echo "${CYAN}Adding nonstandard${NC} ${ORANGE}$module${NC} to ${PROD^}" && cp -r -L ${TEMP}/${module} ${TARBALL}/
+          echo -e "${CYAN}Adding nonstandard${NC} ${ORANGE}$module${NC} to ${PROD^}" && cp -r -L ${TEMP}/${module} ${TARBALL}/
         fi
     done
 

From 62d04d6dcc7541a2800f929bf4d9143f0b6b4344 Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Sat, 17 Feb 2018 11:45:15 +0100
Subject: [PATCH 3/6] use addheader/rewrite header from 2.6 on, no terse report
 from 2.6 on

---
 spam/edit_report.cgi | 32 ++++++++++++++++++--------------
 spam/save_report.cgi | 16 +++++++++-------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi
index 27735c671..212f04d7d 100755
--- a/spam/edit_report.cgi
+++ b/spam/edit_report.cgi
@@ -12,7 +12,7 @@ $conf = &get_config();
 print "$text{'report_desc'}<p>\n";
 &start_form("save_report.cgi", $text{'report_header'});
 
-if (&version_atleast(3.0)) {
+if (&version_atleast(2.6)) {
 	# New version can replace subject, from and to headers
 	@rheader = &find("rewrite_header", $conf);
 	foreach $h ("subject", "from", "to") {
@@ -36,12 +36,12 @@ else {
 	print &ui_table_row($text{'report_rheader'},
 		&yes_no_field("report_header", $header, 0));
 
+	# Terse report mode
+	$terse = &find("use_terse_report", $conf);
+	print &ui_table_row($text{'report_useterse'},
+		&yes_no_field("use_terse_report", $terse, 0));
 	}
 
-# Terse report mode
-$terse = &find("use_terse_report", $conf);
-print &ui_table_row($text{'report_useterse'},
-	&yes_no_field("use_terse_report", $terse, 0));
 
 # Split status header?
 $fold = &find("fold_headers", $conf);
@@ -53,7 +53,7 @@ $detail = &find("detailed_phrase_score", $conf);
 print &ui_table_row($text{'report_detail'},
 	&yes_no_field("detailed_phrase_score", $detail, 0));
 
-if (!&version_atleast(3.0)) {
+if (!&version_atleast(2.6)) {
 	# Include stars header
 	$stars = &find("spam_level_stars", $conf);
 	print &ui_table_row($text{'report_stars'},
@@ -61,6 +61,7 @@ if (!&version_atleast(3.0)) {
 	}
 
 # Character for stars
+# note: has to be replaced in save.cgi with add_header all Level _STARS(.)_ as of 2.6
 $char = &find("spam_level_char", $conf);
 print &ui_table_row($text{'report_char'},
 	&opt_field("spam_level_char", $char, 2, "*"));
@@ -91,16 +92,19 @@ print &ui_table_row($text{'report_report'},
 	&ui_textarea("report", join("\n", @report), 5, 80));
 
 # Extra report to attach to spam messages, for terse mode
-@report = &find_value("terse_report", $conf);
-$clear = &find("clear_terse_report_template", $conf);
-print &ui_table_row($text{'report_terse'},
-	&ui_radio("clear_terse", $clear ? 1 : 0,
-		  [ [ 0, $text{'report_noclear'} ],
-		    [ 1, $text{'report_clear'} ] ])."<br>\n".
-	&ui_textarea("terse", join("\n", @report), 5, 80));
+# note terse report is deprecated in 2.6 and does nothing, will be removed in future
+if (!&version_atleast(2.6)) {
+	@report = &find_value("terse_report", $conf);
+	$clear = &find("clear_terse_report_template", $conf);
+	print &ui_table_row($text{'report_terse'},
+		&ui_radio("clear_terse", $clear ? 1 : 0,
+			  [ [ 0, $text{'report_noclear'} ],
+				[ 1, $text{'report_clear'} ] ])."<br>\n".
+		&ui_textarea("terse", join("\n", @report), 5, 80));
+}
 
 # Additional headers to add
-if (&version_atleast(3)) {
+if (&version_atleast(2.6)) {
 	print &ui_table_hr();
 	$table = &ui_columns_start([ $text{'report_addfor'},
 				  $text{'report_addheader'},
diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index da6cf39fa..af4842f01 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -23,7 +23,7 @@ $in{'terse'} =~ s/\r//g;
 @terse = split(/\n/, $in{'terse'});
 &save_directives($conf, 'terse_report', \@terse, 1);
 
-if (&version_atleast(3.0)) {
+if (&version_atleast(2.6)) {
 	foreach $h ("subject", "from", "to") {
 		if (!$in{"rewrite_header_${h}_def"}) {
 			push(@rheader, { 'name' => 'rewrite_header',
@@ -36,18 +36,16 @@ else {
 	&parse_yes_no($conf, "rewrite_subject");
 	&parse_opt($conf, "subject_tag", undef);
 	&parse_yes_no($conf, "report_header");
+	&parse_yes_no($conf, "use_terse_report");
+	&parse_yes_no($conf, "spam_level_stars");
+	&parse_opt($conf, "spam_level_char", \&char_check);
 	}
-&parse_yes_no($conf, "use_terse_report");
 &parse_yes_no($conf, "fold_headers");
 &parse_yes_no($conf, "detailed_phrase_score");
-if (!&version_atleast(3.0)) {
-	&parse_yes_no($conf, "spam_level_stars");
-	}
-&parse_opt($conf, "spam_level_char", \&char_check);
 &parse_yes_no($conf, "defang_mime");
 &parse_option($conf, "report_safe") if (defined($in{'report_safe'}));
 
-if (&version_atleast(3)) {
+if (&version_atleast(2.6)) {
 	for($i=0; defined($addfor = $in{"addfor_$i"}); $i++) {
 		next if (!$addfor);
 		$addheader = $in{"addheader_$i"};
@@ -56,6 +54,10 @@ if (&version_atleast(3)) {
 			&error(&text('report_eaddheader', $i+1));
 		push(@adds, "$addfor $addheader $addtext");
 		}
+	if (!in{"spam_level_char_def"} && &char_check($in{"spam_level_char"})) {
+		push(@adds, { 'name' => 'add_header',
+		                'value' => "all Level _STARS(".$in{ "spam_level_char"} .")_" });
+		}
 	&save_directives($conf, "add_header", \@adds, 1);
 	}
 

From cfe063b50e4756f684b646dd71dfa289961c1033 Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Sat, 17 Feb 2018 11:53:59 +0100
Subject: [PATCH 4/6] rewrite headers from 3.0 on, remove report_header
 completely

---
 spam/edit_report.cgi | 6 +++---
 spam/save_report.cgi | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spam/edit_report.cgi b/spam/edit_report.cgi
index 212f04d7d..77894e7aa 100755
--- a/spam/edit_report.cgi
+++ b/spam/edit_report.cgi
@@ -12,7 +12,7 @@ $conf = &get_config();
 print "$text{'report_desc'}<p>\n";
 &start_form("save_report.cgi", $text{'report_header'});
 
-if (&version_atleast(2.6)) {
+if (&version_atleast(3.0)) {
 	# New version can replace subject, from and to headers
 	@rheader = &find("rewrite_header", $conf);
 	foreach $h ("subject", "from", "to") {
@@ -33,8 +33,8 @@ else {
 		&opt_field("subject_tag", $subject, 15, "*****SPAM*****"));
 	$header = &find("report_header", $conf);
 	# Include report in headers
-	print &ui_table_row($text{'report_rheader'},
-		&yes_no_field("report_header", $header, 0));
+	#print &ui_table_row($text{'report_rheader'},
+	#	&yes_no_field("report_header", $header, 0));
 
 	# Terse report mode
 	$terse = &find("use_terse_report", $conf);
diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index af4842f01..68c45321d 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -23,7 +23,7 @@ $in{'terse'} =~ s/\r//g;
 @terse = split(/\n/, $in{'terse'});
 &save_directives($conf, 'terse_report', \@terse, 1);
 
-if (&version_atleast(2.6)) {
+if (&version_atleast(3.0)) {
 	foreach $h ("subject", "from", "to") {
 		if (!$in{"rewrite_header_${h}_def"}) {
 			push(@rheader, { 'name' => 'rewrite_header',
@@ -35,7 +35,7 @@ if (&version_atleast(2.6)) {
 else {
 	&parse_yes_no($conf, "rewrite_subject");
 	&parse_opt($conf, "subject_tag", undef);
-	&parse_yes_no($conf, "report_header");
+	#&parse_yes_no($conf, "report_header");
 	&parse_yes_no($conf, "use_terse_report");
 	&parse_yes_no($conf, "spam_level_stars");
 	&parse_opt($conf, "spam_level_char", \&char_check);

From 73acff6602ee0738a20d12bdd69e9255ca7434d8 Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Sat, 17 Feb 2018 12:03:35 +0100
Subject: [PATCH 5/6] fix add_header for STARS

---
 spam/save_report.cgi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spam/save_report.cgi b/spam/save_report.cgi
index 68c45321d..de3573d5f 100755
--- a/spam/save_report.cgi
+++ b/spam/save_report.cgi
@@ -55,8 +55,7 @@ if (&version_atleast(2.6)) {
 		push(@adds, "$addfor $addheader $addtext");
 		}
 	if (!in{"spam_level_char_def"} && &char_check($in{"spam_level_char"})) {
-		push(@adds, { 'name' => 'add_header',
-		                'value' => "all Level _STARS(".$in{ "spam_level_char"} .")_" });
+		push(@adds, "all Level _STARS(".$in{ "spam_level_char"} .")_" );
 		}
 	&save_directives($conf, "add_header", \@adds, 1);
 	}

From 260a98fde72297c59ff3e79b101960126eda896e Mon Sep 17 00:00:00 2001
From: Gnadelwartz <kay@rrr.de>
Date: Sat, 17 Feb 2018 15:20:59 +0100
Subject: [PATCH 6/6] convert internal version to real number to stop
 complaining about version is not a number

---
 update-from-repo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/update-from-repo.sh b/update-from-repo.sh
index 25900cf71..72092063b 100755
--- a/update-from-repo.sh
+++ b/update-from-repo.sh
@@ -3,7 +3,7 @@
 # Update webmin/usermin to the latest develop version  from GitHub repo
 # inspired by authentic-theme/theme-update.sh script, thanks qooob
 #
-# Version 1.5, 2018-02-12
+# Version 1.5.1, 2018-02-17
 #
 # Kay Marquardt, kay@rrr.de, https://github.com/gandelwartz
 #############################################################################
@@ -221,7 +221,7 @@ fi
 
     ####################
     # start processing pulled source
-    version="`head -c -1 ${TEMP}/version`-`cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d.%H%M'`" 
+    version="`head -c -1 ${TEMP}/version``cd ${TEMP}; ${GIT} log -1 --format=%cd --date=format:'%m%d%H%M'`" 
     DOTVER=`echo ${version} | sed 's/-/./'`
     TARBALL="${TEMP}/tarballs/${PROD}-${DOTVER}"
     ###############