Webmin logs annotation

diff --git a/mysql/lang/en b/mysql/lang/en
index d25e46f..72a86bf 100644 (file)
--- a/mysql/lang/en
+++ b/mysql/lang/en
@@ -600,6 +600,7 @@ log_execupload=Executed SQL commands from uploaded file
 log_execfile=Executed SQL commands from file $1
 log_importupload=Imported data from uploaded file
 log_importfile=Imported data from file $1
+log_set=Changed $1 MySQL variables
 
 backup_title=Backup Database
 backup_title2=Backup All Databases

diff --git a/mysql/log_parser.pl b/mysql/log_parser.pl
index 9cff4d7..4a1c45c 100644 (file)
--- a/mysql/log_parser.pl
+++ b/mysql/log_parser.pl
@@ -84,6 +84,9 @@ elsif ($action eq 'import') {
        return &text($p->{'mode'} ? 'log_importupload' : 'log_importfile',
                     "<tt>".&html_escape($p->{'file'})."</tt>");
        }
+elsif ($action eq 'set') {
+       return &text('log_set', $object);
+       }
 else {
        return undef;
        }

diff --git a/webminlog/CHANGELOG b/webminlog/CHANGELOG
index 8324d17..96687c8 100644 (file)
--- a/webminlog/CHANGELOG
+++ b/webminlog/CHANGELOG
@@ -16,3 +16,4 @@ Rollback actions can themselves now be rolled back.
 ---- Changes since 1.380 ----
 Re-designed the UI to use Webmin standard layout and functions.
 Added a field for searching based on the contents of commands run or file changes made.
+When viewing the details of a logged action, an annotation can be entered to explain why it was done.

diff --git a/webminlog/rollback.cgi b/webminlog/rollback.cgi
index 9b36fde..b8396ad 100755 (executable)
--- a/webminlog/rollback.cgi
+++ b/webminlog/rollback.cgi
@@ -10,7 +10,7 @@ if ($in{'annosave'}) {
        # Just saving an annotation
        $in{'anno'} =~ s/\r//g;
        &save_annotation($act, $in{'anno'});
-       &redirect($ENV{'HTTP_REFERER'} || "view.cgi?id=$in{'id'}");
+       &redirect("view.cgi?id=$in{'id'}&search=".&urlize($in{'search'}));
        }
 
 $access{'rollback'} ||  &error($text{'rollback_ecannot'});
@@ -84,7 +84,8 @@ if ($in{'confirm'}) {
 else {
        # Show the user what will be done
        print &ui_form_start("rollback.cgi");
-       print &ui_hidden("id", $in{'id'}),"\n";
+       print &ui_hidden("id", $in{'id'});
+       print &ui_hidden("search", $in{'search'});
        foreach $r (keys %r) {
                print &ui_hidden("r", $r);
                }
@@ -174,7 +175,8 @@ else {
                print &ui_form_end();
                }
        }
-&ui_print_footer("view.cgi?id=$in{'id'}", $text{'view_return'},
+&ui_print_footer("view.cgi?id=$in{'id'}&search=".&urlize($in{'search'}),
+                 $text{'view_return'},
                 "", $text{'index_return'});
 
 

diff --git a/webminlog/view.cgi b/webminlog/view.cgi
index 5e6f034..d0568bb 100755 (executable)
--- a/webminlog/view.cgi
+++ b/webminlog/view.cgi
@@ -16,6 +16,7 @@ $act = &get_action($in{'id'});
 @files = &list_files($act);
 print &ui_form_start("rollback.cgi");
 print &ui_hidden("id", $in{'id'});
+print &ui_hidden("search", $in{'search'});
 
 print &ui_hidden_table_start(&text('view_header', $act->{'id'}),
                             "width=100%", 4, "main", 1);
@@ -119,7 +120,7 @@ else {
        print &ui_form_end();
        }
 
-&ui_print_footer("search.cgi?$in", $text{'search_return'},
+&ui_print_footer("search.cgi?$in{'search'}", $text{'search_return'},
                 "", $text{'index_return'});