michaeluno / admin-page-framework

development/factory/_common/form/AdminPageFramework_Form_Meta.php

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
      * @param       string      $sStructureType    The type of object. Currently 'post_meta_box' or 'user_meta' is accepted.
      * @return      void
      */
-    public function updateMetaDataByType( $iObjectID, array $aInput, array $aSavedMeta, $sStructureType='post_meta_box' ) {
+    public function updateMetaDataByType( $iObjectID, array $aInput, array $aSavedMeta, $sStructureType = 'post_meta_box' ) {
 
-        if ( ! $iObjectID ) {
+        if ( !$iObjectID ) {
             return;
         }
            
@@ -43,7 +43,7 @@ 
             'user_meta'         => 'update_user_meta',               
             'term_meta'         => 'update_term_meta',               
         );
-        if ( ! in_array( $sStructureType, array_keys( $_aFunctionNameMapByFieldsType ) ) ) {
+        if ( !in_array( $sStructureType, array_keys( $_aFunctionNameMapByFieldsType ) ) ) {
             return;
         }
         $_sFunctionName = $this->getElement( $_aFunctionNameMapByFieldsType, $sStructureType );
@@ -80,7 +80,7 @@ 
 
             $_vSavedValue = $this->getElement(
                 $aSavedMeta, // subject
-                $_sSectionOrFieldID,    // dimensional keys
+                $_sSectionOrFieldID, // dimensional keys
                 null   // default value
             );
                 

Braces +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
          */
         private function _updateMetaDatumByFunctionName( $iObjectID, $_vValue, array $aSavedMeta, $_sSectionOrFieldID, $_sFunctionName ) {
             
-            if ( is_null( $_vValue ) ) { 
+            if ( is_null( $_vValue ) ) {
                 return;
             }
 
@@ -86,7 +86,7 @@ 
                 
             // PHP can compare even array contents with the == operator. See http://www.php.net/manual/en/language.operators.array.php
             // if the input value and the saved meta value are the same, no need to update it.
-            if ( $_vValue == $_vSavedValue ) { 
+            if ( $_vValue == $_vSavedValue ) {
                 return; 
             }
             

development/factory/_common/form/AdminPageFramework_Form_Utility.php

Indentation +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 
             // For form sections, a dummy key is set
             if ( '__dummy_option_key' === $_aDimensionalKeys[ 0 ] ) {
-                 array_shift( $_aDimensionalKeys );
+                    array_shift( $_aDimensionalKeys );
             }
 
             // The first element is the option key for the `admin_page` field type and section or field dimensional keys follow.
@@ -129,7 +129,7 @@ 
         }
         
         // If the first element is a string, it is a inline mixed field definition.
-       return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
+        return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
        
     }  
 

Spacing +19 added lines, -19 removed lines

@@ -43,15 +43,15 @@ 
      * For the `admin_page` fields type, an option key is prepended.
      * For `page_meta_box`, no prepended element and it starts with the section or field ID.
      */
-    static public function getInputsUnset( array $aInputs, $sFieldsType, $iSkipDepth=0 ) {
+    static public function getInputsUnset( array $aInputs, $sFieldsType, $iSkipDepth = 0 ) {
 
-        $_sUnsetKey = '__unset_' . $sFieldsType;
-        if ( ! isset( $_POST[ $_sUnsetKey ] ) ) {
+        $_sUnsetKey = '__unset_'.$sFieldsType;
+        if ( !isset( $_POST[ $_sUnsetKey ] ) ) {
             return $aInputs;
         }
 
         $_aUnsetElements = array_unique( $_POST[ $_sUnsetKey ] );
-        foreach( $_aUnsetElements as $_sFlatInputName ) {
+        foreach ( $_aUnsetElements as $_sFlatInputName ) {
 
             $_aDimensionalKeys = explode( '|', $_sFlatInputName );
 
@@ -61,7 +61,7 @@ 
             }
 
             // The first element is the option key for the `admin_page` field type and section or field dimensional keys follow.
-            for ( $_i = 0; $_i < $iSkipDepth; $_i++) {
+            for ( $_i = 0; $_i < $iSkipDepth; $_i++ ) {
                 unset( $_aDimensionalKeys[ $_i ] );
             }
 
@@ -118,7 +118,7 @@ 
      */
     static public function hasNestedFields( $aFieldset ) {
         
-        if ( ! self::hasFieldDefinitionsInContent( $aFieldset ) ) {
+        if ( !self::hasFieldDefinitionsInContent( $aFieldset ) ) {
             return false;
         }
         // At this point, the `content` argument contains either the definition of nested fields or inline-mixed fields.
@@ -140,7 +140,7 @@ 
      */
     static public function hasFieldDefinitionsInContent( $aFieldset ) {
         
-        if ( ! isset( $aFieldset[ 'content' ] ) ) {
+        if ( !isset( $aFieldset[ 'content' ] ) ) {
             return false;
         }
         if ( empty( $aFieldset[ 'content' ] ) ) {
@@ -175,10 +175,10 @@ 
      * @since       3.8.13
      */
     static public function isDynamicField( $aField ) {
-        if ( ! empty( $aField[ 'repeatable' ] ) ) {
+        if ( !empty( $aField[ 'repeatable' ] ) ) {
             return true;
         }
-        if ( ! empty( $aField[ 'sortable' ] ) ) {
+        if ( !empty( $aField[ 'sortable' ] ) ) {
             return true;
         }
         return false;
@@ -207,7 +207,7 @@ 
         if ( empty( $sString ) ) {
             return $sString;
         }
-        return $sString . '|';
+        return $sString.'|';
     }
 
     /**
@@ -223,17 +223,17 @@ 
      */
     static public function getFieldsetReformattedBySubFieldIndex( $aFieldset, $iSubFieldIndex, $bHasSubFields, $aParentFieldset ) {
 
-        $_oCallerForm   = $aFieldset[ '_caller_object' ];
+        $_oCallerForm = $aFieldset[ '_caller_object' ];
 
         // Add sub-field index to the parent field path for repeated nested items.
-        $aFieldset[ '_parent_field_path' ]   = self::getAOrB(
+        $aFieldset[ '_parent_field_path' ] = self::getAOrB(
             $bHasSubFields,
-            $aFieldset[ '_parent_field_path' ] . '|' . $iSubFieldIndex,
+            $aFieldset[ '_parent_field_path' ].'|'.$iSubFieldIndex,
             $aFieldset[ '_parent_field_path' ]
         );
-        $aFieldset[ '_parent_tag_id' ]       = self::getAOrB(
+        $aFieldset[ '_parent_tag_id' ] = self::getAOrB(
             $bHasSubFields,
-            $aParentFieldset[ 'tag_id' ] . '__' . $iSubFieldIndex,
+            $aParentFieldset[ 'tag_id' ].'__'.$iSubFieldIndex,
             $aParentFieldset[ 'tag_id' ]
         );
 
@@ -242,7 +242,7 @@ 
             $aFieldset,
             $aFieldset[ '_structure_type' ],
             $aFieldset[ 'capability' ],
-            ( integer ) $iSubFieldIndex + 1,   // 1-based count (not index)
+            ( integer ) $iSubFieldIndex + 1, // 1-based count (not index)
             $aFieldset[ '_subsection_index' ],
             $aFieldset[ '_is_section_repeatable' ],
             $aFieldset[ '_caller_object' ]
@@ -251,7 +251,7 @@ 
 
         $_oFieldsetOutputFormatter = new AdminPageFramework_Form_Model___Format_FieldsetOutput(
             $aFieldset,
-            $aFieldset[ '_section_index' ],    // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
+            $aFieldset[ '_section_index' ], // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
             $_oCallerForm->aFieldTypeDefinitions
         );
         return $_oFieldsetOutputFormatter->get();
@@ -288,12 +288,12 @@ 
         if ( empty( $aArguments ) ) {
             return '';
         }
-        if ( self::hasBeenCalled( 'disabled_repeatable_elements_modal_' . $sBoxElementID ) ) {
+        if ( self::hasBeenCalled( 'disabled_repeatable_elements_modal_'.$sBoxElementID ) ) {
             return '';
         }
         add_thickbox(); // to display a message to the user.
         return "<div id='{$sBoxElementID}' style='display:none'>"
-                . "<p>" . $aArguments[ 'message' ] . "</p>"
+                . "<p>".$aArguments[ 'message' ]."</p>"
             . "</div>";
 
     }

development/factory/widget/AdminPageFramework_Widget.php

Spacing +13 added lines, -13 removed lines

@@ -75,13 +75,13 @@ 
 
             $_sPropertyClassName = isset( $this->aSubClassNames[ 'oProp' ] )
                 ? $this->aSubClassNames[ 'oProp' ]
-                : 'AdminPageFramework_Property_' . $this->_sStructureType;
+                : 'AdminPageFramework_Property_'.$this->_sStructureType;
             $this->oProp         = new $_sPropertyClassName(
-                $this,                  // caller object
-                null,                   // the caller script path
-                $sThisClassName,        // class name
-                $sCapability,           // capability
-                $sTextDomain,           // text domain
+                $this, // caller object
+                null, // the caller script path
+                $sThisClassName, // class name
+                $sCapability, // capability
+                $sTextDomain, // text domain
                 $this->_sStructureType  // fields type
             );
 
@@ -103,22 +103,22 @@ 
          * @since       3.8.17
          */
         private function ___getConstructorParametersUsedForThisClassName( $sClassName ) {
-            if ( ! isset( $GLOBALS[ 'wp_widget_factory' ] ) ) {
+            if ( !isset( $GLOBALS[ 'wp_widget_factory' ] ) ) {
                 return array();
             }
-            if ( ! is_object( $GLOBALS[ 'wp_widget_factory' ] ) ) {
+            if ( !is_object( $GLOBALS[ 'wp_widget_factory' ] ) ) {
                 return array();
             }
-            if ( ! isset( $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ] ) ) {
+            if ( !isset( $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ] ) ) {
                 return array();
             }
             // At this point, the widget of the given name is already registered.
             $_oWPWidget = $GLOBALS[ 'wp_widget_factory' ]->widgets[ $sClassName ];
             return array(
-                $_oWPWidget->oCaller->oProp->sWidgetTitle,      // 1. widget title,
-                $_oWPWidget->oCaller->oProp->aWidgetArguments,  // 2. widget arguments
-                $_oWPWidget->oCaller->oProp->sCapability,       // 3. capability
-                $_oWPWidget->oCaller->oProp->sTextDomain,       // 4. text domain
+                $_oWPWidget->oCaller->oProp->sWidgetTitle, // 1. widget title,
+                $_oWPWidget->oCaller->oProp->aWidgetArguments, // 2. widget arguments
+                $_oWPWidget->oCaller->oProp->sCapability, // 3. capability
+                $_oWPWidget->oCaller->oProp->sTextDomain, // 4. text domain
             );
         }
 

development/factory/widget/AdminPageFramework_Widget_Factory.php

Indentation +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
      * @since       3.2.0
      * @return      void
      */
-	public function __construct( $oCaller, $sWidgetTitle, array $aArguments=array() ) {
+    public function __construct( $oCaller, $sWidgetTitle, array $aArguments=array() ) {
 		
         $aArguments = $aArguments 
             + array( 
@@ -34,14 +34,14 @@ 
                 'description'   => '',  
             );
             
-		parent::__construct( 
+        parent::__construct( 
             $oCaller->oProp->sClassName,  // base id 
             $sWidgetTitle,      // widget title
             $aArguments         // widget arguments
         );
         $this->oCaller = $oCaller;
      
-	}
+    }
     
     /**
      * Displays the widget contents in the front end.
@@ -51,7 +51,7 @@ 
      * whether the title should be visible or not depending on the content.
      * @return      void
      */
-	public function widget( $aArguments, $aFormData ) {
+    public function widget( $aArguments, $aFormData ) {
            
         echo $aArguments[ 'before_widget' ];
         
@@ -74,9 +74,9 @@ 
 
         echo $_sContent;
         
-		echo $aArguments[ 'after_widget' ];
+        echo $aArguments[ 'after_widget' ];
 		
-	}
+    }
         /**
          * Returns the widget title.
          * 
@@ -105,7 +105,7 @@ 
             if ( ! $_sTitle ) {
                 return '';
             }
-           return $aArguments['before_title'] 
+            return $aArguments['before_title'] 
                 . $_sTitle 
             . $aArguments['after_title'];           
             
@@ -117,7 +117,7 @@ 
      * @since       3.2.0
      * @return      mixed       The validated form data. The type should be an array but it is dealt by the framework user it will be unknown.
      */
-	public function update( $aSubmittedFormData, $aSavedFormData ) {
+    public function update( $aSubmittedFormData, $aSavedFormData ) {
                 
         $aSubmittedFormData = $this->oCaller->oUtil->addAndApplyFilters(
             $this->oCaller, 
@@ -131,7 +131,7 @@ 
         );
         return $this->oCaller->oForm->getInputsUnset( $aSubmittedFormData, $this->oCaller->oForm->sStructureType ); // 3.8.17+
 
-	}
+    }
     
     /**
      * Constructs the widget form with the given saved form data.
@@ -142,7 +142,7 @@ 
      * 
      * @return      void
      */
-	public function form( $aSavedFormData ) {
+    public function form( $aSavedFormData ) {
         
         $this->oCaller->oForm->aCallbacks = $this->_getFormCallbacks() + $this->oCaller->oForm->aCallbacks;
 
@@ -181,7 +181,7 @@ 
         $this->oCaller->oForm->aSectionsets          = $_aSectionsets;
         $this->oCaller->oForm->aFieldsets            = $_aFieldsets;
         
-	}
+    }
         /**
          * Calls the load() method of the caller factory object.
          * 

development/factory/page_meta_box/AdminPageFramework_PageMetaBox_Model.php

Indentation +1 added lines, -1 removed lines

@@ -256,7 +256,7 @@
 
     }    
     
-       /**
+        /**
          * Extracts meta box form fields options array from the given options array of an admin page.
          * 
          * @since       3.5.6

Spacing +21 added lines, -21 removed lines

@@ -45,11 +45,11 @@ 
     public function _replyToSetUpValidationHooks( $oScreen ) {
 
         // Validation hooks
-        foreach( $this->oProp->aPageSlugs as $_sIndexOrPageSlug => $_asTabArrayOrPageSlug ) {
+        foreach ( $this->oProp->aPageSlugs as $_sIndexOrPageSlug => $_asTabArrayOrPageSlug ) {
             
             if ( is_scalar( $_asTabArrayOrPageSlug ) ) {
                 $_sPageSlug = $_asTabArrayOrPageSlug;
-                add_filter( "validation_saved_options_without_dynamic_elements_{$_sPageSlug}", array( $this, '_replyToFilterPageOptionsWODynamicElements' ), 10, 2 );  // 3.4.1+
+                add_filter( "validation_saved_options_without_dynamic_elements_{$_sPageSlug}", array( $this, '_replyToFilterPageOptionsWODynamicElements' ), 10, 2 ); // 3.4.1+
                 add_filter( "validation_{$_sPageSlug}", array( $this, '_replyToValidateOptions' ), 10, 4 );
                 add_filter( "options_update_status_{$_sPageSlug}", array( $this, '_replyToModifyOptionsUpdateStatus' ) );
                 continue;
@@ -58,7 +58,7 @@ 
             // At this point, the array key is the page slug. It means the user specified the tab(s).
             $_sPageSlug = $_sIndexOrPageSlug;
             $_aTabs     = $_asTabArrayOrPageSlug;
-            foreach( $_aTabs as $_sTabSlug ) {
+            foreach ( $_aTabs as $_sTabSlug ) {
                 add_filter( "validation_{$_sPageSlug}_{$_sTabSlug}", array( $this, '_replyToValidateOptions' ), 10, 4 );
                 add_filter( "validation_saved_options_without_dynamic_elements_{$_sPageSlug}_{$_sTabSlug}", array( $this, '_replyToFilterPageOptionsWODynamicElements' ), 10, 2 ); // 3.4.1+
                 add_filter( "options_update_status_{$_sPageSlug}_{$_sTabSlug}", array( $this, '_replyToModifyOptionsUpdateStatus' ) );
@@ -78,9 +78,9 @@ 
      * @return      void
      * @callback    action      add_meta_boxes
      */ 
-    public function _replyToRegisterMetaBoxes( $sPageHook='' ) {
-        foreach( $this->oProp->aPageSlugs as $_sKey => $_asPage ) {
-            if ( is_string( $_asPage ) )  {
+    public function _replyToRegisterMetaBoxes( $sPageHook = '' ) {
+        foreach ( $this->oProp->aPageSlugs as $_sKey => $_asPage ) {
+            if ( is_string( $_asPage ) ) {
                 $this->_registerMetaBox( $_asPage );
                 continue;
             }            
@@ -96,8 +96,8 @@ 
          * @return      void
          */
         private function _registerMetaBoxes( $sPageSlug, $asPage ) {
-            foreach( $this->oUtil->getAsArray( $asPage ) as $_sTabSlug ) {
-                if ( ! $this->oProp->isCurrentTab( $_sTabSlug ) ) { 
+            foreach ( $this->oUtil->getAsArray( $asPage ) as $_sTabSlug ) {
+                if ( !$this->oProp->isCurrentTab( $_sTabSlug ) ) { 
                     continue; 
                 }
                 $this->_registerMetaBox( $sPageSlug );
@@ -114,12 +114,12 @@ 
          */
         private function _registerMetaBox( $sPageSlug ) {
             add_meta_box( 
-                $this->oProp->sMetaBoxID,                       // id
-                $this->oProp->sTitle,                           // title
+                $this->oProp->sMetaBoxID, // id
+                $this->oProp->sTitle, // title
                 array( $this, '_replyToPrintMetaBoxContents' ), // callback
                 $this->oProp->_getScreenIDOfPage( $sPageSlug ), // screen ID
-                $this->oProp->sContext,                         // context
-                $this->oProp->sPriority,                        // priority
+                $this->oProp->sContext, // context
+                $this->oProp->sPriority, // priority
                 null                                            // argument (deprecated)
             );
         }
@@ -167,17 +167,17 @@ 
         
         $_aNewMetaBoxInputs      = $this->oForm->getSubmittedData( $_POST );
         $_aOldMetaBoxInputs      = $this->oUtil->castArrayContents( 
-            $this->oForm->getDataStructureFromAddedFieldsets(),   // model
+            $this->oForm->getDataStructureFromAddedFieldsets(), // model
             $aOldPageOptions        // data source
         );
 
         // Apply filters - third party scripts will have access to the input.
         $_aNewMetaBoxInputsRaw   = $_aNewMetaBoxInputs; // copy one for validation errors.
         $_aNewMetaBoxInputs      = call_user_func_array( 
-            array( $this, 'validate' ),     // triggers __call()
+            array( $this, 'validate' ), // triggers __call()
             array( $_aNewMetaBoxInputs, $_aOldMetaBoxInputs, $this, $aSubmitInfo ) 
         ); // 3.5.3+
-        $_aNewMetaBoxInputs      = $this->oUtil->addAndApplyFilters( 
+        $_aNewMetaBoxInputs = $this->oUtil->addAndApplyFilters( 
             $this, 
             "validation_{$this->oProp->sClassName}", 
             $_aNewMetaBoxInputs, 
@@ -215,7 +215,7 @@ 
      */
     public function _replyToModifyOptionsUpdateStatus( $aStatus ) {
         
-        if ( ! $this->hasFieldError() ) {
+        if ( !$this->hasFieldError() ) {
             return $aStatus;
         }
         return array( 
@@ -245,12 +245,12 @@ 
 
         $_aPageOptions = $this->oUtil->addAndApplyFilter(
             $this, // the caller factory object
-            'options_' . $this->oProp->sClassName,
+            'options_'.$this->oProp->sClassName,
             $_aPageOptions
         );
 
         return $this->oUtil->castArrayContents( 
-            $this->oForm->getDataStructureFromAddedFieldsets(),   // model
+            $this->oForm->getDataStructureFromAddedFieldsets(), // model
             $_aPageOptions        // data source
         );
 
@@ -267,9 +267,9 @@ 
         private function _getPageMetaBoxOptionsFromPageOptions( array $aPageOptions, array $aFieldsets ) {
      
             $_aOptions = array();
-            foreach( $aFieldsets as $_sSectionID => $_aFieldsets ) {
-                if ( '_default' === $_sSectionID  ) {
-                    foreach( $_aFieldsets as $_aField ) {
+            foreach ( $aFieldsets as $_sSectionID => $_aFieldsets ) {
+                if ( '_default' === $_sSectionID ) {
+                    foreach ( $_aFieldsets as $_aField ) {
                         if ( array_key_exists( $_aField[ 'field_id' ], $aPageOptions ) ) {
                             $_aOptions[ $_aField[ 'field_id' ] ] = $aPageOptions[ $_aField[ 'field_id' ] ];
                         }

development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator__Filter.php

Spacing +27 added lines, -27 removed lines

@@ -88,7 +88,7 @@ 
                     $this->oFactory
                 ),               
                 'aStoredTabDataWODynamicElements' => array(),
-                'aEmbeddedDataWODynamicElements'  => array(),   // stores page meta box field options. This will be updated inside the validation methods.
+                'aEmbeddedDataWODynamicElements'  => array(), // stores page meta box field options. This will be updated inside the validation methods.
                 'aSubmitInformation'    => $aSubmitInformation, // 3.5.0+
             );
             
@@ -103,7 +103,7 @@ 
                 call_user_func_array( 
                     array( $this->oFactory, 'validate' ), // triggers __call()
                     array( $_aData[ 'aInput' ], $_aData[ 'aStoredData' ], $this->oFactory, $_aData[ 'aSubmitInformation' ] )
-                ),    // 3.5.3+
+                ), // 3.5.3+
                 $_aData[ 'aStoredData' ],
                 $_aData[ 'aSubmitInformation' ] // 3.5.0+
             );
@@ -115,7 +115,7 @@ 
             
             // If everything fine, return the filtered input data. 
             $this->_bHasFieldErrors = $this->oFactory->hasFieldError();
-            if ( ! $this->_bHasFieldErrors ) {
+            if ( !$this->_bHasFieldErrors ) {
                 return $_aInput;
             }
             
@@ -129,7 +129,7 @@ 
             );            
                         
             // Go to the catch clause.
-            $_oException = new Exception( 'aReturn' );  // the property name to return from the catch clause.
+            $_oException = new Exception( 'aReturn' ); // the property name to return from the catch clause.
             $_oException->aReturn = $_aInput;
             throw $_oException;
 
@@ -153,22 +153,22 @@ 
              */
             private function _validateEachField( array $aData, array $aInputsToParse ) {
                 
-                foreach( $aInputsToParse as $_sID => $_aSectionOrFields ) { // $_sID is either a section id or a field id
+                foreach ( $aInputsToParse as $_sID => $_aSectionOrFields ) { // $_sID is either a section id or a field id
                     
                     // For each section
                     if ( $this->oFactory->oForm->isSection( $_sID ) ) {
                         
                         // If the parsing item does not belong to the current page, do not call the validation callback method.
-                        if ( ! $this->_isValidSection( $_sID, $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
+                        if ( !$this->_isValidSection( $_sID, $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
                             continue;
                         }                             
                         
                         // Call the validation callback method.
-                        foreach( $_aSectionOrFields as $_sFieldID => $_aFields ) { // For fields
+                        foreach ( $_aSectionOrFields as $_sFieldID => $_aFields ) { // For fields
                             $aData[ 'aInput' ][ $_sID ][ $_sFieldID ] = $this->_getValidatedData(
                                 "validation_{$this->oFactory->oProp->sClassName}_{$_sID}_{$_sFieldID}", 
                                 $aData[ 'aInput' ][ $_sID ][ $_sFieldID ], 
-                                $this->getElement( $aData, array( 'aStoredData', $_sID, $_sFieldID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] ) ? $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] : null,
+                                $this->getElement( $aData, array( 'aStoredData', $_sID, $_sFieldID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] ) ? $aData[ 'aStoredData' ][ $_sID ][ $_sFieldID ] : null,
                                 $aData[ 'aSubmitInformation' ]    // 3.5.0+
                             );
                         }
@@ -189,7 +189,7 @@ 
                         $aData[ 'aInput' ][ $_sID ] = $this->_getValidatedData(
                             "validation_{$this->oFactory->oProp->sClassName}_{$_sID}", 
                             $_aSectionInput,
-                            $this->getElement( $aData, array( 'aStoredData', $_sID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
+                            $this->getElement( $aData, array( 'aStoredData', $_sID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
                             $aData[ 'aSubmitInformation' ]
                         );     
                         
@@ -198,7 +198,7 @@ 
                     }
                                         
                     // Check if the parsing item (the default section) belongs to the current page; if not, do not call the validation callback method.
-                    if ( ! $this->_isValidSection( '_default', $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
+                    if ( !$this->_isValidSection( '_default', $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] ) ) {
                         continue;
                     }  
                     
@@ -206,7 +206,7 @@ 
                     $aData[ 'aInput' ][ $_sID ] = $this->_getValidatedData(
                         "validation_{$this->oFactory->oProp->sClassName}_{$_sID}",
                         $aData[ 'aInput' ][ $_sID ],
-                        $this->getElement( $aData, array( 'aStoredData', $_sID ), null ),    // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
+                        $this->getElement( $aData, array( 'aStoredData', $_sID ), null ), // isset( $aData[ 'aStoredData' ][ $_sID ] ) ? $aData[ 'aStoredData' ][ $_sID ] : null,
                         $aData[ 'aSubmitInformation' ]
                     );
                     
@@ -248,22 +248,22 @@ 
              */
             private function _validateTabFields( array $aData ) {
 
-                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sTabSlug' ] || !$aData[ 'sPageSlug' ] ) { 
                     return $aData; 
                 }
 
-                $aData[ 'aStoredTabData' ]        = $this->oFactory->oForm->getTabOptions( 
+                $aData[ 'aStoredTabData' ] = $this->oFactory->oForm->getTabOptions( 
                     $aData[ 'aStoredData' ], 
                     $aData[ 'sPageSlug' ], 
                     $aData[ 'sTabSlug' ] 
                 ); // respects page meta box fields
-                $aData[ 'aStoredTabData' ]        = $this->addAndApplyFilter(
+                $aData[ 'aStoredTabData' ] = $this->addAndApplyFilter(
                     $this->oFactory, 
                     "validation_saved_options_{$aData[ 'sPageSlug' ]}_{$aData[ 'sTabSlug' ]}", 
                     $aData[ 'aStoredTabData' ], 
                     $this->oFactory 
                 );
-                $_aOtherTabOptions  = $this->oFactory->oForm->getOtherTabOptions( 
+                $_aOtherTabOptions = $this->oFactory->oForm->getOtherTabOptions( 
                     $aData[ 'aStoredData' ], 
                     $aData[ 'sPageSlug' ], 
                     $aData[ 'sTabSlug' ] 
@@ -317,7 +317,7 @@ 
              */
             private function _validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sPageSlug' ] ) { 
                     return $aData[ 'aInput' ]; 
                 }
 
@@ -329,7 +329,7 @@ 
                 $_aPageOptionsWODynamicElements = $this->addAndApplyFilter( 
                     $this->oFactory, 
                     "validation_saved_options_without_dynamic_elements_{$aData[ 'sPageSlug' ]}", 
-                    $this->oFactory->oForm->getPageOptions( $aData[ 'aStoredDataWODynamicElements' ], $aData[ 'sPageSlug' ] ),     // united with the in-page tab specific data in order to override the page-specific dynamic elements.
+                    $this->oFactory->oForm->getPageOptions( $aData[ 'aStoredDataWODynamicElements' ], $aData[ 'sPageSlug' ] ), // united with the in-page tab specific data in order to override the page-specific dynamic elements.
                     $this->oFactory 
                 );                
 
@@ -342,15 +342,15 @@ 
                 // Validate the input data.
                 $aData[ 'aInput' ] = $this->_getValidatedData(
                     "validation_{$aData[ 'sPageSlug' ]}", 
-                    $aData[ 'aInput' ],                   // new values
-                    $_aPageOptions,                     // stored page options
+                    $aData[ 'aInput' ], // new values
+                    $_aPageOptions, // stored page options
                     $aData[ 'aSubmitInformation' ]        // submit information 3.5.0+
                 );
 
                 // If it's in a tab-page, drop the elements which belong to the tab so that arrayed-options will not be merged such as multiple select options.
-                $_aPageOptions = $aData[ 'sTabSlug' ] && ! empty( $aData[ 'aStoredTabData' ] ) 
+                $_aPageOptions = $aData[ 'sTabSlug' ] && !empty( $aData[ 'aStoredTabData' ] ) 
                     ? $this->invertCastArrayContents( $_aPageOptions, $aData[ 'aStoredTabData' ] ) 
-                    : ( ! $aData[ 'sTabSlug' ] // if the tab is not specified, do not merge the input array with the page options as the input array already includes the page options. This is for dynamic elements(repeatable sections).
+                    : ( !$aData[ 'sTabSlug' ] // if the tab is not specified, do not merge the input array with the page options as the input array already includes the page options. This is for dynamic elements(repeatable sections).
                         ? array()
                         : $_aPageOptions
                     );    
@@ -405,13 +405,13 @@ 
                  * @param       array       $aStoredData    The stored option.
                  * @param       array       $aSubmitInfo    [3.5.0+] The form submit information such as the field ID of the pressed submit field.
                  */
-                private function _getValidatedData( $sFilterName, $aInputs, $aStoredData, $aSubmitInfo=array() ) {
+                private function _getValidatedData( $sFilterName, $aInputs, $aStoredData, $aSubmitInfo = array() ) {
                     return $this->addAndApplyFilter( 
-                        $this->oFactory,          // caller
-                        $sFilterName,   // hook name
-                        $aInputs,        // 1st argument
-                        $aStoredData,   // 2nd argument
-                        $this->oFactory,          // 3rd argument
+                        $this->oFactory, // caller
+                        $sFilterName, // hook name
+                        $aInputs, // 1st argument
+                        $aStoredData, // 2nd argument
+                        $this->oFactory, // 3rd argument
                         $aSubmitInfo    // 4th argument 3.5.0+
                     );                    
                 }  

development/factory/admin_page/_model/delegate/validaor/AdminPageFramework_Model__FormSubmission__Validator.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
         $this->oFactory = $oFactory;
         
         add_filter(
-            "validation_pre_" . $this->oFactory->oProp->sClassName,
+            "validation_pre_".$this->oFactory->oProp->sClassName,
             array( $this, '_replyToValidateUserFormInputs' ),
             10,
             4
@@ -60,7 +60,7 @@ 
             $_sSubmitSectionID  = $this->_getPressedSubmitButtonData( $_aSubmits, 'section_id' );
             
             // Submit Information - [3.5.0+] this will be passed to validation callback methods.
-            $_aSubmitsInformation        = array(
+            $_aSubmitsInformation = array(
                 'page_slug'     => $_sPageSlug,
                 'tab_slug'      => $_sTabSlug,
                 'input_id'      => $this->_getPressedSubmitButtonData( $_aSubmits, 'input_id' ), 
@@ -80,11 +80,11 @@ 
                 'AdminPageFramework_Model__FormSubmission__Validator__Export',
                 'AdminPageFramework_Model__FormSubmission__Validator__Reset',
                 'AdminPageFramework_Model__FormSubmission__Validator__ResetConfirm', // 3.7.6+ Moved to after validation from before validation
-                'AdminPageFramework_Model__FormSubmission__Validator__ContactForm',  // 3.7.6+ Moved to after validation from before validation
+                'AdminPageFramework_Model__FormSubmission__Validator__ContactForm', // 3.7.6+ Moved to after validation from before validation
                 'AdminPageFramework_Model__FormSubmission__Validator__ContactFormConfirm',
                 
             );
-            foreach( $_aClassNames as $_sClassName ) {
+            foreach ( $_aClassNames as $_sClassName ) {
                 new $_sClassName( $this->oFactory );
             }
             
@@ -93,7 +93,7 @@ 
                 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_before_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_before_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,
@@ -112,7 +112,7 @@ 
 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_after_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_after_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,