X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Femail-functions.php;h=7731595ae4163e39aa19ea5a535ab6a2ecd3002e;hp=d854a993ad655baa404b108be27f2450aff5da7c;hb=f2b603aed42bfdf7a94611d7bae71fe3a1048890;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec

diff --git a/inc/email-functions.php b/inc/email-functions.php
index d854a993ad..7731595ae4 100644
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -10,13 +10,13 @@
  * -------------------------------------------------------------------- *
  * 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                   *
+ * 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 *
@@ -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,14 +81,18 @@ 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;
@@ -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]
 ?>