Commit c2d2fb73 authored by Dries's avatar Dries

- Fixed a typo in the PostgreSQL database scheme.  Patch by Michael Frankowski.

- Fixed a typo in the MSSQL database scheme.  Patch by Michael Frankowski.

- Removed dependency on "register_globals = on"!  Patches by Michael Frankowski.

  Notes:

  + Updated the patches to use $foo["bar"] instead of $foo['bar'].
  + Updated the INSTALL and CHANGELOG files as well.

- Tiny improvement to the "./scripts/code-clean.sh" script.
parent 13ffd895
...@@ -20,17 +20,16 @@ ErrorDocument 500 /error.php ...@@ -20,17 +20,16 @@ ErrorDocument 500 /error.php
# Overload PHP variables: # Overload PHP variables:
<IfModule mod_php4.c> <IfModule mod_php4.c>
php_value register_globals 1
php_value track_vars 1 php_value track_vars 1
php_value short_open_tag 1 php_value short_open_tag 1
php_value magic_quotes_gpc 0 php_value magic_quotes_gpc 0
php_value magic_quotes_runtime 0 php_value magic_quotes_runtime 0
php_value magic_quotes_sybase 0 php_value magic_quotes_sybase 0
php_value arg_separator.output "&amp;" php_value arg_separator.output "&amp;"
php_value session.cache_expire 200000 php_value session.cache_expire 200000
php_value session.cookie_lifetime 2000000 php_value session.cookie_lifetime 2000000
php_value session.auto_start 0 php_value session.auto_start 0
php_value session.save_handler user php_value session.save_handler user
php_value session.cache_limiter none php_value session.cache_limiter none
php_value allow_call_time_pass_reference Off php_value allow_call_time_pass_reference Off
</IfModule> </IfModule>
...@@ -44,7 +43,7 @@ ErrorDocument 500 /error.php ...@@ -44,7 +43,7 @@ ErrorDocument 500 /error.php
#RewriteCond %{REQUEST_FILENAME} !-d #RewriteCond %{REQUEST_FILENAME} !-d
#RewriteCond %{QUERY_STRING} ^id=([^&]+)$ #RewriteCond %{QUERY_STRING} ^id=([^&]+)$
#RewriteRule node.php index.php?q=node/view/%1 [L] #RewriteRule node.php index.php?q=node/view/%1 [L]
# Rewrite old-style URLs of the form 'module.php?mod=x': # Rewrite old-style URLs of the form 'module.php?mod=x':
#RewriteCond %{REQUEST_FILENAME} !-f #RewriteCond %{REQUEST_FILENAME} !-f
#RewriteCond %{REQUEST_FILENAME} !-d #RewriteCond %{REQUEST_FILENAME} !-d
...@@ -54,7 +53,7 @@ ErrorDocument 500 /error.php ...@@ -54,7 +53,7 @@ ErrorDocument 500 /error.php
# Rewrite URLs of the form 'index.php?q=x': # Rewrite URLs of the form 'index.php?q=x':
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
</IfModule> </IfModule>
# $Id$ # $Id$
Drupal x.x.x, xxxx-xx-xx (to be released) Drupal 4.2.0, xxxx-xx-xx (to be released)
------------------------ ------------------------
- added support for clean URLs. - added support for clean URLs.
...@@ -23,6 +23,8 @@ Drupal x.x.x, xxxx-xx-xx (to be released) ...@@ -23,6 +23,8 @@ Drupal x.x.x, xxxx-xx-xx (to be released)
* added default node settings to control the behaviour for promotion, moderation and other options. * added default node settings to control the behaviour for promotion, moderation and other options.
- themes: - themes:
* replaced theme "Goofy" by "Xtemplate", a template driven theme. * replaced theme "Goofy" by "Xtemplate", a template driven theme.
- removed the 'register_globals = on' requirement.
- added better installation instructions.
Drupal 4.1.0, 2003-02-01 Drupal 4.1.0, 2003-02-01
------------------------ ------------------------
......
...@@ -15,7 +15,6 @@ SERVER CONFIGURATION ...@@ -15,7 +15,6 @@ SERVER CONFIGURATION
Your PHP must have the following settings: Your PHP must have the following settings:
register_globals 1
magic_quotes_gpc 0 magic_quotes_gpc 0
session.save_handler user session.save_handler user
......
...@@ -456,7 +456,7 @@ INSERT INTO system VALUES ('modules/story.module','story','module','',1); ...@@ -456,7 +456,7 @@ INSERT INTO system VALUES ('modules/story.module','story','module','',1);
INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1); INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1);
INSERT INTO system VALUES ('themes/marvin/marvin.theme','marvin','theme','Internet explorer, Netscape, Opera',1); INSERT INTO system VALUES ('themes/marvin/marvin.theme','marvin','theme','Internet explorer, Netscape, Opera',1);
INSERT INTO variable(name,value) VALUES('update_start', '2002-05-15'); INSERT INTO variable(name,value) VALUES('update_start', 's:10:"2002-05-15";');
INSERT INTO variable(name,value) VALUES('theme_default','s:6:"marvin";'); INSERT INTO variable(name,value) VALUES('theme_default','s:6:"marvin";');
INSERT INTO blocks(module,delta,status) VALUES('user', '0', '1'); INSERT INTO blocks(module,delta,status) VALUES('user', '0', '1');
......
...@@ -563,7 +563,7 @@ INSERT INTO system VALUES ('modules/story.module','story','module','',1); ...@@ -563,7 +563,7 @@ INSERT INTO system VALUES ('modules/story.module','story','module','',1);
INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1); INSERT INTO system VALUES ('modules/taxonomy.module','taxonomy','module','',1);
INSERT INTO system VALUES ('themes/marvin/marvin.theme','marvin','theme','Internet explorer, Netscape, Opera',1); INSERT INTO system VALUES ('themes/marvin/marvin.theme','marvin','theme','Internet explorer, Netscape, Opera',1);
INSERT INTO variable(name,value) VALUES('update_start', '2003-04-19'); INSERT INTO variable(name,value) VALUES('update_start', 'S:10:"2003-04-19";');
INSERT INTO variable(name,value) VALUES('theme_default','s:6:"marvin";'); INSERT INTO variable(name,value) VALUES('theme_default','s:6:"marvin";');
INSERT INTO blocks(module,delta,status) VALUES('user', '0', '1'); INSERT INTO blocks(module,delta,status) VALUES('user', '0', '1');
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
include_once "includes/common.inc"; include_once "includes/common.inc";
$errors = array(500 => "500 error: internal server error", 404 => "404 error: `$REDIRECT_URL' not found", 403 => "403 error: access denied - forbidden", 401 => "401 error: authorization required", 400 => "400 error: bad request"); $errors = array(500 => "500 error: internal server error", 404 => "404 error: '".`$_SERVER["REDIRECT_URL"] ."' not found", 403 => "403 error: access denied - forbidden", 401 => "401 error: authorization required", 400 => "400 error: bad request");
watchdog("httpd", $errors[$REDIRECT_STATUS]); watchdog("httpd", $errors[$_SERVER["REDIRECT_STATUS"]);
drupal_goto($base_url); drupal_goto($base_url);
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// $Id$ // $Id$
function conf_init() { function conf_init() {
global $HTTP_HOST, $PHP_SELF;
/* /*
** Try finding a matching configuration file by stripping the website's ** Try finding a matching configuration file by stripping the website's
...@@ -10,9 +9,9 @@ function conf_init() { ...@@ -10,9 +9,9 @@ function conf_init() {
** default value 'conf'. ** default value 'conf'.
*/ */
$uri = $PHP_SELF; $uri = $_SERVER["PHP_SELF"];
$file = strtolower(strtr($HTTP_HOST . substr($uri, 0, strrpos($uri, "/")), "/:", "..")); $file = strtolower(strtr($_SERVER["HTTP_HOST"] . substr($uri, 0, strrpos($uri, "/")), "/:", ".."));
while (strlen($file) > 4) { while (strlen($file) > 4) {
if (file_exists("includes/$file.php")) { if (file_exists("includes/$file.php")) {
...@@ -61,11 +60,10 @@ function check_php_setting($name, $value) { ...@@ -61,11 +60,10 @@ function check_php_setting($name, $value) {
function arg($index) { function arg($index) {
global $q;
static $arguments; static $arguments;
if (empty($arguments)) { if (empty($arguments)) {
$arguments = explode("/", $q); $arguments = explode("/", $_GET["q"]);
} }
return $arguments[$index]; return $arguments[$index];
...@@ -102,13 +100,11 @@ function object2array($node) { ...@@ -102,13 +100,11 @@ function object2array($node) {
function request_uri() { function request_uri() {
// since request_uri() is only available on apache, we generate equivalent using other environment vars. // since request_uri() is only available on apache, we generate equivalent using other environment vars.
global $REQUEST_URI, $PATH_INFO, $QUERY_STRING; if (isset($_SERVER["REQUEST_URI"])) {
return $_SERVER["REQUEST_URI"];
if (isset($REQUEST_URI)) {
return $REQUEST_URI;
} }
else { else {
return $PATH_INFO ."?". $QUERY_STRING; return $_SERVER["PATH_INFO"] ."?". $_SERVER["QUERY_STRING"];
} }
} }
...@@ -351,7 +347,9 @@ function search_form($action = 0, $query = 0, $options = 0) { ...@@ -351,7 +347,9 @@ function search_form($action = 0, $query = 0, $options = 0) {
* Collect the search results: * Collect the search results:
*/ */
function search_data() { function search_data() {
global $keys, $edit; global $keys;
$edit = $_POST["edit"];
if (isset($keys)) { if (isset($keys)) {
foreach (module_list() as $name) { foreach (module_list() as $name) {
...@@ -386,7 +384,8 @@ function search_data() { ...@@ -386,7 +384,8 @@ function search_data() {
* ("Restrict search to", help text, etc). * ("Restrict search to", help text, etc).
*/ */
function search_type($type = 0, $action = 0, $query = 0, $options = 0) { function search_type($type = 0, $action = 0, $query = 0, $options = 0) {
global $edit;
$edit = $_POST["edit"];
if (isset($type)) { if (isset($type)) {
$edit["type"][$type] = "on"; $edit["type"][$type] = "on";
...@@ -437,10 +436,10 @@ function drupal_goto($url) { ...@@ -437,10 +436,10 @@ function drupal_goto($url) {
*/ */
function referer_save() { function referer_save() {
global $referer, $HTTP_REFERER; global $referer;
if (!strstr($HTTP_REFERER, request_uri())) { if (!strstr($_SERVER["HTTP_REFERER"], request_uri())) {
$referer = $HTTP_REFERER; $referer = $_SERVER["HTTP_REFERER"];
session_register("referer"); session_register("referer");
} }
} }
...@@ -664,9 +663,9 @@ function cache_clear_all($cid = NULL) { ...@@ -664,9 +663,9 @@ function cache_clear_all($cid = NULL) {
} }
function page_set_cache() { function page_set_cache() {
global $user, $REQUEST_METHOD; global $user;
if (!$user->uid && $REQUEST_METHOD == "GET") { if (!$user->uid && $_SERVER["REQUEST_METHOD"] == "GET") {
if ($data = ob_get_contents()) { if ($data = ob_get_contents()) {
cache_set(request_uri(), $data, (time() + variable_get("cache_clear", 120))); cache_set(request_uri(), $data, (time() + variable_get("cache_clear", 120)));
} }
...@@ -674,11 +673,11 @@ function page_set_cache() { ...@@ -674,11 +673,11 @@ function page_set_cache() {
} }
function page_get_cache() { function page_get_cache() {
global $user, $REQUEST_METHOD; global $user;
$cache = NULL; $cache = NULL;
if (!$user->uid && $REQUEST_METHOD == "GET") { if (!$user->uid && $_SERVER["REQUEST_METHOD"] == "GET") {
$cache = cache_get(request_uri()); $cache = cache_get(request_uri());
if (empty($cache)) { if (empty($cache)) {
......
...@@ -47,12 +47,12 @@ function menu_item($in_path) { ...@@ -47,12 +47,12 @@ function menu_item($in_path) {
} }
function menu_trail() { function menu_trail() {
global $_gmenu, $q; global $_gmenu;
static $trail; // cache static $trail; // cache
if (empty($trail)) { if (empty($trail)) {
$trail = array(); $trail = array();
$path = $q; $path = $_GET["q"];
while ($path) { while ($path) {
if ($_gmenu[$path]) { if ($_gmenu[$path]) {
...@@ -142,12 +142,12 @@ function menu_map($parent = "") { ...@@ -142,12 +142,12 @@ function menu_map($parent = "") {
} }
function menu_execute_action() { function menu_execute_action() {
global $_gmenu, $q; global $_gmenu;
$trail = menu_trail(); $trail = menu_trail();
$selected_menu = array_pop($trail); $selected_menu = array_pop($trail);
if ($_gmenu[$selected_menu]["callback"]) { if ($_gmenu[$selected_menu]["callback"]) {
$arg = substr($q, strlen($selected_menu) + 1); $arg = substr($_GET["q"], strlen($selected_menu) + 1);
if (empty($arg)) { if (empty($arg)) {
return call_user_func($_gmenu[$selected_menu]["callback"]); return call_user_func($_gmenu[$selected_menu]["callback"]);
} }
......
...@@ -301,7 +301,7 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = "") { ...@@ -301,7 +301,7 @@ function pager_query($query, $limit = 10, $element = 0, $count_query = "") {
} }
function pager_link($from_new, $attributes = array()) { function pager_link($from_new, $attributes = array()) {
global $q; $q = $_GET["q"];
foreach($attributes as $key => $value) { foreach($attributes as $key => $value) {
$query[] = "$key=$value"; $query[] = "$key=$value";
......
...@@ -179,7 +179,7 @@ function theme_init() { ...@@ -179,7 +179,7 @@ function theme_init() {
* @param string $region main|left|right * @param string $region main|left|right
*/ */
function theme_blocks($region) { function theme_blocks($region) {
global $user, $REQUEST_URI; global $user;
$result = db_query("SELECT * FROM blocks WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = %d " : "") ."ORDER BY weight, module", $region == "left" ? 0 : 1); $result = db_query("SELECT * FROM blocks WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = %d " : "") ."ORDER BY weight, module", $region == "left" ? 0 : 1);
......
...@@ -148,7 +148,6 @@ class xmlrpc_server { ...@@ -148,7 +148,6 @@ class xmlrpc_server {
var $dmap=array(); var $dmap=array();
function xmlrpc_server($dispMap, $serviceNow=1) { function xmlrpc_server($dispMap, $serviceNow=1) {
global $HTTP_RAW_POST_DATA;
// dispMap is a despatch array of methods // dispMap is a despatch array of methods
// mapped to function names and signatures // mapped to function names and signatures
// if a method // if a method
...@@ -208,14 +207,14 @@ function verifySignature($in, $sig) { ...@@ -208,14 +207,14 @@ function verifySignature($in, $sig) {
} }
function parseRequest($data="") { function parseRequest($data="") {
global $_xh,$HTTP_RAW_POST_DATA; global $_xh;
global $xmlrpcerr, $xmlrpcstr, $xmlrpcerrxml, $xmlrpc_defencoding, global $xmlrpcerr, $xmlrpcstr, $xmlrpcerrxml, $xmlrpc_defencoding,
$_xmlrpcs_dmap; $_xmlrpcs_dmap;
if ($data=="") { if ($data=="") {
$data=$HTTP_RAW_POST_DATA; $data=$_SERVER["HTTP_RAW_POST_DATA"];
} }
$parser = xml_parser_create($xmlrpc_defencoding); $parser = xml_parser_create($xmlrpc_defencoding);
...@@ -291,13 +290,12 @@ function parseRequest($data="") { ...@@ -291,13 +290,12 @@ function parseRequest($data="") {
} }
function echoInput() { function echoInput() {
global $HTTP_RAW_POST_DATA;
// a debugging routine: just echos back the input // a debugging routine: just echos back the input
// packet as a string value // packet as a string value
$r=new xmlrpcresp; $r=new xmlrpcresp;
$r->xv=new xmlrpcval( "'Aha said I: '" . $HTTP_RAW_POST_DATA, "string"); $r->xv=new xmlrpcval( "'Aha said I: '" . $_SERVER["HTTP_RAW_POST_DATA"], "string");
print $r->serialize(); print $r->serialize();
} }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
include_once "includes/common.inc"; include_once "includes/common.inc";
if (isset($q)) { if (isset($_GET["q"])) {
$mod = arg(0); $mod = arg(0);
} }
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
page_header(); page_header();
check_php_setting("magic_quotes_gpc", 0); check_php_setting("magic_quotes_gpc", 0);
check_php_setting("register_globals", 1);
if (module_hook(variable_get("site_frontpage", "node"), "page")) { if (module_hook(variable_get("site_frontpage", "node"), "page")) {
module_invoke(variable_get("site_frontpage", "node"), "page"); module_invoke(variable_get("site_frontpage", "node"), "page");
......
...@@ -25,7 +25,7 @@ function admin_admin() { ...@@ -25,7 +25,7 @@ function admin_admin() {
} }
function admin_page() { function admin_page() {
global $user, $base_url; global $base_url;
if (user_access("access administration pages")) { if (user_access("access administration pages")) {
page_header(); page_header();
......
...@@ -488,7 +488,8 @@ function import_tag() { ...@@ -488,7 +488,8 @@ function import_tag() {
} }
function import_admin() { function import_admin() {
global $op, $edit; $op = $_POST["op"];
$edit = $_POST["edit"];
if (user_access("administer news feeds")) { if (user_access("administer news feeds")) {
......
...@@ -488,7 +488,8 @@ function import_tag() { ...@@ -488,7 +488,8 @@ function import_tag() {
} }
function import_admin() { function import_admin() {
global $op, $edit; $op = $_POST["op"];
$edit = $_POST["edit"];
if (user_access("administer news feeds")) { if (user_access("administer news feeds")) {
......
...@@ -140,7 +140,10 @@ function archive_link($type) { ...@@ -140,7 +140,10 @@ function archive_link($type) {
} }
function archive_page() { function archive_page() {
global $date, $edit, $op, $month, $year, $meta; global $date, $month, $year, $meta;
$op = $_POST["op"];
$edit = $_POST["edit"];
theme("header"); theme("header");
......
...@@ -140,7 +140,10 @@ function archive_link($type) { ...@@ -140,7 +140,10 @@ function archive_link($type) {
} }
function archive_page() { function archive_page() {
global $date, $edit, $op, $month, $year, $meta; global $date, $month, $year, $meta;
$op = $_POST["op"];
$edit = $_POST["edit"];
theme("header"); theme("header");
......
...@@ -260,7 +260,8 @@ function block_box_delete($bid) { ...@@ -260,7 +260,8 @@ function block_box_delete($bid) {
} }
function block_admin() { function block_admin() {
global $edit, $op; $op = $_POST["op"];
$edit = $_POST["edit"];
if (user_access("administer blocks")) { if (user_access("administer blocks")) {
......
...@@ -260,7 +260,8 @@ function block_box_delete($bid) { ...@@ -260,7 +260,8 @@ function block_box_delete($bid) {
} }
function block_admin() { function block_admin() {
global $edit, $op; $op = $_POST["op"];
$edit = $_POST["edit"];
if (user_access("administer blocks")) { if (user_access("administer blocks")) {
......
...@@ -160,8 +160,9 @@ function book_validate(&$node) { ...@@ -160,8 +160,9 @@ function book_validate(&$node) {
} }
function book_form(&$node, &$help, &$error) { function book_form(&$node, &$help, &$error) {
global $user, $op; global $user;
$op = $_POST["op"];
$output = form_select(t("Parent"), "parent", $node->parent, book_toc(), t("The parent subject or category the page belongs in.")); $output = form_select(t("Parent"), "parent", $node->parent, book_toc(), t("The parent subject or category the page belongs in."));
if (function_exists("taxonomy_node_form")) { if (function_exists("taxonomy_node_form")) {
...@@ -197,7 +198,10 @@ function book_form(&$node, &$help, &$error) { ...@@ -197,7 +198,10 @@ function book_form(&$node, &$help, &$error) {
} }
function book_node_link($node = 0) { function book_node_link($node = 0) {
global $user, $op, $edit; global $user;
$op = $_POST["op"];
$edit = $_POST["edit"];
if ($node->type != "book") { if ($node->type != "book") {
...@@ -337,7 +341,7 @@ function book_next($node) { ...@@ -337,7 +341,7 @@ function book_next($node) {
} }
function book_body($node) { function book_body($node) {
global $op; $op = $_POST["op"];
if ($node->format == 1) { if ($node->format == 1) {
// Make sure only authorized users can preview PHP pages. // Make sure only authorized users can preview PHP pages.
...@@ -705,7 +709,8 @@ function book_admin_links() { ...@@ -705,7 +709,8 @@ function book_admin_links() {
} }
function book_admin() { function book_admin() {
global $op, $edit; $op = $_POST["op"];
$edit = $_POST["edit"];
if (user_access("administer nodes")) { if (user_access("administer nodes")) {
if (empty($op)) { if (empty($op)) {
......
...@@ -160,8 +160,9 @@ function book_validate(&$node) { ...@@ -160,8 +160,9 @@ function book_validate(&$node) {
} }