[Fusionforge-commits] r12832 - in trunk/src: common/include www/include

Roland Mas lolando at fusionforge.org
Thu Mar 17 14:10:06 CET 2011


Author: lolando
Date: 2011-03-17 14:10:05 +0100 (Thu, 17 Mar 2011)
New Revision: 12832

Modified:
   trunk/src/common/include/session.php
   trunk/src/www/include/login-form.php
Log:
Use a common method for redirection to a (potentially external) URL

Modified: trunk/src/common/include/session.php
===================================================================
--- trunk/src/common/include/session.php	2011-03-17 11:21:20 UTC (rev 12831)
+++ trunk/src/common/include/session.php	2011-03-17 13:10:05 UTC (rev 12832)
@@ -349,7 +349,18 @@
  *	@return never returns
  */
 function session_redirect($loc) {
-	header('Location: '.util_make_url ($loc));
+	session_redirect_external(util_make_url ($loc));
+	exit;
+}
+
+/**
+ *	session_redirect_external() - Redirect browser to a (potentially external) URL
+ *
+ *	@param		string	Absolute URL, not necessarily within the site
+ *	@return never returns
+ */
+function session_redirect_external($url) {
+	header('Location: '.$url);
 	print("\n\n");
 	exit;
 }

Modified: trunk/src/www/include/login-form.php
===================================================================
--- trunk/src/www/include/login-form.php	2011-03-17 11:21:20 UTC (rev 12831)
+++ trunk/src/www/include/login-form.php	2011-03-17 13:10:05 UTC (rev 12832)
@@ -60,8 +60,7 @@
 		if (count($params['html_snippets']) == 1
 		    && count($params['transparent_redirect_urls']) == 1) {
 			$urls = array_values($params['transparent_redirect_urls']);
-			header('Location: '.$urls[0]);
-			print("\n\n");
+			session_redirect_external($urls[0]);
 		}
 	
 		$HTML->header(array('title'=>'Login'));




More information about the Fusionforge-commits mailing list