Fixes for 'Can't use function return value in write context in /foo/bar.php'

[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 ce48a033e29bffa47376def25142399d1f0f3647..18419e3aa7e2eb937d2cacfa349439347c363f7a 100644 (file)
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 function HTML_ADD_VALID_TAGS()
 {
@@ -155,8 +155,8 @@ function HTML_INSERT_URLS($text)
                $text .= $part;
        }
 
-       // Replace new-lines agains <BR>-s and finally compile possible own HTML tags out...
-       return COMPILE_CODE(str_replace("\n", "<BR>\n", $text));
+       // Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
+       return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
 }
 //
 function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
@@ -165,7 +165,7 @@ function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)
        {
                // Send mail away as HTML
                $FROM = "Content-Type: text/html\n".$FROM;
-               SEND_EMAIL($TO, $SUBJECT, $MSG, "N", $FROM);
+               SEND_EMAIL($TO, $SUBJECT, $MSG, 'N', $FROM);
        }
 }
 //