More work on package updates module

diff --git a/package-updates/index.cgi b/package-updates/index.cgi
index 7cb24f1..3a0e14b 100755 (executable)
--- a/package-updates/index.cgi
+++ b/package-updates/index.cgi
@@ -24,7 +24,8 @@ foreach $m ('all', 'updates', 'new', 'both',
                }
        else {
                push(@mlinks, "<a href='index.cgi?mode=$m&all=".
-                             &urlize($in{'all'})."'>$mmsg</a>");
+                             &urlize($in{'all'})."&search=".
+                             &urlize($in{'search'})."'>$mmsg</a>");
                }
        }
 push(@grid, $text{'index_mode'}, &ui_links_row(\@mlinks));
@@ -39,7 +40,8 @@ if (&show_all_option()) {
                        }
                else {
                        push(@alinks, "<a href='index.cgi?mode=".
-                               &urlize($in{'mode'})."&all=$a'>$amsg</a>");
+                               &urlize($in{'mode'})."&all=$a&search=".
+                               &urlize($in{'search'})."'>$amsg</a>");
                        }
                }
        push(@grid, $text{'index_allsel'}, &ui_links_row(\@alinks));
@@ -51,7 +53,7 @@ push(@grid, $text{'index_search'}, &ui_textbox("search", $in{'search'}, 30)." ".
 
 print &ui_form_start("index.cgi");
 print &ui_hidden("all", &show_all_option() ? 1 : 0);
-print &ui_hidden("mode", "both");
+print &ui_hidden("mode", $in{'mode'});
 print &ui_grid_table(\@grid, 2),"<p>\n";
 print &ui_form_end();
 
@@ -146,7 +148,9 @@ print &ui_form_columns_table(
           [ "refresh", $text{'index_refresh'} ] ],
        1,
        undef,
-       [ [ "mode", $in{'mode'} ], [ "all", $in{'all'} ] ],
+       [ [ "mode", $in{'mode'} ],
+         [ "all", $in{'all'} ],
+         [ "search", $in{'search'} ] ],
        [ "", $text{'index_name'}, $text{'index_desc'}, $text{'index_status'},
          $anysource ? ( $text{'index_source'} ) : ( ), ],
        100,

diff --git a/package-updates/package-updates-lib.pl b/package-updates/package-updates-lib.pl
index 78048d8..ea5bbaa 100644 (file)
--- a/package-updates/package-updates-lib.pl
+++ b/package-updates/package-updates-lib.pl
@@ -1,11 +1,9 @@
 # Functions for checking for updates to packages from YUM, APT or some other
 # update system.
 #
-# XXX don't show virtualmin-specific mode ever
-# XXX offer to install packages?
 # XXX cron job to collect .. actually use webmin module collector
 # XXX confirmation form, showing all dependencies
-# XXX call yum info to get full package list, from software module
+# XXX test automatic notification
 
 BEGIN { push(@INC, ".."); };
 eval "use WebminCore;";

diff --git a/package-updates/update.cgi b/package-updates/update.cgi
index 948cebc..7c67e55 100755 (executable)
--- a/package-updates/update.cgi
+++ b/package-updates/update.cgi
@@ -3,7 +3,8 @@
 
 require './package-updates-lib.pl';
 &ReadParse();
-$redir = "index.cgi?mode=".&urlize($in{'mode'})."&all=".&urlize($in{'all'});
+$redir = "index.cgi?mode=".&urlize($in{'mode'})."&all=".&urlize($in{'all'}).
+        "&search=".&urlize($in{'search'});
 
 if ($in{'refresh'}) {
        &ui_print_unbuffered_header(undef, $text{'refresh_title'}, "");