michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ui-lib and strict conversion

Browse Source
This commit is contained in:
Jamie Cameron
2014-01-04 12:42:14 -08:00
parent e2c169d5ea
commit 11ba8cb1e4
2 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
squid/edit_progs.cgi
View File

@@ -2,23 +2,20 @@
# edit_progs.cgi
# A form for editing helper program options
use strict;
use warnings;
our (%text, %in, %access, $squid_version, %config);
require './squid-lib.pl';
$access{'hprogs'} || &error($text{'eprogs_ecannot'});
&ui_print_header(undef, $text{'eprogs_header'}, "", "edit_progs", 0, 0, 0, &restart_button());
$conf = &get_config();
my $conf = &get_config();
print "<form action=save_progs.cgi>\n";
print "<table border width=100%>\n";
print "<tr $tb> <td><b>$text{'eprogs_chpo'}</b></td> </tr>\n";
print "<tr $cb> <td><table width=100%>\n";
print &ui_form_start("save_progs.cgi", "post");
print &ui_table_start($text{'eprogs_chpo'}, "width=100%", 4);
print "<tr>\n";
if ($squid_version < 2) {
print &opt_input($text{'eprogs_sfp'}, "ftpget_program", $conf,
$text{'default'}, 40, &file_chooser_button("ftpget_program"));
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_fo'}, "ftpget_options", $conf, $text{'default'}, 15);
}
else {
@@ -26,61 +23,41 @@ else {
$text{'default'}, 6, $text{'eprogs_c'});
}
print &opt_input($text{'eprogs_afl'}, "ftp_user", $conf, $text{'default'}, 15);
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_sdp'}, "cache_dns_program", $conf, $text{'default'}, 40,
&file_chooser_button("cache_dns_program"));
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_nodp'}, "dns_children", $conf, $text{'default'}, 5);
print &choice_input($text{'eprogs_adtr'}, "dns_defnames", $conf, "off",
$text{'yes'}, "on", $text{'no'}, "off");
print "</tr>\n";
if ($squid_version >= 2) {
print "<tr>\n";
print &opt_input($text{'eprogs_dsa'}, "dns_nameservers", $conf,
$text{'eprogs_fr'}, 35);
print "</tr>\n";
}
print "<tr>\n";
print &opt_input($text{'eprogs_ccp'}, "unlinkd_program", $conf,
$text{'default'}, 40, &file_chooser_button("unlinkd_program"));
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_spp'}, "pinger_program", $conf,
$text{'default'}, 40, &file_chooser_button("pinger_program"));
print "</tr>\n";
if ($squid_version >= 2.6) {
print "<tr>\n";
print &opt_input($text{'eprogs_crp'}, "url_rewrite_program", $conf,
$text{'none'}, 40, &file_chooser_button("url_rewrite_program"));
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_norp'}, "url_rewrite_children", $conf,
$text{'default'}, 6);
print "</tr>\n";
}
else {
print "<tr>\n";
print &opt_input($text{'eprogs_crp'}, "redirect_program", $conf,
$text{'none'}, 40, &file_chooser_button("redirect_program"));
print "</tr>\n";
print "<tr>\n";
print &opt_input($text{'eprogs_norp'}, "redirect_children", $conf,
$text{'default'}, 6);
print "</tr>\n";
}
print "</table></td></tr></table>\n";
print "<input type=submit value='$text{'buttsave'}'></form>\n";
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'buttsave'} ] ]);
&ui_print_footer("", $text{'eprogs_return'});

12
squid/save_progs.cgi
View File

@@ -2,12 +2,15 @@
# save_progs.cgi
# Save helper program options
use strict;
use warnings;
our (%text, %in, %access, $squid_version, %config);
require './squid-lib.pl';
$access{'hprogs'} || &error($text{'eprogs_ecannot'});
&ReadParse();
&lock_file($config{'squid_conf'});
$conf = &get_config();
$whatfailed = $text{'sprog_ftshpo'};
my $conf = &get_config();
&error_setup($text{'sprog_ftshpo'});
if ($squid_version < 2) {
&save_opt("ftpget_program", \&check_prog, $conf);
@@ -67,10 +70,9 @@ return $_[0] =~ /^\d+$/ ? undef : &text('sprog_emsg6',$_[0]);
sub check_dnsservers
{
local $dns;
local @dns = split(/\s+/, $_[0]);
my @dns = split(/\s+/, $_[0]);
return $text{'sprog_emsg7'} if (!@dns);
foreach $dns (@dns) {
foreach my $dns (@dns) {
&check_ipaddress($dns) || return &text('sprog_emsg8',$dns);
}
return undef;