Fixed more generic array handling #2

[core.git] / inc / classes / main / criteria / class_BaseCriteria.php

diff --git a/inc/classes/main/criteria/class_BaseCriteria.php b/inc/classes/main/criteria/class_BaseCriteria.php
index dfa0d4ee7879f7291884ee15b3f220b126df3a93..78a4e828a110545be024e77829791ead0633dfbc 100644 (file)
--- a/inc/classes/main/criteria/class_BaseCriteria.php
+++ b/inc/classes/main/criteria/class_BaseCriteria.php
@@ -36,6 +36,12 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
+
+               // Initialize all criteria arrays
+               foreach (array('default', 'choice', 'exclude') as $criteriaType) {
+                       // Init it
+                       $this->initGenericArrayKey('criteria', $criteriaType, 'entries');
+               } // END - foreach
        }
 
        /**
@@ -50,7 +56,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE));
 
                // Determine it
-               $isSet = $this->isGenericArrayKeySet('criteria', $criteriaType, $criteriaKey);
+               $isSet = $this->isGenericArrayElementSet('criteria', $criteriaType, 'entries', $criteriaKey);
 
                // Return it
                return $isSet;
@@ -104,7 +110,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         * @return      $criteria
         */
        public final function getCriteriaArray ($criteriaType = 'default') {
-               return $this->getGenericSubArray('criteria', $criteriaType);
+               return $this->getGenericArrayKey('criteria', $criteriaType, 'entries');
        }
 
        /**
@@ -141,7 +147,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                // "Walk" through all criterias
                foreach ($this->getGenericArray('criteria') as $criteriaType => $dummy) {
                        // Remove it
-                       $this->unsetGenericArrayElement('criteria', $criteriaType, $criteriaKey);
+                       $this->unsetGenericArrayElement('criteria', $criteriaType, 'entries', $criteriaKey);
                } // END - foreach
        }
 
@@ -287,7 +293,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                        $key = $this->convertDashesToUnderscores($key);
 
                        // Then walk through all search criteria
-                       foreach ($this->getGenericSubArray('criteria', $criteriaType) as $criteriaKey => $criteriaValue) {
+                       foreach ($this->getGenericArrayKey('criteria', $criteriaType, 'entries') as $criteriaKey => $criteriaValue) {
                                // Make sure no 'my-' or 'my_' passes this point
                                assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE) && (!is_bool($criteriaValue)));
 
@@ -303,7 +309,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                } // END - foreach
 
                // Now check if expected criteria counts match
-               $matches = ($counted == $this->countGenericArrayGroup('criteria', $criteriaType)));
+               $matches = ($counted == $this->countGenericArrayGroup('criteria', $criteriaType));
 
                // Return the result
                return $matches;
@@ -349,9 +355,10 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
                $cacheKey = '';
 
                // Now walk through all criterias
-               foreach ($this->getGenericSubArray('criteria', $criteriaType) as $criteriaKey => $criteriaValue) {
+               foreach ($this->getGenericArrayKey('criteria', $criteriaType, 'entries') as $criteriaKey => $criteriaValue) {
                        // Make sure no 'my-' or 'my_' passes this point
                        assert((strpos($criteriaKey, 'my-') === FALSE) && (strpos($criteriaKey, 'my_') === FALSE) && (!is_bool($criteriaValue)));
+                       assert(!is_array($criteriaValue));
 
                        // Convert dashes to underscore
                        $criteriaKey = $this->convertDashesToUnderscores($criteriaKey);
@@ -416,7 +423,7 @@ class BaseCriteria extends BaseFrameworkSystem implements Criteria {
         */
        public final function count ($criteriaType = 'default') {
                // Return it
-               return $this->countGenericArrayGroup('criteria', $criteriaType));
+               return $this->countGenericArrayGroup('criteria', $criteriaType);
        }
 
        /**