aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2012-06-06 15:38:56 +0000
committerpatdenice <patdenice@piwigo.org>2012-06-06 15:38:56 +0000
commitacb3e717fcc6f779ee72e1e979ec3354850031a5 (patch)
treed3d9c87ce8c42f87a00fcae1e345278b34ed64ac
parent1dfe8d5645165d4f9328eda670877149055087ea (diff)
bug:2647
External ImageMagick does not work anymore on 1and1 servers git-svn-id: http://piwigo.org/svn/trunk@15575 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/image.class.php5
-rw-r--r--include/functions.inc.php19
2 files changed, 24 insertions, 0 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 97875b796..215d2dc5e 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -509,6 +509,11 @@ class image_ext_imagick implements imageInterface
$this->source_filepath = $source_filepath;
$this->imagickdir = $conf['ext_imagick_dir'];
+ if (get_host() == 'kundenserver.de') // 1and1
+ {
+ @putenv('MAGICK_THREAD_LIMIT=1');
+ }
+
$command = $this->imagickdir.'identify -format "%wx%h" "'.realpath($source_filepath).'"';
@exec($command, $returnarray);
if(!is_array($returnarray) or empty($returnarray[0]) or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 2096eb79f..429dd3ccc 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -1692,4 +1692,23 @@ function mobile_theme()
return $is_mobile_theme;
}
+
+/**
+ * return hostname with gethostbyaddr and keep it in database
+ */
+function get_host($force_update=false)
+{
+ global $conf;
+
+ if (!isset($conf['host']) or $force_update)
+ {
+ $conf['host'] = 'undefined';
+ if ($host = @gethostbyaddr($_SERVER['SERVER_ADDR']))
+ {
+ $conf['host'] = $host;
+ }
+ conf_update_param('host', $conf['host']);
+ }
+ return $conf['host'];
+}
?> \ No newline at end of file