From a6379d2ee80392f31691d3d8cdf8558fd34f8348 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 30 Sep 2001 11:09:22 +0000
Subject: [PATCH] - replaced all 'header("Location: foo")'s by a call to
'drupal_goto()' which will append the session ID to the uri 'foo' when PHP
is compiled with '--enable-transe-sid'.
---
error.php | 4 ++--
includes/common.inc | 11 +++++++++++
modules/queue.module | 2 +-
modules/user.module | 6 +++---
modules/user/user.module | 6 +++---
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/error.php b/error.php
index db6f157c4707..c4db050d0944 100644
--- a/error.php
+++ b/error.php
@@ -11,10 +11,10 @@
watchdog("httpd", $errors[$REDIRECT_STATUS]);
if (strstr($REDIRECT_URL, "index.php")) {
- header("Location: ../index.php");
+ drupal_goto("../index.php");
}
else {
- header("Location: index.php");
+ drupal_goto("index.php");
}
?>
\ No newline at end of file
diff --git a/includes/common.inc b/includes/common.inc
index 256beb34cd34..98a94b339392 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -71,6 +71,17 @@ function message_throttle() {
return t("You exceeded the submission rate exceeded. Please wait a few minutes and try again.");
}
+function drupal_goto($url) {
+
+ /*
+ ** It is advised to use "drupal_goto()" instead of PHP's "header()" as
+ ** "drupal_goto()" will append the user's session ID to the URI when PHP
+ ** is compiled with "--enable-trans-sid".
+ */
+
+ header("Location: $url". SID);
+}
+
function check_form($text) {
return htmlspecialchars(stripslashes($text));
}
diff --git a/modules/queue.module b/modules/queue.module
index 3da3fcb2dbbc..676d3fc3a13b 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -86,7 +86,7 @@ function queue_node($id) {
$node = node_get_object(array(nid => $id));
if ($user->uid == $node->author || field_get($node->users, $user->uid)) {
- header("Location: node.php?id=$node->nid");
+ drupal_goto("node.php?id=$node->nid");
}
else {
$queue_votes = array("neutral (+0)" => "+ 0", "post it (+1)" => "+ 1", "dump it (-1)" => "- 1");
diff --git a/modules/user.module b/modules/user.module
index 1ee6599b06d9..5e976b61e36f 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -482,7 +482,7 @@ function user_login($edit = array()) {
$url = $HTTP_REFERER ? $HTTP_REFERER : "module.php?mod=user&op=view";
- header("Location: $url");
+ drupal_goto($url);
}
else {
@@ -529,7 +529,7 @@ function user_logout() {
** Redirect the user to his personal information page:
*/
- header("Location: index.php");
+ drupal_goto("index.php");
}
}
@@ -688,7 +688,7 @@ function user_edit($edit = array()) {
** Redirect the user to his personal information page:
*/
- header("Location: module.php?mod=user&op=view");
+ drupal_goto("module.php?mod=user&op=view");
}
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 1ee6599b06d9..5e976b61e36f 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -482,7 +482,7 @@ function user_login($edit = array()) {
$url = $HTTP_REFERER ? $HTTP_REFERER : "module.php?mod=user&op=view";
- header("Location: $url");
+ drupal_goto($url);
}
else {
@@ -529,7 +529,7 @@ function user_logout() {
** Redirect the user to his personal information page:
*/
- header("Location: index.php");
+ drupal_goto("index.php");
}
}
@@ -688,7 +688,7 @@ function user_edit($edit = array()) {
** Redirect the user to his personal information page:
*/
- header("Location: module.php?mod=user&op=view");
+ drupal_goto("module.php?mod=user&op=view");
}
}
--
GitLab