r8830: Fix provision script after data split

[jra/samba/.git] / swat / install / provision.esp

diff --git a/swat/install/provision.esp b/swat/install/provision.esp
index 3eb7ba720d3b9dca2c84d016f999154935582193..0072247b50a2b6482c15a0262035e19a434d7eab 100644 (file)
--- a/swat/install/provision.esp
+++ b/swat/install/provision.esp
@@ -1,5 +1,6 @@
-<% page_header("columns", "Provisioning", "/install/menu.js"); 
+<% page_header("columns", "Provisioning", "install"); 
 
+  include("/scripting/forms.js");
   libinclude("base.js");
   libinclude("provision.js");
 %>
@@ -36,14 +37,15 @@ f.element[7].label = "Host IP";
 f.element[7].name  = "HOSTIP";
 f.element[8].label = "Default Site";
 f.element[8].name  = "DEFAULTSITE";
-f.submit[0] = "Provision";
-f.submit[1] = "Cancel";
+f.submit[0] = "Initial provision";
+f.submit[1] = "Provision";
+f.submit[2] = "Cancel";
 
 if (form['submit'] == "Cancel") {
        redirect("/");
 }
 
-if (form['submit'] == "Provision") {
+if ((form['submit'] == "Provision") || (form['submit'] == "Initial provision")) {
        for (r in form) {
                subobj[r] = form[r];
        }
@@ -56,9 +58,11 @@ for (i=0;i<f.element.length;i++) {
 lp.set("realm", subobj.REALM);
 
 if (form['submit'] == "Provision") {
-       provision(subobj, writefln);
+       provision(subobj, writefln, true);
+} else if (form['submit'] == "Initial provision") {
+       provision(subobj, writefln, false);
 } else {
-       display_form(f);
+       f.display();
 }
 %>