Code moved because it depends on tables created by ext-user

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index eb0ba63455b268642061309e2d03b24b16963fac..1f462bdfa4d466482e7c4ee4f97d7def49c7c545 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -496,7 +496,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
                $GLOBALS['tpl_content'] = readFromFile($FQFN);
 
                // Run code
-               $GLOBALS['tpl_content'] = "\$newContent = decodeEntities(\"".compileRawCode(escapeQuotes($GLOBALS['tpl_content']))."\");";
+               $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
                eval($GLOBALS['tpl_content']);
        } elseif (!empty($template)) {
                // Template file not found!
@@ -3931,6 +3931,21 @@ function searchDirsRecursive ($dir, &$last_changed, $lookFor = 'Date') {
        } // END - foreach
 }
 
+// "Fixes" null or empty string to count of dashes
+function fixNullEmptyToDashes ($str, $num) {
+       // Use str as default
+       $return = $str;
+
+       // Is it empty?
+       if ((is_null($str)) || (trim($str) == '')) {
+               // Set it
+               $return = str_repeat('-', $num);
+       } // END - if
+
+       // Return final string
+       return $return;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////