[Piwik-svn] r465 - trunk/plugins/Login

[svnmaster at piwik.org]

Author: matt
Date: 2008-05-07 01:11:59 +0200 (Wed, 07 May 2008)
New Revision: 465

Modified:
   trunk/plugins/Login/Controller.php
Log:
- email sent twice because From field invalid?

Modified: trunk/plugins/Login/Controller.php
===================================================================
--- trunk/plugins/Login/Controller.php	2008-05-06 23:09:06 UTC (rev 464)
+++ trunk/plugins/Login/Controller.php	2008-05-06 23:11:59 UTC (rev 465)
@@ -124,8 +124,14 @@
 					$mail->addTo($email, $login);
 					$mail->setSubject(Piwik_Translate('Login_MailTopicPasswordRecovery'));				
 					$mail->setBodyText(sprintf(Piwik_Translate('Login_MailBodyPasswordRecovery'),
-						$login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString()));	
-					$mail->setFrom('password-recovery@'.Piwik_Url::getCurrentHost(), 'Piwik');
+						$login, $randomPassword, Piwik_Url::getCurrentUrlWithoutQueryString()));
+
+					$host = $_SERVER['HTTP_HOST'];
+					if(strlen($host) == 0)
+					{
+						$host = 'piwik.org';
+					}
+					$mail->setFrom('password-recovery@'.$host, 'Piwik');
 					@$mail->send();
 				}
 				catch(Exception $e)