[evolvis-commits] r11879: allow return_to for mediawiki plugin↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 18:27:55 CET 2011


Author: mirabilos
Date: 2011-02-24 18:27:55 +0100 (Thu, 24 Feb 2011)
New Revision: 11879

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/login.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/account/logout.php
Log:
allow return_to for mediawiki plugin


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/login.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/login.php	2011-02-24 17:27:53 UTC (rev 11878)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/login.php	2011-02-24 17:27:55 UTC (rev 11879)
@@ -43,7 +43,7 @@
 //
 if ($return_to) {
 	$tmpreturn=explode('?',$return_to);
-	if (!@is_file($sys_urlroot.$tmpreturn[0]) && !@is_dir($sys_urlroot.$tmpreturn[0]) && !(strpos($tmpreturn[0],'projects') == 1)) {
+	if (!@is_file($sys_urlroot.$tmpreturn[0]) && !@is_dir($sys_urlroot.$tmpreturn[0]) && !(strpos($tmpreturn[0],'projects') == 1) && !(strpos($tmpreturn[0],'mediawiki') == 1)) {
 		$return_to='';
 	}
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/account/logout.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/account/logout.php	2011-02-24 17:27:53 UTC (rev 11878)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/account/logout.php	2011-02-24 17:27:55 UTC (rev 11879)
@@ -23,12 +23,30 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-require_once('pre.php');    
+Header( "Expires: Wed, 11 Nov 1998 11:11:11 GMT");
+Header( "Cache-Control: no-cache");
+Header( "Cache-Control: must-revalidate");
 
+require_once('pre.php');
+
+$return_to = getStringFromRequest('return_to');
+
+//
+//      Validate return_to
+//
+if ($return_to) {
+        $tmpreturn=explode('?',$return_to);
+        if (!@is_file($sys_urlroot.$tmpreturn[0]) && !@is_dir($sys_urlroot.$tmpreturn[0]) && !(strpos($tmpreturn[0],'projects') == 1) && !(strpos($tmpreturn[0],'mediawiki') == 1)) {
+	$return_to='';
+}				        }
+
 session_logout();
 
 plugin_hook('before_logout_redirect');
 
+if ($return_to) {
+header('Location: '.$return_to);
+}else{
 header('Location: /');
-
-?>
\ No newline at end of file
+}
+?>



More information about the evolvis-commits mailing list