michaeluno / admin-page-framework

development/factory/term_meta/AdminPageFramework_TermMeta_Model.php

Spacing +8 added lines, -8 removed lines

@@ -55,10 +55,10 @@ 
      * @since       3.8.0
      * @internal
      */
-    protected function _setOptionArray( $iTermID=null, $_deprecated=null ) {
+    protected function _setOptionArray( $iTermID = null, $_deprecated = null ) {
         $this->oForm->aSavedData = $this->oUtil->addAndApplyFilter(
             $this, // the caller factory object
-            'options_' . $this->oProp->sClassName,
+            'options_'.$this->oProp->sClassName,
             $this->_getSavedTermMetas( $iTermID, $this->oForm->aFieldsets )
             // @todo maybe pass the term id because the user will not know whihch form data is
         );
@@ -90,27 +90,27 @@ 
      */
     public function _replyToValidateOptions( $iTermID ) {
 
-        if ( ! $this->_shouldProceedValidation() ) {
+        if ( !$this->_shouldProceedValidation() ) {
             return;
         }
 
         $_aSavedFormData        = $this->_getSavedTermMetas( $iTermID, $this->oForm->aFieldsets );
-        $_aSubmittedFormData    = $this->oForm->getSubmittedData( $this->oForm->getHTTPRequestSanitized( $_POST ) );    // sanitization done
+        $_aSubmittedFormData    = $this->oForm->getSubmittedData( $this->oForm->getHTTPRequestSanitized( $_POST ) ); // sanitization done
         $_aSubmittedFormData    = $this->oUtil->addAndApplyFilters(
             $this,
-            'validation_' . $this->oProp->sClassName,
+            'validation_'.$this->oProp->sClassName,
             call_user_func_array(       // 1st param
                 array( $this, 'validate' ), // triggers __call()
                 array( $_aSubmittedFormData, $_aSavedFormData, $this )
             ), // 3.5.10+
-            $_aSavedFormData,   // 2nd param
+            $_aSavedFormData, // 2nd param
             $this   // 3rd param
         );
 
         // @todo Update term metas
         $this->oForm->updateMetaDataByType(
-            $iTermID,  // object id
-            $_aSubmittedFormData,  // user submit form data
+            $iTermID, // object id
+            $_aSubmittedFormData, // user submit form data
             $this->oForm->dropRepeatableElements( $_aSavedFormData ), // Drop repeatable section elements from the saved meta array.
             $this->oForm->sStructureType   // fields type
         );

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

Braces +4 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
      * @return      null|string     Returns `null` if no value is found and the associated link url if found. 
      * Otherwise, the found value.
      */ 
-    protected function _getPressedSubmitButtonData( array $aPostElements, $sTargetKey='field_id' ) {    
+    protected function _getPressedSubmitButtonData( array $aPostElements, $sTargetKey='field_id' ) {
 
         foreach( $aPostElements as $_sInputID => $_aSubElements ) {
             
@@ -58,7 +58,8 @@ 
             $_aNameKeys = explode( '|', $_aSubElements[ 'name' ] ); 
             
             // If the element is not found, skip.
-            if ( null === $this->getElement( $_POST, $_aNameKeys, null ) ) {    // sanitization unnecessary
+            if ( null === $this->getElement( $_POST, $_aNameKeys, null ) ) {
+// sanitization unnecessary
                 continue;
             }
             
@@ -85,7 +86,7 @@ 
      */
     protected function _setSettingNoticeAfterValidation( $bIsInputEmtpy ) {
      
-        if ( $this->oFactory->hasSettingNotice() ) {     
+        if ( $this->oFactory->hasSettingNotice() ) {
             return;
         }
         $this->oFactory->setSettingNotice(  

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

Spacing +6 added lines, -6 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      3.7.0
@@ -52,17 +52,17 @@ 
      */
     public function _replyToCheckRedirects() {
 
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
 
         // The redirect transient key.
         $_sPageSlug  = $this->getHTTPQueryGET( 'page', '' );
-        $_sTransient = 'apf_rurl' . md5( trim( "redirect_{$this->oFactory->oProp->sClassName}_{$_sPageSlug}" ) );
+        $_sTransient = 'apf_rurl'.md5( trim( "redirect_{$this->oFactory->oProp->sClassName}_{$_sPageSlug}" ) );
 
         // Check the settings error transient.
         $_aError = $this->oFactory->getFieldErrors();
-        if ( ! empty( $_aError ) ) {
+        if ( !empty( $_aError ) ) {
             $this->deleteTransient( $_sTransient ); // we don't need it any more.
             return;
         }
@@ -89,12 +89,12 @@ 
         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;
             }
 
             // If the settings have not updated the options, do nothing.
-            if ( ! $this->getHTTPQueryGET( 'settings-updated', false ) ) {
+            if ( !$this->getHTTPQueryGET( 'settings-updated', false ) ) {
                 return false;
             }
 

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

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
  */
 class AdminPageFramework_Model__FormSubmission__Validator__ContactForm extends AdminPageFramework_Model__FormSubmission__Validator_Base {
 
-    public $sActionHookPrefix = 'try_validation_after_';    // 3.7.6 Changed it from `try_validation_before_`
+    public $sActionHookPrefix = 'try_validation_after_'; // 3.7.6 Changed it from `try_validation_before_`
     public $iHookPriority = 10;
     public $iCallbackParameters = 5;
 
@@ -33,7 +33,7 @@ 
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
 
         // Check whether sending an email has been confirmed by the user or not.
-        if ( ! $this->_shouldProceed( $oFactory, $aSubmits ) ) {
+        if ( !$this->_shouldProceed( $oFactory, $aSubmits ) ) {
             return;
         }
 
@@ -44,13 +44,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 clause.
+        $_oException = new Exception( 'aReturn' ); // the property name to return from the catch clause.
         $_oException->aReturn = $aInputs;
         throw $_oException;
 
@@ -85,7 +85,7 @@ 
          */
         private function ___sendEmail( $aInputs, $sPressedInputNameFlat, $sSubmitSectionID ) {
 
-            $_sTransientKey = 'apf_em_' . md5( $sPressedInputNameFlat . get_current_user_id() );
+            $_sTransientKey = 'apf_em_'.md5( $sPressedInputNameFlat.get_current_user_id() );
             $_aEmailOptions = $this->getTransient( $_sTransientKey );
             $this->deleteTransient( $_sTransientKey );
 
@@ -102,7 +102,7 @@ 
             );
 sleep( 5 );
 
-            if ( false === wp_verify_nonce( $_aEmailOptions[ 'nonce' ], 'apf_email_nonce_' . md5( ( string ) site_url() ) ) ) {
+            if ( false === wp_verify_nonce( $_aEmailOptions[ 'nonce' ], 'apf_email_nonce_'.md5( ( string ) site_url() ) ) ) {
                 $this->oFactory->setSettingNotice(
                     $this->oFactory->oMsg->get( 'nonce_verification_failed' ),
                     'error'
@@ -137,7 +137,7 @@ 
          * @return      string
          */
         public function _replyToRemoveConfirmationQueryKey( $sSettingUpdateURL ) {
-            return remove_query_arg( array( 'confirmation', ), $sSettingUpdateURL );
+            return remove_query_arg( array( 'confirmation',), $sSettingUpdateURL );
         }
 
 }

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

Spacing +9 added lines, -9 removed lines

@@ -29,7 +29,7 @@ 
         $this->oFactory = $oFactory;
 
         add_filter(
-            "validation_pre_" . $this->oFactory->oProp->sClassName,
+            "validation_pre_".$this->oFactory->oProp->sClassName,
             array( $this, '_replyToValidateUserFormInputs' ),
             10,
             4
@@ -52,15 +52,15 @@ 
         public function _replyToValidateUserFormInputs( $aInputs, $aRawInputs, $aOptions, $oFactory ) {
 
             // No need to retrieve the default tab slug here because it is an embedded value that is already set in the previous page load.
-            $_sTabSlug          = sanitize_text_field( $this->getElement( $_POST, 'tab_slug', '' ) );       // sanitization done
-            $_sPageSlug         = sanitize_text_field( $this->getElement( $_POST, 'page_slug', '' ) );      // sanitization done
+            $_sTabSlug          = sanitize_text_field( $this->getElement( $_POST, 'tab_slug', '' ) ); // sanitization done
+            $_sPageSlug         = sanitize_text_field( $this->getElement( $_POST, 'page_slug', '' ) ); // sanitization done
 
-            $_aSubmits          = $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, '__submit', array() ) );    // sanitization done
+            $_aSubmits          = $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, '__submit', array() ) ); // sanitization done
             $_sPressedInputName = $this->_getPressedSubmitButtonData( $_aSubmits, 'name' );
             $_sSubmitSectionID  = $this->_getPressedSubmitButtonData( $_aSubmits, 'section_id' );
 
             // Submit Information - [3.5.0+] this will be passed to validation callback methods.
-            $_aSubmitsInformation        = array(
+            $_aSubmitsInformation = array(
                 'page_slug'     => $_sPageSlug,
                 'tab_slug'      => $_sTabSlug,
                 'input_id'      => $this->_getPressedSubmitButtonData( $_aSubmits, 'input_id' ),
@@ -80,11 +80,11 @@ 
                 'AdminPageFramework_Model__FormSubmission__Validator__Export',
                 'AdminPageFramework_Model__FormSubmission__Validator__Reset',
                 'AdminPageFramework_Model__FormSubmission__Validator__ResetConfirm', // 3.7.6+ Moved to after validation from before validation
-                'AdminPageFramework_Model__FormSubmission__Validator__ContactForm',  // 3.7.6+ Moved to after validation from before validation
+                'AdminPageFramework_Model__FormSubmission__Validator__ContactForm', // 3.7.6+ Moved to after validation from before validation
                 'AdminPageFramework_Model__FormSubmission__Validator__ContactFormConfirm',
 
             );
-            foreach( $_aClassNames as $_sClassName ) {
+            foreach ( $_aClassNames as $_sClassName ) {
                 new $_sClassName( $this->oFactory );
             }
 
@@ -93,7 +93,7 @@ 
 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_before_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_before_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,
@@ -112,7 +112,7 @@ 
 
                 $this->addAndDoActions(
                     $this->oFactory,
-                    'try_validation_after_' . $this->oFactory->oProp->sClassName,
+                    'try_validation_after_'.$this->oFactory->oProp->sClassName,
                     $aInputs,
                     $aRawInputs,
                     $_aSubmits,

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

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
 
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
         $this->_exportOptions(
@@ -50,7 +50,7 @@ 
             if ( $this->oFactory->hasFieldError() ) {
                 return false;
             }
-            return isset( $_POST[ '__export' ][ 'submit' ] );   // sanitization done
+            return isset( $_POST[ '__export' ][ 'submit' ] ); // sanitization done
         }
 
         /**
@@ -67,11 +67,11 @@ 
          */
         protected function _exportOptions( $mData, $sPageSlug, $sTabSlug ) {
 
-            $_oExport           = new AdminPageFramework_ExportOptions(
-                $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, array( '__export' ) ) ),  // sanitization done
+            $_oExport = new AdminPageFramework_ExportOptions(
+                $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, array( '__export' ) ) ), // sanitization done
                 $this->oFactory->oProp->sClassName
             );
-            $_aArguments        = array(
+            $_aArguments = array(
                 'class_name'        => $this->oFactory->oProp->sClassName,
                 'page_slug'         => $sPageSlug,
                 'tab_slug'          => $sTabSlug,
@@ -143,7 +143,7 @@ 
                     $sExportFileName,
                     $aArguments[ 'pressed_field_id' ],
                     $aArguments[ 'pressed_input_id' ],
-                    $mData,     // 3.4.6+
+                    $mData, // 3.4.6+
                     $this->oFactory       // 3.4.6+
                 );
             }

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

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
      * @since       3.6.3
      */
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
         $this->_doImportOptions(
@@ -52,7 +52,7 @@ 
                 return false;
             }
             return isset(
-                $_POST[ '__import' ][ 'submit' ],   // sanitization unnecessary
+                $_POST[ '__import' ][ 'submit' ], // sanitization unnecessary
                 $_FILES[ '__import' ]               // sanitization unnecessary
             );
         }
@@ -93,11 +93,11 @@ 
              */
             private function _importOptions( $aStoredOptions, $sPageSlug, $sTabSlug ) {
 
-                $_oImport           = new AdminPageFramework_ImportOptions(
+                $_oImport = new AdminPageFramework_ImportOptions(
                     $this->getHTTPRequestSanitized( $_FILES[ '__import' ], false ), // sanitization done
                     $this->getHTTPRequestSanitized( $_POST[ '__import' ] )                     // sanitization done
                 );
-                $_aArguments        = array(
+                $_aArguments = array(
                     'class_name'        => $this->oFactory->oProp->sClassName,
                     'page_slug'         => $sPageSlug,
                     'tab_slug'          => $sTabSlug,
@@ -116,9 +116,9 @@ 
                 // Check the uploaded file MIME type.
                 $_aMIMEType = $this->_getImportMIMEType( $_aArguments );
                 $_sType     = $_oImport->getType();
-                if ( ! in_array( $_sType, $_aMIMEType ) ) {
+                if ( !in_array( $_sType, $_aMIMEType ) ) {
                     $this->oFactory->setSettingNotice( sprintf( $this->oFactory->oMsg->get( 'uploaded_file_type_not_supported' ), $_sType ) );
-                    return $aStoredOptions;        // do not change the framework's options.
+                    return $aStoredOptions; // do not change the framework's options.
                 }
 
                 // Retrieve the importing data.
@@ -183,9 +183,9 @@ 
                         array(
                             'text/plain',
                             'application/octet-stream', // .json file is dealt as a binary file.
-                            'application/json',         // 3.7.0+ some servers cannot upload json files without this
-                            'text/html',                // 3.7.2+
-                            'application/txt',          // 3.7.2+
+                            'application/json', // 3.7.0+ some servers cannot upload json files without this
+                            'text/html', // 3.7.2+
+                            'application/txt', // 3.7.2+
                         ),
                         $aArguments
                     );
@@ -274,18 +274,18 @@ 
     protected function _getPortFilterHookNames( $sPrefix, array $aArguments ) {
 
         return array(
-            $sPrefix . $aArguments[ 'class_name' ] . '_' . $aArguments[ 'pressed_input_id' ],
+            $sPrefix.$aArguments[ 'class_name' ].'_'.$aArguments[ 'pressed_input_id' ],
             $aArguments[ 'section_id' ]
-                ? $sPrefix . $aArguments[ 'class_name' ] . '_' . $aArguments[ 'section_id' ] .'_' . $aArguments[ 'pressed_field_id' ]
-                : $sPrefix . $aArguments[ 'class_name' ] . '_' . $aArguments[ 'pressed_field_id' ],
+                ? $sPrefix.$aArguments[ 'class_name' ].'_'.$aArguments[ 'section_id' ].'_'.$aArguments[ 'pressed_field_id' ]
+                : $sPrefix.$aArguments[ 'class_name' ].'_'.$aArguments[ 'pressed_field_id' ],
             $aArguments[ 'section_id' ]
-                ? $sPrefix . $aArguments[ 'class_name' ] . '_' . $aArguments[ 'section_id' ]
+                ? $sPrefix.$aArguments[ 'class_name' ].'_'.$aArguments[ 'section_id' ]
                 : null,
             $aArguments[ 'tab_slug' ]
-                ? $sPrefix . $aArguments[ 'page_slug' ] . '_' . $aArguments[ 'tab_slug' ]
+                ? $sPrefix.$aArguments[ 'page_slug' ].'_'.$aArguments[ 'tab_slug' ]
                 : null,
-            $sPrefix . $aArguments[ 'page_slug' ],
-            $sPrefix . $aArguments[ 'class_name' ]
+            $sPrefix.$aArguments[ 'page_slug' ],
+            $sPrefix.$aArguments[ 'class_name' ]
         );
 
     }

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

Spacing +21 added lines, -21 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function __construct( $oFactory, $aSavedData, $aArguments, $aSectionsets, $aFieldsets ) {
        
-        $this->oFactory         = $oFactory;        
+        $this->oFactory = $oFactory;        
                 
         // add_action
         // @deprecated      3.7.0
@@ -71,11 +71,11 @@ 
      */    
     public function _handleFormData() {
         
-        if ( ! $this->_shouldProceed() ) {
+        if ( !$this->_shouldProceed() ) {
             return;
         }
 
-        $_sTabSlug   = sanitize_text_field( $this->getElement( $_POST, 'tab_slug', '' ) );  // sanitization done
+        $_sTabSlug   = sanitize_text_field( $this->getElement( $_POST, 'tab_slug', '' ) ); // sanitization done
         $_sPageSlug  = sanitize_text_field( $this->getElement( $_POST, 'page_slug', '' ) ); // sanitization done
         
         // Apply user validation callbacks to the submitted data.
@@ -108,7 +108,7 @@ 
         );                
 
         // Execute the submit_{...} actions.
-        $_aSubmits          = $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, '__submit', array() ) );    // sanitization done
+        $_aSubmits          = $this->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, '__submit', array() ) ); // sanitization done
         $_sSubmitSectionID  = $this->_getPressedSubmitButtonData( $_aSubmits, 'section_id' );
         $_sPressedFieldID   = $this->_getPressedSubmitButtonData( $_aSubmits, 'field_id' );
         $_sPressedInputID   = $this->_getPressedSubmitButtonData( $_aSubmits, 'input_id' );        
@@ -126,7 +126,7 @@ 
         new AdminPageFramework_Model__FormSubmission__Validator( $this->oFactory );
         
         // [3.6.3+] Apply filters. All the 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,
@@ -137,7 +137,7 @@ 
 
         // Save the data.
         $_bUpdated = false;
-        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {  
+        if ( !$this->oFactory->oProp->_bDisableSavingOptions ) {  
             $_bUpdated = $this->oFactory->oProp->updateOption( $_aInputs );
         }
 
@@ -176,7 +176,7 @@ 
         private function _shouldProceed() {
             
             if ( 
-                ! isset( 
+                !isset( 
                     $_POST[ 'admin_page_framework_start' ], // indicates the framework form is started // sanitization unnecessary as just checking
                     $_POST[ '_wp_http_referer' ]             // sanitization unnecessary as just checking
                 ) 
@@ -185,19 +185,19 @@ 
             }
             
             // Referrer
-            $_sRequestURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( wp_unslash( $_SERVER[ 'REQUEST_URI' ] ) ) );  // sanitization done
-            $_sRefererURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( $_POST[ '_wp_http_referer' ] ) );             // sanitization done
+            $_sRequestURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( wp_unslash( $_SERVER[ 'REQUEST_URI' ] ) ) ); // sanitization done
+            $_sRefererURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( $_POST[ '_wp_http_referer' ] ) ); // sanitization done
             if ( $_sRequestURI != $_sRefererURI ) { // see the function definition of wp_referer_field() in functions.php.
                 return false;
             }
             
             // 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 // sanitization unnecessary as just checking
-                    $_POST[ 'page_slug' ],  // sanitization unnecessary as just checking
+                    $_POST[ 'page_slug' ], // sanitization unnecessary as just checking
                     $_POST[ 'tab_slug' ]    // sanitization unnecessary as just checking
                 )
             ) {
@@ -213,11 +213,11 @@ 
                 return false;
             }
 
-            $_bVerifyNonce       = wp_verify_nonce(
-                $_POST[ '_is_admin_page_framework' ],   // sanitization should not be done as and leave the nonce check fail if the value modified
-                'form_' . md5( $this->oFactory->oProp->sClassName . get_current_user_id() )
+            $_bVerifyNonce = wp_verify_nonce(
+                $_POST[ '_is_admin_page_framework' ], // sanitization should not be done as and leave the nonce check fail if the value modified
+                'form_'.md5( $this->oFactory->oProp->sClassName.get_current_user_id() )
             );
-            if ( ! $_bVerifyNonce ) {
+            if ( !$_bVerifyNonce ) {
                 $this->oFactory->setAdminNotice( $this->oFactory->oMsg->get( 'nonce_verification_failed' ) );
                 return false;
             }
@@ -231,7 +231,7 @@ 
          */
         private function _getUserInputsFromPOST() {
             return $this->oFactory->oForm->getSubmittedData(
-                $this->oFactory->oForm->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, $this->oFactory->oProp->sOptionKey ) ),  // sanitization done
+                $this->oFactory->oForm->getHTTPRequestSanitized( $this->getElementAsArray( $_POST, $this->oFactory->oProp->sOptionKey ) ), // sanitization done
                 false   // do not extract from form fieldsets structure
             );
         }        
@@ -257,7 +257,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}",
@@ -301,7 +301,7 @@ 
                         null
                     ),
                     $this->getAOrB(
-                        isset( $_POST[ 'tab_slug' ] ),  // sanitization unnecessary
+                        isset( $_POST[ 'tab_slug' ] ), // sanitization unnecessary
                         "submit_after_{$this->oFactory->oProp->sClassName}_{$_sPageSlug}_{$_sTabSlug}",
                         null
                     ),
@@ -340,9 +340,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+
@@ -367,7 +367,7 @@ 
          */
         private function _removePageElements( $aOptions, $sPageSlug, $sTabSlug ) {
             
-            if ( ! $sPageSlug && ! $sTabSlug ) {
+            if ( !$sPageSlug && !$sTabSlug ) {
                 return $aOptions;
             }
             

Braces +4 added lines, -3 removed lines

@@ -137,7 +137,7 @@ 
 
         // Save the data.
         $_bUpdated = false;
-        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {  
+        if ( ! $this->oFactory->oProp->_bDisableSavingOptions ) {
             $_bUpdated = $this->oFactory->oProp->updateOption( $_aInputs );
         }
 
@@ -180,14 +180,15 @@ 
                     $_POST[ 'admin_page_framework_start' ], // indicates the framework form is started // sanitization unnecessary as just checking
                     $_POST[ '_wp_http_referer' ]             // sanitization unnecessary as just checking
                 ) 
-            ) {     
+            ) {
                 return false;
             }
             
             // Referrer
             $_sRequestURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( wp_unslash( $_SERVER[ 'REQUEST_URI' ] ) ) );  // sanitization done
             $_sRefererURI   = remove_query_arg( array( 'settings-updated', 'confirmation', 'field_errors' ), sanitize_text_field( $_POST[ '_wp_http_referer' ] ) );             // sanitization done
-            if ( $_sRequestURI != $_sRefererURI ) { // see the function definition of wp_referer_field() in functions.php.
+            if ( $_sRequestURI != $_sRefererURI ) {
+// see the function definition of wp_referer_field() in functions.php.
                 return false;
             }
             

development/factory/admin_page/_model/AdminPageFramework_Property_admin_page.php

Spacing +15 added lines, -15 removed lines

@@ -217,7 +217,7 @@ 
      */
     public $aDisallowedQueryKeys = array(
         'settings-updated',
-        'confirmation',     // 3.3.0+
+        'confirmation', // 3.3.0+
         'field_errors'      // 3.4.1+
     );
 
@@ -263,7 +263,7 @@ 
      * Stores the cache lifetime of the transient used for the form options when the user passes an integer to the option key parameter.
      * @since       3.5.9
      */
-    public $iOptionTransientDuration  = 0;
+    public $iOptionTransientDuration = 0;
 
     /**
      * Constructs the instance of AdminPageFramework_Property_admin_page class object.
@@ -272,10 +272,10 @@ 
      * @since       2.0.0
      * @since       2.1.5   The $oCaller parameter was added.
      */
-    public function __construct( $oCaller, $sCallerPath, $sClassName, $aisOptionKey, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $oCaller, $sCallerPath, $sClassName, $aisOptionKey, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
 
         // 3.7.0+ This must be set before the parent constructor. As the form arguments array uses this value.
-        $this->_sFormRegistrationHook = 'load_after_' . $sClassName;
+        $this->_sFormRegistrationHook = 'load_after_'.$sClassName;
 
         parent::__construct(
             $oCaller,
@@ -351,7 +351,7 @@ 
                 }
                 // The user want to save options in a transient.
                 if ( in_array( $_sType, array( 'integer' ) ) ) {
-                    return 'apf_' . md5( site_url() . '_' . $sClassName . '_' . get_current_user_id() );
+                    return 'apf_'.md5( site_url().'_'.$sClassName.'_'.get_current_user_id() );
                 }
 
                 // Unknown type - maybe the user is trying to do something advanced.
@@ -377,10 +377,10 @@ 
          * @internal
          */
         protected function _isAdminPage() {
-            if ( ! is_admin() ) {
+            if ( !is_admin() ) {
                 return false;
             }
-            return isset( $_GET[ 'page' ] );    // sanitization unnecessary
+            return isset( $_GET[ 'page' ] ); // sanitization unnecessary
         }
 
     /**
@@ -416,7 +416,7 @@ 
                 case 'transient':
                     return $this->getAsArray(
                         $this->getTransient(
-                            $this->sOptionKey,  // transient key
+                            $this->sOptionKey, // transient key
                             array() // default
                         )
                     );
@@ -430,7 +430,7 @@ 
      * @since       3.1.1       Made it return a value.
      * @return      boolean     True if saved; otherwise, false.
      */
-    public function updateOption( $aOptions=null ) {
+    public function updateOption( $aOptions = null ) {
 
         if ( $this->_bDisableSavingOptions ) {
             return false;
@@ -458,7 +458,7 @@ 
                     );
                 case 'transient':
                     return $this->setTransient(
-                        $this->sOptionKey,  // transient key
+                        $this->sOptionKey, // transient key
                         $aOptions,
                         $this->iOptionTransientDuration
                     );
@@ -473,7 +473,7 @@ 
      * @since       2.1.0       Set the default value to the parameter and if the parameter value is empty, it applies the current `$_GET[ 'page' ]` value.
      * @return      boolean     Returns true if it is of framework's added page; otherwise, false.
      */
-    public function isPageAdded( $sPageSlug='' ) {
+    public function isPageAdded( $sPageSlug = '' ) {
 
         $sPageSlug = trim( $sPageSlug );
         $sPageSlug = $sPageSlug
@@ -506,7 +506,7 @@ 
      * @return      string      The found tab slug. An empty string if not found.
      * @remark      Do not return `null` when not found as some framework methods check the returned value with `isset()` and if null is given, `isset()` yields `false` while it does `true` for an empty string ('').
      */
-    public function getCurrentTabSlug( $sCurrentPageSlug='' ) {
+    public function getCurrentTabSlug( $sCurrentPageSlug = '' ) {
 
         // It is possible that the tab slug is not set if it is the default tab.
         $_sTabSlug = $this->getElement( $this->aQuery, 'tab', '' );
@@ -526,7 +526,7 @@ 
          *
          * @deprecated  3.5.3
          */
-        public function getCurrentTab( $sCurrentPageSlug='' ) {
+        public function getCurrentTab( $sCurrentPageSlug = '' ) {
             return $this->getCurrentTabSlug( $sCurrentPageSlug );
         }
 
@@ -541,11 +541,11 @@ 
      */
     public function getDefaultInPageTab( $sPageSlug ) {
 
-        if ( ! $sPageSlug ) {
+        if ( !$sPageSlug ) {
             return '';
         }
         return $this->getElement(
-            $this->aDefaultInPageTabs,  // subject array
+            $this->aDefaultInPageTabs, // subject array
             $sPageSlug, // key
             ''    // default
         );