From ada20e8e2d2c19bd8cd6558e0df6a772b5938cfb Mon Sep 17 00:00:00 2001
From: Nawawi Jamili <nawawi@rutweb.com>
Date: Thu, 19 Dec 2013 15:43:46 +0800
Subject: [PATCH] ui_link conversion -> webmin

---
 webmin/edit_ssl.cgi         | 13 ++++++-------
 webmin/edit_webmincron.cgi  |  4 ++--
 webmin/standard_chooser.cgi |  2 +-
 webmin/third_chooser.cgi    |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/webmin/edit_ssl.cgi b/webmin/edit_ssl.cgi
index 7e14fa02c..f126ec1cd 100755
--- a/webmin/edit_ssl.cgi
+++ b/webmin/edit_ssl.cgi
@@ -98,10 +98,8 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email',
 		}
 	}
 @clinks = (
-	"<a href='download_cert.cgi/cert.pem'>".
-	"$text{'ssl_pem'}</a>",
-	"<a href='download_cert.cgi/cert.p12'>".
-	"$text{'ssl_pkcs12'}</a>"
+	&ui_link("download_cert.cgi/cert.pem", $text{'ssl_pem'}),
+	&ui_link("download_cert.cgi/cert.p12", $text{'ssl_pkcs12'})
 	);
 print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks), undef, [ "valign=middle","valign=middle" ]);
 print &ui_table_end();
@@ -116,8 +114,8 @@ if (@ipkeys) {
 				  $text{'ssl_cert'} ]);
 	foreach $k (@ipkeys) {
 		print &ui_columns_row([
-			"<a href='edit_ipkey.cgi?idx=$k->{'index'}'>".
-			join(", ", @{$k->{'ips'}})."</a>",
+			&ui_link("edit_ipkey.cgi?idx=".$k->{'index'},
+			join(", ", @{$k->{'ips'}}) ),
 			"<tt>$k->{'key'}</tt>",
 			$k->{'cert'} ? "<tt>$k->{'cert'}</tt>"
 				     : $text{'ssl_cert_def'},
@@ -128,7 +126,8 @@ if (@ipkeys) {
 else {
 	print "<b>$text{'ssl_ipkeynone'}</b><p>\n";
 	}
-print "<a href='edit_ipkey.cgi?new=1'>$text{'ssl_addipkey'}</a><p>\n";
+print &ui_link("edit_ipkey.cgi?new=1", $text{'ssl_addipkey'});
+print "<p>\n";
 print &ui_tabs_end_tab();
 
 # SSL key generation form
diff --git a/webmin/edit_webmincron.cgi b/webmin/edit_webmincron.cgi
index ecbc43112..442929916 100755
--- a/webmin/edit_webmincron.cgi
+++ b/webmin/edit_webmincron.cgi
@@ -27,8 +27,8 @@ if (@wcrons) {
 	foreach my $w (@wcrons) {
 		my %minfo = &get_module_info($w->{'module'});
 		print &ui_checked_columns_row([
-			"<a href='view_webmincron.cgi?id=$w->{'id'}'>".
-			  ($minfo{'desc'} || $w->{'module'})."</a>",
+			&ui_link("view_webmincron.cgi?id=".$w->{'id'},
+			  ($minfo{'desc'} || $w->{'module'}) ),
 			$w->{'func'},
 			join(" ", @{$w->{'args'}}),
 			&cron::when_text($w, 1),
diff --git a/webmin/standard_chooser.cgi b/webmin/standard_chooser.cgi
index c2cce89d9..8a3878b50 100755
--- a/webmin/standard_chooser.cgi
+++ b/webmin/standard_chooser.cgi
@@ -30,7 +30,7 @@ else {
 		my $minfo = { 'os_support' => $m->[3] };
 		next if (!&check_os_support($minfo));
 		push(@table, [
-		 "<a href='' onClick='return select(\"$m->[0]\")'>$m->[0]</a>",
+		 &ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[0]\");'"),
 		 &html_escape($m->[4]),
 		 ]);
         $cnt++;
diff --git a/webmin/third_chooser.cgi b/webmin/third_chooser.cgi
index 92656b15f..8f8b4371d 100755
--- a/webmin/third_chooser.cgi
+++ b/webmin/third_chooser.cgi
@@ -26,7 +26,7 @@ else {
     $cnt = 0;
 	foreach $m (@$mods) {
 		push(@table, [
-		 "<a href='' onClick='return select(\"$m->[2]\")'>$m->[0]</a>",
+		 &ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[2]\");'"),
 		 $m->[1] eq "NONE" ? "" : &html_escape($m->[1]),
 		 $m->[3],
 		 ]);