michaeluno / admin-page-framework

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

Spacing +5 added lines, -5 removed lines

@@ -28,13 +28,13 @@ 
      */
     public function __construct( $oFactory ) {
        
-        $this->oFactory         = $oFactory;        
+        $this->oFactory = $oFactory;        
 
         // Form emails.
-        if ( ! isset( $_GET[ 'apf_action' ], $_GET[ 'transient' ] ) ) {
+        if ( !isset( $_GET[ 'apf_action' ], $_GET[ 'transient' ] ) ) {
             return;
         }
-        if ( 'email' !== $_GET['apf_action'] ) {
+        if ( 'email' !== $_GET[ 'apf_action' ] ) {
             return;
         }
       
@@ -73,12 +73,12 @@ 
             self::$_bDoneEmail = true;
 
             $_sTransient = $this->getElement( $_GET, 'transient', '' );
-            if ( ! $_sTransient ) {
+            if ( !$_sTransient ) {
                 return;
             }
             $_aFormEmail = $this->getTransient( $_sTransient );
             $this->deleteTransient( $_sTransient );
-            if ( ! is_array( $_aFormEmail ) ) {
+            if ( !is_array( $_aFormEmail ) ) {
                 return;
             }
 

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/AdminPageFramework_Model_FormRegistration.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct( $oFactory ) {
        
-        $this->oFactory         = $oFactory;        
+        $this->oFactory = $oFactory;        
         
         add_action( 
             "load_after_{$this->oFactory->oProp->sClassName}", 
@@ -60,7 +60,7 @@ 
      */ 
     public function _replyToRegisterSettings() {
 
-        if ( ! $this->oFactory->_isInThePage() ) { 
+        if ( !$this->oFactory->_isInThePage() ) { 
             return;
         }
 
@@ -70,7 +70,7 @@ 
             "sections_{$this->oFactory->oProp->sClassName}", 
             $this->oFactory->oForm->aSections 
         );
-        foreach( $this->oFactory->oForm->aFields as $_sSectionID => &$_aFields ) {
+        foreach ( $this->oFactory->oForm->aFields as $_sSectionID => &$_aFields ) {
             $_aFields = $this->addAndApplyFilter( // Parameters: $oCallerObject, $aFilters, $vInput, $vArgs...
                 $this->oFactory,
                 "fields_{$this->oFactory->oProp->sClassName}_{$_sSectionID}",
@@ -111,7 +111,7 @@ 
         $this->oFactory->loadFieldTypeDefinitions();
 
         /* 4. Set up the contextual help pane for sections. */ 
-        foreach( $this->oFactory->oForm->aConditionedSections as $_aSection ) {
+        foreach ( $this->oFactory->oForm->aConditionedSections as $_aSection ) {
                                     
             if ( empty( $_aSection[ 'help' ] ) ) {
                 continue;

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */ 
     public function _replyToRegisterSettings() {
 
-        if ( ! $this->oFactory->_isInThePage() ) { 
+        if ( ! $this->oFactory->_isInThePage() ) {
             return;
         }
 

development/factory/admin_page/model/delegate/AdminPageFramework_Model_FormSubmission.php

Spacing +14 added lines, -14 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function __construct( $oFactory ) {
        
-        $this->oFactory         = $oFactory;        
+        $this->oFactory = $oFactory;        
                 
         // add_action
         add_action( 
@@ -70,7 +70,7 @@ 
      */    
     public function _replyToProcessFormData() {
         
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
 
@@ -120,7 +120,7 @@ 
         new AdminPageFramework_Model_FormSubmission_Validator( $this->oFactory );
         
         // [3.6.3+] Apply filters. All sub-routines of handling form submit data use this filter hook.
-        $_aInputs    = $this->addAndApplyFilters(    
+        $_aInputs = $this->addAndApplyFilters(    
             $this->oFactory, 
             "validation_pre_{$this->oFactory->oProp->sClassName}", 
             $_aInputs,
@@ -131,7 +131,7 @@ 
         
         // Save the data.
         $_bUpdated = false;
-        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {  
+        if ( !$this->oFactory->oProp->_bDisableSavingOptions ) {  
             $_bUpdated = $this->oFactory->oProp->updateOption( $_aInputs );
         }
 
@@ -172,7 +172,7 @@ 
         private function _shouldProceed() {
             
             if ( 
-                ! isset( 
+                !isset( 
                     $_POST[ 'admin_page_framework_start' ], // indicates the framework form is started
                     $_POST[ '_wp_http_referer' ]
                 ) 
@@ -189,7 +189,7 @@ 
             
             // Check if all the form fields are sent. 
             if (
-                ! isset(
+                !isset(
                     // these keys are supposed to be embedded at the end of the form.
                     // if the server truncates the form input values for `max_input_vars`, these will be lost in PHP 5.3.9 or above.
                     $_POST[ '_is_admin_page_framework' ], // holds the form nonce
@@ -209,7 +209,7 @@ 
                 return false;
             }
                         
-            $_sNonceTransientKey = 'form_' . md5( $this->oFactory->oProp->sClassName . get_current_user_id() );
+            $_sNonceTransientKey = 'form_'.md5( $this->oFactory->oProp->sClassName.get_current_user_id() );
             if ( $_POST[ '_is_admin_page_framework' ] !== $this->getTransient( $_sNonceTransientKey ) ) {
                 $this->oFactory->setAdminNotice( $this->oFactory->oMsg->get( 'nonce_verification_failed' ) );
                 return false;
@@ -227,12 +227,12 @@ 
          */
         private function _getUserInputsFromPOST() {
 
-            $_aInputs     = $this->getElementAsArray( 
+            $_aInputs = $this->getElementAsArray( 
                 $_POST, 
                 $this->oFactory->oProp->sOptionKey, 
                 array() 
             );
-            $_aInputs     = stripslashes_deep( $_aInputs );  
+            $_aInputs = stripslashes_deep( $_aInputs );  
             return $this->oFactory->getSortedInputs( $_aInputs ); // 3.6.0+
         
         }        
@@ -250,7 +250,7 @@ 
             // Warnings for deprecated hooks.
             if ( has_action( "submit_{$this->oFactory->oProp->sClassName}_{$_sPressedInputID}" ) ) {
                 trigger_error( 
-                    'Admin Page Framework: ' . ' : ' 
+                    'Admin Page Framework: '.' : ' 
                         . sprintf( 
                             __( 'The hook <code>%1$s</code>is deprecated. Use <code>%2$s</code> instead.', $this->oFactory->oProp->sTextDomain ), 
                             "submit_{instantiated class name}_{pressed input id}", 
@@ -263,7 +263,7 @@ 
                 $this->oFactory,
                 array( 
                     // @todo deprecate the hook with the input ID
-                    "submit_{$this->oFactory->oProp->sClassName}_{$_sPressedInputID}",  // will be deprecated in near future release
+                    "submit_{$this->oFactory->oProp->sClassName}_{$_sPressedInputID}", // will be deprecated in near future release
                     $_sSubmitSectionID 
                         ? "submit_{$this->oFactory->oProp->sClassName}_{$_sSubmitSectionID}_{$_sPressedFieldID}" 
                         : "submit_{$this->oFactory->oProp->sClassName}_{$_sPressedFieldID}",
@@ -346,9 +346,9 @@ 
             
             // Drop the 'field_errors' key.
             $_aRemoveQueries = array();
-            if ( ! isset( $aStatus[ 'field_errors' ] ) || ! $aStatus[ 'field_errors' ] ) {
+            if ( !isset( $aStatus[ 'field_errors' ] ) || !$aStatus[ 'field_errors' ] ) {
                 unset( $aStatus[ 'field_errors' ] );
-                $_aRemoveQueries[] = 'field_errors';
+                $_aRemoveQueries[ ] = 'field_errors';
             }        
          
             return $this->addAndApplyFilters(    // 3.4.4+
@@ -373,7 +373,7 @@ 
          */
         private function _removePageElements( $aOptions, $sPageSlug, $sTabSlug ) {
             
-            if ( ! $sPageSlug && ! $sTabSlug ) {
+            if ( !$sPageSlug && !$sTabSlug ) {
                 return $aOptions;
             }
             

Braces +4 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
         
         // Save the data.
         $_bUpdated = false;
-        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {  
+        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {
             $_bUpdated = $this->oFactory->oProp->updateOption( $_aInputs );
         }
 
@@ -181,14 +181,15 @@ 
                     $_POST[ 'admin_page_framework_start' ], // indicates the framework form is started
                     $_POST[ '_wp_http_referer' ]
                 ) 
-            ) {     
+            ) {
                 return false;
             }
             
             // Referrer
             $_sRequestURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), wp_unslash( $_SERVER[ 'REQUEST_URI' ] ) );
             $_sReffererURI  = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), $_POST[ '_wp_http_referer' ] );
-            if ( $_sRequestURI != $_sReffererURI ) { // see the function definition of wp_referer_field() in functions.php.
+            if ( $_sRequestURI != $_sReffererURI ) {
+// see the function definition of wp_referer_field() in functions.php.
                 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' ),