Command-line tools for importing mail (uses 'curl').

[cocanwiki.git] / scripts / cocanwiki_ok.ml

diff --git a/scripts/cocanwiki_ok.ml b/scripts/cocanwiki_ok.ml
index a7fe4ed..6067197 100644 (file)
--- a/scripts/cocanwiki_ok.ml
+++ b/scripts/cocanwiki_ok.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: cocanwiki_ok.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: cocanwiki_ok.ml,v 1.6 2004/10/12 10:00:38 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
@@ -9,17 +24,17 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki_template
 
 (* Override StdPages.ok and StdPages.error with out our versions.
  * Also have some standard buttons around.
  *)
-let ok_error_template = get_template "ok_error.html"
+let ok_error_template = _get_template "ok_error.html"
 
 let error ?cookie ?cookies ?title ?(icon = "/_graphics/error.png")
     ?icon_alt ?back_button ?close_button q message =
+  (* Set the status so scripts can determine if the request failed. *)
+  Request.set_status q#request cHTTP_BAD_REQUEST;
   StdPages.error ?cookie ?cookies ~template:ok_error_template
     ?title ~icon ?icon_alt ?back_button ?close_button q message