Changeset 9606ffb in github

Timestamp:

Jun 25, 2006 5:18:00 AM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

fb5f4f3

Parents:

cbdd6dc

Message:

Changed behavior to include host-specific configuration (Bug #1483849)

Files:

• config/main.inc.php.dist (modified) (2 diffs)
• program/include/main.inc (modified) (2 diffs)

config/main.inc.php.dist

@@ -174 +174 @@
  */
 
+// try to load host-specific configuration
+$rcmail_config['include_host_config'] = FALSE;
+
 
 /***** these settings can be overwritten by user's preferences *****/
@@ -201 +204 @@
 $rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
 
-/***** try to load host-specific configuration *****/
-
-@include($_SERVER['HTTP_HOST'].'.inc.php');
-
 
 // end of config file

program/include/main.inc

@@ -43 +43 @@
   include_once('config/main.inc.php');
   $CONFIG = is_array($rcmail_config) ? $rcmail_config : array();
+  
+  // load host-specific configuration
+  rcmail_load_host_config(&$CONFIG);
+  
   $CONFIG['skin_path'] = $CONFIG['skin_path'] ? preg_replace('/\/$/', '', $CONFIG['skin_path']) : 'skins/default';
 
@@ -126 +130 @@
 
   register_shutdown_function('rcmail_shutdown');
+  }
+
+
+// load a host-specific config file if configured
+function rcmail_load_host_config(&$config)
+  {
+  $fname = NULL;
+  
+  if (is_array($config['include_host_config']))
+    $fname = $config['include_host_config'][$_SERVER['HTTP_HOST']];
+  else if (!empty($config['include_host_config']))
+    $fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
+
+   if ($fname && is_file('config/'.$fname))
+     {
+     include('config/'.$fname);
+     $config = array_merge($config, $rcmail_config);
+     }
   }