From 83eca6fa0dac3c5dbf68aff23d87ff5fca2e5a5c Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Tue, 15 Oct 2002 16:10:00 +0000
Subject: wiz update, nfs fixed

---
 proxy_wizard/proxy.wiz            | 10 ++++++----
 proxy_wizard/scripts/Squidconf.pm |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'proxy_wizard')

diff --git a/proxy_wizard/proxy.wiz b/proxy_wizard/proxy.wiz
index 354f2a35..37d7006c 100644
--- a/proxy_wizard/proxy.wiz
+++ b/proxy_wizard/proxy.wiz
@@ -9,10 +9,10 @@
 	defaultImage="__WIZ_HOME__/proxy_wizard/images/proxy"
 	perlModule="__WIZ_HOME__/proxy_wizard/scripts/Squidconf.pm"
 	rpm="squid"
+	summaryFunc="do_it_squid"
 >
-
 	<Variable
-		name="wiz_squid_level"
+		name="var_wiz_squid_level"
 		comment="The proxy access control level"
 		shellVariable="wiz_squid_level"
 		defaultValue="2"
@@ -263,10 +263,9 @@
 		>
 		</Info>
 
-
 		<Chooser
 			name="chooser1"
-			variableName="wiz_squid_level"
+			variableName="var_wiz_squid_level"
 			helpFontName="Default"
 			helpFontStyle="plain"
 			helpFontSize="12"
@@ -331,6 +330,7 @@
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
 		jumpPage="cachepeer"
 		executionLevel="NORMAL"
+		is="var_wiz_squid_level=2"
 		nextFinish="false"
 		canBack="true"
 		canCancel="true"
@@ -359,6 +359,7 @@
 			fillfunc="network_mask"
 			helpText="Authorised network:"
 			editable="true"
+			help="Use numeric format like \q192.168.1.0/255.255.255.0\q or a text format like \q.domain.net\q"
 		>
 		</Freetext>
 
@@ -434,6 +435,7 @@
 		jumpPage="doit"
 		executionLevel="NORMAL"
 		nextFinish="false"
+		is="wiz_squid_menupeer=2"
 		canBack="true"
 		canCancel="true"
 	>
diff --git a/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm
index b586b711..3c343b8f 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -49,6 +49,7 @@ sub	do_it_squid {
     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}");
+    print "$ENV{wiz_squid_level}\n";
     if ($ENV{wiz_squid_level} == 1) {
 	substInFile {
 	    s|^\s*\#?\s*(http_access\s*)deny(\s*all.*)|\#$&\n$1allow$2|;
-- 
cgit v1.2.1