X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_file_form.ml;h=8cec265a5c28e96bc5bf6052efe59964eda60cff;hb=cd059731a60fd3d4dcf426430ad26ff227b91910;hp=93e82423426c7db86ec3f67ace96628a8cee0cf4;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/upload_file_form.ml b/scripts/upload_file_form.ml
index 93e8242..8cec265 100644
--- a/scripts/upload_file_form.ml
+++ b/scripts/upload_file_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: upload_file_form.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: upload_file_form.ml,v 1.10 2006/03/28 16:24:08 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,15 +24,36 @@ open Registry
 open Cgi
 open Printf
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_template
 
-let template = get_template "upload_file_form.html"
+let run r (q : cgi) dbh hostid _ _ =
+  let template = get_template dbh hostid "upload_file_form.html" in
+
+  (* If called with a 'name' argument, prefill the name field.
+   * If called with an 'id' argument, get the name field from the
+   * database and prefill that field.
+   *)
+  let name =
+    if q#param_exists "name" then q#param "name"
+    else if q#param_exists "id" then (
+      let id = Int32.of_string (q#param "id") in
+      let name = Option.get (
+	List.hd (
+	  PGSQL(dbh)
+	    "select coalesce (name, name_deleted) from files
+              where hostid = $hostid and id = $id"
+	)
+      ) in
+      name
+    )
+    else "" in
+  template#set "name" name;
+
+  (* Does the user want to replace an existing object? *)
+  template#conditional "replace" (q#param_true "replace");
 
-let run r (q : cgi) (dbh : Dbi.connection) _ _ =
   q#template template
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run