X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flogin_form.ml;h=ec71c355d37f24a3c93be21215f311ab46ba7264;hb=288535f82bf4a5d944536bd0790a54a5f8fb4363;hp=9bd2fe35e29388cceea12edb66a9227abe4191e3;hpb=a9168cad656af034b671c9dea53057845e2196c9;p=cocanwiki.git

diff --git a/scripts/login_form.ml b/scripts/login_form.ml
index 9bd2fe3..ec71c35 100644
--- a/scripts/login_form.ml
+++ b/scripts/login_form.ml
@@ -1,7 +1,22 @@
-(* COCANWIKI scripts.
+(* COCANWIKI - a wiki written in Objective CAML.
  * Written by Richard W.M. Jones <rich@merjis.com>.
  * Copyright (C) 2004 Merjis Ltd.
- * $Id: login_form.ml,v 1.1 2004/09/07 16:19:43 rich Exp $
+ * $Id: login_form.ml,v 1.5 2004/10/15 12:47:18 rich Exp $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  *)
 
 open Apache
@@ -13,9 +28,9 @@ open Cocanwiki
 open Cocanwiki_template
 open Cocanwiki_strings
 
-let template = get_template "login_form.html"
+let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ =
+  let template = get_template dbh hostid "login_form.html" in
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
   let redirect = try q#param "redirect" with Not_found -> "" in
 
   if string_is_whitespace redirect then
@@ -25,6 +40,9 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, _, _) _ =
     template#set "redirect" redirect
   );
 
+  let username = try q#param "username" with Not_found -> "" in
+  template#set "username" username;
+
   let sth = dbh#prepare_cached "select create_account_anon from hosts
                                  where id = ?" in
   sth#execute [`Int hostid];