Fixed logfile writing in installation phase, .revision is now ignored

[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 18419e3aa7e2eb937d2cacfa349439347c363f7a..1b1027654f6f085469b1bad59aceed0e4e22b7b9 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die HTML-Erweiterung             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -38,28 +43,22 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function HTML_ADD_VALID_TAGS()
-{
-       global $HTML_TAGS; $OUT = "";
-       if (!is_array($HTML_TAGS)) return "";
-       foreach ($HTML_TAGS as $tag)
-       {
+function HTML_ADD_VALID_TAGS() {
+       $OUT = "";
+       if (!is_array($GLOBALS['html_tags'])) return "";
+       foreach ($GLOBALS['html_tags'] as $tag) {
                $OUT .= ", ".strtoupper($tag);
        }
        $OUT = substr($OUT, 2);
        return $OUT;
 }
 //
-function HTML_CHECK_TAGS($html)
-{
-       global $HTML_TAGS;
+function HTML_CHECK_TAGS ($html) {
        $test = stripslashes($html);
-       while (ereg("<", $test) && ereg(">", $test))
-       {
+       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, $HTML_TAGS))
-               {
+               if (!in_array($check, $GLOBALS['html_tags'])) {
                        // Invalid tag found!
                        return "";
                }
@@ -69,9 +68,7 @@ function HTML_CHECK_TAGS($html)
        return $html;
 }
 //
-function HTML_INSERT_URLS($text)
-{
-       global $URL_ENDS, $VALID_EMAIL_CHARS;
+function HTML_INSERT_URLS ($text) {
        $test = $text;
 
        // First replace URLs...
@@ -80,13 +77,13 @@ function HTML_INSERT_URLS($text)
                $check = substr($test, strpos($test, "http://")); $check2 = $check;
 
                // See ext-html.php if you want to add more URL ends...
-               foreach ($URL_ENDS as $end)
+               foreach ($GLOBALS['url_ends'] as $end)
                {
                        if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
                }
 
                // 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=\"".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));
@@ -110,7 +107,7 @@ function HTML_INSERT_URLS($text)
                while ($idx > 0)
                {
                        $check = substr($test2, $idx, 1);
-                       if (!in_array($check, $VALID_EMAIL_CHARS))
+                       if (!in_array($check, $GLOBALS['valid_email_chars']))
                        {
                                // Char found so we end here
                                break;
@@ -129,7 +126,7 @@ function HTML_INSERT_URLS($text)
                while ($idx < strlen($test))
                {
                        $check = substr($test, $idx, 1);
-                       if ((!in_array($check, $VALID_EMAIL_CHARS)) && ($check != "@"))
+                       if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != "@"))
                        {
                                // Char found so end here again
                                break;
@@ -143,7 +140,7 @@ function HTML_INSERT_URLS($text)
                }
 
                // Now replace the email against anchor with mailto and pray...
-               $PARTS[] = $check2."<A href=\"mailto:".$check."\">".$check."</A>";
+               $PARTS[] = $check2."<a href=\"mailto:".$check."\">".$check."</a>";
 
                // Remove email from testing string (see above why...)
                $test = substr($test, strlen($check));