Changeset 15576 for branches

Timestamp:

Jun 6, 2012, 5:43:40 PM (12 years ago)

Author:

patdenice

Message:

merge r15575 from trunk to branch 23
bug:2647
External ImageMagick does not work anymore on 1and1 servers

Location:

branches/2.3

Files:

• admin/include/image.class.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)

branches/2.3/admin/include/image.class.php

@@ -421 +421 @@
     $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);

branches/2.3/include/functions.inc.php

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