X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=170c400b4f090bdbb18bb19ceb05db8de30b075b;hb=5292c2362fb54524b8ec7877ee15c79596429491;hp=64eb357f46cdf18dd2d385cccf567e9929dbaacf;hpb=714e5e5b4b585da1eca55274e3903ee9a1dbf0d6;p=cocanwiki.git

diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml
index 64eb357..170c400 100644
--- a/scripts/upload_image.ml
+++ b/scripts/upload_image.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_image.ml,v 1.2 2004/09/07 13:40:10 rich Exp $
+ * $Id: upload_image.ml,v 1.10 2004/11/01 16:24:50 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
@@ -11,19 +26,18 @@ open Printf
 
 open ExtString
 
-open Merjisforwiki
-
 open Cocanwiki
 open Cocanwiki_ok
 open Cocanwiki_emailnotify
+open Cocanwiki_images
 
 let is_ws_re = Pcre.regexp "^\\s*$"
 let is_whitespace str = Pcre.pmatch ~rex:is_ws_re str
 
 (* Valid image names. *)
-let image_ok_re = Pcre.regexp "^[a-z0-9][_a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
+let image_ok_re = Pcre.regexp "^[a-z0-9][-._a-z0-9]*\\.(jpg|jpeg|gif|ico|png)$"
 
-let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
+let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = hostname } user=
   let name = q#param "name" in
   let alt = q#param "alt" in
   let title = q#param "title" in
@@ -33,21 +47,22 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   (* See if there was an upload. *)
   let image =
     try
-      let upload = q#upload "image" in
+      let upload = q#upload "file" in
       upload.upload_value
     with
 	Not_found ->
 	  error ~title:"No image" ~back_button:true
 	    q "No image was uploaded.";
-	  raise CgiExit in
+	  return () in
 
   (* Check the name is valid. *)
   if not (Pcre.pmatch ~rex:image_ok_re name) then (
     error ~title:"Bad Image Name" ~back_button:true
       q ("The Image Name must contain only lowercase English letters, " ^
-	 "numbers and underscore.  It must end with .jpg, .gif or .png " ^
+	 "numbers, dots, dashes and underscore.  " ^
+	 "It must end with .jpg, .gif or .png " ^
 	 "depending on the image format.");
-    raise CgiExit
+    return ()
   );
 
   (* Check the image is an image, and get the size. *)
@@ -58,7 +73,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 	  error ~title:"Bad image" ~back_button:true
 	    q ("Unknown image type.  Is the file you uploaded really an " ^
 	       "image?");
-	  raise CgiExit in
+	  return () in
 
   (* Check the image filename extension matches the MIME type. *)
   let ext_ok =
@@ -77,7 +92,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
 	 "For example if the image is in JPEG format, the name must " ^
 	 "be 'something.jpg'.  I detected the following image type " ^
 	 "in the file you uploaded: " ^ mime_type);
-    raise CgiExit
+    return ()
   );
 
   (* Check some ALT text was supplied. *)
@@ -86,7 +101,7 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
       q ("You must supply Alt text describing the image.  This is required " ^
 	 "by accessibility laws and to allow search engines to discover the " ^
 	 "content of images.");
-    raise CgiExit
+    return ()
   );
 
   let title = if is_whitespace title then `Null else `String title in
@@ -97,6 +112,29 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   let thumbnail, tn_mime_type, tn_width, tn_height =
     image_thumbnail image 120 120 in
 
+  (* Check if something with the same name already exists.  If replace=1
+   * then we can replace it, otherwise we must present an error message.
+   *)
+  let replace = q#param_true "replace" in
+  let sth = dbh#prepare_cached "select 1 from images
+                                 where hostid = ? and name = ?" in
+  sth#execute [`Int hostid; `String name];
+
+  let exists = try sth#fetch1int () = 1 with Not_found -> false in
+
+  if exists then (
+    if not replace then (
+      error ~title:"Image already exists" ~back_button:true
+	q ("An image with the same name already exists.");
+    return ()
+    ) else (
+      let sth = dbh#prepare_cached "update images
+                                       set name_deleted = name, name = null
+                                     where hostid = ? and name = ?" in
+      sth#execute [`Int hostid; `String name];
+    )
+  );
+
   (* Put the image into the database. *)
   let sth =
     dbh#prepare_cached
@@ -116,11 +154,11 @@ let run r (q : cgi) (dbh : Dbi.connection) (hostid, hostname, _) _ =
   let body = fun () ->
     "Page: http://" ^ hostname ^ "/_images" in
 
-  email_notify ~body ~subject dbh hostid;
+  email_notify ~body ~subject ~user dbh hostid;
 
   let buttons = [ ok_button "/_images" ] in
   ok ~title:"Image uploaded" ~buttons
     q "Image was uploaded successfully."
 
 let () =
-  register_script run
+  register_script ~restrict:[CanEdit] run