diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl index 10fc3adfe..faba993b2 100755 --- a/apache/apache-lib.pl +++ b/apache/apache-lib.pl @@ -864,7 +864,7 @@ foreach $e (@{$_[0]}) { foreach $ed (split(/\s+/, $e->{'name'})) { # nodo50 v0.1 - Change 000004 - Open new window for Help in Apache module and mod_apachessl Help from http://www.apache-ssl.org and # nodo50 v0.1 - Change 000004 - Abre nueva ventana para Ayuda del módulo Apache y para mod_apachessl busca la Ayuda en http://www.apache-ssl.org and - $names .= "{'module'}.".html#".lc($ed))."'>".$ed." "; + $names .= "".&ui_link( ($e->{'module'} eq 'mod_apachessl' ? 'http://www.apache-ssl.org/docs.html#'.$ed : $apache_docbase."/".$e->{'module'}.".html#".lc($ed)), $ed )." "; #$names .= "".$ed." "; # nodo50 v0.1 - Change 000004 - End } @@ -938,7 +938,7 @@ return ( [ $v =~ /\s/ && !$_[3] ? "\"$v\"" : $v ] ); # Each choice is a display,value pair sub choice_input { -local($i, $rv); +my($i, $rv); for($i=3; $i<@_; $i++) { $_[$i] =~ /^([^,]*),(.*)$/; $rv .= &ui_oneradio($_[1], $2, $1, lc($2) eq lc($_[0]) || @@ -951,12 +951,11 @@ return $rv; # Each choice is a display,value pair sub choice_input_vert { -local($i, $rv); +my($i, $rv); for($i=3; $i<@_; $i++) { $_[$i] =~ /^([^,]*),(.*)$/; - $rv .= sprintf " $1
\n", - lc($2) eq lc($_[0]) || !defined($_[0]) && - lc($2) eq lc($_[2]) ? "checked" : ""; + $rv .= &ui_oneradio($_[1], $2, $1, lc($2) eq lc($_[0]) || + !defined($_[0]) && lc($2) eq lc($_[2]))."
\n"; } return $rv; } @@ -971,15 +970,12 @@ else { return ( [ $in{$_[0]} ] ); } # select_input(value, name, default, [choice]+) sub select_input { -local($i, $rv); -$rv = "\n"; -return $rv; +return &ui_select($_[1], undef, \@sel, 1); } # parse_choice(name, default) @@ -991,8 +987,8 @@ return &parse_choice(@_); # handler_input(value, name) sub handler_input { -local($m, $func, @hl, $rv, $h); -local $conf = &get_config(); +my($m, $func, @hl, @sel, $h); +my $conf = &get_config(); push(@hl, ""); foreach $m (keys %httpd_modules) { $func = $m."_handlers"; @@ -1001,15 +997,11 @@ foreach $m (keys %httpd_modules) { } } if (&indexof($_[0], @hl) < 0) { push(@hl, $_[0]); } -$rv = "\n"; -return $rv; +push(@sel, ["None", "<".$text{'core_none'}.">", ($_[0] eq "None" ? "selected" : "")] ); +return &ui_select($_[1], undef, \@sel, 1); } # parse_handler(name) @@ -1034,8 +1026,7 @@ foreach $f (@{$_[0]}) { push(@fl, $f) if (&indexof($f, @fl) < 0); } foreach $f (&unique(@fl)) { - $rv .= sprintf " %s\n", - $f, &indexof($f, @{$_[0]}) < 0 ? "" : "checked", $f; + $rv .= &ui_checkbox($_[1], $f, $f, (&indexof($f, @{$_[0]}) < 0 ? 0 : 1 ) ); } return $rv; } @@ -1147,14 +1138,14 @@ $args = "redir=".&urlize(&this_url()); local @rv; if (&is_apache_running()) { if ($access{'apply'}) { - push(@rv, "$text{'apache_apply'}\n"); + push(@rv, &ui_link("restart.cgi?$args", $text{'apache_apply'}) ); } if ($access{'stop'}) { - push(@rv, "$text{'apache_stop'}\n"); + push(@rv, &ui_link("stop.cgi?$args", $text{'apache_stop'}) ); } } elsif ($access{'stop'}) { - push(@rv, "$text{'apache_start'}\n"); + push(@rv, &ui_link("start.cgi?$args", $text{'apache_start'}) ); } return join("
\n", @rv); } @@ -1259,7 +1250,7 @@ local $txtlen = length($txt); $txt = &html_escape($txt); print " " x $_[2]; if ($_[3]) { - print "",$txt,""; + print &ui_link($_[3], $txt); } else { print $txt; } print " " x (90 - $txtlen - $_[2] - length($lstr)); diff --git a/apache/edit_global.cgi b/apache/edit_global.cgi index 6c92cab3d..e6e8eb2bc 100755 --- a/apache/edit_global.cgi +++ b/apache/edit_global.cgi @@ -28,8 +28,8 @@ if ($in{'type'} == 6) { print &ui_hr(); print &ui_subheading($text{'global_mime'}); print "$text{'global_mimedesc'}

\n"; - @links = ( "". - "$text{'global_add'}" ); + @links = ( &ui_link("edit_gmime_type.cgi?file=$mfile", + $text{'global_add'}) ); print &ui_links_row(\@links); print &ui_columns_start([ $text{'global_type'}, $text{'global_ext'} ]); @@ -40,8 +40,8 @@ if ($in{'type'} == 6) { s/#.*$//; if (/^\s*(\S+)\s*(.*)$/) { print &ui_columns_row([ - "$1", $2 ]); + &ui_link("edit_gmime_type.cgi?line=$line". + "&file=$mfile", $1), $2 ]); } $line++; } diff --git a/apache/htaccess.cgi b/apache/htaccess.cgi index 47fb0385a..bb70e44a5 100755 --- a/apache/htaccess.cgi +++ b/apache/htaccess.cgi @@ -15,7 +15,7 @@ if (@htaccess_files) { $i = 0; foreach $f (@htaccess_files) { print &ui_columns_row([ - "".$htaccess_files[$i]."" + &ui_link("htaccess_index.cgi?file=".&urlize($htaccess_files[$i]), $htaccess_files[$i]) ]); $i++; } diff --git a/apache/htaccess_index.cgi b/apache/htaccess_index.cgi index 0833abf20..1fe93a283 100755 --- a/apache/htaccess_index.cgi +++ b/apache/htaccess_index.cgi @@ -10,8 +10,8 @@ $access{'global'} || &error($text{'htaccess_ecannot'}); $conf = &get_htaccess_config($in{'file'}); $desc = &html_escape($in{'file'}); &ui_print_header($desc, $text{'htindex_title'}, "", - undef, undef, undef, undef, "$text{'htindex_delete'}"); + undef, undef, undef, undef, &ui_link("delete_htaccess.cgi?file=". + &urlize($in{'file'}), $text{'htindex_delete'}) ); $sw_icon = { "icon" => "images/show.gif", "name" => $text{'htindex_show'}, @@ -45,7 +45,7 @@ if (@file && $httpd_modules{'core'} >= 1.2) { $text{'virt_type'} ]); for($i=0; $i<@links; $i++) { print &ui_columns_row([ - "$titles[$i]", + &ui_link($links[$i], $titles[$i]), $text{'virt_'.$types[$i]} ]); } print &ui_columns_end(); diff --git a/apache/index.cgi b/apache/index.cgi index f1874916e..9e9a48216 100755 --- a/apache/index.cgi +++ b/apache/index.cgi @@ -335,13 +335,13 @@ elsif ($config{'show_list'} && scalar(@vname)) { $text{'index_url'} ], 100); for($i=0; $i<@vname; $i++) { local @cols; - push(@cols, "$vname[$i]"); + push(@cols, &ui_link($vlink[$i], $vname[$i]) ); push(@cols, &html_escape($vaddr[$i])); push(@cols, &html_escape($vport[$i])); push(@cols, $vserv[$i] || $text{'index_auto'}); push(@cols, &html_escape($vproxy[$i]) || &html_escape($vroot[$i])); - push(@cols, "$text{'index_view'}"); + push(@cols, &ui_link($vurl[$i], $text{'index_view'}) ); if ($showdel && $vidx[$i]) { print &ui_checked_columns_row(\@cols, undef, "d", $vidx[$i]); diff --git a/apache/list_authgroups.cgi b/apache/list_authgroups.cgi index 1eb66d0f5..f31c07e64 100755 --- a/apache/list_authgroups.cgi +++ b/apache/list_authgroups.cgi @@ -25,10 +25,11 @@ if (@groups) { $g = $groups[$i]->{'group'}; @m = @{$groups[$i]->{'members'}}; if (@m > 15) { @m = @m[0..14]; } - printf " $g\n", - &urlize($f), &urlize(&this_url()); - printf "%s \n", + print ""; + print &ui_link("edit_authgroup.cgi?group=$g&". + "file=".&urlize($f)."&url=".&urlize(&this_url()), $g); + print ""; + printf "%s\n", @m ? join(" , ", @m) : "None"; } print "\n"; @@ -36,8 +37,9 @@ if (@groups) { else { print "",&text('authg_none', "$f"),"

\n"; } -printf "%s

\n", - &urlize($f), &urlize(&this_url()), $text{'authg_add'}; +print &ui_link("edit_authgroup.cgi?file=". + &urlize($f)."&url=".&urlize(&this_url()), $text{'authg_add'}); +print "

\n"; &ui_print_footer($in{'url'}, $text{'auth_return'}); diff --git a/apache/list_authusers.cgi b/apache/list_authusers.cgi index 25b8c7690..74f240182 100755 --- a/apache/list_authusers.cgi +++ b/apache/list_authusers.cgi @@ -22,9 +22,9 @@ if (@users) { for($i=0; $i<@users; $i++) { $u = $users[$i]; if ($i%4 == 0) { print "\n"; } - printf "$u\n", - &urlize($f), &urlize(&this_url()); + print ""; + print &ui_link("edit_authuser.cgi?user=$u&file=".&urlize($f)."&url=".&urlize(&this_url()), $u); + print ""; if ($i%4 == 3) { print "\n"; } } while($i++%4) { print "\n"; } @@ -33,8 +33,8 @@ if (@users) { else { print "",&text('authu_none', "$f"),"

\n"; } -printf "%s

\n", - &urlize($f), &urlize(&this_url()), $text{'authu_add'}; +print &ui_link("edit_authuser.cgi?file=".&urlize($f)."&url=".&urlize(&this_url()), $text{'authu_add'}); +print "

\n"; print &ui_hr(); $s = $config{"sync_$f"}; diff --git a/apache/mod_auth.pl b/apache/mod_auth.pl index a97ab170d..45baeeb51 100755 --- a/apache/mod_auth.pl +++ b/apache/mod_auth.pl @@ -18,14 +18,14 @@ $rv = "
\n"; $rv .= "\n"; + ($uf ? " ".&ui_link("list_authusers.cgi?file=".$_[0]->{'value'}. + "&url=".&urlize(&this_url()), $text{'mod_auth_uedit'}) : "")."\n"; $rv .= "\n"; + ($gf ? " ".&ui_link("list_authgroups.cgi?file=".$_[1]->{'value'}. + "&url=".&urlize(&this_url()), $text{'mod_auth_gedit'}) : "")."\n"; $rv .= "
$text{'mod_auth_ufile'} ". &opt_input($_[0]->{'value'}, "AuthUserFile", $text{'default'}, 45). &file_chooser_button("AuthUserFile", 0). - ($uf ? " {'value'}. - "&url=".&urlize(&this_url())."\">$text{'mod_auth_uedit'}" : "")."
$text{'mod_auth_gfile'} ". &opt_input($_[1]->{'value'}, "AuthGroupFile", $text{'default'}, 45). &file_chooser_button("AuthGroupFile", 0). - ($gf ? " {'value'}. - "&url=".&urlize(&this_url())."\">$text{'mod_auth_gedit'}" : "")."
$text{'mod_auth_pass'} ". &choice_input($_[2]->{'value'}, "AuthAuthoritative", "", diff --git a/apache/mod_authn_file.pl b/apache/mod_authn_file.pl index 04286db12..3ee4b29f3 100755 --- a/apache/mod_authn_file.pl +++ b/apache/mod_authn_file.pl @@ -14,8 +14,8 @@ local $uf = $_[0] && -r "list_authusers.cgi" ? 1 : 0; return (2, $text{'mod_auth_ufile'}, &opt_input($_[0]->{'value'}, "AuthUserFile", $text{'default'}, 45). &file_chooser_button("AuthUserFile", 0). - ($uf ? " {'value'}. - "&url=".&urlize(&this_url())."\">$text{'mod_auth_uedit'}" : "")); + ($uf ? " ".&ui_link("list_authusers.cgi?file=".$_[0]->{'value'}. + "&url=".&urlize(&this_url()), $text{'mod_auth_uedit'}) : "")); } sub save_AuthUserFile { diff --git a/apache/mod_authz_groupfile.pl b/apache/mod_authz_groupfile.pl index 66e2d397e..b3c221613 100755 --- a/apache/mod_authz_groupfile.pl +++ b/apache/mod_authz_groupfile.pl @@ -14,8 +14,8 @@ local $uf = $_[0] && -r "list_authgroups.cgi" ? 1 : 0; return (2, $text{'mod_auth_gfile'}, &opt_input($_[0]->{'value'}, "AuthGroupFile", $text{'default'}, 45). &file_chooser_button("AuthGroupFile", 0). - ($uf ? " {'value'}. - "&url=".&urlize(&this_url())."\">$text{'mod_auth_gedit'}" : "")); + ($uf ? " ".&ui_link("list_authgroups.cgi?file=".$_[0]->{'value'}. + "&url=".&urlize(&this_url()), $text{'mod_auth_gedit'}) : "")); } sub save_AuthGroupFile { diff --git a/apache/search_virt.cgi b/apache/search_virt.cgi index d29e1d472..820a7ce3a 100755 --- a/apache/search_virt.cgi +++ b/apache/search_virt.cgi @@ -111,14 +111,14 @@ else { } else { print "\n"; - print " ", + print " ", " ", " ", " ", "\n"; foreach $i (@match) { print "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; print "\n"; diff --git a/apache/show.cgi b/apache/show.cgi index d2523fa1f..9c9eb688c 100755 --- a/apache/show.cgi +++ b/apache/show.cgi @@ -104,16 +104,15 @@ for($idx=0; $idx<@$list; $idx++) { $t = $edit{lc($d->{'name'})}; if ($d->{'type'}) { # Recurse into section - local ($ed1, $ed2); + my $ed = ""; print " " x $ind; if ($d->{'name'} eq "VirtualHost") { next; } elsif ($d->{'name'} =~ /Location|Files|Directory/) { - $ed1 = ""; - $ed2 = ""; + $ed = "$dir?$args&idx=$idx"; } - print $ed1,"<",$d->{'name'}," ",$d->{'value'}, - ">",$ed2,"\n"; + my $et = "<".$d->{'name'}." ".$d->{'value'}.">"; + print ( $ed ne "" ? &ui_link($ed, $et) : $et); + print "\n"; &show_directives($d->{'members'}, $ind+1); print " " x $ind; print "</",$d->{'name'},">\n"; diff --git a/apache/virt_index.cgi b/apache/virt_index.cgi index 5f055c215..eb3665ba1 100755 --- a/apache/virt_index.cgi +++ b/apache/virt_index.cgi @@ -47,7 +47,7 @@ if (@dir) { $text{'virt_type'} ]); for($i=0; $i<@links; $i++) { print &ui_columns_row([ - "$titles[$i]", + &ui_link($links[$i], $titles[$i]), $text{'virt_'.$types[$i]} ]); } print &ui_columns_end();
$text{'index_type'}
$text{'index_type'}$text{'index_addr'}$text{'index_port'}$text{'index_name'}$text{'index_root'}
$vname[$i]".&ui_link($vlink[$i], $vname[$i])."$vaddr[$i]$vport[$i]$vserv[$i]