From 1f303596312f87391795214f032fa97044e5d5c4 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:22:31 +0800 Subject: [PATCH 01/17] ui_link conversion -> quota --- quota/group_filesys.cgi | 2 +- quota/index.cgi | 16 ++++++---------- quota/list_groups.cgi | 11 ++++------- quota/list_users.cgi | 11 ++++------- quota/user_filesys.cgi | 2 +- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/quota/group_filesys.cgi b/quota/group_filesys.cgi index 4dab5e091..180de3fc2 100755 --- a/quota/group_filesys.cgi +++ b/quota/group_filesys.cgi @@ -54,7 +54,7 @@ if ($n) { $bsize = &block_size($f); local @cols; if ($fslist{$f} && !$access{'ro'}) { - push(@cols, "$f"); + push(@cols, &ui_link("edit_group_quota.cgi?filesys=$f&group=$u&source=1", $f) ); } else { push(@cols, $f); diff --git a/quota/index.cgi b/quota/index.cgi index a3271b93c..69cdb8139 100755 --- a/quota/index.cgi +++ b/quota/index.cgi @@ -71,19 +71,15 @@ if (@list) { push(@cols, $dir); } elsif ($qc == 1) { - push(@cols, "$dir"); + push(@cols, &ui_link("list_users.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir) ); } elsif ($qc == 2) { - push(@cols, "$dir"); + push(@cols, &ui_link("list_groups.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir) ); } elsif ($qc == 3) { - push(@cols, "$dir (users)
". - "$dir (groups)"); + push(@cols, &ui_link("list_users.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir." (users)"). + "
". + &ui_link("list_groups.cgi?dir=".&urlize($dir)."&can=".&urlize($qc), $dir." (groups)") ); } push(@cols, &foreign_call("mount", "fstype_name", $f->[2])); @@ -91,7 +87,7 @@ if (@list) { push(@cols, $msg); if ($access{'enable'}) { if ($canactivate) { - push(@cols, "$chg"); + push(@cols, &ui_link("activate.cgi?dir=$dir&active=$qn&mode=$qc", $chg) ); } else { push(@cols, $chg); diff --git a/quota/list_groups.cgi b/quota/list_groups.cgi index 502a66c7f..253c819b0 100755 --- a/quota/list_groups.cgi +++ b/quota/list_groups.cgi @@ -30,11 +30,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1); # Build user list links @ulinks = ( ); if ($access{'ggrace'}) { - push(@ulinks, "$text{'lusers_egrace'}"); + push(@ulinks, &ui_link("group_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) ); } -push(@ulinks, "$text{'lusers_check'}"); +push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=group", $text{'lusers_check'}) ); # Groups list, in a tab print &ui_tabs_start_tab("mode", "list"); @@ -151,10 +149,9 @@ elsif ($n) { push(@cols, $group{$i,'group'}); } else { - push(@cols, "$group{$i,'group'}". - ""); + &urlize($f)."&source=0", $group{$i,'group'}) ); } my $pc_hblocks=0; my $pc_sblocks=0; diff --git a/quota/list_users.cgi b/quota/list_users.cgi index fafb21b62..d023cc1b2 100755 --- a/quota/list_users.cgi +++ b/quota/list_users.cgi @@ -30,11 +30,9 @@ print &ui_tabs_start(\@tabs, "mode", $in{'mode'} || 'list', 1); # Build user list links @ulinks = ( ); if ($access{'ugrace'}) { - push(@ulinks, "$text{'lusers_egrace'}"); + push(@ulinks, &ui_link("user_grace_form.cgi?filesys=".&urlize($f), $text{'lusers_egrace'}) ); } -push(@ulinks, "$text{'lusers_check'}"); +push(@ulinks, &ui_link("check_quotas.cgi?filesys=".&urlize($f)."&source=user", $text{'lusers_check'}) ); # Users list, in a tab print &ui_tabs_start_tab("mode", "list"); @@ -153,10 +151,9 @@ elsif ($n) { push(@cols, $user{$i,'user'}); } else { - push(@cols, "$user{$i,'user'}". - ""); + &urlize($f)."&source=0", $user{$i,'user'}) ); } my $pc_hblocks=0; my $pc_sblocks=0; diff --git a/quota/user_filesys.cgi b/quota/user_filesys.cgi index d483abd6a..33ee1be9d 100755 --- a/quota/user_filesys.cgi +++ b/quota/user_filesys.cgi @@ -54,7 +54,7 @@ if ($n) { $bsize = &block_size($f); local @cols; if ($fslist{$f} && !$access{'ro'}) { - push(@cols, "$f"); + push(@cols, &ui_link("edit_user_quota.cgi?filesys=$f&user=$u&source=1", $f) ); } else { push(@cols, $f); From 9ea296066f9a2c9902f7baeb8a293fda43fb0664 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:27:04 +0800 Subject: [PATCH 02/17] ui_link conversion -> fsdump --- fsdump/index.cgi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fsdump/index.cgi b/fsdump/index.cgi index 0e9adca1d..37263bc0c 100755 --- a/fsdump/index.cgi +++ b/fsdump/index.cgi @@ -37,8 +37,7 @@ if (@dumps) { @dirs = &dump_directories($d); $dirs = join("
", map { &html_escape($_) } @dirs); if ($access{'edit'}) { - push(@cols, "". - "$dirs"); + push(@cols, &ui_link("edit_dump.cgi?id=".$d->{'id'}, "$dirs") ); } else { push(@cols, "$dirs"); @@ -57,8 +56,7 @@ if (@dumps) { else { push(@cols, &cron::when_text($d, 1)); } - push(@cols, "". - "$text{'index_now'}"); + push(@cols, &ui_link("backup.cgi?id=".$d->{'id'}, $text{'index_now'}) ); print &ui_checked_columns_row(\@cols, \@tds, "d", $d->{'id'}); } print &ui_columns_end(); @@ -134,11 +132,13 @@ if (@running) { local $action; if ($d->{'status'}->{'status'} eq 'running' || $d->{'status'}->{'status'} eq 'tape') { - $action .= "{'pid'}'>$text{'index_kill'}\n"; + $action .= &ui_link("kill.cgi?id=$d->{'id'}&pid=".$d->{'pid'}, $text{'index_kill'}); + $action .= "\n"; } if ($d->{'status'}->{'status'} eq 'tape') { $action .= " | \n"; - $action .= "{'pid'}'>$text{'index_newtape'}\n"; + $action .= &ui_link("newtape.cgi?id=".$d->{'id'}."&pid=".$d->{'pid'}, $text{'index_newtape'}); + $action .= "\n"; } if ($d->{'status'}->{'status'} eq 'complete' || $d->{'status'}->{'status'} eq 'failed' || From af87d94f2bdf407d4791f5bb2a10e50c94f64d90 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:29:13 +0800 Subject: [PATCH 03/17] ui_link conversion -> inittab --- inittab/index.cgi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/inittab/index.cgi b/inittab/index.cgi index 7393328b2..09d70aa12 100755 --- a/inittab/index.cgi +++ b/inittab/index.cgi @@ -10,7 +10,7 @@ require './inittab-lib.pl'; print &ui_form_start("delete.cgi", "post"); @links = ( &select_all_link("d"), &select_invert_link("d"), - "$text{'inittab_new'}" ); + &ui_link("edit_inittab.cgi?new=1", $text{'inittab_new'}) ); print &ui_links_row(\@links); @tds = ( "width=5" ); print &ui_columns_start([ "", @@ -22,8 +22,7 @@ print &ui_columns_start([ "", 100, 0, \@tds); foreach $i (&parse_inittab()) { local @cols; - push(@cols, "". - &html_escape($i->{'id'}).""); + push(@cols, &ui_link("edit_inittab.cgi?id=".$i->{'id'}, &html_escape($i->{'id'})) ); push(@cols, $i->{'comment'} ? "$text{'no'}" : $text{'yes'}); local @rls = @{$i->{'levels'}}; From c14eebeb95c3ddadbc6c35177f466a1416965847 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:33:15 +0800 Subject: [PATCH 04/17] ui_link conversion -> logrotate --- logrotate/index.cgi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/logrotate/index.cgi b/logrotate/index.cgi index 2a95f7cf9..7ee559eb6 100755 --- a/logrotate/index.cgi +++ b/logrotate/index.cgi @@ -52,9 +52,9 @@ foreach $c ($config{'sort_mode'} ? local $p = &get_period($c->{'members'}) || $defp; local $r = &find_value("postrotate", $c->{'members'}); $r =~ s/\n/
\n/g; - push(@table, [ "". + push(@table, [ &ui_link("edit_log.cgi?idx=".$c->{'index'}, join(" ", map { "$_
" } - @{$c->{'name'}})."", + @{$c->{'name'}}) ), $text{'period_'.$p} || "$text{'index_notset'}", $r ? "$r" @@ -66,7 +66,7 @@ if (@table) { print &ui_form_start("delete_logs.cgi", "post"); @links = ( &select_all_link("d"), &select_invert_link("d"), - "$text{'index_add'}" ); + &ui_link("edit_log.cgi?new=1", $text{'index_add'}) ); print &ui_links_row(\@links); @tds = ( "width=5", "nowrap valign=top", "valign=top", "valign=top" ); print &ui_columns_start([ "", @@ -85,7 +85,8 @@ if (@table) { } else { print "

$text{'index_none'}

\n"; - print "$text{'index_add'}

\n"; + print &ui_link("edit_log.cgi?new=1", $text{'index_add'}); + print "

\n"; } # Show buttons for editing global config and scheduling From 8899315d59e9a3f6729e6c4a8af00e7f16cdafa5 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:35:34 +0800 Subject: [PATCH 05/17] ui_link conversion -> mailcap --- mailcap/index.cgi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mailcap/index.cgi b/mailcap/index.cgi index b088cd340..98cc71978 100755 --- a/mailcap/index.cgi +++ b/mailcap/index.cgi @@ -9,7 +9,7 @@ if (@mailcap) { print &ui_form_start("delete.cgi", "post"); @links = ( &select_all_link("d"), &select_invert_link("d"), - "$text{'index_add'}" ); + &ui_link("edit.cgi?new=1", $text{'index_add'}) ); print &ui_links_row(\@links); @tds = ( "width=5" ); @@ -22,7 +22,7 @@ if (@mailcap) { ], 100, 0, \@tds); foreach $m (@mailcap) { print &ui_checked_columns_row([ - "$m->{'type'}", + &ui_link("edit.cgi?index=".$m->{'index'}, $m->{'type'}), $m->{'program'}, $m->{'cmt'} || $m->{'args'}->{'description'}, $m->{'enabled'} ? $text{'yes'} : @@ -39,7 +39,8 @@ if (@mailcap) { } else { print "$text{'index_none'}

\n"; - print "$text{'index_add'}

\n"; + print &ui_link("edit.cgi?new=1", $text{'index_add'}); + print "

\n"; } &ui_print_footer("/", $text{'index'}); From ada20e8e2d2c19bd8cd6558e0df6a772b5938cfb Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:43:46 +0800 Subject: [PATCH 06/17] 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 = ( - "". - "$text{'ssl_pem'}", - "". - "$text{'ssl_pkcs12'}" + &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([ - "". - join(", ", @{$k->{'ips'}})."", + &ui_link("edit_ipkey.cgi?idx=".$k->{'index'}, + join(", ", @{$k->{'ips'}}) ), "$k->{'key'}", $k->{'cert'} ? "$k->{'cert'}" : $text{'ssl_cert_def'}, @@ -128,7 +126,8 @@ if (@ipkeys) { else { print "$text{'ssl_ipkeynone'}

\n"; } -print "$text{'ssl_addipkey'}

\n"; +print &ui_link("edit_ipkey.cgi?new=1", $text{'ssl_addipkey'}); +print "

\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([ - "". - ($minfo{'desc'} || $w->{'module'})."", + &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, [ - "$m->[0]", + &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, [ - "$m->[0]", + &ui_link("#", $m->[0], undef, "onClick='return select(\"$m->[2]\");'"), $m->[1] eq "NONE" ? "" : &html_escape($m->[1]), $m->[3], ]); From 69d96d991203bf751fb0759973505afcc2ec92f8 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 15:50:54 +0800 Subject: [PATCH 07/17] ui_link conversion -> pam --- pam/edit_pam.cgi | 23 ++++++++++------------- pam/index.cgi | 5 ++--- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pam/edit_pam.cgi b/pam/edit_pam.cgi index 9e38c6d9f..c40c1211b 100755 --- a/pam/edit_pam.cgi +++ b/pam/edit_pam.cgi @@ -49,16 +49,15 @@ foreach $t ('auth', 'account', 'session', 'password') { local @cols; if ($m->{'control'} eq 'include') { # Included module - push(@cols, "{'index'}'>". - &text('edit_inc', "$mn").""); + push(@cols, &ui_link("edit_inc.cgi?". + "idx=".$pam->{'index'}."&midx=".$m->{'index'}, + &text('edit_inc', "$mn")) ); @rtds = ( "colspan=4", "width=5%" ); } else { # Regular PAM module - push(@cols, "{'index'}'>". - "$mn"); + push(@cols, &ui_link("edit_mod.cgi?". + "idx=".$pam->{'index'}."&midx=".$m->{'index'}, $mn) ); push(@cols, $text{$mn}); push(@cols, $text{'control_'.$m->{'control'}}); push(@cols, $m->{'args'}); @@ -69,17 +68,15 @@ foreach $t ('auth', 'account', 'session', 'password') { $mv .= ""; } else { - $mv .= "{'index'}&down=1'>"; + $mv .= &ui_link("move.cgi?idx=$pam->{'index'}&". + "midx=".$m->{'index'}."&down=1", ""); } if ($m eq $mods[0]) { - $mv .= ""; + $mv .= ""; } else { - $mv .= "{'index'}&up=1'>"; + $mv .= &ui_link("move.cgi?idx=".$pam->{'index'}."&". + "midx=".$m->{'index'}."&up=1", ""); } push(@cols, $mv); $ptable .= &ui_columns_row(\@cols, \@rtds); diff --git a/pam/index.cgi b/pam/index.cgi index 3593808bc..1dbde2eff 100755 --- a/pam/index.cgi +++ b/pam/index.cgi @@ -14,7 +14,7 @@ if (!@pams) { exit; } -@links = ( "$text{'index_add'}" ); +@links = ( &ui_link("create_form.cgi", $text{'index_add'}) ); print &ui_links_row(\@links); $mid = int((@pams-1) / 2); print "\n"; if (&can_edit_process($pr->{'user'})) { - print "\n"; + print "\n"; } else { print "\n"; diff --git a/proc/proc-lib.pl b/proc/proc-lib.pl index 725e1a1d4..56f3092cd 100755 --- a/proc/proc-lib.pl +++ b/proc/proc-lib.pl @@ -66,12 +66,7 @@ local @links; foreach $l ("tree", "user", "size", "cpu", ($has_zone ? ("zone") : ()), "search", "run") { next if ($l eq "run" && !$access{'run'}); - local $link; - if ($l ne $_[0]) { $link .= ""; } - else { $link .= ""; } - $link .= $text{"index_$l"}; - if ($l ne $_[0]) { $link .= ""; } - else { $link .= ""; } + my $link = ( $l ne $_[0] ? &ui_link("index_".$l.".cgi", $text{"index_$l"}) : "".$text{"index_$l"}."" ); push(@links, $link); } print &ui_links_row(\@links); From e27cf0da04e56b91675d13728070c98c7a297348 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 16:33:08 +0800 Subject: [PATCH 11/17] ui_link conversion -> at --- at/edit_job.cgi | 3 +-- at/index.cgi | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/at/edit_job.cgi b/at/edit_job.cgi index e8a9a3e70..9521905a3 100755 --- a/at/edit_job.cgi +++ b/at/edit_job.cgi @@ -39,8 +39,7 @@ else { print &ui_table_row($text{'edit_shortcmd'}, "
".&html_escape(
 		    join("\n", &wrap_lines($job->{'realcmd'}, 80)))."
". - "". - $text{'edit_showfull'}."", 3); + &ui_link("edit_job.cgi?full=1&id=".&urlize($in{'id'}), $text{'edit_showfull'}), 3); } print &ui_table_end(); diff --git a/at/index.cgi b/at/index.cgi index c7d4659ad..9712e9d33 100755 --- a/at/index.cgi +++ b/at/index.cgi @@ -35,8 +35,7 @@ if (@jobs) { $text{'index_cmd'} ], 100, 0, \@tds); foreach $j (@jobs) { local @cols; - push(@cols, "". - "$j->{'id'}"); + push(@cols, &ui_link("edit_job.cgi?id=".$j->{'id'}, $j->{'id'}) ); push(@cols, &html_escape($j->{'user'})); $date = localtime($j->{'date'}); push(@cols, "$date"); From 803a5535507e848ba7ee8e57d78551f50324066b Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 16:57:13 +0800 Subject: [PATCH 12/17] ui_link conversion -> cron --- cron/index.cgi | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/cron/index.cgi b/cron/index.cgi index ee4e64cfa..75a44a62a 100755 --- a/cron/index.cgi +++ b/cron/index.cgi @@ -47,14 +47,11 @@ if ($config{'show_run'}) { # Work out creation links @crlinks = ( ); if ($access{'create'}) { - push(@crlinks, - "$text{'index_create'}"); - push(@crlinks, - "$text{'index_ecreate'}") - if ($env_support); + push(@crlinks, &ui_link("edit_cron.cgi?new=1", $text{'index_create'}) ); + push(@crlinks, &ui_link("edit_env.cgi?new=1", $text{'index_ecreate'}) ) if ($env_support); } if ($config{cron_allow_file} && $config{cron_deny_file} && $access{'allow'}) { - push(@crlinks, "$text{'index_allow'}"); + push(@crlinks, &ui_link("edit_allow.cgi", $text{'index_allow'}) ); } # Build a list of cron job rows to show @@ -101,17 +98,17 @@ foreach $u (@ulist) { if ($job->{'name'}) { # An environment variable - show the name only $cmdidx = scalar(@cols); - push(@cols, "". + push(@cols, &ui_link("edit_env.cgi?idx=".$idx, "$text{'index_env'} ". - "$job->{'name'} = $job->{'value'}"); + "$job->{'name'} = $job->{'value'}") ); $donelink = 1; } elsif (@exp && $access{'command'}) { # A multi-part command $cmdidx = scalar(@cols); @exp = map { &html_escape($_) } @exp; - push(@cols, "". - join("
",@exp).""); + push(@cols, &ui_link("edit_cron.cgi?idx=".$idx, + join("
",@exp)) ); $donelink = 1; } elsif ($access{'command'}) { @@ -123,8 +120,7 @@ foreach $u (@ulist) { $cmd = length($cmd) > $max ? &html_escape(substr($cmd, 0, $max))." ..." : $cmd !~ /\S/ ? "BLANK" : &html_escape($cmd); - push(@cols, - "$cmd"); + push(@cols, &ui_link("edit_cron.cgi?idx=".$idx, $cmd) ); $donelink = 1; } @@ -138,8 +134,7 @@ foreach $u (@ulist) { push(@cols, $when); } else { - push(@cols, - "$when"); + push(@cols, &ui_link("edit_cron.cgi?idx=".$idx, $when) ); } } @@ -163,7 +158,7 @@ foreach $u (@ulist) { if ($config{'show_run'} == 2 && ($access{'kill'} || !$proc)) { $lnk = $proc ? "kill_cron.cgi?idx=$idx" : "exec_cron.cgi?idx=$idx&bg=1"; - push(@cols, "$txt"); + push(@cols, &ui_link($lnk, $txt) ); } else { push(@cols, $txt); @@ -215,7 +210,7 @@ elsif (@rows) { if ($in{'search'}) { print "",&text('index_searchres', "".&html_escape($in{'search'}).""),"

\n"; - push(@links, "$text{'index_reset'}"); + push(@links, &ui_link("index.cgi", $text{'index_reset'}) ); } print &ui_form_start("delete_jobs.cgi", "post"); print &ui_links_row(\@links); @@ -245,7 +240,7 @@ elsif (@rows) { else { # Show message if ($in{'search'}) { - push(@crlinks, "$text{'index_reset'}"); + push(@crlinks, &ui_link("index.cgi", $text{'index_reset'}) ); } print $in{'search'} ? "".&text('index_esearch', "".&html_escape($in{'search'})."")."

" : From 1922d3b94cb35d90203dfa75c67a016bc36bf63e Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 17:01:27 +0800 Subject: [PATCH 13/17] ui_link conversion -> package-updates --- package-updates/index.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-updates/index.cgi b/package-updates/index.cgi index ebd1a19b8..05a8bf49e 100755 --- a/package-updates/index.cgi +++ b/package-updates/index.cgi @@ -23,9 +23,9 @@ foreach $m ('current', 'updates', 'new', push(@mlinks, "$mmsg"); } else { - push(@mlinks, "$mmsg"); + &urlize($in{'search'}), $mmsg) ); } } push(@grid, $text{'index_mode'}, &ui_links_row(\@mlinks)); @@ -109,10 +109,10 @@ foreach $p (sort { $a->{'name'} cmp $b->{'name'} } (@current, @avail)) { { 'type' => 'checkbox', 'name' => 'u', 'value' => $p->{'update'}."/".$p->{'system'}, 'checked' => $need }, - "{'name'})."&system=". &urlize($p->{'system'})."&search=". - &urlize($in{'search'})."'>$p->{'name'}", + &urlize($in{'search'}), $p->{'name'}), $p->{'desc'}, $msg, $source ? ( $source ) : $anysource ? ( "") : ( ), From 11f9dee5ca43047ae6f7ee5c0ae0d9a4e3ee41df Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 19:44:11 +0800 Subject: [PATCH 14/17] ui_link conversion -> software --- software/file_info.cgi | 5 ++--- software/find.cgi | 2 +- software/list_pack.cgi | 18 ++++++++---------- software/rhn.cgi | 4 +++- software/rpmfind.cgi | 3 +-- software/search.cgi | 6 +++--- software/tree.cgi | 19 +++++++++++-------- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/software/file_info.cgi b/software/file_info.cgi index 8e8b23b36..6c581b2aa 100755 --- a/software/file_info.cgi +++ b/software/file_info.cgi @@ -62,9 +62,8 @@ else { $packages{$i,'version'} ne $vers[$j] || $packages{$i,'name'} ne $pkgs[$j]); local @cols; - push(@cols, "$pkgs[$j]"); + push(@cols, &ui_link("edit_pack.cgi?package=". + &urlize($pkgs[$j])."&version=".&urlize($vers[$j]), $pkgs[$j]) ); $c = $packages{$i,'class'}; push(@cols, $c || $text{'file_none'}); push(@cols, $packages{$i,'desc'}); diff --git a/software/find.cgi b/software/find.cgi index 56ca77c7b..34a8e8810 100755 --- a/software/find.cgi +++ b/software/find.cgi @@ -55,7 +55,7 @@ if (defined($search)) { $sel = $a->{'select'} || $a->{'name'}; $epoch = $a->{'epoch'} ? "$a->{'epoch'}:" : ""; print &ui_columns_row( - [ "$a->{'name'}", + [ &ui_link("#", $a->{'name'}, undef, "onClick='sel(\"$sel\");'"), $hasver ? ($epoch.$a->{'version'}) : ( ), $hasdesc ? ($a->{'desc'}) : ( ) ]); } diff --git a/software/list_pack.cgi b/software/list_pack.cgi index fd1a130d6..d20aff398 100755 --- a/software/list_pack.cgi +++ b/software/list_pack.cgi @@ -21,23 +21,21 @@ for($i=0; $i<$n; $i++) { $sz = $files{$i,'size'}; $ty = $files{$i,'type'}; local @cols; - $ls = ""; + $ls = "file_info.cgi?file=".&urlize($files{$i,'path'}); $le = ""; if ($ty == 3 || $ty == 4) { # Hard or soft link - push(@cols, $ls.&html_escape($files{$i,'path'}). - " -> ".&html_escape($files{$i,'link'}).$le); + push(@cols, &ui_link($ls, &html_escape($files{$i,'path'}). + " -> ".&html_escape($files{$i,'link'})) ); push(@cols, "", ""); } else { - $table = "

\n"; @@ -32,8 +32,7 @@ print &ui_columns_start([ $text{'index_name'}, $text{'index_desc'} ], 100); foreach $p (@_) { local $t = $text{'desc_'.$p->{'name'}}; print &ui_columns_row([ - "". - &html_escape($p->{'name'})."", + &ui_link("edit_pam.cgi?idx=".$p->{'index'}, &html_escape($p->{'name'}) ), $p->{'desc'} || $t ]); } From d7fbd5b0936439ceb78c4db1aceac40c40a0f866 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 16:03:42 +0800 Subject: [PATCH 08/17] remove unused function --- certmgr/config_info.pl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/certmgr/config_info.pl b/certmgr/config_info.pl index 508997e65..e39db93a7 100755 --- a/certmgr/config_info.pl +++ b/certmgr/config_info.pl @@ -2,14 +2,4 @@ # do 'certmgr-lib.pl'; require 'certmgr-lib.pl'; -sub show_cfile -{ -local ($value) = @_; -return " ". &file_chooser_button("cfile")." "."Edit.."; -} - -sub parse_cfile -{ -return $in{'cfile'}; -} From c55a79695957077cadea34c8fb61675efb9d88c0 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 16:05:41 +0800 Subject: [PATCH 09/17] ui_link conversion -> certmgr --- certmgr/certmgr-lib.pl | 4 +++- certmgr/index.cgi | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/certmgr/certmgr-lib.pl b/certmgr/certmgr-lib.pl index af5ff3bb7..d0be0a431 100755 --- a/certmgr/certmgr-lib.pl +++ b/certmgr/certmgr-lib.pl @@ -61,7 +61,9 @@ sub print_sign_form { print &ui_table_row($text{'signcsr_csrfile'}, &ui_textbox("csrfile", $in{'csrfile'}, 40), undef, $valign_middle); print &ui_table_row($text{'signcsr_signfile'}, &ui_textbox("signfile", $in{'signfile'}, 40), undef, $valign_middle); print &ui_table_row($text{'signcsr_keyfile'}, &ui_textbox("keycertfile", $in{'keycertfile'}, 40), undef, $valign_middle); - print &ui_table_row("$text{'signcsr_ca_passphrase'}", + print &ui_table_row(&ui_link("/help.cgi/certmgr/signcsr_ca_pass", + "$text{'signcsr_ca_passphrase'}", undef, + "onClick='window.open(\"/help.cgi/certmgr/signcsr_ca_pass\", \"help\", \"toolbar=no,menubar=no,scrollbars=yes,width=400,height=300,resizable=yes\"); return false;'"), &ui_password("password", $in{'password'}, 40), undef, $valign_middle); print &ui_table_row($text{'signcsr_days'}, &ui_textbox("days", $in{'days'}, 40), undef, $valign_middle); print &ui_table_row(" ", diff --git a/certmgr/index.cgi b/certmgr/index.cgi index 511099e62..4677fdaba 100755 --- a/certmgr/index.cgi +++ b/certmgr/index.cgi @@ -13,7 +13,7 @@ print &ui_table_start($text{'index_header'}, undef, 2); foreach $p (@pages) { next if (!$access{$p}); $txt = $text{'index_'.$p}; - print &ui_columns_row(["", "$txt"], ["valign=middle width=5%","valign=middle style='padding-right:10px;'"]); + print &ui_columns_row([ &ui_link("$p.cgi", ""), &ui_link("$p.cgi", $txt) ], ["valign=middle width=5%","valign=middle style='padding-right:10px;'"]); } print ui_table_end(); From ced1acc9e5c8f7972c18bfad477046be1ab60524 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 16:22:28 +0800 Subject: [PATCH 10/17] ui_link conversion -> proc --- proc/edit_proc.cgi | 6 +++--- proc/index_cpu.cgi | 2 +- proc/index_search.cgi | 2 +- proc/index_size.cgi | 2 +- proc/index_tree.cgi | 2 +- proc/index_user.cgi | 2 +- proc/index_zone.cgi | 4 +++- proc/proc-lib.pl | 7 +------ 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/proc/edit_proc.cgi b/proc/edit_proc.cgi index bc8fbb0a2..ed440e0d5 100755 --- a/proc/edit_proc.cgi +++ b/proc/edit_proc.cgi @@ -28,8 +28,8 @@ print &ui_table_row($text{'pid'}, $pinfo{pid}); if ($pinfo{ppid}) { local %ppinfo = &process_info($pinfo{ppid}); print &ui_table_row($text{'parent'}, - "". - &cut_string($ppinfo{'args'}, 30).""); + &ui_link("edit_proc.cgi?".$ppinfo{pid}, + &cut_string($ppinfo{'args'}, 30)) ); } else { print &ui_table_row($text{'parent'}, $text{'edit_none'}); @@ -139,7 +139,7 @@ if (@sub) { foreach $s (@sub) { local $p = $s->{'pid'}; print &ui_columns_row([ - "$p", + &ui_link("edit_proc.cgi?".$p, $p), &cut_string($s->{args}, 80), ]); } diff --git a/proc/index_cpu.cgi b/proc/index_cpu.cgi index 683bdafda..b17727dd7 100755 --- a/proc/index_cpu.cgi +++ b/proc/index_cpu.cgi @@ -37,7 +37,7 @@ foreach $pr (@procs) { $p = $pr->{'pid'}; local @cols; if (&can_edit_process($pr->{'user'})) { - push(@cols, "$p"); + push(@cols, &ui_link("edit_proc.cgi?".$p, $p) ); } else { push(@cols, $p); diff --git a/proc/index_search.cgi b/proc/index_search.cgi index 9dd7868fb..ceef4a4df 100755 --- a/proc/index_search.cgi +++ b/proc/index_search.cgi @@ -158,7 +158,7 @@ if (%in) { push(@pidlist, $p); local @cols; if (&can_edit_process($d->{'user'})) { - push(@cols, "$p"); + push(@cols, &ui_link("edit_proc.cgi?".$p, $p) ); } else { push(@cols, $p); diff --git a/proc/index_size.cgi b/proc/index_size.cgi index 965d269ff..a3a28aa34 100755 --- a/proc/index_size.cgi +++ b/proc/index_size.cgi @@ -34,7 +34,7 @@ foreach $pr (@procs) { $p = $pr->{'pid'}; local @cols; if (&can_edit_process($pr->{'user'})) { - push(@cols, "$p"); + push(@cols, &ui_link("edit_proc.cgi?".$p, $p) ); } else { push(@cols, $p); diff --git a/proc/index_tree.cgi b/proc/index_tree.cgi index 34a5b9be8..af0827a6a 100755 --- a/proc/index_tree.cgi +++ b/proc/index_tree.cgi @@ -40,7 +40,7 @@ local(@ch, $_, $args); if (&can_view_process($usermap{$_[1]})) { local @cols; if (&can_edit_process($usermap{$_[1]})) { - push(@cols, "$_[0]$_[1]"); + push(@cols, $_[0].&ui_link("edit_proc.cgi?".$_[1], $_[1]) ); } else { push(@cols, "$_[0]$_[1]"); diff --git a/proc/index_user.cgi b/proc/index_user.cgi index dcac9844c..47c8364dd 100755 --- a/proc/index_user.cgi +++ b/proc/index_user.cgi @@ -23,7 +23,7 @@ foreach $u (@users) { $p = $pr->{'pid'}; local @cols; if (&can_edit_process($pr->{'user'})) { - push(@cols, "$p"); + push(@cols, &ui_link("edit_proc.cgi?".$p, $p) ); } else { push(@cols, $p); diff --git a/proc/index_zone.cgi b/proc/index_zone.cgi index 93eb76a18..a10771ec5 100755 --- a/proc/index_zone.cgi +++ b/proc/index_zone.cgi @@ -21,7 +21,9 @@ foreach $z (@zones) { $p = $pr->{'pid'}; print "
$p"; + print &ui_link("edit_proc.cgi?".$p, $p); + print "$p
\n"; } print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; } diff --git a/software/rpmfind.cgi b/software/rpmfind.cgi index 143c033af..9d1dcef3a 100755 --- a/software/rpmfind.cgi +++ b/software/rpmfind.cgi @@ -70,8 +70,7 @@ if ($in{'search'}) { $text{'rpm_finddesc'} ], 100); foreach $r (@rv) { print &ui_columns_row([ - "". - "$r->{'file'}", + &ui_link("#", $r->{'file'}, undef, "onClick='sel(\"$r->{'url'}\");'"), $r->{'dist'}, $r->{'desc'} ]); diff --git a/software/search.cgi b/software/search.cgi index 14d92694d..862a3c004 100755 --- a/software/search.cgi +++ b/software/search.cgi @@ -49,10 +49,10 @@ if (@match) { local @cols; local $v = $packages{$i,'shortversion'} || $packages{$i,'version'}; - push(@cols, "".&html_escape( - $packages{$i,'name'}.($v ? " $v" : "")).""); + &urlize($packages{$i,'version'}), &html_escape( + $packages{$i,'name'}.($v ? " $v" : "")) ) ); $c = $packages{$i,'class'}; push(@cols, $c ? &html_escape($c) : $text{'search_none'}); diff --git a/software/tree.cgi b/software/tree.cgi index a484e94fa..6a016a1f4 100755 --- a/software/tree.cgi +++ b/software/tree.cgi @@ -44,8 +44,10 @@ print "
$ls". - &html_escape($files{$i,'path'}). - "$le \n"; + $table = "
". + &ui_link($ls, &html_escape($files{$i,'path'}) ). + "\n"; if ($ty == 0 || $ty == 5) { - $table .= "$text{'list_view'}"; + $table .= &ui_link("view.cgi". + &html_escape($files{$i,'path'}), $text{'list_view'}); } $table .= "
"; push(@cols, $table); diff --git a/software/rhn.cgi b/software/rhn.cgi index c27cfe6ef..2ce0f34dc 100755 --- a/software/rhn.cgi +++ b/software/rhn.cgi @@ -35,7 +35,9 @@ else { "$text{'rhn_version'}
$1"; + print &ui_link("#", $1, undef, "onClick='sel(\"$1\");'"); + print "$2 - $3
\n"; &traverse("", 0); print "
\n"; if ($hasclasses) { - print "$text{'index_close'}\n"; - print "$text{'index_open'}

\n"; + print &ui_link("closeall.cgi", $text{'index_close'}); + print "\n"; + print &ui_link("openall.cgi", $text{'index_open'}); + print "

\n"; } &ui_print_footer("", $text{'index_return'}); @@ -59,9 +61,10 @@ print " ", $spacer x $_[1]; if ($_[0]) { print "\n"; $act = $heiropen{$_[0]} ? "close" : "open"; - print ""; + my $link = "$act.cgi?what=".&urlize($_[0]); $_[0] =~ /([^\/]+)$/; - print "  $1\n"; + print &ui_link($link, ""); + print "  $1\n"; } else { print " $text{'index_all'}\n"; @@ -74,10 +77,10 @@ if ($heiropen{$_[0]}) { if ($class[$i] eq $_[0]) { print " ", $spacer x ($_[1]+1); print " \n"; - print "",&html_escape($pack[$i]. - ($svers[$i] ? " $svers[$i]" : "")),"\n"; + print &ui_link("edit_pack.cgi?package=". + &urlize($pack[$i])."&version=". + &urlize($vers[$i]), &html_escape($pack[$i]. + ($svers[$i] ? " $svers[$i]" : "")) )."\n"; print "",&html_escape($desc[$i]),"\n"; print "\n"; } From fd2ac3a302a3a4615bc5930a58e125a0d7afc27d Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 19:49:47 +0800 Subject: [PATCH 15/17] ui_link conversion -> man --- man/search.cgi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/man/search.cgi b/man/search.cgi index f4453952b..c47646190 100755 --- a/man/search.cgi +++ b/man/search.cgi @@ -276,12 +276,10 @@ if (@rv) { foreach $r (@rv) { local @cols; if ($r->[1] =~ /^(http|ftp|https):/) { - push(@cols, "". - &html_escape($r->[2]).""); + push(@cols, &ui_link($r->[1], &html_escape($r->[2]), undef, "target=_blank") ); } else { - push(@cols, "".&html_escape($r->[2]).""); + push(@cols, &ui_link($r->[1]."&for=".&urlize($in{'for'}), &html_escape($r->[2]) ) ); } push(@cols, $r->[0]); push(@cols, &html_escape($r->[3])); From b6691c620db7daa4120688a642d1fc8c8718be5b Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 19:54:25 +0800 Subject: [PATCH 16/17] ui_link conversion -> syslog --- syslog/index.cgi | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/syslog/index.cgi b/syslog/index.cgi index 35c2b6d9e..65b3c5702 100755 --- a/syslog/index.cgi +++ b/syslog/index.cgi @@ -30,8 +30,7 @@ if (!-r $config{'syslog_conf'}) { @links = ( ); if ($access{'syslog'}) { $conf = &get_config(); - push(@links, "$text{'index_add'}") - if (!$access{'noedit'}); + push(@links, &ui_link("edit_log.cgi?new=1", $text{'index_add'}) ) if (!$access{'noedit'}); } print &ui_links_row(\@links); print &ui_columns_start([ @@ -77,8 +76,8 @@ if ($access{'syslog'}) { push(@cols, $name); } else { - push(@cols, "$name"); + push(@cols, &ui_link("edit_log.cgi?". + "idx=".$c->{'index'}, $name) ); } if ($config{'tags'}) { push(@cols, $c->{'section'}->{'tag'} eq '*' ? @@ -89,8 +88,8 @@ if ($access{'syslog'}) { push(@cols, join(" ; ", map { &html_escape($_) } @{$c->{'sel'}})); if ($c->{'file'} && -f $c->{'file'}) { - push(@cols, "$text{'index_view'}\n"); + push(@cols, &ui_link("save_log.cgi?idx=".$c->{'index'}."&". + "view=1", $text{'index_view'}) ); } else { push(@cols, ""); @@ -120,8 +119,8 @@ if (@others) { push(@cols, $o->{'active'} ? $text{'yes'} : "$text{'no'}"); push(@cols, $o->{'desc'}); - push(@cols, "{'mod'}&view=1'>$text{'index_view'}"); + push(@cols, &ui_link("save_log.cgi?oidx=$o->{'mindex'}". + "&omod=$o->{'mod'}&view=1", $text{'index_view'}) ); print &ui_columns_row(\@cols); } } @@ -136,8 +135,7 @@ foreach $e (&extra_log_files()) { } push(@cols, $text{'yes'}); push(@cols, $e->{'desc'}); - push(@cols, "". - "$text{'index_view'}"); + push(@cols, &ui_link("save_log.cgi?extra=$e->{'file'}&view=1", $text{'index_view'}) ); print &ui_columns_row(\@cols); } From 21348b23b3bbccbb65e33f32a0d3e947e86112c4 Mon Sep 17 00:00:00 2001 From: Nawawi Jamili Date: Thu, 19 Dec 2013 20:41:19 +0800 Subject: [PATCH 17/17] ui_link conversion -> useradmin --- useradmin/edit_group.cgi | 4 ++-- useradmin/index.cgi | 13 ++++++------- useradmin/list_who.cgi | 4 ++-- useradmin/my_group_chooser.cgi | 8 ++++++-- useradmin/my_user_chooser.cgi | 8 ++++++-- useradmin/user-lib.pl | 12 ++++-------- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/useradmin/edit_group.cgi b/useradmin/edit_group.cgi index 257f3dc90..1db61e265 100755 --- a/useradmin/edit_group.cgi +++ b/useradmin/edit_group.cgi @@ -100,8 +100,8 @@ if ($n ne "") { @uprilinks = ( ); foreach $u (@upri) { if (&can_edit_user(\%access, $u)) { - push(@uprilinks, "".&html_escape($u->{'user'}).""); + push(@uprilinks, &ui_link("edit_user.cgi?". + "user=$u->{'user'}", &html_escape($u->{'user'}) ) ); } else { push(@uprilinks, $u->{'user'}); diff --git a/useradmin/index.cgi b/useradmin/index.cgi index 041ddfe97..d62681d03 100755 --- a/useradmin/index.cgi +++ b/useradmin/index.cgi @@ -221,16 +221,15 @@ if ($access{'ucreate'}) { } else { $cancreate = 1; } if ($cancreate) { - push(@rv, "". - "$text{'index_createuser'}"); + push(@rv, &ui_link("edit_user.cgi", $text{'index_createuser'}) ); } else { push(@rv, $text{'index_nomoreusers'}); } } -push(@rv, "$text{'index_batch'}") +push(@rv, &ui_link("batch_form.cgi", $text{'index_batch'}) ) if ($access{'batch'}); -push(@rv, "$text{'index_export'}") +push(@rv, &ui_link("export_form.cgi", $text{'index_export'}) ) if ($access{'export'}); return @rv; } @@ -259,15 +258,15 @@ if ($access{'gcreate'} == 1) { } else { $cancreate = 1; } if ($cancreate) { - push(@rv, "$text{'index_creategroup'}"); + push(@rv, &ui_link("edit_group.cgi", $text{'index_creategroup'}) ); } else { push(@rv, $text{'index_nomoregroups'}); } } -push(@rv, "$text{'index_batch'}") +push(@rv, &ui_link("gbatch_form.cgi", $text{'index_batch'}) ) if ($access{'batch'}); -push(@rv, "$text{'index_export'}") +push(@rv, &ui_link("gexport_form.cgi", $text{'index_export'}) ) if ($access{'export'}); return @rv; } diff --git a/useradmin/list_who.cgi b/useradmin/list_who.cgi index b7faf84fb..6ebce3347 100755 --- a/useradmin/list_who.cgi +++ b/useradmin/list_who.cgi @@ -17,8 +17,8 @@ foreach $w (@whos) { $tm = defined(&mailboxes::parse_mail_date) ? &mailboxes::parse_mail_date($w->{'when'}) : undef; push(@table, [ - "". - &html_escape($w->{'user'})."", + &ui_link("list_logins.cgi?username=".&urlize($w->{'user'}), + &html_escape($w->{'user'}) ), &html_escape($w->{'tty'}), &html_escape($tm ? &make_date($tm) : $w->{'when'}), $w->{'from'} ? &html_escape($w->{'from'}) diff --git a/useradmin/my_group_chooser.cgi b/useradmin/my_group_chooser.cgi index 892162216..b7913bc0b 100755 --- a/useradmin/my_group_chooser.cgi +++ b/useradmin/my_group_chooser.cgi @@ -68,7 +68,9 @@ if ($in{'multi'}) { foreach $u (&get_groups_list()) { if ($in{'group'} eq $u->[0]) { print "\n"; } else { print "\n"; } - print "$u->[0]\n"; + print ""; + print &ui_link("#", $u->[0], undef, "onClick='return addgroup(\"$u->[0]\", \"$u->[3]\");'"); + print "\n"; print "$u->[3] \n"; $cnt++; } @@ -155,7 +157,9 @@ else { foreach $u (&get_groups_list()) { if ($in{'group'} eq $u->[0]) { print "\n"; } else { print "\n"; } - print "".&html_escape($u->[0])."\n"; + print ""; + print &ui_link("#", &html_escape($u->[0]), undef, "onClick='return select(\"$u->[0]\");'"); + print "\n"; print "".&html_escape($u->[3])." \n"; $cnt++; } diff --git a/useradmin/my_user_chooser.cgi b/useradmin/my_user_chooser.cgi index 830b858ee..d76e62d2b 100755 --- a/useradmin/my_user_chooser.cgi +++ b/useradmin/my_user_chooser.cgi @@ -61,7 +61,9 @@ if ($in{'multi'}) { if ($in{'user'} eq $u->[0]) { print "\n"; } else { print "\n"; } $u->[6] =~ s/'/'/g; - print "$u->[0]\n"; + print ""; + print &ui_link("#", $u->[0], undef, "onClick='return adduser(\"$u->[0]\", \"$u->[6]\");'"); + print "\n"; print "$u->[6] \n"; $cnt++; } @@ -148,7 +150,9 @@ else { foreach $u (&get_users_list()) { if ($in{'user'} eq $u->[0]) { print "\n"; } else { print "\n"; } - print "$u->[0]\n"; + print ""; + print &ui_link("#", $u->[0], undef, "onClick='return select(\"$u->[0]\");'"); + print "\n"; print "$u->[6] \n"; $cnt++; } diff --git a/useradmin/user-lib.pl b/useradmin/user-lib.pl index 06294373c..4ef717c44 100755 --- a/useradmin/user-lib.pl +++ b/useradmin/user-lib.pl @@ -2520,12 +2520,10 @@ if ($_[0]->{'noedit'}) { return $dis; } elsif ($_[0]->{'dn'}) { - return "". - "$dis"; + return &ui_link("edit_user.cgi?dn=".&urlize($_[0]->{'dn'}), $dis); } else { - return "". - "$dis"; + return &ui_link("edit_user.cgi?user=".&urlize($_[0]->{'user'}), $dis); } } @@ -2540,12 +2538,10 @@ if ($_[0]->{'noedit'}) { return &html_escape($_[0]->{'group'}); } elsif ($_[0]->{'dn'}) { - return "". - &html_escape($_[0]->{'group'}).""; + return &ui_link("edit_group.cgi?dn=".&urlize($_[0]->{'dn'}), &html_escape($_[0]->{'group'}) ); } else { - return "". - &html_escape($_[0]->{'group'}).""; + return &ui_link("edit_group.cgi?group=".&urlize($_[0]->{'group'}), &html_escape($_[0]->{'group'}) ); } }