Added some missing wrapper functions

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

diff --git a/inc/xml-functions.php b/inc/xml-functions.php
index 6c5e5812a4d7bdb88129ceac0a947fba4d69add8..217f8e73a0b901fea4a1756624d3d95d66f38ae4 100644 (file)
--- a/inc/xml-functions.php
+++ b/inc/xml-functions.php
@@ -40,8 +40,26 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Init XML system
+function initXml () {
+       // All conditions
+       $GLOBALS['__XML_CONDITIONS'] = array(
+               // Equals not
+               'NOT-EQUALS' => ' != ',
+               // Is not
+               'IS-NOT'     => ' IS NOT ',
+               // Is
+               'IS'         => ' IS ',
+               // Equals
+               'EQUALS'     => ' = ',
+       );
+}
+
 // Calls back a function based on given XML template data
-function showEntriesByXmlCallback ($template, $content = array(), $compileCode = TRUE) {
+function doGenericXmlTemplateCallback ($template, $content = array(), $compileCode = TRUE) {
+       // Init XML system as sch calls will be only used once per run
+       initXml();
+
        // Generate FQFN for with special path
        $FQFN = sprintf("%stemplates/xml/%s%s.xml",
                getPath(),
@@ -257,22 +275,13 @@ function isXmlValueValid ($type, $value) {
 
 // Converts given condition into a symbol
 function convertXmlContion ($condition) {
-       // Default is an invalid one
-       $return = '???';
-
        // Detect the condition again
-       switch ($condition) {
-               case 'EQUALS': // Equals
-                       $return = '=';
-                       break;
-
-               default: // Unknown condition
-                       reportBug(__FUNCTION__, __LINE__, 'Condition ' . $condition . ' is unknown/unsupported.');
-                       break;
-       } // END - switch
+       if (!isset($GLOBALS['__XML_CONDITIONS'][$condition])) {
+               reportBug(__FUNCTION__, __LINE__, 'Condition ' . $condition . ' is unknown/unsupported.');
+       } // END - if
 
        // Return it
-       return $return;
+       return $GLOBALS['__XML_CONDITIONS'][$condition];
 }
 
 // "Getter" for sql part back from given array
@@ -319,7 +328,7 @@ function searchXmlArray ($value, $columns, $childKey) {
                assert(isset($columnArray[$childKey]));
 
                // Now is it what we are looking for?
-               if ($columnArray[$childKey] == $value) {
+               if ($columnArray[$childKey] === $value) {
                        // Remember this match
                        $return = $key;