Changeset 15584 for branches

Timestamp:

Jun 7, 2012, 12:52:43 PM (12 years ago)

Author:

patdenice

Message:

Merged r15583 from trunk to branch 23
bug:2647
Test 1and1 server with $_SERVERSCRIPT_FILENAME

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
+    if (strpos(@$_SERVER['SCRIPT_FILENAME'], '/kunden/') === 0)  // 1and1
     {
       @putenv('MAGICK_THREAD_LIMIT=1');

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