Double question mark fixed

[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 3c4e377e93c30aa227bdfea5a662f38790858ed0..eb205ec7345e7edd84dadf394b85ac0e42a1614f 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/25/2004 *
- * ================                             Last change: 04/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 04/25/2004 *
+ * ===================                          Last change: 04/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : html_mail_functions.php                          *
@@ -14,10 +14,9 @@
  * $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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,12 +37,11 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-}
+       die();
+} // END - if
 
 //
-function HTML_ADD_VALID_TAGS() {
+function addValidHtmlTags() {
        $OUT = '';
        if (!is_array($GLOBALS['html_tags'])) return "";
        foreach ($GLOBALS['html_tags'] as $tag) {
@@ -52,36 +50,39 @@ function HTML_ADD_VALID_TAGS() {
        $OUT = substr($OUT, 2);
        return $OUT;
 }
+
 //
-function HTML_CHECK_TAGS ($html) {
+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'])) {
-                       // Invalid tag found!
-                       return "";
-               }
+                       // Invalid tag found
+                       return '';
+               } // END - if
                $test = substr($test, strpos($test, '>') + 1);
-       }
+       } // END - while
+
        // Return tested code
        return $html;
 }
+
 //
-function HTML_INSERT_URLS ($text) {
+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=\"".DEREFERER($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));
@@ -95,8 +96,8 @@ function HTML_INSERT_URLS ($text) {
 
        // ... what will the email address be out the @... ;-)
        $PARTS = array();
-       while (ereg("@", $test)) {
-               $pos = strpos($test, "@");
+       while (isInString('@', $test)) {
+               $pos = strpos($test, '@');
                $test2 = substr($test, 0, $pos);
 
                // First check backwards
@@ -106,34 +107,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;
+               $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));
@@ -143,20 +144,11 @@ function HTML_INSERT_URLS ($text) {
        $text = ''; $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 COMPILE_CODE(str_replace("\n", "<br />\n", $text));
+       return preCompileCode(str_replace("\n", "<br />\n", $text));
 }
 
-// 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;
-               sendEmail($to, $subject, $message, 'N', $FROM);
-       }
-}
-
-//
+// [EOF]
 ?>