Heacy rewrite/cleanup:

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

diff --git a/inc/callback-functions.php b/inc/callback-functions.php
index 821bbd4dafc3fbab80a69eca80ac126c26e36fc0..ee0a38754b81a06286df01a0cad446d3b53a0799 100644 (file)
--- a/inc/callback-functions.php
+++ b/inc/callback-functions.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 // Handles the XML node 'admin-entry-meta-data'
 function doXmlAdminEntryMetaData ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -52,7 +52,7 @@ function doXmlAdminEntryMetaData ($resource, $attributes) {
 // Handles the XML node 'member-entry-meta-data'
 function doXmlMemberEntryMetaData ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -118,7 +118,7 @@ function doXmlDatabaseTable ($resource, $attributes) {
 // Handles the XML node 'database-column-list'
 function doXmlDatabaseColumnList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } // END - if
@@ -172,7 +172,7 @@ function doXmlDatabaseColumnListEntry ($resource, $attributes) {
 // Handles the XML node 'callback-function-list'
 function doXmlCallbackFunctionList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } // END - if
@@ -214,7 +214,7 @@ function doXmlCallbackFunctionListEntry ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-list'
 function doXmlExtraParameterList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } // END - if
@@ -256,7 +256,7 @@ function doXmlExtraParameterListEntry ($resource, $attributes) {
 // Handles the XML node 'time-columns-list'
 function doXmlTimeColumnsList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } // END - if
@@ -298,7 +298,7 @@ function doXmlTimeColumnsListEntry ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-member-list'
 function doXmlExtraParameterMemberList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['member_list'])) {
@@ -310,7 +310,7 @@ function doXmlExtraParameterMemberList ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-reload-list'
 function doXmlExtraParameterReloadList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['reload_list'])) {
@@ -322,7 +322,7 @@ function doXmlExtraParameterReloadList ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-waiting-list'
 function doXmlExtraParameterWaitingList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['waiting_list'])) {
@@ -424,7 +424,7 @@ function doXmlExtraParameterWaitingListEntry ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-added-list'
 function doXmlExtraParameterAddedList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['added_list'])) {
@@ -466,7 +466,7 @@ function doXmlExtraParameterAddedListEntry ($resource, $attributes) {
 // Handles the XML node 'extra-parameter-created-list'
 function doXmlExtraParameterCreatedList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['extra_list']['created_list'])) {
@@ -538,7 +538,7 @@ function doXmlStatusChangeColumn ($resource, $attributes) {
 // Handles the XML node 'status-change-list'
 function doXmlStatusChangeList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction'])) {
@@ -740,7 +740,7 @@ function doXmlCacheFile ($resource, $attributes) {
 // Handles the XML node 'admin-list-data'
 function doXmlAdminListData ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -749,7 +749,7 @@ function doXmlAdminListData ($resource, $attributes) {
 // Handles the XML node 'member-list-data'
 function doXmlMemberListData ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -758,7 +758,7 @@ function doXmlMemberListData ($resource, $attributes) {
 // Handles the XML node 'data-tables'
 function doXmlDataTables ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -803,7 +803,7 @@ function doXmlDataTable ($resource, $attributes) {
 // Handles the XML node 'table-join-condition'
 function doXmlTableJoinCondition ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -855,7 +855,7 @@ function doXmlTableJoinName ($resource, $attributes) {
 // Handles the XML node 'join-on'
 function doXmlJoinOn ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes, got ' . count($attributes));
        } // END - if
@@ -958,7 +958,7 @@ function doXmlJoinOnCondition ($resource, $attributes) {
 // Handles the XML node 'select-data-from-list'
 function doXmlSelectDataFromList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['data_table'])) {
@@ -1012,7 +1012,7 @@ function doXmlSelectDataFromListEntry ($resource, $attributes) {
 // Handles the XML node 'where-select-from-list'
 function doXmlWhereSelectFromList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['data_table'])) {
@@ -1102,7 +1102,7 @@ function doXmlWhereCondition ($resource, $attributes) {
 // Handles the XML node 'order-by-list'
 function doXmlOrderByList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['data_table'])) {
@@ -1210,7 +1210,7 @@ function doXmlListRowTemplate ($resource, $attributes) {
 // Handles the XML node 'column-callback-list'
 function doXmlColumnCallbackList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['data_table'])) {
@@ -1225,7 +1225,7 @@ function doXmlColumnCallbackList ($resource, $attributes) {
 // Handles the XML node 'column-callback-list-entry'
 function doXmlColumnCallbackListEntry ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 0 attributes because this is a foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['column_callback_list'])) {
@@ -1270,7 +1270,7 @@ function doXmlColumnCallbackData ($resource, $attributes) {
 // Handles the XML node 'callback-extra-parameter-list'
 function doXmlCallbackExtraParameterList ($resource, $attributes) {
        // There should be no attributes
-       if (count($attributes) > 0) {
+       if (isFilledArray($attributes)) {
                // Please don't add any attributes to foo-list nodes
                reportBug(__FUNCTION__, __LINE__, 'Expected 1 attributes because this is a named foo-list node, got ' . count($attributes));
        } elseif (!isset($GLOBALS['__XML_ARGUMENTS']['doXmlCallbackFunction']['column_callback_list'])) {