Opps, not all elements for sprintf() has been set.

[mailer.git] / inc / libs / html_mail_functions.php

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 8630b681283b234c2360fbad7e3ad5608b00d92c..e891c061bc59483ddbf8484b5f9903a1cc0f25d1 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -40,15 +38,15 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 //
 function addValidHtmlTags() {
        $OUT = '';
        if (!is_array($GLOBALS['html_tags'])) return "";
        foreach ($GLOBALS['html_tags'] as $tag) {
-               $OUT .= ", ".strtoupper($tag);
-       }
+               $OUT .= ', ' . strtolower($tag);
+       } // END - foreach
        $OUT = substr($OUT, 2);
        return $OUT;
 }
@@ -60,11 +58,13 @@ function checkHtmlTags ($html) {
                $check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
                $check = str_replace('/', '', $check);
                if (!in_array($check, $GLOBALS['html_tags'])) {
-                       // Invalid tag found!
-                       return '';
-               }
+                       // Invalid tag found
+                       $html = '';
+                       break;
+               } // END - if
                $test = substr($test, strpos($test, '>') + 1);
-       }
+       } // END - while
+
        // Return tested code
        return $html;
 }
@@ -83,7 +83,7 @@ function insertUrlsIntoHtml ($text) {
                } // END - foreach
 
                // Now replace the URL against anchor container and pray...
-               $text = substr($text, 0, strpos($text, $check2)) . '<a href="' . generateDerefererUrl($check) . '" target="_blank">' . $check . '</a>' . substr($text, strpos($text, $check2) + strlen($check));
+               $text = substr($text, 0, strpos($text, $check2)) . '<a href="' . generateDereferrerUrl($check) . '" target="_blank">' . $check . '</a>' . substr($text, strpos($text, $check2) + strlen($check));
 
                // Finally remove the url from testing string (or we have a loop and maybe server overload!)
                $test = substr($test, strpos($test, $check) + strlen($check));
@@ -119,7 +119,7 @@ function insertUrlsIntoHtml ($text) {
                } // END - if
 
                // And now go forward...
-               $idx = '0';
+               $idx = 0;
                while ($idx < strlen($test)) {
                        $check = substr($test, $idx, 1);
                        if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
@@ -135,30 +135,22 @@ function insertUrlsIntoHtml ($text) {
                } // END - if
 
                // Now replace the email against anchor with mailto and pray...
-               $PARTS[] = $check2 . '<a href="' . generateEmailLink($check, 'user_data') . '">' . $check . '</a>';
+               array_push($PARTS, $check2 . '<a href="' . generateEmailLink($check, 'user_data') . '">' . $check . '</a>');
 
                // Remove email from testing string (see above why...)
                $test = substr($test, strlen($check));
        }
 
        // Now put all parts together
-       $text = ''; $PARTS[] = $test;
+       $text = '';
+       array_push($PARTS, $test);
        foreach ($PARTS as $part) {
                $text .= $part;
        } // END - foreach
 
        // Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
-       return compileCode(str_replace("\n", "<br />\n", $text));
+       return preCompileCode(str_replace(PHP_EOL, '<br />' . PHP_EOL, $text));
 }
 
-// Sends a HTML mail to the user
-function sendHtmlEmail($to, $subject, $message, $FROM) {
-       if (isExtensionActive('html_mail')) {
-               // Send mail away as HTML
-               $FROM = "Content-Type: text/html; charset=UTF-8\n" . $FROM;
-               sendEmail($to, $subject, $message, 'N', $FROM);
-       } // END - if
-}
-
-//
+// [EOF]
 ?>