X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Flogin.ml;h=4b55be7f508264c09ad84c5f67bd0173d8639a5f;hb=295f2cde3f43ccf7f775d39b95925e10aa4c37cb;hp=e316d64a82d4668e186f4bcdcf0d4fda55af8729;hpb=79f907772aef608a83338589f64c10a901889b5c;p=cocanwiki.git diff --git a/scripts/login.ml b/scripts/login.ml index e316d64..4b55be7 100644 --- a/scripts/login.ml +++ b/scripts/login.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: login.ml,v 1.4 2004/09/25 13:17:00 rich Exp $ + * $Id: login.ml,v 1.6 2005/03/31 14:24:04 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 @@ -62,12 +62,12 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid _ _ = let cookie = if permanent then - Cookie.cookie ~name:"auth" ~value:cookie ~path:"/" ~expires () + Cookie.cookie "auth" cookie ~path:"/" ~expires else - Cookie.cookie ~name:"auth" ~value:cookie ~path:"/" () in + Cookie.cookie "auth" cookie ~path:"/" in ok ~title:"Logged in" ~buttons:[ok_button redirect] ~cookie - q ("Welcome back " ^ username ^ "." ^ + q ("Welcome " ^ username ^ "." ^ if force_password_change then " Please change your password now." else "") with