From c30630a03ea000a276e620b8a6b1fd4a0621847f Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Fri, 18 Oct 2002 13:36:33 +0000
Subject: new improved samba wizard, network access selection under
 construction

---
 samba_wizard/samba.wiz | 345 ++++++++++++++++++++++++++++---------------------
 1 file changed, 197 insertions(+), 148 deletions(-)

(limited to 'samba_wizard/samba.wiz')

diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index 00c075c2..e715a8df 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -19,13 +19,23 @@
 		name="doFileSharing"
 		comment="true if we do file sharing, false otherwise"
 		shellVariable="wiz_do_file_sharing"
-	>				
+	>
+	</Variable>		
+	<Variable
+		name="wiz_samba_net"
+		shellVariable="wiz_samba_net"
+	>
 	</Variable>
 	<Variable
 		name="all_printers"
 		shellVariable="wiz_all_printers"
 	>				
 	</Variable>
+	<Variable
+		name="wiz_printers"
+		shellVariable="wiz_printers"
+	>				
+	</Variable>
 	<Variable
 		name="doPrinterSharing"
 		comment="true if samba do printer sharing"
@@ -102,6 +112,156 @@
 		</Info>
 	</Page>
 
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_workgroup"
+		func="check_workgroup"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Target
+			targetName="error_in_workgroup"
+			jumpIndex="1"
+		>
+		</Target>
+
+		<Target
+			targetName="ask_banner"
+			jumpIndex="10"
+		>
+		</Target>
+
+		<Info
+			helpText="Workgroup"
+		>
+		</Info>
+
+
+		<Info
+			helpText="Samba need to know the Windows Workgroup it will serve."
+		>
+		</Info>
+		<Freetext
+			name="freetext2"
+			variableName="workgroup"
+			helpText="Workgroup:"
+			editable="true"
+			fillfunc="get_workgroup"
+		>
+		</Freetext>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="error_in_workgroup"
+		jumpPage="ask_workgroup"
+		nextButtonText="Fix it"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+		<Info
+			helpText="The Workgroup is wrong"
+		>
+		</Info>
+	</Page>
+
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="ask_banner"
+		func="check_banner"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Target
+			targetName="error_in_banner"
+			jumpIndex="1"
+		>
+		</Target>
+
+		<Target
+			targetName="ask_net"
+			jumpIndex="10"
+		>
+		</Target>
+
+		<Info
+			helpText="Server Banner."
+		>
+		</Info>
+
+
+		<Info
+			helpText="The banner is the way this server will be described in the Windows workstations."
+		>
+		</Info>
+
+
+		<Freetext
+			name="serverBannerInput"
+			variableName="banner"
+			helpText="Banner:"
+			editable="true"
+			fillfunc="get_banner"
+		>
+		</Freetext>
+	</Page>
+
+	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="error_in_banner"
+		jumpPage="ask_banner"
+		nextButtonText="Fix It"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+
+		<Info
+			helpText="The Server Banner is incorrect"
+		>
+		</Info>
+	</Page>
+	<Page
+		name="ask_net"
+		jumpPage="ask_services"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+		<Info
+			helpText="Access control"
+		>
+		</Info>
+
+		<Chooser
+			name="chooser1"
+			variableName="wiz_samba_net"
+		>
+			<Option
+				value="1"
+				description="All - No access restriction"
+			>
+			</Option>
+
+			<Option
+				value="2"
+				description="Local Network - access for local network (recommended)"
+			>
+			</Option>
+		</Chooser>
+	</Page>
+
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_services"
@@ -131,7 +291,7 @@
 		</Target>
 
 		<Target
-			targetName="ask_workgroup"
+			targetName="doit"
 			jumpIndex="0"
 		>
 		</Target>
@@ -154,6 +314,7 @@
 			forceEnabled="true"
 			forceDisabled="false"
 			helpText="Enable file sharing area"
+			fillfunc="get_file_sharing"
 		>
 		</Boolean>
 
@@ -171,6 +332,7 @@
 			forceEnabled="true"
 			forceDisabled="false"
 			helpText="Make home directories available for their owners"
+			fillfunc="get_home_sharing"
 		>
 		</Boolean>
 
@@ -200,7 +362,7 @@
 		</Target>
 
 		<Target
-			targetName="ask_workgroup"
+			targetName="doit"
 			jumpIndex="0"
 		>
 		</Target>
