michaeluno / admin-page-framework

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

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
             : 'add_filter';
             
         $_sFunctionName(
-            $this->sActionHookPrefix . $this->oFactory->oProp->sClassName,
+            $this->sActionHookPrefix.$this->oFactory->oProp->sClassName,
             array( $this, $this->sCallbackName ),
             $this->iHookPriority,
             $this->iCallbackParameters
@@ -56,17 +56,17 @@ 
      * @since   3.6.3       Moved from `AdminPageFramework_Validation`.
      * @return  array       The intact stored options.
      */
-    protected function _confirmSubmitButtonAction( $sPressedInputName, $sSectionID, $sType='reset' ) {
+    protected function _confirmSubmitButtonAction( $sPressedInputName, $sSectionID, $sType = 'reset' ) {
         
-        switch( $sType ) {
+        switch ( $sType ) {
             default:
             case 'reset':
                 $_sFieldErrorMessage = $this->oFactory->oMsg->get( 'reset_options' );
-                $_sTransientKey      =  'apf_rc_' . md5( $sPressedInputName . get_current_user_id() );
+                $_sTransientKey      = 'apf_rc_'.md5( $sPressedInputName.get_current_user_id() );
                 break;
             case 'email':
                 $_sFieldErrorMessage = $this->oFactory->oMsg->get( 'send_email' );
-                $_sTransientKey      =  'apf_ec_' . md5( $sPressedInputName . get_current_user_id() );
+                $_sTransientKey      = 'apf_ec_'.md5( $sPressedInputName.get_current_user_id() );
                 break;                
         }
         
@@ -88,7 +88,7 @@ 
         $this->oFactory->setFieldErrors( $_aErrors );
             
         // Set a flag that the confirmation is displayed
-        $this->setTransient( $_sTransientKey, $sPressedInputName, 60*2 );
+        $this->setTransient( $_sTransientKey, $sPressedInputName, 60 * 2 );
         
         // Set the admin notice
         $this->oFactory->setSettingNotice( $this->oFactory->oMsg->get( 'confirm_perform_task' ), 'error confirmation' );

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

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' ]; 
                 }
 

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->sStructureType;
-                if ( ! isset( $_POST[ $_sUnsetKey ] ) ) {
+                $_sUnsetKey = '__unset_'.$this->oFactory->oProp->sStructureType;
+                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( 
+                $_aOtherTabOptions = $this->oFactory->oForm->getOtherTabOptions( 
                     $aData[ 'aStoredData' ], 
                     $aData[ 'sPageSlug' ], 
                     $aData[ 'sTabSlug' ] 
@@ -345,7 +345,7 @@ 
              */
             private function _validatePageFields( array $aData ) {
            
-                if ( ! $aData[ 'sPageSlug' ] ) { 
+                if ( !$aData[ 'sPageSlug' ] ) { 
                     return $aData[ 'aInput' ]; 
                 }
 
@@ -357,7 +357,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 
                 );                
 
@@ -370,15 +370,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
                     );    
@@ -433,13 +433,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+
                     );                    
                 }  

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Admin Page Framework
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
- * 
- */
+         * Admin Page Framework
+         * 
+         * http://en.michaeluno.jp/admin-page-framework/
+         * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
+         * 
+         */
 
 /**
  * Provides utility methods which can be accessed among different components of the framework.

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/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 ];
     }
     
     /**

development/factory/admin_page/_model/format/AdminPageFramework_Format_SubMenuItem.php

Indentation -1 removed lines

@@ -19,7 +19,6 @@
     
     /**
      * Represents the structure of the sub-field definition array.
-  
      */
     static public $aStructure = array(
     );