From b4e20f74d16d02c471d6611c5a49fedd055b5f4c Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Sun, 28 Oct 2018 22:35:43 -0700
Subject: [PATCH] Remove redundant form

---
 software/csw-lib.pl      | 10 ----------
 software/csw_upgrade.cgi | 24 ------------------------
 software/ports-lib.pl    |  9 ---------
 software/yum-lib.pl      |  9 ---------
 4 files changed, 52 deletions(-)
 delete mode 100755 software/csw_upgrade.cgi

diff --git a/software/csw-lib.pl b/software/csw-lib.pl
index 355a471da..9af9c18e9 100755
--- a/software/csw-lib.pl
+++ b/software/csw-lib.pl
@@ -114,15 +114,5 @@ close(PKG);
 return sort { lc($a->{'name'}) cmp lc($b->{'name'}) } @rv;
 }
 
-# update_system_form()
-# Shows a form for updating all packages on the system
-sub update_system_form
-{
-print &ui_subheading($text{'csw_form'});
-print &ui_form_start("csw_upgrade.cgi");
-print &ui_submit($text{'csw_upgrade'});
-print &ui_form_end();
-}
-
 1;
 
diff --git a/software/csw_upgrade.cgi b/software/csw_upgrade.cgi
deleted file mode 100755
index c2134f711..000000000
--- a/software/csw_upgrade.cgi
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/local/bin/perl
-# Upgrade all CSW packages
-
-require './software-lib.pl';
-&ReadParse();
-
-&ui_print_unbuffered_header(undef, $text{'csw_upgrade'}, "");
-
-print "<b>",&text('csw_updatedesc',
-		  "<tt>$pkg_get upgrade</tt>"),"</b><p>\n";
-print "<pre>";
-&additional_log("exec", undef, "$pkg_get upgrade");
-&clean_environment();
-$flag = $pkg_get =~ /pkgutil/ ? "--upgrade" : "upgrade";
-open(CMD, "yes y | $pkg_get $flag 2>&1 </dev/null |");
-while(<CMD>) {
-	print &html_escape($_);
-	}
-close(CMD);
-&reset_environment();
-print "</pre>\n";
-
-&ui_print_footer("", $text{'index_return'});
-
diff --git a/software/ports-lib.pl b/software/ports-lib.pl
index 825258c26..385f368cd 100644
--- a/software/ports-lib.pl
+++ b/software/ports-lib.pl
@@ -136,13 +136,4 @@ while(my $line = <PKG>) {
 return @rv;
 }
 
-# update_system_form()
-# Show a form for updating the ports DB
-sub update_system_form
-{
-print &ui_subheading($text{'ports_form'});
-print &ui_form_start("ports_upgrade.cgi");
-print &ui_form_end([ [ undef, $text{'ports_apply'} ] ]);
-}
-
 1;
diff --git a/software/yum-lib.pl b/software/yum-lib.pl
index dff0bb8c5..add132cf2 100755
--- a/software/yum-lib.pl
+++ b/software/yum-lib.pl
@@ -196,15 +196,6 @@ if (&compare_versions($pinfo[4], "2.1.10") > 0) {
 return undef;
 }
 
-# update_system_form()
-# Shows a form for updating all packages on the system
-sub update_system_form
-{
-print &ui_subheading($text{'yum_form'});
-print &ui_form_start("yum_upgrade.cgi");
-print &ui_form_end([ [ undef, $text{'yum_apply'} ] ]);
-}
-
 # update_system_resolve(name)
 # Converts a standard package name like apache, sendmail or squid into
 # the name used by YUM.