projects / webmin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0d190f8)
Fixed logging messages
authorJamie Cameron <jcameron@webmin.com>
Sun, 27 Dec 2009 21:18:09 +0000 (13:18 -0800)
committerJamie Cameron <jcameron@webmin.com>
Sun, 27 Dec 2009 21:18:09 +0000 (13:18 -0800)
postfix/CHANGELOG patch | blob | history
postfix/address_rewriting.cgi patch | blob | history
postfix/debug.cgi patch | blob | history
postfix/lang/en patch | blob | history
postfix/ldap.cgi patch | blob | history
postfix/local_delivery.cgi patch | blob | history
postfix/rate.cgi patch | blob | history
postfix/resource.cgi patch | blob | history
postfix/save_opts.cgi patch | blob | history
postfix/smtp.cgi patch | blob | history
postfix/smtpd.cgi patch | blob | history

diff --git a/postfix/CHANGELOG b/postfix/CHANGELOG
index 6307102..52245dc 100644 (file)
--- a/postfix/CHANGELOG
+++ b/postfix/CHANGELOG
@@ -72,3 +72,4 @@ Autoreply messages starting with <html> or <body> will now be sent using the tex
 t/html MIME type.
 ---- Changes since 1.500 ----
 If a map is made up of files in multiple directories and a Webmin user has a directory restriction defined, he will be able to edit map entries in files under that directory.
+Fixed the descriptions of logged events as shown in the Webmin Actions Log module.
diff --git a/postfix/address_rewriting.cgi b/postfix/address_rewriting.cgi
index 3faec73..fef9f9a 100755 (executable)
--- a/postfix/address_rewriting.cgi
+++ b/postfix/address_rewriting.cgi
@@ -26,6 +26,7 @@ $none = $text{'opts_none'};
 $no_ = $text{'opts_no'};
 
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "opts");
 print &ui_table_start($text{'address_rewriting_title'}, "width=100%", 4);
 
 &option_yesno("allow_percent_hack");
diff --git a/postfix/debug.cgi b/postfix/debug.cgi
index ad014aa..e3dde48 100755 (executable)
--- a/postfix/debug.cgi
+++ b/postfix/debug.cgi
@@ -28,6 +28,7 @@ $no_ = $text{'opts_no'};
 
 # Start of form
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "debug");
 print &ui_table_start($text{'debug_title'}, "width=100%", 4);
 
 &option_freefield("debug_peer_list", 65);
diff --git a/postfix/lang/en b/postfix/lang/en
index b727b63..ffa270d 100644 (file)
--- a/postfix/lang/en
+++ b/postfix/lang/en
@@ -706,6 +706,13 @@ log_transport=Changed transport mapping options
 log_relocated=Changed relocate mapping options
 log_header=Changed header check options
 log_body=Changed body check options
+log_debug=Changed debugging features
+log_ldap=Changed LDAP lookups
+log_local=Changed local delivery
+log_rate=Changed delivery rates
+log_resource=Changed general resource control
+log_smtp=Changed SMTP client options
+log_smtpd=Changed SMTP server options
 log_alias_create=Created alias $1
 log_alias_modify=Modified alias $1
 log_alias_delete=Deleted alias $1
diff --git a/postfix/ldap.cgi b/postfix/ldap.cgi
index e935ac9..1ec3248 100755 (executable)
--- a/postfix/ldap.cgi
+++ b/postfix/ldap.cgi
@@ -35,6 +35,7 @@ if (!(&is_existing_parameter($ldap_timeout)))
 
 
 print "<form action=save_opts.cgi>\n";
+print &ui_hidden("_log_form", "ldap");
 print "<table border width=100%>\n";
 print "<tr $tb> <td><b>$text{'ldap_title'}</b></td></tr>\n";
 print "<tr $cb> <td><table width=100%>\n";
diff --git a/postfix/local_delivery.cgi b/postfix/local_delivery.cgi
index bc8794c..7e703ff 100755 (executable)
--- a/postfix/local_delivery.cgi
+++ b/postfix/local_delivery.cgi
@@ -28,6 +28,7 @@ $no_ = $text{'opts_no'};
 
 # Start of form
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "local");
 print &ui_table_start($text{'local_delivery_title'}, "width=100%", 4);
 
 &option_radios_freefield("local_transport", 30, $text{'opts_local_transport_local'});
diff --git a/postfix/rate.cgi b/postfix/rate.cgi
index cdecc35..e7088c8 100755 (executable)
--- a/postfix/rate.cgi
+++ b/postfix/rate.cgi
@@ -28,6 +28,7 @@ $no_ = $text{'opts_no'};
 
 # Form start
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "rate");
 print &ui_table_start($text{'rate_title'}, "width=100%", 4);
 
 &option_freefield("default_destination_concurrency_limit", 15);
diff --git a/postfix/resource.cgi b/postfix/resource.cgi
index ce1e423..97f5aae 100755 (executable)
--- a/postfix/resource.cgi
+++ b/postfix/resource.cgi
@@ -28,6 +28,7 @@ $no_ = $text{'opts_no'};
 
 # Form start
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "resource");
 print &ui_table_start($text{'resource_title'}, "width=100%", 4);
 
 &option_freefield("bounce_size_limit", 15);
diff --git a/postfix/save_opts.cgi b/postfix/save_opts.cgi
index 68317ef..9636542 100755 (executable)
--- a/postfix/save_opts.cgi
+++ b/postfix/save_opts.cgi
@@ -38,7 +38,7 @@ if (defined($in{"debug_peer_level_def"})) {
 
 &reload_postfix();
 
-&webmin_log("opts");
+&webmin_log($in{'_log_form'} || "opts");
 &redirect("");
 
 
diff --git a/postfix/smtp.cgi b/postfix/smtp.cgi
index 1e01d68..8abcee3 100755 (executable)
--- a/postfix/smtp.cgi
+++ b/postfix/smtp.cgi
@@ -28,6 +28,7 @@ $no_ = $text{'opts_no'};
 
 # Start of form
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "smtp");
 print &ui_table_start($text{'smtp_title'}, "width=100%", 4);
 
 &option_radios_freefield("best_mx_transport", 25, $text{'opts_best_mx_transport_default'});
diff --git a/postfix/smtpd.cgi b/postfix/smtpd.cgi
index 1e0d445..fa17876 100755 (executable)
--- a/postfix/smtpd.cgi
+++ b/postfix/smtpd.cgi
@@ -27,6 +27,7 @@ $no_ = $text{'opts_no'};
 
 # Form start
 print &ui_form_start("save_opts.cgi");
+print &ui_hidden("_log_form", "smtpd");
 print &ui_table_start($text{'smtpd_title'}, "width=100%", 4);
 
 &option_radios_freefield("smtpd_banner", 65, $default);
Webmin PERL server management