[eGroupWare-svn] r35565 - /trunk/felamimail/inc/class.felamimail_bo.inc.php

[<lei...@us...>]

Author: leithoff
Date: Thu Jun 30 12:17:08 2011
New Revision: 35565

URL: http://svn.stylite.de/viewvc/egroupware?rev=35565&view=rev
Log:
remove error_log statements

Modified:
    trunk/felamimail/inc/class.felamimail_bo.inc.php

Modified: trunk/felamimail/inc/class.felamimail_bo.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/felamimail/inc/class.felamimail_bo.inc.php?rev=35565&r1=35564&r2=35565&view=diff
==============================================================================
--- trunk/felamimail/inc/class.felamimail_bo.inc.php (original)
+++ trunk/felamimail/inc/class.felamimail_bo.inc.php Thu Jun 30 12:17:08 2011
@@ -4173,9 +4173,9 @@
 					$Subject = $mailObject->Subject;
 					//error_log(__METHOD__.__LINE__.' Subject:'.$Subject);
 					$Body = $mailObject->Body;
-					error_log(__METHOD__.__LINE__.' Body:'.$Body);
+					//error_log(__METHOD__.__LINE__.' Body:'.$Body);
 					$AltBody = $mailObject->AltBody;
-					error_log(__METHOD__.__LINE__.' AltBody:'.$AltBody);
+					//error_log(__METHOD__.__LINE__.' AltBody:'.$AltBody);
 					foreach ($SendAndMergeTocontacts as $k => $val)
 					{
 						//error_log(__METHOD__.__LINE__.' Id To Merge:'.$val);
@@ -4198,7 +4198,10 @@
 							$mailObject->AddAddress($email,$mailObject->EncodeHeader($nfn));
 							$mailObject->Subject = $bo_merge->merge_string($Subject, $val, $e, 'text/plain');
 							if (!empty($AltBody)) $mailObject->IsHTML(true);
+							else $mailObject->IsHTML(false);
+							//error_log(__METHOD__.__LINE__.' ContentType:'.$mailObject->BodyContentType);
 							if (!empty($Body)) $mailObject->Body = $bo_merge->merge_string($Body, $val, $e, $mailObject->BodyContentType);
+							//error_log(__METHOD__.__LINE__.' Result:'.$mailObject->Body.' error:'.array2string($e));
 							if (!empty($AltBody)) $mailObject->AltBody = $bo_merge->merge_string($AltBody, $val, $e, $mailObject->AltBodyContentType);
 
 							$ogServer = $this->mailPreferences->getOutgoingServer($this->profileID);
@@ -4214,7 +4217,7 @@
 								$mailObject->Username = $username;
 								$mailObject->Password = $ogServer->password;
 							}
-							error_log(__METHOD__.__LINE__.array2string($mailObject));
+							//error_log(__METHOD__.__LINE__.array2string($mailObject));
 							// set a higher timeout for big messages
 							@set_time_limit(120);
 							$sendOK = true;