Changeset 1649 for trunk/include/functions.inc.php

Timestamp:

Dec 11, 2006, 7:04:53 AM (17 years ago)

Author:

rub

Message:

Feature Issue ID 0000602: Redirect must be done by html or http

Redirect it's only done by the html method but must be done too with http method.
Creation of two functions redirect_http and redirect_html.
Function redirect calls one or other functions follow $conf or parameters.

$conf value are true on BSF, in order to check modifications.
Must be set to false on RC.

File:

• trunk/include/functions.inc.php (modified) (3 diffs)

trunk/include/functions.inc.php

@@ -601 +601 @@
 
 /**
- * Redirects to the given URL
+ * Redirects to the given URL (HTTP method)
+ *
+ * Note : once this function called, the execution doesn't go further
+ * (presence of an exit() instruction.
+ *
+ * @param string $url
+ * @return void
+ */
+function redirect_http( $url )
+{
+  if (ob_get_length () !== FALSE)
+  {
+    ob_clean();
+  }
+  header('Request-URI: '.$url);
+  header('Content-Location: '.$url);
+  header('Location: '.$url);
+  exit();
+}
+
+/**
+ * Redirects to the given URL (HTML method)
  *
  * Note : once this function called, the execution doesn't go further
@@ -611 +632 @@
  * @return void
  */
-function redirect( $url , $msg = '', $refresh_time = 0)
+function redirect_html( $url , $msg = '', $refresh_time = 0)
 {
   global $user, $template, $lang_info, $conf, $lang, $t2, $page, $debug;
@@ -651 +672 @@
 
   exit();
+}
+
+/**
+ * Redirects to the given URL (Switch to HTTP method or HTML method)
+ *
+ * Note : once this function called, the execution doesn't go further
+ * (presence of an exit() instruction.
+ *
+ * @param string $url
+ * @param string $title_msg
+ * @param integer $refreh_time
+ * @return void
+ */
+function redirect( $url , $msg = '', $refresh_time = 0)
+{
+  global $conf;
+
+  // with RefeshTime <> 0, only html must be used
+  if (($conf['default_redirect_method'] == 'http') and ($refresh_time == 0))
+  {
+    redirect_http($url);
+  }
+  else
+  {
+    redirect_html($url, $msg, $refresh_time);
+  }
 }