r8477: Simplify header/footer handling. esp variables allow

[sfrench/samba-autobuild/.git] / swat / login.esp

diff --git a/swat/login.esp b/swat/login.esp
index 5d12af22584ddb47a39646a73115561671161487..10a0ba80d641a54fedcaa60c3f399cb624334999 100644 (file)
--- a/swat/login.esp
+++ b/swat/login.esp
@@ -1,9 +1,20 @@
 <% page_header("plain", "SWAT Login"); %>
 
 <%
-var f = Form("login", 2, 1);
+
+if (request['SESSION_EXPIRED'] == "True") {
+   write("<b>Your session has expired - please authenticate again<br /></b>\n");
+}
+
+var f = FormObj("login", 3, 1);
 f.element[0].label = "Username";
+f.element[0].value = form['Username'];
 f.element[1].label = "Password";
+f.element[1].value = form['Password'];
+f.element[1].type  = "password";
+f.element[2].label = "Domain";
+f.element[2].type  = "select";
+f.element[2].list  = getDomainList();
 f.submit[0] = "Login";
 
 display_form(f);
@@ -11,20 +22,34 @@ display_form(f);
 
 <%
        if (request.REQUEST_METHOD == "POST") {
-               /* for now just authenticate everyone */
-               session.AUTHENTICATED = true;
-               session.authinfo = new Object();
-
-               session.authinfo.username = form.Username;
-
-               /* if the user was asking for the login page, then now
-                  redirect them to the main page. Otherwise just
-                  redirect them to the current page, which will now
-                  show its true content */
-               if (request.REQUEST_URI == "/login.esp") {
-                  redirect("/");
+
+               var authinfo = new Object();
+               authinfo.username = form.Username;
+               authinfo.password = form.Password;
+               authinfo.domain = form.Domain;
+               authinfo.rhost = request['REMOTE_HOST'];
+
+               auth = userAuth(authinfo);
+               if (auth.result) {
+
+                       /* for now just authenticate everyone */
+                       session.AUTHENTICATED = true;
+                       session.authinfo = new Object();
+
+                       session.authinfo.username = auth.username;
+                       session.authinfo.domain = auth.domain;
+
+                       /* if the user was asking for the login page, then now
+                          redirect them to the main page. Otherwise just
+                          redirect them to the current page, which will now
+                          show its true content */
+                       if (request.REQUEST_URI == "/login.esp") {
+                          redirect(session_uri("/"));
+                       } else {
+                          redirect(session_uri(request.REQUEST_URI));
+                       }
                } else {
-                  redirect(request.REQUEST_URI);
+                       write("<b>Login failed - please try again<br /></b>\n");
                }
        }
 %>