diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 8 | ||||
| -rw-r--r-- | includes/setting.php (renamed from includes/hostname.conf) | 21 |
2 files changed, 6 insertions, 23 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"; diff --git a/includes/hostname.conf b/includes/setting.php index 68e6f8df9..dbbc5eec6 100644 --- a/includes/hostname.conf +++ b/includes/setting.php @@ -1,21 +1,5 @@ <?php -# IMPORTANT! -# Extract from the Drupal handbook: -# "5.Rename the configuration file includes/hostname.conf to match your -# server's hostname: -# $ cp includes/hostname.conf includes/www.yourdomain.com.conf -# /'s and :'s are translated to .'s. So if the URI of your drupal site -# would be http://www.yourdomain.com:80/foo/ your configuration file -# should be named www.yourdomain.com.80.foo.conf." -# -# If you intend to support multiple domains or vhosts with different -# configurations make sure you read: -# http://www.drop.org/node.php?id=173. -# -# If you are going to only use one domain/vhost, or the same -# configuration for several domains you can still use the domain.conf -# format, or simply rename this file to default.conf. # # Database settings: @@ -73,4 +57,7 @@ $themes = array("UnConeD" => array( #$language = array(); // = language support disabled $languages = array("en" => "English"); -?> +# This line prevents users from accessing your settings file: +die(); + +?>
\ No newline at end of file |