Rewrote 2 str_replace() calls to one with array()

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c5aea2d344f62861eb17bf735393416d712a1649..e20a4abd2139350827cf4f5e69ec2794cb233cc5 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -66,7 +66,7 @@ function writeToFile ($FQFN, $content, $aquireLock = FALSE) {
        // Is the file writeable?
        if ((isFileReadable($FQFN)) && (!is_writeable($FQFN)) && (!changeMode($FQFN, 0644))) {
                // Not writeable!
-               logDebugMessage(__FUNCTION__, __LINE__, sprintf("File %s not writeable or cannot change CHMOD to 0644.", basename($FQFN)));
+               logDebugMessage(__FUNCTION__, __LINE__, sprintf('File %s not writeable or cannot change CHMOD to 0644.', basename($FQFN)));
 
                // Failed! :(
                return FALSE;
@@ -157,10 +157,10 @@ function merge_array ($array1, $array2, $keepIndex = FALSE) {
                reportBug(__FUNCTION__, __LINE__, 'No arrays provided!');
        } elseif (!is_array($array1)) {
                // Left one is not an array
-               reportBug(__FUNCTION__, __LINE__, sprintf("array1 is not an array. array != %s", gettype($array1)));
+               reportBug(__FUNCTION__, __LINE__, sprintf('array1 is not an array. array != %s', gettype($array1)));
        } elseif (!is_array($array2)) {
                // Right one is not an array
-               reportBug(__FUNCTION__, __LINE__, sprintf("array2 is not an array. array != %s", gettype($array2)));
+               reportBug(__FUNCTION__, __LINE__, sprintf('array2 is not an array. array != %s', gettype($array2)));
        }
 
        // Maintain index of array2?
@@ -3491,9 +3491,9 @@ function translateFullComma ($dotted) {
 // Wrapper to check if the first element to be shifted is set to given value
 function shift_array (&$array, $value, $key = '0') {
        // Is the element set and value matches?
-       assert(is_array($array), 'array[]=' . gettype($array), ',expected: array');
-       assert(isset($array[$key]), 'array[' . $key . '] not set.');
-       assert(($array[$key] === $value), ',array[' . $key . ']=' . $array[$key] . ',value=' . $value);
+       assert(is_array($array));
+       assert(isset($array[$key]));
+       assert($array[$key] === $value);
 
        // Shift it
        array_shift($array);
@@ -3502,7 +3502,7 @@ function shift_array (&$array, $value, $key = '0') {
 // Wrapper for str_pad() with left padding zeros
 function padLeftZero ($str, $amount = 2) {
        // Is str_pad() there?
-       if (function_exists('str_pad')) {
+       if (!function_exists('str_pad')) {
                // Use prependZeros()
                return prependZeros($str, $amount);
        } else {
@@ -3556,5 +3556,27 @@ function ifSubjectHasReferralSuffix ($subject) {
        return $GLOBALS[__FUNCTION__][$subject];
 }
 
+// Converts an API response to an associative array
+function convertApiResponseToArray ($responseString, $keyDelimiter, $valueDelimiter) {
+       // Explode for key delimiter
+       $keys = explode($keyDelimiter, $responseString);
+
+       // Init returned array and "walk" through all entries
+       $returned = array();
+       foreach ($keys as $keyValue) {
+               // Explode it
+               $parts = explode($valueDelimiter, $keyValue);
+
+               // Count must be 2
+               assert(count($parts) == 2);
+
+               // Then add both: 0=key, 1=value
+               $returned[sqlEscapeString($parts[0])] = sqlEscapeString($parts[1]);
+       } // END - if
+
+       // Return finished array
+       return $returned;
+}
+
 // [EOF]
 ?>