@@ -260,7 +422,7 @@
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_access"
 		is="doFileSharing"
-		func="check_user"
+		func="check_users"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -281,7 +443,7 @@
 
 
 		<Target
-			targetName="ask_workgroup"
+			targetName="doit"
 			jumpIndex="0"
 		>
 		</Target>
@@ -319,90 +481,30 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_printers"
-		jumpPage="ask_workgroup"
-		func="check_printers"
+		jumpPage="doit"
 		is="doPrinterSharing"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
 		canCancel="true"
 	>
-	<Info
-		helpText="toto"
-	>
-	</Info>
-	<Boolean
-		variableName="all_printers"
-		helpText="Enable all printer"
-	>
-	</Boolean>
-	<Boolean
-		is="all_printers=0"
-		variableName="box_list"
-		listfunc="list_printers"
-	>
- 	</Boolean>
-	</Page>
-
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="ask_workgroup"
-		func="check_workgroup"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Target
-			targetName="error_in_workgroup"
-			jumpIndex="1"
-		>
-		</Target>
-
-		<Target
-			targetName="ask_banner"
-			jumpIndex="10"
-		>
-		</Target>
-
-		<Info
-			helpText="Workgroup"
-		>
-		</Info>
-
-
 		<Info
-			helpText="Samba need to know the Windows Workgroup it will serve."
+			helpText="Select which printers you want to be accessible from known users"
 		>
 		</Info>
-		<Freetext
-			name="freetext2"
-			variableName="workgroup"
-			helpText="Workgroup:"
-			editable="true"
-			fillfunc="get_workgroup"
+		<Boolean
+			variableName="all_printers"
+			helpText="Enable all printer"
 		>
-		</Freetext>
-	</Page>
-
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="error_in_workgroup"
-		jumpPage="ask_workgroup"
-		nextButtonText="Fix it"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-		<Info
-			helpText="The Workgroup is wrong"
+		</Boolean>
+		<Boolean
+			is="all_printers=0"
+			variableName="box_list"
+			listfunc="list_printers"
 		>
-		</Info>
+		</Boolean>
 	</Page>
 
-
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="error_in_dir"
@@ -420,67 +522,6 @@
 		</Info>
 	</Page>
 
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="ask_banner"
-		func="check_banner"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Target
-			targetName="error_in_banner"
-			jumpIndex="1"
-		>
-		</Target>
-
-		<Target
-			targetName="doit"
-			jumpIndex="10"
-		>
-		</Target>
-
-		<Info
-			helpText="Server Banner."
-		>
-		</Info>
-
-
-		<Info
-			helpText="The banner is the way this server will be described in the Windows workstations."
-		>
-		</Info>
-
-
-		<Freetext
-			name="serverBannerInput"
-			variableName="banner"
-			helpText="Banner:"
-			editable="true"
-			fillfunc="get_banner"
-		>
-		</Freetext>
-	</Page>
-
-	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="error_in_banner"
-		jumpPage="ask_banner"
-		nextButtonText="Fix It"
-		executionLevel="NORMAL"
-		nextFinish="false"
-		canBack="true"
-		canCancel="true"
-	>
-
-		<Info
-			helpText="The Server Banner is incorrect"
-		>
-		</Info>
-	</Page>
-
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="doit"
@@ -516,6 +557,22 @@ needed to configure Samba."
 		>
 		</Info>
 
+		<Freetext
+			name="freetext3"
+			variableName="workgroup"
+			helpText="Workgroup:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			name="freetext4"
+			variableName="banner"
+			helpText="Server Banner:"
+			editable="false"
+		>
+		</Freetext>
+
 		<Freetext
 			name="freetext"
 			variableName="doFileSharing"
@@ -549,23 +606,15 @@ needed to configure Samba."
 		>
 		</Freetext>
 
-		<Freetext
-			name="freetext3"
-			variableName="workgroup"
-			helpText="Workgroup:"
-			editable="false"
-		>
-		</Freetext>
 
 		<Freetext
-			name="freetext4"
-			variableName="banner"
-			helpText="Server Banner:"
+			name="freetext5"
+			helpText="Printers:"
 			editable="false"
+			fillfunc="get_printers"
 		>
 		</Freetext>
 
-
 		<Info
 			helpText="To accept these values, and configure your server, click the Next button or use the Back button to correct them."
 		>
-- 
cgit v1.2.1