4 files changed, 16 insertions, 8 deletions
diff --git a/swat/esptest/exception.esp b/swat/esptest/exception.esp
index dcc0fda0930..f32aaeb610e 100644
--- a/swat/esptest/exception.esp
+++ b/swat/esptest/exception.esp
@@ -1,4 +1,6 @@
-<% page_header("columns", "ESP Exception test", "/esptest/menu.js"); %>
+<% page_header("columns", "ESP Exception test", "/esptest/menu.js"); 
+   include("/scripting/forms.js");
+%>
 
 <h1>Samba4 exception test</h1>
 
@@ -8,7 +10,7 @@ var f = FormObj("ExceptionTest", 0, 2);
 f.submit[0] = "Generate Exception";
 f.submit[1] = "No Exception";
 
-display_form(f);
+f.display();
 
 if (request['REQUEST_METHOD'] == "POST") {
 	function TestFunction(arg1, arg2) {
diff --git a/swat/esptest/formtest.esp b/swat/esptest/formtest.esp
index 5cb4f003272..32ad4a04b20 100644
--- a/swat/esptest/formtest.esp
+++ b/swat/esptest/formtest.esp
@@ -1,4 +1,6 @@
-<% page_header("columns", "ESP Form Test", "/esptest/menu.js"); %>
+<% page_header("columns", "ESP Form Test", "/esptest/menu.js"); 
+   include("/scripting/forms.js");
+%>
 
 <%
 var f = FormObj("FormTest", 3, 2);
@@ -15,7 +17,7 @@ f.element[2].value = form['Color'];
 f.submit[0] = "OK";
 f.submit[1] = "Cancel";
 
-display_form(f);
+f.display();
 
 <%
   /* if its a post then the user has filled in the form, so
diff --git a/swat/esptest/loadparm.esp b/swat/esptest/loadparm.esp
index 9ea83b77bca..2783c8e6474 100644
--- a/swat/esptest/loadparm.esp
+++ b/swat/esptest/loadparm.esp
@@ -1,4 +1,6 @@
-<% page_header("columns", "ESP loadparm test", "/esptest/menu.js" ); %>
+<% page_header("columns", "ESP loadparm test", "/esptest/menu.js" ); 
+   include("/scripting/forms.js");
+%>
 
 <h1>Samba4 loadparm test</h1>
 
@@ -10,7 +12,7 @@ f.element[0].label = "Share";
 f.element[1].label = "Parameter";
 f.submit[0] = "OK";
 
-display_form(f);
+f.display();
 
 function stringVar(v) {
 	var type = typeof(v);
diff --git a/swat/esptest/session.esp b/swat/esptest/session.esp
index 01352212668..6637c782c08 100644
--- a/swat/esptest/session.esp
+++ b/swat/esptest/session.esp
@@ -1,4 +1,6 @@
-<% page_header("columns", "ESP session test", "/esptest/menu.js"); %>
+<% page_header("columns", "ESP session test", "/esptest/menu.js"); 
+   include("/scripting/forms.js");
+%>
 
 <h1>Samba4 session test</h1>
 
@@ -12,7 +14,7 @@ f.submit[1] = "Reset";
 f.submit[2] = "Destroy";
 f.submit[3] = "Cancel";
 
-display_form(f);
+f.display();
 
   /* if its a post then the user has filled in the form, so
      report the values