diff --git a/development/factory/_common/_abstract/_model/AdminPageFramework_Property_Base.php b/development/factory/_common/_abstract/_model/AdminPageFramework_Property_Base.php index 3a214aa92..53434fac2 100644 --- a/development/factory/_common/_abstract/_model/AdminPageFramework_Property_Base.php +++ b/development/factory/_common/_abstract/_model/AdminPageFramework_Property_Base.php @@ -459,7 +459,7 @@ private function ___getReferrer() { self::$___sCacheReferrer = isset( self::$___sCacheReferrer ) ? self::$___sCacheReferrer : wp_get_referer(); - return self::$___sCacheReferrer; + return is_string( self::$___sCacheReferrer ) ? self::$___sCacheReferrer : ''; } /** * diff --git a/development/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php b/development/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php index 17f0655df..a94e8c40f 100644 --- a/development/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php +++ b/development/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php @@ -26,6 +26,10 @@ class AdminPageFramework_TabNavigationBar extends AdminPageFramework_FrameworkUt * Stores the tab items. */ public $aTabs = array(); + /** + * Stores the active slugs. + */ + public $aActiveSlugs = array(); /** * Stores container attributes. diff --git a/development/factory/_common/form/AdminPageFramework_Form.php b/development/factory/_common/form/AdminPageFramework_Form.php index b3f396913..b982b1ccb 100644 --- a/development/factory/_common/form/AdminPageFramework_Form.php +++ b/development/factory/_common/form/AdminPageFramework_Form.php @@ -44,6 +44,11 @@ class AdminPageFramework_Form extends AdminPageFramework_Form_Controller { ), ); + /** + * Stores sections definitions. + */ + public $aSections = array(); + /** * Stores field set definitions. */ diff --git a/development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___FieldTitle.php b/development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___FieldTitle.php index ffe0767bb..4cee1c828 100644 --- a/development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___FieldTitle.php +++ b/development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___FieldTitle.php @@ -90,7 +90,7 @@ public function get() { strip_tags( is_array( $aField[ 'description' ] ) ? implode( ' ', $aField[ 'description' ] ) - : $aField[ 'description' ] + : ( is_string( $aField[ 'description' ] ) ? $aField[ 'description' ] : '' ) ) ) . "'>" diff --git a/development/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php b/development/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php index 474d4f5aa..2ae614b6b 100644 --- a/development/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php +++ b/development/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php @@ -115,9 +115,9 @@ static public function getStyleAttribute( $asInlineCSSes ) { } // At this point, it is a string. Break them down to array elements. - $__aCSSRules = explode( ';', $_asCSSRules ); + $__aCSSRules = explode( ';', is_string( $_asCSSRules ) ? $_asCSSRules : '' ); foreach( $__aCSSRules as $_sPair ) { - $_aCSSPair = explode( ':', $_sPair ); + $_aCSSPair = explode( ':', ( is_string( $_sPair )? $_sPair : '' ) ); if ( ! isset( $_aCSSPair[ 0 ], $_aCSSPair[ 1 ] ) ) { continue; } @@ -229,4 +229,4 @@ static public function getDataAttributeArray( array $aArray ) { } -} \ No newline at end of file +} diff --git a/development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php b/development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php index 43f6775b2..7beccac3c 100644 --- a/development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php +++ b/development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php @@ -43,10 +43,10 @@ public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubm $aSubmits, 'reset_key' ); - $_sKeyToReset = trim( $_sKeyToReset ); if ( ! $_sKeyToReset ) { return; } + $_sKeyToReset = trim( $_sKeyToReset ); $_oException = new Exception( 'aReturn' ); $_oException->aReturn = $this->_resetOptions( $_sKeyToReset, diff --git a/development/utility/toc/AdminPageFramework_TableOfContents.php b/development/utility/toc/AdminPageFramework_TableOfContents.php index d0901a6f7..f03260384 100644 --- a/development/utility/toc/AdminPageFramework_TableOfContents.php +++ b/development/utility/toc/AdminPageFramework_TableOfContents.php @@ -86,6 +86,7 @@ public function getTOC() { $_aOutput = array(); foreach( $this->_aMatches as $_iIndex => $_sMatch ) { + $_sMatch = is_string( $_sMatch ) ? $_sMatch : ''; $_sMatch = strip_tags( $_sMatch, '

' ); $_sMatch = preg_replace( '//', '
  • ', $_sMatch ); $_sMatch = preg_replace( '/<\/h[1-' . $iDepth . ']>/', '
  • ', $_sMatch ); diff --git a/library/apf/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php b/library/apf/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php index 0bcba6736..1a3529b67 100644 --- a/library/apf/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php +++ b/library/apf/factory/_common/_abstract/_view/AdminPageFramework_TabNavigationBar.php @@ -9,6 +9,7 @@ class AdminPageFramework_TabNavigationBar extends AdminPageFramework_FrameworkUtility { public $sTabTag = 'h2'; public $aTabs = array(); + public $aActiveSlugs; public $aAttributes = array( 'class' => 'nav-tab-wrapper', ); public $aTab = array( 'slug' => null, 'title' => null, 'href' => null, 'disabled' => null, 'class' => null, 'attributes' => array(), ); public $aCallbacks = array( 'format' => null, 'arguments' => array(), ); diff --git a/library/apf/factory/_common/form/AdminPageFramework_Form.php b/library/apf/factory/_common/form/AdminPageFramework_Form.php index fb2bc0208..ba4f3fa55 100644 --- a/library/apf/factory/_common/form/AdminPageFramework_Form.php +++ b/library/apf/factory/_common/form/AdminPageFramework_Form.php @@ -10,6 +10,7 @@ class AdminPageFramework_Form extends AdminPageFramework_Form_Controller { public $sStructureType = ''; public $aFieldTypeDefinitions = array(); public $aSectionsets = array( '_default' => array( 'section_id' => '_default', ), ); + public $aSections = array(); public $aFieldsets = array(); public $aSavedData = array(); public $sCapability = ''; diff --git a/library/apf/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php b/library/apf/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php index 612ffa49f..3d20582f9 100644 --- a/library/apf/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php +++ b/library/apf/factory/_common/utility/base_utility/AdminPageFramework_Utility_HTMLAttribute.php @@ -42,7 +42,7 @@ public static function getStyleAttribute($asInlineCSSes) $_aCSSRules = array_merge($_asCSSRules, $_aCSSRules); continue; } - $__aCSSRules = explode(';', $_asCSSRules); + $__aCSSRules = explode( ';', is_string( $_asCSSRules ) ? $_asCSSRules : '' ); foreach ($__aCSSRules as $_sPair) { $_aCSSPair = explode(':', $_sPair); if (! isset($_aCSSPair[ 0 ], $_aCSSPair[ 1 ])) { diff --git a/library/apf/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php b/library/apf/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php index cdcc67c02..0cd51605b 100644 --- a/library/apf/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php +++ b/library/apf/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Reset.php @@ -16,10 +16,10 @@ public function _replyToCallback($aInputs, $aRawInputs, array $aSubmits, $aSubmi return; } $_sKeyToReset = $this->_getPressedSubmitButtonData($aSubmits, 'reset_key'); - $_sKeyToReset = trim($_sKeyToReset); if (! $_sKeyToReset) { return; } + $_sKeyToReset = trim($_sKeyToReset); $_oException = new Exception('aReturn'); $_oException->aReturn = $this->_resetOptions($_sKeyToReset, $aInputs, $aSubmitInformation); throw $_oException;