Project

General

Profile

« Previous | Next » 

Revision 1463

Added by Dietmar over 13 years ago

fixed Ticket 1050 Bug in include/phpmailer/class.phpmailer.php with Lotus Notes
fixed Ticket 573, 939 Bad formatting of e-mail received from form submissions
fixed Ticket 1009 cannot change user password without changing Email in preference

View differences:

class.wb.php
438 438
		$fromaddress = preg_replace('/[\r\n]/', '', $fromaddress);
439 439
		$toaddress = preg_replace('/[\r\n]/', '', $toaddress);
440 440
		$subject = preg_replace('/[\r\n]/', '', $subject);
441
		$message_alt = $message;
442
		$message = preg_replace('/[\r\n]/', '<br \>', $message);
443
		
441
		// $message_alt = $message;
442
		// $message = preg_replace('/[\r\n]/', '<br \>', $message);
443

  
444 444
		// create PHPMailer object and define default settings
445 445
		$myMail = new wbmailer();
446 446

  
......
454 454
		// define recepient and information to send out
455 455
		$myMail->AddAddress($toaddress);                            // TO:
456 456
		$myMail->Subject = $subject;                                // SUBJECT
457
		$myMail->Body = $message;                                   // CONTENT (HTML)
458
		$myMail->AltBody = strip_tags($message_alt);				// CONTENT (TEXT)
459
		
457
		$myMail->Body = nl2br($message);                                   // CONTENT (HTML)
458
		$myMail->AltBody = strip_tags($message);				// CONTENT (TEXT)
459

  
460 460
		// check if there are any send mail errors, otherwise say successful
461 461
		if (!$myMail->Send()) {
462 462
			return false;

Also available in: Unified diff