Commit e22f1042 authored by Dries's avatar Dries
Browse files

- 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.
parent 8ec10183
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
function conf_init() { function conf_init() {
global $HTTP_HOST, $REQUEST_URI; global $HTTP_HOST, $REQUEST_URI;
$file = strtolower(strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", "..")); $file = strtolower(strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", ".."));
while ($file && !file_exists("includes/$file.conf")) { return file_exists("includes/$file.php") ? $file : "setting";
$file = substr($file, 0, strrpos($file, "."));
}
if (empty($file) && file_exists("includes/default.conf")) $file = "default";
return $file;
} }
function error_handler($errno, $message, $filename, $line, $variables) { function error_handler($errno, $message, $filename, $line, $variables) {
...@@ -191,7 +187,7 @@ function form_submit($value) { ...@@ -191,7 +187,7 @@ function form_submit($value) {
$conf = conf_init(); $conf = conf_init();
include_once "includes/$conf.conf"; include_once "includes/$conf.php";
include_once "includes/structure.inc"; include_once "includes/structure.inc";
include_once "includes/database.inc"; include_once "includes/database.inc";
include_once "includes/variable.inc"; include_once "includes/variable.inc";
......
<?php <?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: # Database settings:
...@@ -73,4 +57,7 @@ ...@@ -73,4 +57,7 @@
#$language = array(); // = language support disabled #$language = array(); // = language support disabled
$languages = array("en" => "English"); $languages = array("en" => "English");
?> # This line prevents users from accessing your settings file:
die();
?>
\ No newline at end of file
<?php <?php
$format = array(0 => HTML, 1 => PHP, 2 => text);
function forum_status() { function forum_status() {
return array(dumped, posted); return array(dumped, posted);
} }
...@@ -13,7 +11,7 @@ function forum_view($node) { ...@@ -13,7 +11,7 @@ function forum_view($node) {
} }
function forum_form($edit = array()) { function forum_form($edit = array()) {
global $format, $REQUEST_URI; global $REQUEST_URI;
$form .= form_textfield(t("Subject"), "title", $edit[title], 50, 64); $form .= form_textfield(t("Subject"), "title", $edit[title], 50, 64);
$form .= structure_form("forum", $edit); $form .= structure_form("forum", $edit);
......
<?php <?php
$format = array(0 => HTML, 1 => PHP, 2 => text);
function forum_status() { function forum_status() {
return array(dumped, posted); return array(dumped, posted);
} }
...@@ -13,7 +11,7 @@ function forum_view($node) { ...@@ -13,7 +11,7 @@ function forum_view($node) {
} }
function forum_form($edit = array()) { function forum_form($edit = array()) {
global $format, $REQUEST_URI; global $REQUEST_URI;
$form .= form_textfield(t("Subject"), "title", $edit[title], 50, 64); $form .= form_textfield(t("Subject"), "title", $edit[title], 50, 64);
$form .= structure_form("forum", $edit); $form .= structure_form("forum", $edit);
......
<?php <?php
global $format; $GLOBALS[format] = array(0 => HTML, 1 => PHP, 2 => text);
$format = array(0 => "HTML", 1 => "PHP", 2 => "text");
function page_view($node, $main = 0) { function page_view($node, $main = 0) {
global $format, $theme; global $format, $theme;
......
<?php <?php
global $format; $GLOBALS[format] = array(0 => HTML, 1 => PHP, 2 => text);
$format = array(0 => "HTML", 1 => "PHP", 2 => "text");
function page_view($node, $main = 0) { function page_view($node, $main = 0) {
global $format, $theme; global $format, $theme;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment