- Renamed "hostname.conf" to "setting.php" (cfr. "setting.module").

  Note that - when upgrading - you have to rename all your existing
  configuration files to reflect this change:

     yourdomain.com.conf -> yourdomain.com.php

  By default, i.e. if no configuration file is found, setting.php
  will be used instead.  Using the ".php"-extension will fix most
  configuration/security issues with .htaccess-files ...

- Removed some dead code from forum.module.

1 files changed, 2 insertions, 6 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 5efe00f5a..49b55eb54 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -5,11 +5,7 @@ $na = "<I>na</I>";
 function conf_init() {
   global $HTTP_HOST, $REQUEST_URI;
   $file = strtolower(strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", ".."));
-  while ($file && !file_exists("includes/$file.conf")) {
-    $file = substr($file, 0, strrpos($file, "."));
-  }
-  if (empty($file) && file_exists("includes/default.conf")) $file = "default";
-  return $file;
+  return file_exists("includes/$file.php") ? $file : "setting";
 }
 
 function error_handler($errno, $message, $filename, $line, $variables) {
@@ -191,7 +187,7 @@ function form_submit($value) {
 
 $conf = conf_init();
 
-include_once "includes/$conf.conf";
+include_once "includes/$conf.php";
 include_once "includes/structure.inc";
 include_once "includes/database.inc";
 include_once "includes/variable.inc";