diff options
| -rw-r--r-- | admin/include/image.class.php | 5 | ||||
| -rw-r--r-- | include/functions.inc.php | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 53a27b924..c45669d8d 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -420,6 +420,11 @@ class image_ext_imagick implements imageInterface $this->source_filepath = $source_filepath; $this->imagickdir = $imagickdir; + if (get_host() == 'kundenserver.de') // 1and1 + { + @putenv('MAGICK_THREAD_LIMIT=1'); + } + $command = $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 f6b8303b6..15baa8fef 100644 --- a/include/functions.inc.php +++ b/include/functions.inc.php @@ -1649,4 +1649,23 @@ function get_branch_from_version($version) { return implode('.', array_slice(explode('.', $version), 0, 2)); } + +/** + * 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 |