X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Femail-functions.php;h=1dcfa418bbbe9ad308f1dac248a95456df636d19;hb=4373e155854012d687fdfcae4c69d1a940883fab;hp=e477edac1b790c209be0958b073173bfb152071e;hpb=3879d3c60f562c3f904a025e5fc7cf5a6920b0e3;p=mailer.git

diff --git a/inc/email-functions.php b/inc/email-functions.php
index e477edac1b..1dcfa418bb 100644
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mailversand bezogene Funktionen                  *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,7 +45,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	} // END - if
 
 	// Set from header
-	if ((!isInString('@', $toEmail)) && ($toEmail > 0)) {
+	if ((!isInString('@', $toEmail)) && (isValidId($toEmail))) {
 		// Does the user exist?
 		if ((isExtensionActive('user')) && (fetchUserData($toEmail))) {
 			// Get the email
@@ -81,7 +76,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	} // END - if
 
 	// Debug mode enabled?
-	if (isDebugModeEnabled()) {
+	if ((isDebugModeEnabled()) && (!isAjaxOutputMode())) {
 		// Init content array
 		$content = array(
 			'headers' => htmlentities(trim($mailHeader)),
@@ -143,7 +138,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 		$mail->CharSet = 'UTF-8';
 
 		// Path for PHPMailer
-		$mail->PluginDir  = sprintf("%sinc/phpmailer/", getPath());
+		$mail->PluginDir  = sprintf('%sinc/phpmailer/', getPath());
 
 		$mail->IsSMTP();
 		$mail->SMTPAuth   = TRUE;
@@ -227,7 +222,7 @@ function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart =
 	} // END - if
 
 	// Is the raw userid set?
-	if (isValidUserId(postRequestElement($userIdColumn[0], $id))) {
+	if (isValidId(postRequestElement($userIdColumn[0], $id))) {
 		// Set it in content
 		$content[$userIdColumn[0]] = bigintval(postRequestElement($userIdColumn[0], $id));