More fixes from bugtracker issues, thanks to profi-concept

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index fd8b2c5a9074c4fd388e3bb1999e6ed4f35ade1c..1133a3b1cbd646cb346d202173a33292edb26f40 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -347,7 +347,7 @@ function LOAD_TEMPLATE($template, $return=false, $content=array()) {
        // Now does the final template exists?
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)
        // Now does the final template exists?
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)

-               $tmpl_file = implode("", file($file));
+               $tmpl_file = READ_FILE($file);

 
                // Replace ' to our own chars to preventing them being quoted
                while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }
 
                // Replace ' to our own chars to preventing them being quoted
                while (strpos($tmpl_file, "'") !== false) { $tmpl_file = str_replace("'", '{QUOT}', $tmpl_file); }


@@ -881,7 +881,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
        $newContent = "";
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)
        $newContent = "";
        if (FILE_READABLE($file)) {
                // The local file does exists so we load it. :)

-               $tmpl_file = implode("", file($file));
+               $tmpl_file = READ_FILE($file);

                $tmpl_file = addslashes($tmpl_file);
 
                // Run code
                $tmpl_file = addslashes($tmpl_file);
 
                // Run code


@@ -2990,6 +2990,28 @@ function incrementConfigEntry ($configEntry, $value=1) {
        }
 }
 
        }
 }
 

+// Read a given file
+function READ_FILE ($FQFN, $sqlPrepare = false) {
+       // Load the file
+       if (function_exists('file_get_contents')) {
+               // Use new function
+               $content = file_get_contents($FQFN);
+       } else {
+               // Fall-back to implode-file chain
+               $content = implode("", file($FQFN));
+       }
+
+       // Prepare SQL queries?
+       if ($sqlPreppare === true) {
+               // Remove some unwanted chars
+               $content = str_replace("\r", "", $content);
+               $content = str_replace("\n\n", "\n", $content);
+       } // END - if
+
+       // Return the content
+       return $content;
+}
+

 //////////////////////////////////////////////////
 //                                              //
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
 //                                              //
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //