michaeluno / admin-page-framework

development/factory/admin_page/_controller/AdminPageFramework_Resource_Page.php

Spacing +25 added lines, -25 removed lines

@@ -45,7 +45,7 @@ 
         
         // tab 
         if ( $_sPageSlug && $_sTabSlug ) {
-            $this->oProp->sStyle     = $this->addAndApplyFilters( 
+            $this->oProp->sStyle = $this->addAndApplyFilters( 
                 $_oCaller, 
                 "style_{$_sPageSlug}_{$_sTabSlug}", 
                 $this->oProp->sStyle 
@@ -54,7 +54,7 @@ 
         
         // page
         if ( $_sPageSlug ) {
-            $this->oProp->sStyle     = $this->addAndApplyFilters( 
+            $this->oProp->sStyle = $this->addAndApplyFilters( 
                 $_oCaller, 
                 "style_{$_sPageSlug}", 
                 $this->oProp->sStyle 
@@ -88,7 +88,7 @@ 
          * @return      string      The tab slug if the tab has been added.
          */
         private function _getCurrentTabSlugForFilter( $sPageSlug ) {
-            $_sTabSlug  = $this->oProp->getCurrentTabSlug( $sPageSlug ); 
+            $_sTabSlug = $this->oProp->getCurrentTabSlug( $sPageSlug ); 
             return isset( $this->oProp->aInPageTabs[ $sPageSlug ][ $_sTabSlug ] )
                 ? $_sTabSlug
                 : '';          
@@ -116,7 +116,7 @@ 
         
         // tab 
         if ( $_sPageSlug && $_sTabSlug ) {
-            $this->oProp->sScript     = $this->addAndApplyFilters( 
+            $this->oProp->sScript = $this->addAndApplyFilters( 
                 $_oCaller, 
                 "script_{$_sPageSlug}_{$_sTabSlug}", 
                 $this->oProp->sScript 
@@ -125,7 +125,7 @@ 
         
         // page
         if ( $_sPageSlug ) {
-            $this->oProp->sScript     = $this->addAndApplyFilters( 
+            $this->oProp->sScript = $this->addAndApplyFilters( 
                 $_oCaller, 
                 "script_{$_sPageSlug}", 
                 $this->oProp->sScript 
@@ -143,11 +143,11 @@ 
      * @since 2.1.5
      * @internal
      */
-    public function _enqueueStyles( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueStyles( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         
         $_aHandleIDs = array();
-        foreach( ( array ) $aSRCs as $_sSRC ) {
-            $_aHandleIDs[] = $this->_enqueueStyle( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
+        foreach ( ( array ) $aSRCs as $_sSRC ) {
+            $_aHandleIDs[ ] = $this->_enqueueStyle( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
         return $_aHandleIDs;
         
@@ -173,7 +173,7 @@ 
      * @return      string  The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      * @internal
      */    
-    public function _enqueueStyle( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueStyle( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         return $this->_enqueueResourceByType( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs, 'style' );        
     }
     
@@ -182,11 +182,11 @@ 
      * 
      * @since 2.1.5
      */
-    public function _enqueueScripts( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueScripts( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         
         $_aHandleIDs = array();
-        foreach( ( array ) $aSRCs as $_sSRC ) {
-            $_aHandleIDs[] = $this->_enqueueScript( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
+        foreach ( ( array ) $aSRCs as $_sSRC ) {
+            $_aHandleIDs[ ] = $this->_enqueueScript( $_sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
         return $_aHandleIDs;
         
@@ -213,7 +213,7 @@ 
      * @return      string      The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      * @internal
      */
-    public function _enqueueScript( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function _enqueueScript( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         return $this->_enqueueResourceByType( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs, 'script' );
     }
         /**
@@ -226,20 +226,20 @@ 
          * @param       array       $aCustomArgs    A custom argument array.
          * @param       string      $sType          Accepts 'style' or 'script'
          */
-        private function _enqueueResourceByType( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array(), $sType='style' ) {
+        private function _enqueueResourceByType( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array(), $sType = 'style' ) {
             
-            $sSRC       = trim( $sSRC );
+            $sSRC = trim( $sSRC );
             if ( empty( $sSRC ) ) { 
                 return ''; 
             }
-            $sSRC       = $this->getResolvedSRC( $sSRC );
+            $sSRC = $this->getResolvedSRC( $sSRC );
 
             // Get the property name for the type
             $_sContainerPropertyName     = $this->_getContainerPropertyNameByType( $sType );
             $_sEnqueuedIndexPropertyName = $this->_getEnqueuedIndexPropertyNameByType( $sType );
             
             // setting the key based on the url prevents duplicate items
-            $_sSRCHash  = md5( $sSRC );
+            $_sSRCHash = md5( $sSRC );
             if ( isset( $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ] ) ) { 
                 return ''; 
             } 
@@ -250,13 +250,13 @@ 
                     'sTabSlug'  => $sTabSlug,
                     'sSRC'      => $sSRC,
                     'sType'     => $sType,
-                    'handle_id' => $sType . '_' . $this->oProp->sClassName . '_' .  ( ++$this->oProp->{$_sEnqueuedIndexPropertyName} ),
+                    'handle_id' => $sType.'_'.$this->oProp->sClassName.'_'.( ++$this->oProp->{$_sEnqueuedIndexPropertyName} ),
                 )
                 + self::$_aStructure_EnqueuingResources
                 ;
 
             // Store the attributes in another container by url.
-            $this->oProp->aResourceAttributes[ $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ]['handle_id'] ] = $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ]['attributes'];
+            $this->oProp->aResourceAttributes[ $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'handle_id' ] ] = $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'attributes' ];
             
             return $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ][ 'handle_id' ];
             
@@ -296,7 +296,7 @@ 
      * @since       3.0.0
      * @internal
      */
-    public function _forceToEnqueueStyle( $sSRC, $aCustomArgs=array() ) {
+    public function _forceToEnqueueStyle( $sSRC, $aCustomArgs = array() ) {
         return $this->_enqueueStyle( $sSRC, '', '', $aCustomArgs );
     }
     /**
@@ -306,7 +306,7 @@ 
      * @since       3.0.0
      * @internal
      */    
-    public function _forceToEnqueueScript( $sSRC, $aCustomArgs=array() ) {
+    public function _forceToEnqueueScript( $sSRC, $aCustomArgs = array() ) {
         return $this->_enqueueScript( $sSRC, '', '', $aCustomArgs );
     }
     
@@ -323,11 +323,11 @@ 
 
         $sCurrentPageSlug   = $this->oProp->getCurrentPageSlug();
         $sCurrentTabSlug    = $this->oProp->getCurrentTabSlug( $sCurrentPageSlug );
-        $sPageSlug          = $aEnqueueItem['sPageSlug'];
-        $sTabSlug           = $aEnqueueItem['sTabSlug'];
+        $sPageSlug          = $aEnqueueItem[ 'sPageSlug' ];
+        $sTabSlug           = $aEnqueueItem[ 'sTabSlug' ];
 
         // If the page slug is not specified and the currently loading page is one of the pages that is added by the framework,
-        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
+        if ( !$sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
             return $this->_enqueueSRC( $aEnqueueItem );
         }
                 
@@ -342,7 +342,7 @@ 
         // If the tab slug is not specified and the page slug is specified, 
         // and if the current loading page slug and the specified one matches,
         if ( 
-            ( $sPageSlug && ! $sTabSlug )
+            ( $sPageSlug && !$sTabSlug )
             && ( $sCurrentPageSlug == $sPageSlug )
         ) {
             return $this->_enqueueSRC( $aEnqueueItem );

Braces +4 added lines, -3 removed lines

@@ -229,7 +229,7 @@ 
         private function _enqueueResourceByType( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array(), $sType='style' ) {
             
             $sSRC       = trim( $sSRC );
-            if ( empty( $sSRC ) ) { 
+            if ( empty( $sSRC ) ) {
                 return ''; 
             }
             $sSRC       = $this->getResolvedSRC( $sSRC );
@@ -240,7 +240,7 @@ 
             
             // setting the key based on the url prevents duplicate items
             $_sSRCHash  = md5( $sSRC );
-            if ( isset( $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ] ) ) { 
+            if ( isset( $this->oProp->{$_sContainerPropertyName}[ $_sSRCHash ] ) ) {
                 return ''; 
             } 
             
@@ -327,7 +327,8 @@ 
         $sTabSlug           = $aEnqueueItem['sTabSlug'];
 
         // If the page slug is not specified and the currently loading page is one of the pages that is added by the framework,
-        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) { // means script-global(among pages added by the framework)
+        if ( ! $sPageSlug && $this->oProp->isPageAdded( $sCurrentPageSlug ) ) {
+// means script-global(among pages added by the framework)
             return $this->_enqueueSRC( $aEnqueueItem );
         }
                 

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-2015 Michael Uno; Licensed MIT
- * 
- */
+     * Admin Page Framework
+     * 
+     * http://en.michaeluno.jp/admin-page-framework/
+     * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
+     * 
+     */
 
 /**
  * Provides methods for creating fields in the taxonomy page (edit-tags.php).

development/factory/admin_page/_model/AdminPageFramework_CustomSubmitFields.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
     public function __construct( array $aPostElement ) {
             
         $this->aPost    = $aPostElement;
-        $this->sInputID = $this->getInputID( $aPostElement['submit'] ); // the submit element must be set by the field type.
+        $this->sInputID = $this->getInputID( $aPostElement[ 'submit' ] ); // the submit element must be set by the field type.
     
     }
     
@@ -47,10 +47,10 @@ 
      * @since   2.0.0
      * @since   3.4.0   Changed the name from `getElement()`.
      */ 
-    protected function getSubmitValueByType( $aElement, $sInputID, $sElementKey='format' ) {
+    protected function getSubmitValueByType( $aElement, $sInputID, $sElementKey = 'format' ) {
             
         return $this->getElement( 
-            $aElement,  // subject array
+            $aElement, // subject array
             array( $sInputID, $sElementKey ), // dimensional keys
             null    // default
         );
@@ -80,7 +80,7 @@ 
         // Only the pressed element will be stored in the array.
         // The input tag: name="__import[submit][my_section_my_import_field_the_index]" value="Import Button"
         // The array structure:  array( 'my_section_my_import_field_the_index' => 'Import Button' )
-        foreach( $aSubmitElement as $sInputID => $v ) { // $aSubmitElement should have been set in the constructor.
+        foreach ( $aSubmitElement as $sInputID => $v ) { // $aSubmitElement should have been set in the constructor.
             $this->sInputID = $sInputID;
             return $this->sInputID;
         }     

Braces +3 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
      * 
      * @since 2.1.5
      */
-    public function getSiblingValue( $sKey ) {    
+    public function getSiblingValue( $sKey ) {
         return $this->getSubmitValueByType( $this->aPost, $this->sInputID, $sKey );
     }
     
@@ -80,7 +80,8 @@ 
         // Only the pressed element will be stored in the array.
         // The input tag: name="__import[submit][my_section_my_import_field_the_index]" value="Import Button"
         // The array structure:  array( 'my_section_my_import_field_the_index' => 'Import Button' )
-        foreach( $aSubmitElement as $sInputID => $v ) { // $aSubmitElement should have been set in the constructor.
+        foreach( $aSubmitElement as $sInputID => $v ) {
+// $aSubmitElement should have been set in the constructor.
             $this->sInputID = $sInputID;
             return $this->sInputID;
         }     

development/factory/admin_page/_model/AdminPageFramework_ExportOptions.php

Spacing +5 added lines, -5 removed lines

@@ -94,9 +94,9 @@ 
      * @since       2.0.0
      * @since       3.5.4       Added the `$aHeader` parameter. Deprecated the `$sFileName` parameter as it is included in the $aHeader definition.
      */ 
-    public function doExport( $vData, $sFormatType=null, array $aHeader=array() ) {
+    public function doExport( $vData, $sFormatType = null, array $aHeader = array() ) {
 
-        $sFormatType    = isset( $sFormatType ) 
+        $sFormatType = isset( $sFormatType ) 
             ? $sFormatType 
             : $this->sFormatType;
 
@@ -122,9 +122,9 @@ 
          * @since       3.5.4
          * @return      void
          */
-        private function _outputHTTPHeader( array $aHeader, $sKey='' ) {
+        private function _outputHTTPHeader( array $aHeader, $sKey = '' ) {
             
-            foreach( $aHeader as $_sKey => $_asValue ) {
+            foreach ( $aHeader as $_sKey => $_asValue ) {
                 
                 // Nested items. Set the key to overrider array keys.
                 if ( is_array( $_asValue ) ) {
@@ -164,7 +164,7 @@ 
                     return;
                 case 'json': // for json.
                     echo json_encode( ( array ) $vData );
-                    return ;
+                    return;
                 case 'array': // for serialized PHP array.
                 default: // for anything else, 
                     echo serialize( ( array ) $vData );

development/factory/admin_page/_model/delegate/AdminPageFramework_Model__FormRedirectHandler.php

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct( $oFactory ) {
        
-        $this->oFactory         = $oFactory;        
+        $this->oFactory = $oFactory;        
         
         // wp_mail() will be loaded by the time 'after_setup_theme' is loaded.
         // @deprecated      DEVVER
@@ -52,18 +52,18 @@ 
      */
     public function _replyToCheckRedirects() {
   
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
 
         // The redirect transient key.
-        $_sTransient = 'apf_rurl' . md5( 
-            trim( "redirect_{$this->oFactory->oProp->sClassName}_{$_GET['page']}" )
+        $_sTransient = 'apf_rurl'.md5( 
+            trim( "redirect_{$this->oFactory->oProp->sClassName}_{$_GET[ 'page' ]}" )
         );
         
         // Check the settings error transient.
         $_aError = $this->oFactory->_getFieldErrors( $_GET[ 'page' ], false );
-        if ( ! empty( $_aError ) ) {
+        if ( !empty( $_aError ) ) {
             $this->deleteTransient( $_sTransient ); // we don't need it any more.
             return;
         }
@@ -90,7 +90,7 @@ 
         private function _shouldProceed() {
 
             // Check if it's one of the plugin's added page. If not, do nothing.
-            if ( ! $this->oFactory->_isInThePage() ) {
+            if ( !$this->oFactory->_isInThePage() ) {
                 return false;
             }
             
@@ -103,7 +103,7 @@ 
                 'settings-updated',
                 false
             );            
-            if ( ! $_bsSettingsUpdatedFlag ) {
+            if ( !$_bsSettingsUpdatedFlag ) {
                 return false;
             }
             

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

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
         $this->oFactory = $oFactory;
         
         add_filter(
-            "validation_pre_" . $this->oFactory->oProp->sClassName,
+            "validation_pre_".$this->oFactory->oProp->sClassName,
             array( $this, '_replyToValiateUserFormInputs' ),
             10,
             4
@@ -61,7 +61,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' ), 
@@ -85,7 +85,7 @@ 
                 'AdminPageFramework_Model__FormSubmission__Validator__ContactFormConfirm',
                 
             );
-            foreach( $_aClassNames as $_sClassName ) {
+            foreach ( $_aClassNames as $_sClassName ) {
                 new $_sClassName( $this->oFactory );
             }
             
@@ -94,7 +94,7 @@ 
                 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_before_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_before_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,
@@ -113,7 +113,7 @@ 
 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_after_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_after_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,

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__ContactForm.php

Spacing +9 added lines, -9 removed lines

@@ -34,11 +34,11 @@ 
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
                 
         // Check whether sending an email has been confirmed by the user or not.
-        $_bConfirmedToSendEmail     = ( bool ) $this->_getPressedSubmitButtonData( 
+        $_bConfirmedToSendEmail = ( bool ) $this->_getPressedSubmitButtonData( 
             $aSubmits, 
             'confirmed_sending_email' 
         );
-        if ( ! $_bConfirmedToSendEmail ) {
+        if ( !$_bConfirmedToSendEmail ) {
             return;
         }
         
@@ -49,13 +49,13 @@ 
             $this->getElement( $aSubmitInformation, 'section_id' )
         );
         $this->oFactory->oProp->_bDisableSavingOptions = true;
-        $this->deleteTransient( 'apf_tfd' . md5( 'temporary_form_data_' . $this->oFactory->oProp->sClassName . get_current_user_id() ) );
+        $this->deleteTransient( 'apf_tfd'.md5( 'temporary_form_data_'.$this->oFactory->oProp->sClassName.get_current_user_id() ) );
         
         // Schedule to remove the confirmation url query key.
         add_action( "setting_update_url_{$this->oFactory->oProp->sClassName}", array( $this, '_replyToRemoveConfirmationQueryKey' ) );
         
         // 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 = $aInputs;
         throw $_oException;
     
@@ -73,7 +73,7 @@ 
          */
         private function _sendEmailInBackground( $aInputs, $sPressedInputNameFlat, $sSubmitSectionID ) {
             
-            $_sTranskentKey = 'apf_em_' . md5( $sPressedInputNameFlat . get_current_user_id() );
+            $_sTranskentKey = 'apf_em_'.md5( $sPressedInputNameFlat.get_current_user_id() );
             $_aEmailOptions = $this->getTransient( $_sTranskentKey );
             $this->deleteTransient( $_sTranskentKey );
 
@@ -88,13 +88,13 @@ 
                 'name'          => '',
             );
 
-            $_sTransientKey  = 'apf_emd_' . md5( $sPressedInputNameFlat . get_current_user_id() );
+            $_sTransientKey  = 'apf_emd_'.md5( $sPressedInputNameFlat.get_current_user_id() );
             $_aFormEmailData = array(
                 'email_options' => $_aEmailOptions,
                 'input'         => $aInputs,
                 'section_id'    => $sSubmitSectionID,
             );
-            $_bIsSet = $this->setTransient( $_sTransientKey,  $_aFormEmailData, 100 );
+            $_bIsSet = $this->setTransient( $_sTransientKey, $_aFormEmailData, 100 );
             
             // Send the email in the background.
             wp_remote_get( 
@@ -112,7 +112,7 @@ 
             );  
             
             // @remark      Not possible to tell whether it is sent or not at the moment because it is performed in the background.
-            $_bSent      = $_bIsSet;    
+            $_bSent = $_bIsSet;    
             $this->oFactory->setSettingNotice( 
                 $this->oFactory->oMsg->get( 
                     $this->getAOrB( 
@@ -134,7 +134,7 @@ 
          * @return      string
          */
         public function _replyToRemoveConfirmationQueryKey( $sSettingUpdateURL ) {
-            return remove_query_arg( array( 'confirmation', ), $sSettingUpdateURL );
+            return remove_query_arg( array( 'confirmation',), $sSettingUpdateURL );
         }      
         
 }
\ No newline at end of file

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

Spacing +3 added lines, -3 removed lines

@@ -36,11 +36,11 @@ 
         if ( $this->oFactory->hasFieldError() ) {
             return;
         }
-        $_bConfirmingToSendEmail    = ( bool ) $this->_getPressedSubmitButtonData( 
+        $_bConfirmingToSendEmail = ( bool ) $this->_getPressedSubmitButtonData( 
             $aSubmits, 
             'confirming_sending_email' 
         );
-        if ( ! $_bConfirmingToSendEmail ) {
+        if ( !$_bConfirmingToSendEmail ) {
             return;
         }
 
@@ -53,7 +53,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/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->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( $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' ]; 
                 }
 

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-2015 Michael Uno; Licensed MIT
- * 
- */
+         * Admin Page Framework
+         * 
+         * http://en.michaeluno.jp/admin-page-framework/
+         * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
+         * 
+         */
 
 /**
  * Provides methods to handle importing options.