First batch of removal of the headers needed for revision-functions.php

[mailer.git] / inc / email-functions.php

diff --git a/inc/email-functions.php b/inc/email-functions.php
index 7731595ae4163e39aa19ea5a535ab6a2ecd3002e..1dcfa418bbbe9ad308f1dac248a95456df636d19 100644 (file)
--- a/inc/email-functions.php
+++ b/inc/email-functions.php
@@ -10,11 +10,6 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mailversand bezogene Funktionen                  *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
@@ -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
@@ -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;