michaeluno / admin-page-framework

development/factory/admin_page/model/delegate/validaor/AdminPageFramework_Model_FormSubmission_Validator_Filter.php

Spacing +30 added lines, -30 removed lines

@@ -89,7 +89,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+
             );
             
@@ -104,7 +104,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;
 
@@ -152,13 +152,13 @@ 
              */
             private function _getInputByUnset( array $aInputs ) {
                 
-                $_sUnsetKey = '__unset_' . $this->oFactory->oProp->sFieldsType;
-                if ( ! isset( $_POST[ $_sUnsetKey ] ) ) {
+                $_sUnsetKey = '__unset_'.$this->oFactory->oProp->sFieldsType;
+                if ( !isset( $_POST[ $_sUnsetKey ] ) ) {
                     return $aInputs;
                 }
                 
                 $_aUnsetElements = array_unique( $_POST[ $_sUnsetKey ] );
-                foreach( $_aUnsetElements as $_sFlatInputName ) {
+                foreach ( $_aUnsetElements as $_sFlatInputName ) {
                     $_aDimensionalKeys = explode( '|', $_sFlatInputName );
                     
                     // The first element is the option key; the section or field dimensional keys follow.
@@ -181,22 +181,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+
                             );
                         }
@@ -217,7 +217,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' ]
                         );     
                         
@@ -226,7 +226,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;
                     }  
                     
@@ -234,7 +234,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' ]
                     );
                     
@@ -276,22 +276,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( $aData[ 'aStoredData' ], $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] );
+                $_aOtherTabOptions = $this->oFactory->oForm->getOtherTabOptions( $aData[ 'aStoredData' ], $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] );
 
                 // This options data contain embedded options.
                 $aData[ 'aStoredTabDataWODynamicElements' ] = $this->oFactory->oForm->getTabOptions( $aData[ 'aStoredDataWODynamicElements' ], $aData[ 'sPageSlug' ], $aData[ 'sTabSlug' ] );
@@ -337,7 +337,7 @@ 
              */
             private function _validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sPageSlug' ] ) { 
                     return $aData[ 'aInput' ]; 
                 }
 
@@ -349,7 +349,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 
                 );                
 
@@ -362,15 +362,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
                     );    
@@ -425,13 +425,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+
                     );                    
                 }  

Braces +6 added lines, -4 removed lines

@@ -181,7 +181,8 @@ 
              */
             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 ) ) {
@@ -192,7 +193,8 @@ 
                         }                             
                         
                         // 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 ], 
