archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug:2647

Browse source 
External ImageMagick does not work anymore on 1and1 servers

git-svn-id: http://piwigo.org/svn/trunk@15575 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2012-06-06 15:38:56 +00:00
parent 1dfe8d5645
commit acb3e717fc
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/include/image.class.php
View file

@ -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))

19
include/functions.inc.php
View file

@ -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'];
}
?>