[Piwik-svn] r335 - in trunk: modules plugins/Login

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-09 01:46:36 +0100 (Sun, 09 Mar 2008)
New Revision: 335

Modified:
   trunk/modules/Piwik.php
   trunk/plugins/Login/Controller.php
   trunk/plugins/Login/Form.php
Log:
- Fixed #86

Modified: trunk/modules/Piwik.php
===================================================================
--- trunk/modules/Piwik.php	2008-03-08 23:57:55 UTC (rev 334)
+++ trunk/modules/Piwik.php	2008-03-09 00:46:36 UTC (rev 335)
@@ -694,6 +694,7 @@
 		}
 		
 //		var_dump($dbInfos);
+		// test with the password ='][{}!3456&&^#gegq"eQ for example
 		if(substr($dbInfos['password'],0,1) == '"'
 			&& substr($dbInfos['password'],-1,1) == '"'
 			&& strlen($dbInfos['password']) >= 2 )

Modified: trunk/plugins/Login/Controller.php
===================================================================
--- trunk/plugins/Login/Controller.php	2008-03-08 23:57:55 UTC (rev 334)
+++ trunk/plugins/Login/Controller.php	2008-03-09 00:46:36 UTC (rev 335)
@@ -80,7 +80,7 @@
 		$cookie = new Piwik_Cookie($authCookieName);
 		$cookie->delete();
 		
-		$baseUrl = Piwik_Url::getCurrentUrlWithoutQueryString();
+		$baseUrl = Piwik_Url::getReferer();
 	
 		Piwik_Url::redirectToUrl($baseUrl);
 	}

Modified: trunk/plugins/Login/Form.php
===================================================================
--- trunk/plugins/Login/Form.php	2008-03-08 23:57:55 UTC (rev 334)
+++ trunk/plugins/Login/Form.php	2008-03-09 00:46:36 UTC (rev 335)
@@ -26,6 +26,12 @@
 	{
 		$urlToGoAfter = Piwik_Url::getCurrentUrl();			
 		
+		// if the current url to redirect contains module=login we insteaed redirect to the referer url
+		if(stripos($urlToGoAfter,'module=login') !== false)
+		{
+			$urlToGoAfter = Piwik_Url::getReferer();
+		}
+		
 		$formElements = array(
 			array('text', 'form_login', 'login:'),
 			array('password', 'form_password', 'pass:'),