Changeset 15575 for trunk

Timestamp:

Jun 6, 2012, 5:38:56 PM (12 years ago)

Author:

patdenice

Message:

bug:2647
External ImageMagick does not work anymore on 1and1 servers

Location:

trunk

Files:

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

trunk/admin/include/image.class.php

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

trunk/include/functions.inc.php

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