@@ -276,7 +278,7 @@ 
              */
             private function _validateTabFields( array $aData ) {
                 
-                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) { 
+                if ( ! $aData[ 'sTabSlug' ] || ! $aData[ 'sPageSlug' ] ) {
                     return $aData; 
                 }
                     
@@ -337,7 +339,7 @@ 
              */
             private function _validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( ! $aData[ 'sPageSlug' ] ) {
                     return $aData[ 'aInput' ]; 
                 }
 

development/factory/admin_page/model/delegate/validaor/AdminPageFramework_Model_FormSubmission_Validator_Link.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
         $_sLinkURL = $this->_getPressedSubmitButtonData( $aSubmits, 'href' );
-        if ( ! $_sLinkURL ) {
+        if ( !$_sLinkURL ) {
             return;
         }        
         $this->goToURL( $_sLinkURL );

development/factory/admin_page/model/delegate/validaor/AdminPageFramework_Model_FormSubmission_Validator_ResetConfirm.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
             $aSubmits, 
             'is_reset' 
         );  
-        if ( ! $_bIsReset ) {
+        if ( !$_bIsReset ) {
             return;
         }     
         
@@ -47,7 +47,7 @@ 
         );
                     
         // Go to the catch clause.
-        $_oException = new Exception( 'aReturn' );  // the property name to return from the catch clasue.
+        $_oException = new Exception( 'aReturn' ); // the property name to return from the catch clasue.
         $_oException->aReturn = $this->_confirmSubmitButtonAction( 
             $this->getElement( $aSubmitInformation, 'input_name' ),
             $this->getElement( $aSubmitInformation, 'section_id' ),

development/factory/admin_page/model/form_definition/AdminPageFramework_FormDefinition_Page.php

Indentation +1 added lines, -2 removed lines

@@ -468,7 +468,6 @@ 
      * 
      * @since       2.0.0
      * @since       3.0.0       The second parameter was changed to a tab slug. Moved from the settings class.
-
      * @param       array       $aOptions      the options array. Note that the options array structure are very similar to the aFields array. 
      * However, it does not have the `_default` section key.
      * @param       string      $sPageSlug     the page slug to check
@@ -508,7 +507,7 @@ 
          */
         private function _setOtherTabOptions( array &$_aStoredOptionsNotOfTheTab, array $aOptions, array $_aSubSectionsOrFields, $_sSectionID ) {
             
-           // At this point, the passed element belongs to the other tabs since the section of the given tab is skipped.
+            // At this point, the passed element belongs to the other tabs since the section of the given tab is skipped.
             foreach ( $_aSubSectionsOrFields as $_isSubSectionIndexOrFieldID => $_aSubSectionOrField  ) {
                 
                 // If it's a sub section

Spacing +64 added lines, -64 removed lines

@@ -59,10 +59,10 @@ 
      * @since       3.0.0
      */
     public function isPageAdded( $sPageSlug ) {
-        foreach( $this->aSections as $_sSectionID => $_aSection ) {
+        foreach ( $this->aSections as $_sSectionID => $_aSection ) {
             if ( 
-                isset( $_aSection['page_slug'] ) 
-                && $sPageSlug == $_aSection['page_slug'] 
+                isset( $_aSection[ 'page_slug' ] ) 
+                && $sPageSlug == $_aSection[ 'page_slug' ] 
             ) {
                 return true;    
             }
@@ -75,7 +75,7 @@ 
      * 
      * @since       3.0.0
      */
-    public function getFieldsByPageSlug( $sPageSlug, $sTabSlug='' ) { 
+    public function getFieldsByPageSlug( $sPageSlug, $sTabSlug = '' ) { 
         return $this->castArrayContents( 
             $this->getSectionsByPageSlug( $sPageSlug, $sTabSlug ), 
             $this->aFields
@@ -86,14 +86,14 @@ 
      * Returns the registered sections that belong to the given page by slug.
      * @since       3.0.0.
      */
-    public function getSectionsByPageSlug( $sPageSlug, $sTabSlug='' ) {
+    public function getSectionsByPageSlug( $sPageSlug, $sTabSlug = '' ) {
         
         $_aSections = array();
-        foreach( $this->aSections as $_sSecitonID => $_aSection ) {    
-            if ( $sTabSlug && $_aSection['tab_slug'] != $sTabSlug ) { 
+        foreach ( $this->aSections as $_sSecitonID => $_aSection ) {    
+            if ( $sTabSlug && $_aSection[ 'tab_slug' ] != $sTabSlug ) { 
                 continue; 
             }      
-            if ( $_aSection['page_slug'] != $sPageSlug ) { 
+            if ( $_aSection[ 'page_slug' ] != $sPageSlug ) { 
                 continue; 
             }
             $_aSections[ $_sSecitonID ] = $_aSection;     
@@ -113,8 +113,8 @@ 
      * @internal
      */ 
     public function getPageSlugBySectionID( $sSectionID ) {
-        return isset( $this->aSections[ $sSectionID ]['page_slug'] )
-            ? $this->aSections[ $sSectionID ]['page_slug']
+        return isset( $this->aSections[ $sSectionID ][ 'page_slug' ] )
+            ? $this->aSections[ $sSectionID ][ 'page_slug' ]
             : null;     
     }    
     
@@ -230,16 +230,16 @@ 
         
         $_aField = parent::formatField( $aField, $sFieldsType, $sCapability, $iCountOfElements, $iSectionIndex, $bIsSectionRepeatable, $oCallerObject );
         
-        if ( ! $_aField ) { 
+        if ( !$_aField ) { 
             return; 
         }
-        $_aField['option_key']      = $this->sOptionKey;
-        $_aField['class_name']      = $this->sClassName;
-        $_aField['page_slug']       = $this->getElement( $this->aSections, array( $_aField['section_id'], 'page_slug' ), null );
-        $_aField['tab_slug']        = $this->getElement( $this->aSections, array( $_aField['section_id'], 'tab_slug' ), null );
+        $_aField[ 'option_key' ]      = $this->sOptionKey;
+        $_aField[ 'class_name' ]      = $this->sClassName;
+        $_aField[ 'page_slug' ]       = $this->getElement( $this->aSections, array( $_aField[ 'section_id' ], 'page_slug' ), null );
+        $_aField[ 'tab_slug' ]        = $this->getElement( $this->aSections, array( $_aField[ 'section_id' ], 'tab_slug' ), null );
         
         // used for the contextual help pane.
-        $_aField['section_title']   = $this->getElement( $this->aSections, array( $_aField['section_id'], 'title' ), null );
+        $_aField[ 'section_title' ]   = $this->getElement( $this->aSections, array( $_aField[ 'section_id' ], 'title' ), null );
         return $_aField;
         
     }
@@ -256,19 +256,19 @@ 
      */
     protected function getConditionedSection( array $aSection ) {
 
-        if ( ! current_user_can( $aSection['capability'] ) ) {
+        if ( !current_user_can( $aSection[ 'capability' ] ) ) {
             return array();
         }
-        if ( ! $aSection['if'] ) { 
+        if ( !$aSection[ 'if' ] ) { 
             return array();
         }
-        if ( ! $aSection['page_slug'] ) { 
+        if ( !$aSection[ 'page_slug' ] ) { 
             return array();
         }
-        if ( 'options.php' != $this->getPageNow() && $this->sCurrentPageSlug != $aSection['page_slug'] ) { 
+        if ( 'options.php' != $this->getPageNow() && $this->sCurrentPageSlug != $aSection[ 'page_slug' ] ) { 
             return array();
         }
-        if ( ! $this->_isSectionOfCurrentTab( $aSection, $this->sCurrentPageSlug, $this->sCurrentTabSlug ) ) { 
+        if ( !$this->_isSectionOfCurrentTab( $aSection, $this->sCurrentPageSlug, $this->sCurrentTabSlug ) ) { 
             return array();
         }
         return $aSection;
@@ -285,7 +285,7 @@ 
         private function _isSectionOfCurrentTab( array $aSection, $sCurrentPageSlug, $sCurrentTabSlug ) {
             
             // Make sure if it's in the loading page.
-            if ( $aSection['page_slug'] != $sCurrentPageSlug  ) { 
+            if ( $aSection[ 'page_slug' ] != $sCurrentPageSlug ) { 
                 return false; 
             }
 
@@ -296,7 +296,7 @@ 
             // }
                                         
             // If the checking tab slug and the current loading tab slug is the same, it should be registered.
-            return ( $aSection['tab_slug'] == $sCurrentTabSlug );
+            return ( $aSection[ 'tab_slug' ] == $sCurrentTabSlug );
             
         }    
         
@@ -330,16 +330,16 @@ 
     public function getPageOnlyOptions( $aOptions, $sPageSlug ) {
 
         $_aStoredOptionsOfThePage = array();
-        foreach( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
             
             // Check the section
-            if ( ! $this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
+            if ( !$this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
                 continue;
             }
 
             // At this point, the element belongs the given page slug as the section is of the given page slug's.
             $this->_setPageOnlyOptions( 
-                $_aStoredOptionsOfThePage,  // by reference - gets updated in the method.
+                $_aStoredOptionsOfThePage, // by reference - gets updated in the method.
                 $aOptions, 
                 $_aSubSectionsOrFields, 
                 $sPageSlug,
@@ -358,7 +358,7 @@ 
          * @internal
          */
         private function _setPageOnlyOptions( array &$_aStoredOptionsOfThePage, array $aOptions, array $_aSubSectionsOrFields, $sPageSlug, $_sSectionID ) {
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
                 
                 // If it's a sub-section array,
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -372,20 +372,20 @@ 
                 
                 // @todo Examine whether this check can be removed 
                 // as the section that hods this field is already checked above outside this loop.
-                if ( $sPageSlug !== $_aField['page_slug'] ) { 
+                if ( $sPageSlug !== $_aField[ 'page_slug' ] ) { 
                     continue; 
                 }        
                 
-                if ( '_default' !== $_aField['section_id'] ) {
-                    if ( array_key_exists( $_aField['section_id'], $aOptions ) ) {
-                        $_aStoredOptionsOfThePage[ $_aField['section_id'] ] = $aOptions[ $_aField['section_id'] ];
+                if ( '_default' !== $_aField[ 'section_id' ] ) {
+                    if ( array_key_exists( $_aField[ 'section_id' ], $aOptions ) ) {
+                        $_aStoredOptionsOfThePage[ $_aField[ 'section_id' ] ] = $aOptions[ $_aField[ 'section_id' ] ];
                     }
                     continue;
                 }
                 
                 // It does not have a section so set the field id as its key.
-                if ( array_key_exists( $_aField['field_id'], $aOptions ) ) {
-                    $_aStoredOptionsOfThePage[ $_aField['field_id'] ] = $aOptions[ $_aField['field_id'] ];
+                if ( array_key_exists( $_aField[ 'field_id' ], $aOptions ) ) {
+                    $_aStoredOptionsOfThePage[ $_aField[ 'field_id' ] ] = $aOptions[ $_aField[ 'field_id' ] ];
                 }
                     
             }            
@@ -403,7 +403,7 @@ 
     public function getOtherPageOptions( $aOptions, $sPageSlug ) {
 
         $_aStoredOptionsNotOfThePage = array();
-        foreach( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
             
             // Check the section
             if ( $this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
@@ -431,7 +431,7 @@ 
          * @internal
          */
         private function _setOtherPageOptions( array &$_aStoredOptionsNotOfThePage, array $aOptions, array $_aSubSectionsOrFields, $sPageSlug ) {
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
 
                 // It's a sub-section array. 
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -440,20 +440,20 @@ 
                 
                 // @todo Examine whether this check can be removed 
                 // as the section that hods this field is already checked above outside the loop.
-                if ( $sPageSlug === $_aField['page_slug'] ) { 
+                if ( $sPageSlug === $_aField[ 'page_slug' ] ) { 
                     continue; 
                 }
              
                 // If a section is set,
-                if ( '_default' !== $_aField['section_id'] ) {
-                    if ( array_key_exists( $_aField['section_id'], $aOptions ) ) {
-                        $_aStoredOptionsNotOfThePage[ $_aField['section_id'] ] = $aOptions[ $_aField['section_id'] ];
+                if ( '_default' !== $_aField[ 'section_id' ] ) {
+                    if ( array_key_exists( $_aField[ 'section_id' ], $aOptions ) ) {
+                        $_aStoredOptionsNotOfThePage[ $_aField[ 'section_id' ] ] = $aOptions[ $_aField[ 'section_id' ] ];
                     } 
                     continue;
                 }
                 // It does not have a section
-                if ( array_key_exists( $_aField['field_id'], $aOptions ) ) {
-                    $_aStoredOptionsNotOfThePage[ $_aField['field_id'] ] = $aOptions[ $_aField['field_id'] ];
+                if ( array_key_exists( $_aField[ 'field_id' ], $aOptions ) ) {
+                    $_aStoredOptionsNotOfThePage[ $_aField[ 'field_id' ] ] = $aOptions[ $_aField[ 'field_id' ] ];
                 }
                     
             }            
@@ -479,7 +479,7 @@ 
     public function getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug ) {
 
         $_aStoredOptionsNotOfTheTab = array();
-        foreach( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
                         
             // If the section is of the given page and the given tab, skip.
             if ( $this->_isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) ) {
@@ -509,7 +509,7 @@ 
         private function _setOtherTabOptions( array &$_aStoredOptionsNotOfTheTab, array $aOptions, array $_aSubSectionsOrFields, $_sSectionID ) {
             
            // At this point, the passed element belongs to the other tabs since the section of the given tab is skipped.
-            foreach ( $_aSubSectionsOrFields as $_isSubSectionIndexOrFieldID => $_aSubSectionOrField  ) {
+            foreach ( $_aSubSectionsOrFields as $_isSubSectionIndexOrFieldID => $_aSubSectionOrField ) {
                 
                 // If it's a sub section
                 if ( $this->isNumericInteger( $_isSubSectionIndexOrFieldID ) ) {
@@ -526,15 +526,15 @@ 
                 $_aField = $_aSubSectionOrField;
                 
                 // If a section is set,
-                if ( $_aField['section_id'] !== '_default' ) {
-                    if ( array_key_exists( $_aField['section_id'], $aOptions ) ) {
-                        $_aStoredOptionsNotOfTheTab[ $_aField['section_id'] ] = $aOptions[ $_aField['section_id'] ];
+                if ( $_aField[ 'section_id' ] !== '_default' ) {
+                    if ( array_key_exists( $_aField[ 'section_id' ], $aOptions ) ) {
+                        $_aStoredOptionsNotOfTheTab[ $_aField[ 'section_id' ] ] = $aOptions[ $_aField[ 'section_id' ] ];
                     }
                     continue;
                 }
                 // So it's a field
-                if ( array_key_exists( $_aField['field_id'], $aOptions ) ) {
-                    $_aStoredOptionsNotOfTheTab[ $_aField['field_id'] ] = $aOptions[ $_aField['field_id'] ];
+                if ( array_key_exists( $_aField[ 'field_id' ], $aOptions ) ) {
+                    $_aStoredOptionsNotOfTheTab[ $_aField[ 'field_id' ] ] = $aOptions[ $_aField[ 'field_id' ] ];
                 }
 
             }            
@@ -547,7 +547,7 @@ 
      * so that the externally injected options will be respected.
      * @since 3.0.0
      */
-    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {     
+    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug = '' ) {     
         $_aOtherTabOptions = $this->getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug );
         return $this->invertCastArrayContents( $aOptions, $_aOtherTabOptions );     
     }
@@ -561,17 +561,17 @@ 
      * @since       3.0.0
      * @return      array
      */
-    public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug='' ) {
+    public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug = '' ) {
         
         $_aStoredOptionsOfTheTab = array();
-        if ( ! $sTabSlug ) { 
+        if ( !$sTabSlug ) { 
             return $_aStoredOptionsOfTheTab; 
         }
         
-        foreach( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFields as $_sSectionID => $_aSubSectionsOrFields ) {
              
             // Check the section
-            if ( ! $this->_isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) ) {
+            if ( !$this->_isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) ) {
                 continue;
             }
             
@@ -596,7 +596,7 @@ 
          */
         private function _setTabOnlyOptions( array &$_aStoredOptionsOfTheTab, array $aOptions, array $_aSubSectionsOrFields, $_sSectionID ) {
             
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aField ) {
                                 
                 // if it's a sub-section array.
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -607,16 +607,16 @@ 
                 }    
                 
                 // if a section is set,
-                if ( '_default' !== $_aField['section_id'] ) {
-                    if ( array_key_exists( $_aField['section_id'], $aOptions ) ) {
-                        $_aStoredOptionsOfTheTab[ $_aField['section_id'] ] = $aOptions[ $_aField['section_id'] ];
+                if ( '_default' !== $_aField[ 'section_id' ] ) {
+                    if ( array_key_exists( $_aField[ 'section_id' ], $aOptions ) ) {
+                        $_aStoredOptionsOfTheTab[ $_aField[ 'section_id' ] ] = $aOptions[ $_aField[ 'section_id' ] ];
                     }
                     continue;
                 }
                 
                 // It does not have a section so set the field id as its key.
-                if ( array_key_exists( $_aField['field_id'], $aOptions ) ) {
-                    $_aStoredOptionsOfTheTab[ $_aField['field_id'] ] = $aOptions[ $_aField['field_id'] ];
+                if ( array_key_exists( $_aField[ 'field_id' ], $aOptions ) ) {
+                    $_aStoredOptionsOfTheTab[ $_aField[ 'field_id' ] ] = $aOptions[ $_aField[ 'field_id' ] ];
                     continue;
                 }
 
@@ -633,11 +633,11 @@ 
      */
     private function _isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) {
         
-        if ( ! isset( $this->aSections[ $_sSectionID ]['page_slug'] ) ) {
+        if ( !isset( $this->aSections[ $_sSectionID ][ 'page_slug' ] ) ) {
             return false;
         }
         return ( 
-            $sPageSlug === $this->aSections[ $_sSectionID ]['page_slug']
+            $sPageSlug === $this->aSections[ $_sSectionID ][ 'page_slug' ]
         );
     }
     
@@ -650,14 +650,14 @@ 
      */
     private function _isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) {
         
-        if ( ! $this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
+        if ( !$this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
             return false;
         }
-        if ( ! isset( $this->aSections[ $_sSectionID ]['tab_slug'] ) ) {
+        if ( !isset( $this->aSections[ $_sSectionID ][ 'tab_slug' ] ) ) {
             return false;
         }
         return (
-            $sTabSlug === $this->aSections[ $_sSectionID ]['tab_slug']
+            $sTabSlug === $this->aSections[ $_sSectionID ][ 'tab_slug' ]
         );
         
     }

Braces +14 added lines, -14 removed lines

@@ -75,7 +75,7 @@ 
      * 
      * @since       3.0.0
      */
-    public function getFieldsByPageSlug( $sPageSlug, $sTabSlug='' ) { 
+    public function getFieldsByPageSlug( $sPageSlug, $sTabSlug='' ) {
         return $this->castArrayContents( 
             $this->getSectionsByPageSlug( $sPageSlug, $sTabSlug ), 
             $this->aFields
@@ -89,11 +89,11 @@ 
     public function getSectionsByPageSlug( $sPageSlug, $sTabSlug='' ) {
         
         $_aSections = array();
-        foreach( $this->aSections as $_sSecitonID => $_aSection ) {    
-            if ( $sTabSlug && $_aSection['tab_slug'] != $sTabSlug ) { 
+        foreach( $this->aSections as $_sSecitonID => $_aSection ) {
+            if ( $sTabSlug && $_aSection['tab_slug'] != $sTabSlug ) {
                 continue; 
             }      
-            if ( $_aSection['page_slug'] != $sPageSlug ) { 
+            if ( $_aSection['page_slug'] != $sPageSlug ) {
                 continue; 
             }
             $_aSections[ $_sSecitonID ] = $_aSection;     
@@ -230,7 +230,7 @@ 
         
         $_aField = parent::formatField( $aField, $sFieldsType, $sCapability, $iCountOfElements, $iSectionIndex, $bIsSectionRepeatable, $oCallerObject );
         
-        if ( ! $_aField ) { 
+        if ( ! $_aField ) {
             return; 
         }
         $_aField['option_key']      = $this->sOptionKey;
@@ -259,16 +259,16 @@ 
         if ( ! current_user_can( $aSection['capability'] ) ) {
             return array();
         }
-        if ( ! $aSection['if'] ) { 
+        if ( ! $aSection['if'] ) {
             return array();
         }
-        if ( ! $aSection['page_slug'] ) { 
+        if ( ! $aSection['page_slug'] ) {
             return array();
         }
-        if ( 'options.php' != $this->getPageNow() && $this->sCurrentPageSlug != $aSection['page_slug'] ) { 
+        if ( 'options.php' != $this->getPageNow() && $this->sCurrentPageSlug != $aSection['page_slug'] ) {
             return array();
         }
-        if ( ! $this->_isSectionOfCurrentTab( $aSection, $this->sCurrentPageSlug, $this->sCurrentTabSlug ) ) { 
+        if ( ! $this->_isSectionOfCurrentTab( $aSection, $this->sCurrentPageSlug, $this->sCurrentTabSlug ) ) {
             return array();
         }
         return $aSection;
@@ -285,7 +285,7 @@ 
         private function _isSectionOfCurrentTab( array $aSection, $sCurrentPageSlug, $sCurrentTabSlug ) {
             
             // Make sure if it's in the loading page.
-            if ( $aSection['page_slug'] != $sCurrentPageSlug  ) { 
+            if ( $aSection['page_slug'] != $sCurrentPageSlug  ) {
                 return false; 
             }
 
@@ -372,7 +372,7 @@ 
                 
                 // @todo Examine whether this check can be removed 
                 // as the section that hods this field is already checked above outside this loop.
-                if ( $sPageSlug !== $_aField['page_slug'] ) { 
+                if ( $sPageSlug !== $_aField['page_slug'] ) {
                     continue; 
                 }        
                 
@@ -440,7 +440,7 @@ 
                 
                 // @todo Examine whether this check can be removed 
                 // as the section that hods this field is already checked above outside the loop.
-                if ( $sPageSlug === $_aField['page_slug'] ) { 
+                if ( $sPageSlug === $_aField['page_slug'] ) {
                     continue; 
                 }
              
@@ -547,7 +547,7 @@ 
      * so that the externally injected options will be respected.
      * @since 3.0.0
      */
-    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {     
+    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {
         $_aOtherTabOptions = $this->getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug );
         return $this->invertCastArrayContents( $aOptions, $_aOtherTabOptions );     
     }
@@ -564,7 +564,7 @@ 
     public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug='' ) {
         
         $_aStoredOptionsOfTheTab = array();
-        if ( ! $sTabSlug ) { 
+        if ( ! $sTabSlug ) {
             return $_aStoredOptionsOfTheTab; 
         }
         

development/factory/admin_page/model/format/AdminPageFramework_Format_InPageTab.php

Spacing +8 added lines, -8 removed lines

@@ -31,14 +31,14 @@
         'page_slug'         => null,
         'tab_slug'          => null,
         'title'             => null,
-        'order'             => 10,      // (integer)
-        'show_in_page_tab'  => true,    // 3.6.0+ (boolean)
-        'parent_tab_slug'   => null,    // this needs to be set if the above show_in_page_tab is false so that the framework can mark the parent tab to be active when the hidden page is accessed.
-        'url'               => null,    // 3.5.0+ This allows the user set custom link.
-        'disabled'          => null,    // 3.5.10+ (boolean) If true, the link will be unlinked.
-        'attributes'        => null,    // 3.5.10+ (array) Applies to the navigation tab bar element.    
-        'capability'        => null,    // 3.6.0+ (string)
-        'if'                => true,    // 3.6.0+ (boolean)
+        'order'             => 10, // (integer)
+        'show_in_page_tab'  => true, // 3.6.0+ (boolean)
+        'parent_tab_slug'   => null, // this needs to be set if the above show_in_page_tab is false so that the framework can mark the parent tab to be active when the hidden page is accessed.
+        'url'               => null, // 3.5.0+ This allows the user set custom link.
+        'disabled'          => null, // 3.5.10+ (boolean) If true, the link will be unlinked.
+        'attributes'        => null, // 3.5.10+ (array) Applies to the navigation tab bar element.    
+        'capability'        => null, // 3.6.0+ (string)
+        'if'                => true, // 3.6.0+ (boolean)
     );
     
     /**

development/factory/admin_page/model/format/AdminPageFramework_Format_InPageTabs.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     public function get() {
 
-         // Apply filters to modify the in-page tab array.
+            // Apply filters to modify the in-page tab array.
         $_aInPageTabs = $this->addAndApplyFilter(
             $this->oFactory,  // caller object
             "tabs_{$this->oFactory->oProp->sClassName}_{$this->sPageSlug}", // filter name

Spacing +3 added lines, -3 removed lines

@@ -53,14 +53,14 @@
 
          // Apply filters to modify the in-page tab array.
         $_aInPageTabs = $this->addAndApplyFilter(
-            $this->oFactory,  // caller object
+            $this->oFactory, // caller object
             "tabs_{$this->oFactory->oProp->sClassName}_{$this->sPageSlug}", // filter name
             $this->aInPageTabs     // filtering value
         );    
 
         // Added items may be missing necessary keys so format them
-        foreach( ( array ) $_aInPageTabs as $_sTabSlug => $_aInPageTab ) {
-            if ( ! is_array( $_aInPageTab ) ) {
+        foreach ( ( array ) $_aInPageTabs as $_sTabSlug => $_aInPageTab ) {
+            if ( !is_array( $_aInPageTab ) ) {
                 continue;
             }
             $_oFormatter = new AdminPageFramework_Format_InPageTab( 

development/factory/admin_page/model/format/AdminPageFramework_Format_NavigationTab_InPageTab.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
             )
         );
         
-        if ( ! $this->_isEnabled( $_aTab ) ) {
+        if ( !$this->_isEnabled( $_aTab ) ) {
             return array();
         }
                 
@@ -78,7 +78,7 @@ 
                 : esc_url( 
                     $this->getElement( 
                         $_aTab, 
-                        'url',  // if the 'url' argument is set, use it. Otherwise, use the below gnerated url.
+                        'url', // if the 'url' argument is set, use it. Otherwise, use the below gnerated url.
                         $this->getQueryAdminURL( 
                             array( 
                                 'page'  => $this->aArguments[ 'page_slug' ],
@@ -107,7 +107,7 @@ 
          * @return      boolean
          */
         private function _isEnabled( $aTab ) {
-            return ! in_array(
+            return !in_array(
                 false,
                 array(
                     ( bool ) current_user_can( $aTab[ 'capability' ] ), // whether the user has the sufficient capability level

development/factory/admin_page/model/format/AdminPageFramework_Format_PageResource_Script.php

Spacing +5 added lines, -5 removed lines

@@ -24,12 +24,12 @@ 
      * @static
      */     
     static public $aStructure = array(    
-        'src'           => null,    // (required, string) the source url or path        
+        'src'           => null, // (required, string) the source url or path        
         'handle_id'     => null,
         'dependencies'  => array(),
-        'version'       => false,       // although the type should be string, the wp_enqueue_...() functions want false as the default value.
-        'translation'   => array(),     // only for scripts
-        'in_footer'     => false,       // only for scripts
+        'version'       => false, // although the type should be string, the wp_enqueue_...() functions want false as the default value.
+        'translation'   => array(), // only for scripts
+        'in_footer'     => false, // only for scripts
         // 'attributes'    => null,    // (optional, array) [3.3.0+] attributes array. `array( 'data-id' => '...' )`
     );        
     
@@ -42,7 +42,7 @@ 
         $_aParameters = func_get_args() + array( 
             $this->asSubject, 
         );
-        $this->asSubject             = $_aParameters[ 0 ];
+        $this->asSubject = $_aParameters[ 0 ];
     }
     
     /**

development/factory/admin_page/model/format/AdminPageFramework_Format_PageResource_Style.php

Spacing +6 added lines, -6 removed lines

@@ -24,11 +24,11 @@ 
      * @static
      */     
     static public $aStructure = array(    
-        'src'           => null,    // (required, string) the source url or path
-        'handle_id'     => null,    // (optional, string) The handle ID of the stylesheet
-        'dependencies'  => null,    // (optional, array) The dependency array.
-        'version'       => null,    // (optional, string) The stylesheet version number.
-        'media'         => null,    // (optional, string) the description of the field which is inserted into the after the input field tag.
+        'src'           => null, // (required, string) the source url or path
+        'handle_id'     => null, // (optional, string) The handle ID of the stylesheet
+        'dependencies'  => null, // (optional, array) The dependency array.
+        'version'       => null, // (optional, string) The stylesheet version number.
+        'media'         => null, // (optional, string) the description of the field which is inserted into the after the input field tag.
         // 'attributes'    => null,    // (optional, array) [3.3.0+] attributes array. `array( 'data-id' => '...' )`
     );        
     
@@ -41,7 +41,7 @@ 
         $_aParameters = func_get_args() + array( 
             $this->asSubject, 
         );
-        $this->asSubject             = $_aParameters[ 0 ];
+        $this->asSubject = $_aParameters[ 0 ];
     }
     
     /**