X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2Fupload_image.ml;h=5b74bb998533231286072a2a70ab8cefa036adea;hb=a91aac39ca718af3ad1f446742c3d200da60f4b6;hp=c6d11e2a8abfd02cbae29c997d8543b558b4ee63;hpb=6b0b6830a2e784eee99dcd1b1a3cb8b44e27c765;p=cocanwiki.git diff --git a/scripts/upload_image.ml b/scripts/upload_image.ml index c6d11e2..5b74bb9 100644 --- a/scripts/upload_image.ml +++ b/scripts/upload_image.ml @@ -1,7 +1,7 @@ (* COCANWIKI - a wiki written in Objective CAML. * Written by Richard W.M. Jones . * Copyright (C) 2004 Merjis Ltd. - * $Id: upload_image.ml,v 1.7 2004/09/23 11:56:47 rich Exp $ + * $Id: upload_image.ml,v 1.8 2004/10/21 19:54:29 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 @@ -37,7 +37,7 @@ 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 run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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 @@ -130,7 +130,7 @@ let run r (q : cgi) (dbh : Dbi.connection) hostid { hostname = 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