use drakconnect db

1 files changed, 10 insertions, 72 deletions

diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz
index 431e5597..995b7aaa 100644
--- a/web_wizard/web.wiz
+++ b/web_wizard/web.wiz
@@ -14,6 +14,7 @@
 	referenceLength="425"
 	referenceHeight="13"
 	perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm"
+	rpm="apache-conf"
 >
 
 	<Variable
@@ -33,7 +34,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
 		name="welcome"
-		jumpScript="__WIZ_HOME__/common/scripts/check.sh root wiz_ip_net"
+		func="check"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -53,7 +54,7 @@
 		</Target>
 
 		<Target
-			targetName="error_need_net"
+			targetName="error_dhcp"
 			jumpIndex="2"
 		>
 		</Target>
@@ -126,82 +127,19 @@
 
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-web.html"
-		name="error_need_net"
-		subWizard="__WIZ_HOME__/server_wizard/server.wiz"
+		name="error_dhcp"
+		jumpPage="web connections"
 		executionLevel="NORMAL"
 		nextFinish="false"
-		canBack="false"
+		canBack="true"
 		canCancel="true"
 	>
 
 		<Info
 			name="errorLabel"
 			alignement="Center"
-			helpText="Network not configured yet"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
-
-		<Info
-			name="info23"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
-		>
-		</Info>
-
-		<Info
-			name="info22"
-			alignement="Center"
-			helpText="You have to configure the basic network parameters before launch this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
-
-		<Info
-			name="info25"
-			alignement="Center"
-			helpText="Press next to configure these parameters now, or Cancel to exit this wizard."
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
-
-		<Info
-			name="info26"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
-
-		<Info
-			name="info24"
-			alignement="Center"
-			helpText="If you choose to configure now, you will automatically continue"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
-
-		<Info
-			name="info27"
-			alignement="Center"
-			helpText="with the WEB configuration"
+			helpText="Warning\nYou are in dhcp, server may doesn't
+			work with your configuration."
 			guiType="label"
 			fontName="Default"
 			fontStyle="plain"
@@ -434,7 +372,7 @@
 		<Freetext
 			name="freetext1"
 			alignement="Fill"
-			fillScript="[  \( ${wiz_web_internal} -eq 1 \) -o \( ${wiz_web_external} -eq 1 \)  ] \a\a echo \qenabled\q || echo \qdisabled\q"
+			variableName="wiz_web_internal"
 			helpText="Intranet Web Server:"
 			guiType="textfield"
 			editable="false"
@@ -450,7 +388,7 @@
 		<Freetext
 			name="freetext2"
 			alignement="Fill"
-			fillScript="[ ${wiz_web_external} -eq 0 ] \a\a echo \qdisabled\q || echo \qenabled\q"
+			variableName="wiz_web_external"
 			helpText="Internet Web Server:"
 			guiType="textfield"
 			editable="false"