From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 2 Nov 2015 00:12:10 +0000 (+0100)
Subject: mod_http_upload: Check availability of ImageMagick
X-Git-Tag: 16.01~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d2f1d5f0d8215142d53e3d095f4f3638b172abb;p=ejabberd

mod_http_upload: Check availability of ImageMagick

Log an error message during startup if the thumbnail option is enabled
but ImageMagick is not installed.
---

diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index c88e768f2..a2aee27d7 100644
--- a/src/mod_http_upload.erl
+++ b/src/mod_http_upload.erl
@@ -272,6 +272,18 @@ init({ServerHost, Opts}) ->
       Mode ->
 	  file:change_mode(DocRoot, Mode)
     end,
+    case Thumbnail of
+      true ->
+	  case string:str(os:cmd("identify"), "Magick") of
+	    0 ->
+		?ERROR_MSG("Cannot find 'identify' command, please install "
+			   "ImageMagick or disable thumbnail creation", []);
+	    _ ->
+		ok
+	  end;
+      false ->
+	  ok
+    end,
     ejabberd_router:register_route(Host),
     {ok, #state{server_host = ServerHost, host = Host, name = Name,
 		access = Access, max_size = MaxSize,