From 5992c7ba516c6d9ba4484ca08896b04d44170d83 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 13 Oct 2024 19:36:37 -0700
Subject: [PATCH] Respect global to address if set

---
 package-updates/index.cgi | 3 ++-
 package-updates/update.pl | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package-updates/index.cgi b/package-updates/index.cgi
index a482cafd5..f76ed585c 100755
--- a/package-updates/index.cgi
+++ b/package-updates/index.cgi
@@ -210,7 +210,8 @@ print &ui_table_row($text{'index_sched'},
 
 # Send email to
 print &ui_table_row($text{'index_email'},
-		    &ui_textbox("email", $config{'sched_email'}, 40));
+	    &ui_textbox("email", $config{'sched_email'} ||
+				 $gconfig{'webmin_email_to'}, 40));
 
 # Install or just notify?
 print &ui_table_row($text{'index_action'},
diff --git a/package-updates/update.pl b/package-updates/update.pl
index 9126c11b9..5f6a04dd9 100755
--- a/package-updates/update.pl
+++ b/package-updates/update.pl
@@ -56,12 +56,13 @@ if ($tellcount) {
 	}
 
 # Email the admin
-if ($config{'sched_email'} && $body) {
+$emailto = $config{'sched_email'} || $gconfig{'webmin_email_to'};
+if ($emailto && $body) {
 	&foreign_require("mailboxes", "mailboxes-lib.pl");
 	my $from = &mailboxes::get_from_address();
 	my $mail = { 'headers' =>
 			[ [ 'From', $from ],
-			  [ 'To', $config{'sched_email'} ],
+			  [ 'To', $emailto ],
 			  [ 'Subject', "Package updates on ".
 				       &get_system_hostname() ] ],
 			'attach' =>