Fixes for compilation, more EL code:

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index eac1fc7359735549886fab3d95cfea5e1f263bcb..fdf4b97ecf6c66de6c01f12e98c2176e4acf7c71 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1104,10 +1104,10 @@ function generateErrorCodeFromUserStatus ($status = '') {
        } // END - if
 
        // Default error code if unknown account status
-       $errorCode = getCode('ACCOUNT_STATUS_UNKNOWN');
+       $errorCode = getCode('ACCOUNT_UNKNOWN');
 
        // Generate constant name
-       $codeName = sprintf("ACCOUNT_STATUS_%s", strtoupper($status));
+       $codeName = sprintf("ACCOUNT_%s", strtoupper($status));
 
        // Is the constant there?
        if (isCodeSet($codeName)) {
@@ -1328,7 +1328,7 @@ function isUrlValidSimple ($url) {
 
 // Wtites data to a config.php-style file
 // @TODO Rewrite this function to use readFromFile() and writeToFile()
-function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
+function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $inserted, $seek=0) {
        // Initialize some variables
        $done = false;
        $seek++;
@@ -1358,7 +1358,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
                                        // Read from source file
                                        $line = fgets ($fp, 1024);
 
-                                       if (strpos($line, $search) > -1) { 
+                                       if (strpos($line, $search) > -1) {
                                                $next = '0';
                                                $found = true;
                                        } // END - if
@@ -1366,7 +1366,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
                                        if ($next > -1) {
                                                if ($next === $seek) {
                                                        $next = -1;
-                                                       $line = $prefix . $DATA . $suffix . "\n";
+                                                       $line = $prefix . $inserted . $suffix . "\n";
                                                } else {
                                                        $next++;
                                                }
@@ -2457,6 +2457,30 @@ function convertStringToBoolean ($str) {
        return (($str == 'true') ? true : false);
 }
 
+/**
+ * "Makes" a variable in given string parseable, this function will throw an
+ * error if the first character is not a dollar sign.
+ *
+ * @param      $varString      String which contains a variable
+ * @return     $return         String with added single quotes for better parsing
+ */
+function makeParseableVariable ($varString) {
+       // The first character must be a dollar sign
+       if (substr($varString, 0, 1) != '$') {
+               // Please report this
+               debug_report_bug(__FUNCTION__, __LINE__, 'varString=' . $varString . ' - No dollar sign detected, will not parse it.');
+       } // END - if
+
+       // Do we have cache?
+       if (!isset($GLOBALS[__FUNCTION__][$varString])) {
+               // Snap them in, if [,] are there
+               $GLOBALS[__FUNCTION__][$varString] = str_replace('[', "['", str_replace(']', "']", $varString));
+       } // END - if
+
+       // Return cache
+       return $GLOBALS[__FUNCTION__][$varString];
+}
+
 //-----------------------------------------------------------------------------
 // Automatically re-created functions, all taken from user comments on www.php.net
 //-----------------------------------------------------------------------------