summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2003-03-02 15:40:12 +0000
committerFlorent Villard <warly@mandriva.com>2003-03-02 15:40:12 +0000
commit92bc886b773cfe8148af69399e2cced600c4422d (patch)
tree0b2afcab0baf88fd2670c3028092a26db84fffbf
parent0c24f86ef88df61f17770a60376ab934101e6677 (diff)
downloaddrakwizard-92bc886b773cfe8148af69399e2cced600c4422d.tar
drakwizard-92bc886b773cfe8148af69399e2cced600c4422d.tar.gz
drakwizard-92bc886b773cfe8148af69399e2cced600c4422d.tar.bz2
drakwizard-92bc886b773cfe8148af69399e2cced600c4422d.tar.xz
drakwizard-92bc886b773cfe8148af69399e2cced600c4422d.zip
fix summary not returning right combo boxes values
-rwxr-xr-xdrakwizard.pl14
-rw-r--r--po/drakwizard.pot10
-rw-r--r--proxy_wizard/scripts/Squidconf.pm2
3 files changed, 24 insertions, 2 deletions
diff --git a/drakwizard.pl b/drakwizard.pl
index f79c163e..dc2b74a6 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -89,7 +89,19 @@ if (/-summary/) {
while ($::isSummary--) {
push @$data, '';
}
- $in->ask_from("summary", "", $data) && $::{$perl_module_name."::"}{"$summary_func"}->();
+
+ if ($in->ask_from("summary", translate($summary->{info}), $data)) {
+ foreach (@{$summary->{freetext}}) {
+ if ($_->{main_order} eq 'bool') {
+ $ENV{$variable{$_->{variableName}}} = $ENV{$variable{$_->{variableName}}} ? 1 : 0;
+ $description{$ENV{$variable{$_->{variableName}}}} = $ENV{$variable{$_->{variableName}}} ? N("enabled") : N("disabled");
+ }
+ elsif ($_->{main_order} eq 'combo') {
+ $ENV{$variable{$_->{variableName}}} = $chooser_hash{$ENV{$variable{$_->{variableName}}}};
+ }
+ }
+ $::{$perl_module_name."::"}{"$summary_func"}->();
+ }
}
else {
get_parameter($o, $xmltree);
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index fc2a2dd0..4fabfb89 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-03-02 15:00+0100\n"
+"POT-Creation-Date: 2003-03-02 16:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -459,6 +459,14 @@ msgstr ""
msgid "Please select a wizard"
msgstr ""
+#: ../drakwizard.pl_.c:97
+msgid "disabled"
+msgstr ""
+
+#: ../drakwizard.pl_.c:97
+msgid "enabled"
+msgstr ""
+
#: ../firewall_wizard/firewall.wiz_.c:1
msgid "Medium - web, ftp and ssh shown to outside"
msgstr ""
diff --git a/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm
index 0155a72f..56548652 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -66,6 +66,8 @@ sub do_it_squid {
s|^\s*\#?\s*(cache_mem\s*)\d*(\s*MB.*)|$1$ENV{wiz_squid_mem}$2|;
s|^\s*\#?\s*(http_port\s*)\d*(.*)|$1$ENV{wiz_squid_port}$2|;
} $file;
+ print "LEVEL $ENV{'wiz_squid_level'}\n\n";
+ exit;
standalone::explanations("$file: cache_dir = $ENV{wiz_squid_defdir} $ENV{wiz_squid_disk}
mynetw = $ENV{wiz_squid_mynetw} cache_mem = $ENV{wiz_squid_mem} http_port = $ENV{wiz_squid_port}
level = $ENV{wiz_squid_level}");