[Piwik-svn] r463 - in trunk: modules/LogStats plugins/Login plugins/Provider plugins/UsersManager plugins/UsersManager/lang

[svnmaster at piwik.org]

Author: matt
Date: 2008-05-07 01:06:02 +0200 (Wed, 07 May 2008)
New Revision: 463

Modified:
   trunk/modules/LogStats/Visit.php
   trunk/plugins/Login/Controller.php
   trunk/plugins/Provider/Provider.php
   trunk/plugins/UsersManager/API.php
   trunk/plugins/UsersManager/lang/en.php
Log:
- adding user now check for email unicity
- setting name in password recovery email
- fixing bug when provider disabled because column NOT NULL..

Modified: trunk/modules/LogStats/Visit.php
===================================================================
--- trunk/modules/LogStats/Visit.php	2008-05-06 23:03:08 UTC (rev 462)
+++ trunk/modules/LogStats/Visit.php	2008-05-06 23:06:02 UTC (rev 463)
@@ -241,7 +241,7 @@
 		$ip				= Piwik_Common::getIp();
 		$ip 			= ip2long($ip);
 
-		$browserLang	= Piwik_Common::sanitizeInputValues(@$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+		$browserLang	= substr(Piwik_Common::sanitizeInputValues(@$_SERVER['HTTP_ACCEPT_LANGUAGE']), 0, 20);
 		if(is_null($browserLang))
 		{
 			$browserLang = '';

Modified: trunk/plugins/Login/Controller.php
===================================================================
--- trunk/plugins/Login/Controller.php	2008-05-06 23:03:08 UTC (rev 462)
+++ trunk/plugins/Login/Controller.php	2008-05-06 23:06:02 UTC (rev 463)
@@ -120,11 +120,12 @@
 				// send email with new password
 				try 
 				{
-					$mail = new Piwik_Mail();				
+					$mail = new Piwik_Mail();
 					$mail->addTo($email, $login);
 					$mail->setSubject(Piwik_Translate('Login_MailTopicPasswordRecovery'));				
 					$mail->setBodyText(sprintf(Piwik_Translate('Login_MailBodyPasswordRecovery'),
-						$login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString()));				
+						$login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString()));	
+					$mail->setFrom('password-recovery@'.Piwik_Url::getCurrentHost(), 'Piwik');
 					@$mail->send();
 				}
 				catch(Exception $e)

Modified: trunk/plugins/Provider/Provider.php
===================================================================
--- trunk/plugins/Provider/Provider.php	2008-05-06 23:03:08 UTC (rev 462)
+++ trunk/plugins/Provider/Provider.php	2008-05-06 23:06:02 UTC (rev 463)
@@ -33,7 +33,7 @@
 	function install()
 	{
 		// add column hostname / hostname ext in the visit table
-		$query = "ALTER IGNORE TABLE `".Piwik::prefixTable('log_visit')."` ADD `location_provider` VARCHAR( 100 ) NOT NULL";
+		$query = "ALTER IGNORE TABLE `".Piwik::prefixTable('log_visit')."` ADD `location_provider` VARCHAR( 100 ) NULL";
 		
 		// if the column already exist do not throw error. Could be installed twice...
 		try {

Modified: trunk/plugins/UsersManager/API.php
===================================================================
--- trunk/plugins/UsersManager/API.php	2008-05-06 23:03:08 UTC (rev 462)
+++ trunk/plugins/UsersManager/API.php	2008-05-06 23:06:02 UTC (rev 463)
@@ -202,7 +202,7 @@
 								FROM ".Piwik::prefixTable("user")
 								." WHERE email = ?", $userEmail);
 		return $user;
-	}
+	}
 	
 	static private function checkLogin($userLogin)
 	{
@@ -226,7 +226,12 @@
 	}
 	
 	static private function checkEmail($email)
-	{
+	{
+		if(self::userEmailExists($email))
+		{
+			throw new Exception(sprintf(Piwik_TranslateException('UsersManager_ExceptionEmailExists'),$email));
+		}
+		
 		if(!Piwik::isValidEmailString($email))
 		{
 			throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidEmail'));

Modified: trunk/plugins/UsersManager/lang/en.php
===================================================================
--- trunk/plugins/UsersManager/lang/en.php	2008-05-06 23:03:08 UTC (rev 462)
+++ trunk/plugins/UsersManager/lang/en.php	2008-05-06 23:06:02 UTC (rev 463)
@@ -21,7 +21,8 @@
 
 	'UsersManager_DeleteConfirm_js' => 'Are you sure you want to delete the user %s?',
 	
-	'UsersManager_ExceptionLoginExists' => "Login '%s' already exists.",
+	'UsersManager_ExceptionLoginExists' => "Login '%s' already exists.",
+	'UsersManager_ExceptionEmailExists' => "User with email '%s' already exists.",
 	'UsersManager_ExceptionInvalidLogin' => "The login must contain only letters, numbers, or the characters '_' or '-' or '.'",
 	'UsersManager_ExceptionInvalidPassword' => "The password length must be between 6 and 26 characters.",
 	'UsersManager_ExceptionInvalidEmail' => "The email doesn't have a valid format.",