From: Roland Häder Date: Sun, 23 Jun 2013 19:25:05 +0000 (+0000) Subject: Introduced isValidGenericArrayKey() X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=0f4c80d1fd4050de4c2c9d0b705e534289335ac5 Introduced isValidGenericArrayKey() --- diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 09d13a57..80d861d3 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -2119,38 +2119,38 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Determines if a key is set in the generic array + * Determines if an element is set in the generic array * * @param $keyGroup Main group for the key * @param $subGroup Sub group for the key * @param $key Key to check + * @param $element Element to check * @return $isset Whether the given key is set */ - protected final function isGenericArrayKeySet ($keyGroup, $subGroup, $key) { + protected final function isGenericArrayElementSet ($keyGroup, $subGroup, $key, $element) { // Is it there? - $isset = isset($this->genericArray[$keyGroup][$subGroup][$key]); + $isset = isset($this->genericArray[$keyGroup][$subGroup][$key][$element]); // Return it return $isset; } - /** - * Determines if an element is set in the generic array + * Determines if a key is set in the generic array * * @param $keyGroup Main group for the key * @param $subGroup Sub group for the key * @param $key Key to check - * @param $element Element to check * @return $isset Whether the given key is set */ - protected final function isGenericArrayElementSet ($keyGroup, $subGroup, $key, $element) { + protected final function isGenericArrayKeySet ($keyGroup, $subGroup, $key) { // Is it there? - $isset = isset($this->genericArray[$keyGroup][$subGroup][$key][$element]); + $isset = isset($this->genericArray[$keyGroup][$subGroup][$key]); // Return it return $isset; } + /** * Determines if a group is set in the generic array * @@ -2478,6 +2478,22 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { // Return it return $isValid; } + + /** + * Checks if a given key is valid (array) + * + * @param $keyGroup Key group to get + * @param $subGroup Sub group for the key + * @param $key Key to check + * @return $isValid Whether given sub group is valid + */ + protected final function isValidGenericArrayKey ($keyGroup, $subGroup, $key) { + // Determine it + $isValid = (($this->isGenericArrayKeySet($keyGroup, $subGroup, $key)) && (is_array($this->getGenericArrayKey($keyGroup, $subGroup, $key)))); + + // Return it + return $isValid; + } } // [EOF] diff --git a/inc/classes/main/stacker/class_BaseStacker.php b/inc/classes/main/stacker/class_BaseStacker.php index 7b4c18cd..d2817580 100644 --- a/inc/classes/main/stacker/class_BaseStacker.php +++ b/inc/classes/main/stacker/class_BaseStacker.php @@ -66,7 +66,7 @@ class BaseStacker extends BaseFrameworkSystem { */ public final function isStackInitialized ($stackerName) { // Is is there? - $isInitialized = ($this->isValidGenericArrayGroup('stacks', $stackerName)); + $isInitialized = ($this->isValidGenericArrayKey('stacks', $stackerName, 'entries')); // Return result return $isInitialized;