X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Femail-functions.php;h=a793b45e7859eaa437e887fc9269292b85fade2a;hp=bb4f0e55eb863de23c59bcfdc2a14ac1454b2797;hb=0ed9eaa5aea8db1f690a983a39ff4b2074faf6c5;hpb=e937b6540b932d537f72e827de76dd5be4aefe48

diff --git a/inc/email-functions.php b/inc/email-functions.php
index bb4f0e55eb..a793b45e78 100644
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -10,10 +10,10 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mailversand bezogene Funktionen                  *
  * -------------------------------------------------------------------- *
- * $Revision:: 2773                                                   $ *
- * $Date:: 2012-06-26 01:02:44 +0200 (Tue, 26 Jun 2012)               $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: quix0r                                                   $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
@@ -59,7 +59,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 			// Set webmaster
 			$toEmail = getWebmaster();
 		}
-	} elseif ($toEmail == '0') {
+	} elseif (($toEmail == '0') || (is_null($toEmail))) {
 		// Is the webmaster!
 		$toEmail = getWebmaster();
 	}
@@ -81,17 +81,21 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 	} // END - if
 
 	// Debug mode enabled?
-	if (isDebugModeEnabled()) {
-		// In debug mode we want to display the mail instead of sending it away so we can debug this part
-		outputHtml('<pre>
-<strong>Headers</strong> : ' . htmlentities(trim($mailHeader)) . '
-<strong>To</strong>      : ' . htmlentities($toEmail) . '
-<strong>Subject</strong> : ' . htmlentities($subject) . '
-<strong>Message(' . strlen($message) . ')</strong> : ' . htmlentities($message) . '
-</pre>');
+	if ((isDebugModeEnabled()) && (!isAjaxOutputMode())) {
+		// Init content array
+		$content = array(
+			'headers' => htmlentities(trim($mailHeader)),
+			'to'      => htmlentities($toEmail),
+			'subject' => htmlentities($subject),
+			'message' => htmlentities($message),
+			'length'  => strlen($message)
+		);
+
+		// In debug mode display the mail instead of sending it away so it can be debugged
+		loadTemplate('display_email', FALSE, $content);
 
 		// This is always fine
-		return true;
+		return TRUE;
 	} elseif (!empty($toEmail)) {
 		// Send Mail away
 		return sendRawEmail($toEmail, $subject, $message, $mailHeader);
@@ -116,12 +120,12 @@ function isPhpMailerConfigured () {
 // Send out a raw email with PHPMailer class or plain mail() command
 function sendRawEmail ($toEmail, $subject, $message, $headers) {
 	// Just compile all to put out all configs, etc.
-	$eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), false)) . '"); ';
-	$eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), false)) . '"); ';
-	$eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), false)) . '"); ';
+	$eval  = '$toEmail = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($toEmail), FALSE)) . '"); ';
+	$eval .= '$subject = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($subject), FALSE)) . '"); ';
+	$eval .= '$headers = decodeEntities("' . escapeQuotes(doFinalCompilation(compileRawCode($headers), FALSE)) . '"); ';
 
 	// Do not decode entities in the message because we also send HTML mails through this function
-	$eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), false)) . '";';
+	$eval .= '$message = "' . escapeQuotes(doFinalCompilation(compileRawCode($message), FALSE)) . '";';
 
 	// Run the final eval() command
 	eval($eval);
@@ -142,7 +146,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 		$mail->PluginDir  = sprintf("%sinc/phpmailer/", getPath());
 
 		$mail->IsSMTP();
-		$mail->SMTPAuth   = true;
+		$mail->SMTPAuth   = TRUE;
 		$mail->Host       = getConfig('SMTP_HOSTNAME');
 		$mail->Port       = 25;
 		$mail->Username   = getConfig('SMTP_USER');
@@ -158,7 +162,7 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 			$mail->Body       = $message;
 			$mail->AltBody    = decodeEntities($message);
 			$mail->WordWrap   = 70;
-			$mail->IsHTML(true);
+			$mail->IsHTML(TRUE);
 		} else {
 			$mail->Body       = decodeEntities(strip_tags($message));
 		}
@@ -176,10 +180,10 @@ function sendRawEmail ($toEmail, $subject, $message, $headers) {
 			logDebugMessage(__FUNCTION__, __LINE__, 'Error while sending mail: ' . $mail->ErrorInfo);
 
 			// Raise an error
-			return false;
+			return FALSE;
 		} else {
 			// All fine!
-			return true;
+			return TRUE;
 		}
 	} else {
 		// Use plain mail() command
@@ -201,28 +205,6 @@ function sendAdminNotification ($subject, $templateName, $content = array(), $us
 	}
 }
 
-// ----------------------------------------------------------------------------
-//                           Template helper functions
-// ----------------------------------------------------------------------------
-
-// Helper function to add extra headers to text mails
-function doTemplateAddExtraTextMailHeaders ($templateName, $clear, $extraHeaders = '') {
-	// Run the header through the filter
-	$extraHeaders = runFilterChain('add_extra_text_mail_headers', $extraHeaders);
-
-	// And return it
-	return $extraHeaders;
-}
-
-// Helper function to add extra headers to HTML mails
-function doTemplateAddExtraHtmlMailHeaders ($templateName, $clear, $extraHeaders = '') {
-	// Run the header through the filter
-	$extraHeaders = runFilterChain('add_extra_html_mail_headers', $extraHeaders);
-
-	// And return it
-	return $extraHeaders;
-}
-
 // Send mails for del/edit/lock build modes
 // @TODO $rawUserId is currently unused
 function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart = '', $userIdColumn = array('userid'), $rawUserId = array('userid')) {
@@ -245,7 +227,10 @@ function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart =
 	} // END - if
 
 	// Is the raw userid set?
-	if (postRequestElement($userIdColumn[0], $id) > 0) {
+	if (isValidId(postRequestElement($userIdColumn[0], $id))) {
+		// Set it in content
+		$content[$userIdColumn[0]] = bigintval(postRequestElement($userIdColumn[0], $id));
+
 		// Load email template
 		if (!empty($subjectPart)) {
 			$mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $tableName[0], $content);
@@ -268,5 +253,27 @@ function sendGenericBuildMails ($mode, $tableName, $content, $id, $subjectPart =
 	}
 }
 
+// ----------------------------------------------------------------------------
+//                           Template helper functions
+// ----------------------------------------------------------------------------
+
+// Helper function to add extra headers to text mails
+function doTemplateAddExtraTextMailHeaders ($templateName, $clear, $extraHeaders = '') {
+	// Run the header through the filter
+	$extraHeaders = runFilterChain('add_extra_text_mail_headers', $extraHeaders);
+
+	// And return it
+	return $extraHeaders;
+}
+
+// Helper function to add extra headers to HTML mails
+function doTemplateAddExtraHtmlMailHeaders ($templateName, $clear, $extraHeaders = '') {
+	// Run the header through the filter
+	$extraHeaders = runFilterChain('add_extra_html_mail_headers', $extraHeaders);
+
+	// And return it
+	return $extraHeaders;
+}
+
 // [EOF]
 ?>