New wrapper functions introduced, TODOs.txt updated

[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 f7a34e0298c62265c4641fb115faea5957fa0644..0ca2f48b0402d0357f9cfcb221930476f9afce82 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -18,6 +18,7 @@
  * 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                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -55,7 +56,7 @@ function addValidHtmlTags() {
 //
 function checkHtmlTags ($html) {
        $test = stripslashes($html);
-       while (ereg('<', $test) && ereg('>', $test)) {
+       while (isInString('<', $test) && isInString('>', $test)) {
                $check = strtolower(substr($test, strpos($test, '<') + 1, strpos($test, '>') - strpos($test, '<') - 1));
                $check = str_replace('/', '', $check);
                if (!in_array($check, $GLOBALS['html_tags'])) {
@@ -73,16 +74,16 @@ function insertUrlsIntoHtml ($text) {
        $test = $text;
 
        // First replace URLs...
-       while (ereg('http://', $test)) {
+       while (isInString('http://', $test)) {
                $check = substr($test, strpos($test, 'http://')); $check2 = $check;
 
                // See ext-html.php if you want to add more URL ends...
                foreach ($GLOBALS['url_ends'] as $end) {
-                       if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
+                       if (isInString($end, $check)) $check = substr($check, 0, strpos($check, $end));
                } // 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="' . generateDerefererUrl($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));
@@ -96,7 +97,7 @@ function insertUrlsIntoHtml ($text) {
 
        // ... what will the email address be out the @... ;-)
        $PARTS = array();
-       while (ereg('@', $test)) {
+       while (isInString('@', $test)) {
                $pos = strpos($test, '@');
                $test2 = substr($test, 0, $pos);
 
@@ -134,7 +135,7 @@ 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>";
+               $PARTS[] = $check2 . '<a href="' . generateEmailLink($check, 'user_data') . '">' . $check . '</a>';
 
                // Remove email from testing string (see above why...)
                $test = substr($test, strlen($check));
@@ -147,7 +148,7 @@ function insertUrlsIntoHtml ($text) {
        } // 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("\n", "<br />\n", $text));
 }
 
 // Sends a HTML mail to the user