More misc fixes and rewrites (sorry, lame description)

[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 e2bcafab29ba4b5cbae7b30e2389222daec74ac2..ee0f7bde321cda3d1dce7073f6c4a598b57e2a7a 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -55,14 +55,14 @@ function HTML_ADD_VALID_TAGS() {
 //
 function HTML_CHECK_TAGS ($html) {
        $test = stripslashes($html);
-       while (ereg("<", $test) && ereg(">", $test)) {
-               $check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
+       while (ereg('<', $test) && ereg('>', $test)) {
+               $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 "";
                }
-               $test = substr($test, strpos($test, ">") + 1);
+               $test = substr($test, strpos($test, '>') + 1);
        }
        // Return tested code
        return $html;
@@ -72,22 +72,20 @@ function HTML_INSERT_URLS ($text) {
        $test = $text;
 
        // First replace URLs...
-       while (ereg("http://", $test))
-       {
-               $check = substr($test, strpos($test, "http://")); $check2 = $check;
+       while (ereg('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)
-               {
+               foreach ($GLOBALS['url_ends'] as $end) {
                        if (ereg($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=\"".DEREFERER($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));
-       }
+       } // END - while
 
        // Now do the (nearly) same thing with email addresses
        // but now we have the problem that email addresses didn't have
@@ -97,8 +95,8 @@ function HTML_INSERT_URLS ($text) {
 
        // ... what will the email address be out the @... ;-)
        $PARTS = array();
-       while (ereg("@", $test)) {
-               $pos = strpos($test, "@");
+       while (ereg('@', $test)) {
+               $pos = strpos($test, '@');
                $test2 = substr($test, 0, $pos);
 
                // First check backwards
@@ -108,34 +106,34 @@ function HTML_INSERT_URLS ($text) {
                        if (!in_array($check, $GLOBALS['valid_email_chars'])) {
                                // Char found so we end here
                                break;
-                       }
+                       } // END - if
                        $idx--;
-               }
+               } // END - while
 
                if ($idx > 0) {
                        // Starting mark is found
                        $check2 = substr($test, 0, ($idx + 1));
                        $test = substr($test, ($idx + 1));
-               }
+               } // END - if
 
                // And now go forward...
                $idx = 0;
                while ($idx < strlen($test)) {
                        $check = substr($test, $idx, 1);
-                       if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != "@")) {
+                       if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
                                // Char found so end here again
                                break;
-                       }
+                       } // END - if
                        $idx++;
-               }
+               } // END - while
 
                if ($idx > 0) {
                        // Maybe this is the email address?
                        $check = substr($test, 0, $idx);
-               }
+               } // END - if
 
                // Now replace the email against anchor with mailto and pray...
-               $PARTS[] = $check2."<a href=\"mailto:".$check."\">".$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));
@@ -151,11 +149,11 @@ function HTML_INSERT_URLS ($text) {
        return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
 }
 
-//
-function SEND_HTML_EMAIL($to, $subject, $message, $FROM) {
+// Sends a HTML mail to the user
+function sendHtmlEmail($to, $subject, $message, $FROM) {
        if (EXT_IS_ACTIVE('html_mail')) {
                // Send mail away as HTML
-               $FROM = "Content-Type: text/html\n".$FROM;
+               $FROM = "Content-Type: text/html\n" . $FROM;
                sendEmail($to, $subject, $message, 'N', $FROM);
        }
 }