[Mapbender-commits] r5920 - branches/3_dev/core/lib

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2010-04-11 09:12:48 -0400 (Sun, 11 Apr 2010)
New Revision: 5920

Modified:
   branches/3_dev/core/lib/class_User.php
Log:
sendUserLoginMail use user properties if possible

Modified: branches/3_dev/core/lib/class_User.php
===================================================================
--- branches/3_dev/core/lib/class_User.php	2010-04-11 13:09:49 UTC (rev 5919)
+++ branches/3_dev/core/lib/class_User.php	2010-04-11 13:12:48 UTC (rev 5920)
@@ -436,12 +436,11 @@
 		$userMessage .= "Your login name is: ".$this->name."\n";
 		$userMessage .= "Please set your password using the following link: \n";
 		$mbUrl = substr(LOGIN, 0, -9);
-		$userMessage .= $mbUrl."../javascripts/mod_confirmLogin.php?user_id=".$this->id."&user_name=".$this->name."&user_ticket=".$this->passwordTicket."\n";
+		$userMessage .= $mbUrl."../plugins/mod_confirmLogin.php?user_id=".$this->id."&user_name=".$this->name."&user_ticket=".$this->passwordTicket."\n";
 		$userMessage .= "Follow this link to login to Mapbender: \n";
 		$userMessage .= LOGIN."\n";
 		
-		$userMail = $admin->getEmailByUserId($this->id);
-		if(!$admin->sendEmail("", "", $userMail, $this->name, utf8_decode("Your Mapbender account"), utf8_decode($userMessage), $error_msg)) {
+		if(!$admin->sendEmail("", "", $this->email, $this->name, utf8_decode("Your Mapbender account"), utf8_decode($userMessage), $error_msg)) {
 			return "Registry data could not be send. Please check mail address.";
 		}
 		else {