From dd3bb8dc7b173049f09969265e100e2e9f430946 Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Mon, 19 Sep 2011 15:07:25 +0000
Subject: dont require ultratimeout

---
 it.class | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/it.class b/it.class
index 82d01cc..b01285e 100644
--- a/it.class
+++ b/it.class
@@ -562,9 +562,10 @@ static function imageconvert($p)
 	$type = strtr($type, array("jpeg" => "jpg", "tiff" => "tif", "ps" => "eps", "ept" => "eps"));
 	$p += array('type' => $type, 'types' => "bmp,eps,gif,jp2,jpg,png,svg,tif");
 	$p['-opts'] = array('-thumbnail' => $p['size']) + (array)$p['-opts'];
+	$ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 600 " : "";
 
 	if (in_array($type, explode(',', $p['types'])))	# Valid type?
-		$cmdoutput = it::exec('ultratimeout 600 gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p);
+		$cmdoutput = it::exec($ultratimeout . 'gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p);
 
 	return $cmdoutput === "";
 }
-- 
cgit v1.2.3