michaeluno / admin-page-framework

development/factory/admin_page/_controller/AdminPageFramework_Resource_admin_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 );
         }
                 

development/factory/admin_page/_controller/AdminPageFramework_HelpPane_admin_page.php

Braces +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
         $_sCurrentPageSlug  = $this->oProp->getCurrentPageSlug();
         $_sCurrentTabSlug   = $this->oProp->getCurrentTabSlug( $_sCurrentPageSlug );
         
-        if ( ! $this->oProp->isPageAdded( $_sCurrentPageSlug ) ) { 
+        if ( ! $this->oProp->isPageAdded( $_sCurrentPageSlug ) ) {
             return; 
         }
 
@@ -86,7 +86,7 @@ 
          */
         private function _registerHelpTab( array $aHelpTab, $sCurrentPageSlug, $sCurrentTabSlug ) {
            
-            if ( $sCurrentPageSlug != $aHelpTab['sPageSlug'] ) { 
+            if ( $sCurrentPageSlug != $aHelpTab['sPageSlug'] ) {
                 return;
             }
             if ( isset( $aHelpTab['sPageTabSlug'] ) && ! empty( $aHelpTab['sPageTabSlug'] ) && $sCurrentTabSlug != $aHelpTab['sPageTabSlug'] ) {

Spacing +17 added lines, -17 removed lines

@@ -65,18 +65,18 @@ 
      */  
     public function _replyToRegisterHelpTabs() {
 
-        if ( ! $this->oProp->oCaller->isInThePage() ) {
+        if ( !$this->oProp->oCaller->isInThePage() ) {
             return;
         }
     
         $_sCurrentPageSlug  = $this->oProp->getCurrentPageSlug();
         $_sCurrentTabSlug   = $this->oProp->getCurrentTabSlug( $_sCurrentPageSlug );
         
-        if ( ! $this->oProp->isPageAdded( $_sCurrentPageSlug ) ) { 
+        if ( !$this->oProp->isPageAdded( $_sCurrentPageSlug ) ) { 
             return; 
         }
 
-        foreach( $this->oProp->aHelpTabs as $aHelpTab ) {
+        foreach ( $this->oProp->aHelpTabs as $aHelpTab ) {
             $this->_registerHelpTab( $aHelpTab, $_sCurrentPageSlug, $_sCurrentTabSlug );
         }
         
@@ -89,10 +89,10 @@ 
          */
         private function _registerHelpTab( array $aHelpTab, $sCurrentPageSlug, $sCurrentTabSlug ) {
            
-            if ( $sCurrentPageSlug != $aHelpTab['sPageSlug'] ) { 
+            if ( $sCurrentPageSlug != $aHelpTab[ 'sPageSlug' ] ) { 
                 return;
             }
-            if ( isset( $aHelpTab['sPageTabSlug'] ) && ! empty( $aHelpTab['sPageTabSlug'] ) && $sCurrentTabSlug != $aHelpTab['sPageTabSlug'] ) {
+            if ( isset( $aHelpTab[ 'sPageTabSlug' ] ) && !empty( $aHelpTab[ 'sPageTabSlug' ] ) && $sCurrentTabSlug != $aHelpTab[ 'sPageTabSlug' ] ) {
                 return;
             }
 
@@ -131,24 +131,24 @@ 
         $aHelpTab = ( array ) $aHelpTab + self::$_aStructure_HelpTabUserArray;
         
         // If the key is not set, that means the help tab array is not created yet. So create it and go back.
-        if ( ! isset( $this->oProp->aHelpTabs[ $aHelpTab['help_tab_id'] ] ) ) {
-            $this->oProp->aHelpTabs[ $aHelpTab['help_tab_id'] ] = array(
-                'sID'           => $aHelpTab['help_tab_id'],
-                'sTitle'        => $aHelpTab['help_tab_title'],
-                'aContent'      => ! empty( $aHelpTab['help_tab_content'] ) ? array( $this->_formatHelpDescription( $aHelpTab['help_tab_content'] ) ) : array(),
-                'aSidebar'      => ! empty( $aHelpTab['help_tab_sidebar_content'] ) ? array( $this->_formatHelpDescription( $aHelpTab['help_tab_sidebar_content'] ) ) : array(),
-                'sPageSlug'     => $aHelpTab['page_slug'],
-                'sPageTabSlug'  => $aHelpTab['page_tab_slug'],
+        if ( !isset( $this->oProp->aHelpTabs[ $aHelpTab[ 'help_tab_id' ] ] ) ) {
+            $this->oProp->aHelpTabs[ $aHelpTab[ 'help_tab_id' ] ] = array(
+                'sID'           => $aHelpTab[ 'help_tab_id' ],
+                'sTitle'        => $aHelpTab[ 'help_tab_title' ],
+                'aContent'      => !empty( $aHelpTab[ 'help_tab_content' ] ) ? array( $this->_formatHelpDescription( $aHelpTab[ 'help_tab_content' ] ) ) : array(),
+                'aSidebar'      => !empty( $aHelpTab[ 'help_tab_sidebar_content' ] ) ? array( $this->_formatHelpDescription( $aHelpTab[ 'help_tab_sidebar_content' ] ) ) : array(),
+                'sPageSlug'     => $aHelpTab[ 'page_slug' ],
+                'sPageTabSlug'  => $aHelpTab[ 'page_tab_slug' ],
             );
             return;
         }
 
         // This line will be reached if the help tab array is already set. In this case, just append an array element into the keys.
-        if ( ! empty( $aHelpTab['help_tab_content'] ) ) {
-            $this->oProp->aHelpTabs[ $aHelpTab['help_tab_id'] ]['aContent'][] = $this->_formatHelpDescription( $aHelpTab['help_tab_content'] );
+        if ( !empty( $aHelpTab[ 'help_tab_content' ] ) ) {
+            $this->oProp->aHelpTabs[ $aHelpTab[ 'help_tab_id' ] ][ 'aContent' ][ ] = $this->_formatHelpDescription( $aHelpTab[ 'help_tab_content' ] );
         }
-        if ( ! empty( $aHelpTab['help_tab_sidebar_content'] ) ) {
-            $this->oProp->aHelpTabs[ $aHelpTab['help_tab_id'] ]['aSidebar'][] = $this->_formatHelpDescription( $aHelpTab['help_tab_sidebar_content'] );
+        if ( !empty( $aHelpTab[ 'help_tab_sidebar_content' ] ) ) {
+            $this->oProp->aHelpTabs[ $aHelpTab[ 'help_tab_id' ] ][ 'aSidebar' ][ ] = $this->_formatHelpDescription( $aHelpTab[ 'help_tab_sidebar_content' ] );
         }
         
     }

development/factory/admin_page/_controller/AdminPageFramework_Link_admin_page.php

Braces +5 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function _replyToSetFooterInfo() {
 
-        if ( ! $this->oProp->isPageAdded() ) { 
+        if ( ! $this->oProp->isPageAdded() ) {
             return; 
         }
         parent::_replyToSetFooterInfo();
@@ -211,7 +211,7 @@ 
     public function _replyToAddSettingsLinkInPluginListingPage( $aLinks ) {
          
         // If the sub-pages are not added, do nothing.
-        if ( count( $this->oProp->aPages ) < 1 ) { 
+        if ( count( $this->oProp->aPages ) < 1 ) {
             return $aLinks; 
         }    
         
@@ -260,7 +260,7 @@ 
      */
     public function _replyToAddLinkToPluginDescription( $aLinks, $sFile ) {
 
-        if ( $sFile !== plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] ) ) { 
+        if ( $sFile !== plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] ) ) {
             return $aLinks; 
         }
         
@@ -271,7 +271,8 @@ 
             if ( ! $_sLLinkHTML ) {
                 continue;
             }
-            if ( is_array( $_sLLinkHTML ) ) {  // should not be an array
+            if ( is_array( $_sLLinkHTML ) ) {
+// should not be an array
                 $_aAddingLinks = array_merge( $_sLLinkHTML, $_aAddingLinks );
                 continue;
             } 

Indentation +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
             $this->oProp->aPluginTitleLinks = array_merge( 
                 $this->oProp->aPluginTitleLinks, 
                 $asLinks 
-           );
+            );
         }
                 
         $this->_addFilterHook_PluginTitleActionLink();

Spacing +29 added lines, -29 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function _replyToSetFooterInfo() {
 
-        if ( ! $this->oProp->isPageAdded() ) { 
+        if ( !$this->oProp->isPageAdded() ) { 
             return; 
         }
         parent::_replyToSetFooterInfo();
@@ -56,8 +56,8 @@ 
      */
     public function _addLinkToPluginDescription( $asLinks ) {
         
-        if ( ! is_array( $asLinks ) ) {
-            $this->oProp->aPluginDescriptionLinks[] = $asLinks;
+        if ( !is_array( $asLinks ) ) {
+            $this->oProp->aPluginDescriptionLinks[ ] = $asLinks;
         } else {
             $this->oProp->aPluginDescriptionLinks = array_merge( 
                 $this->oProp->aPluginDescriptionLinks, 
@@ -84,8 +84,8 @@ 
      */    
     public function _addLinkToPluginTitle( $asLinks ) {
         
-        if ( ! is_array( $asLinks ) ) {
-            $this->oProp->aPluginTitleLinks[] = $asLinks;
+        if ( !is_array( $asLinks ) ) {
+            $this->oProp->aPluginTitleLinks[ ] = $asLinks;
         } else {
             $this->oProp->aPluginTitleLinks = array_merge( 
                 $this->oProp->aPluginTitleLinks, 
@@ -120,7 +120,7 @@ 
             }
             $_sPluginBaseName = plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] );
             add_filter( 
-                $this->_sFilterSuffix_PluginActionLinks . $_sPluginBaseName, 
+                $this->_sFilterSuffix_PluginActionLinks.$_sPluginBaseName, 
                 array( $this, '_replyToAddPluginActionLinks' ) 
             );            
         }
@@ -133,14 +133,14 @@ 
      * @return      string
      * @internal
      */ 
-    public function _replyToAddInfoInFooterLeft( $sLinkHTML='' ) {
+    public function _replyToAddInfoInFooterLeft( $sLinkHTML = '' ) {
 
-        if ( ! $this->_isPageAdded() ) {
+        if ( !$this->_isPageAdded() ) {
             return $sLinkHTML; // $sLinkHTML is given by the hook.
         }
-        $sLinkHTML  = empty( $this->oProp->aScriptInfo['sName'] )
+        $sLinkHTML = empty( $this->oProp->aScriptInfo[ 'sName' ] )
             ? $sLinkHTML
-            : $this->oProp->aFooterInfo['sLeft'];     
+            : $this->oProp->aFooterInfo[ 'sLeft' ];     
             
         $_sPageSlug = $this->oProp->getCurrentPageSlug();
         $_sTabSlug  = $this->oProp->getCurrentTabSlug();        
@@ -151,11 +151,11 @@ 
             array(                 
                 $this->getAOrB( 
                     $_sTabSlug,
-                    'footer_left_' . $_sPageSlug . '_' . $_sTabSlug,
+                    'footer_left_'.$_sPageSlug.'_'.$_sTabSlug,
                     null    // will be ignored
                 ),
-                'footer_left_' . $_sPageSlug,
-                'footer_left_' . $this->oProp->sClassName
+                'footer_left_'.$_sPageSlug,
+                'footer_left_'.$this->oProp->sClassName
             ),
             $sLinkHTML
         );        
@@ -169,9 +169,9 @@ 
      * @return      string
      * @internal
      */
-    public function _replyToAddInfoInFooterRight( $sLinkHTML='' ) {
+    public function _replyToAddInfoInFooterRight( $sLinkHTML = '' ) {
 
-        if ( ! $this->_isPageAdded() ) {
+        if ( !$this->_isPageAdded() ) {
             return $sLinkHTML; // $sLinkTHML is given by the hook.
         }
             
@@ -184,13 +184,13 @@ 
             array(                 
                 $this->getAOrB( 
                     $_sTabSlug,
-                    'footer_right_' . $_sPageSlug . '_' . $_sTabSlug,
+                    'footer_right_'.$_sPageSlug.'_'.$_sTabSlug,
                     null    // will be ignored
                 ),
-                'footer_right_' . $_sPageSlug,
-                'footer_right_' . $this->oProp->sClassName
+                'footer_right_'.$_sPageSlug,
+                'footer_right_'.$this->oProp->sClassName
             ),
-            $this->oProp->aFooterInfo['sRight']
+            $this->oProp->aFooterInfo[ 'sRight' ]
         );             
             
     }
@@ -203,10 +203,10 @@ 
          */
         private function _isPageAdded() {
             
-            if ( ! isset( $_GET['page'] ) ) {
+            if ( !isset( $_GET[ 'page' ] ) ) {
                 return false;
             }            
-            return ( bool ) $this->oProp->isPageAdded( $_GET['page'] );
+            return ( bool ) $this->oProp->isPageAdded( $_GET[ 'page' ] );
 
         }
     /**
@@ -228,7 +228,7 @@ 
             : $this->oProp->sLabelPluginSettingsLink;        
 
         // If the user disables the settings link, the label property is empty. If so, do not add it.
-        if ( ! $this->oProp->sLabelPluginSettingsLink ) {
+        if ( !$this->oProp->sLabelPluginSettingsLink ) {
             return $aLinks;
         }
 
@@ -246,13 +246,13 @@ 
         array_unshift(    
             $aLinks,
             // '<a href="' . esc_url( $_sLinkURL ) . '">' 
-            '<a ' . $this->getAttributes(
+            '<a '.$this->getAttributes(
                 array(
                     'href'      => esc_url( $_sLinkURL ),
                     // 3.5.7+ Added for acceptance testing
                     'class'     => 'apf-plugin-title-action-link apf-post-type',
                 )
-            ) . '>' 
+            ).'>' 
                 . $this->oProp->sLabelPluginSettingsLink 
             . '</a>'
         ); 
@@ -275,16 +275,16 @@ 
         
         // Backward compatibility sanitisation.
         $_aAddingLinks = array();
-        foreach( array_filter( $this->oProp->aPluginDescriptionLinks ) as $_sLLinkHTML ) {
+        foreach ( array_filter( $this->oProp->aPluginDescriptionLinks ) as $_sLLinkHTML ) {
             
-            if ( ! $_sLLinkHTML ) {
+            if ( !$_sLLinkHTML ) {
                 continue;
             }
             if ( is_array( $_sLLinkHTML ) ) {  // should not be an array
                 $_aAddingLinks = array_merge( $_sLLinkHTML, $_aAddingLinks );
                 continue;
             } 
-            $_aAddingLinks[] = ( string ) $_sLLinkHTML;
+            $_aAddingLinks[ ] = ( string ) $_sLLinkHTML;
             
         }
         return array_merge( $aLinks, $_aAddingLinks );
@@ -301,13 +301,13 @@ 
     public function _replyToAddPluginActionLinks( $aLinks ) {
 
         $_aAddingLinks = array();
-        foreach( array_filter( $this->oProp->aPluginTitleLinks ) as $_sLinkHTML ) {
+        foreach ( array_filter( $this->oProp->aPluginTitleLinks ) as $_sLinkHTML ) {
 
             if ( is_array( $_sLinkHTML ) ) {
                 $_aAddingLinks = array_merge( $_sLinkHTML, $aAddingLinks );
                 continue;
             } 
-            $_aAddingLinks[] = ( string ) $_sLinkHTML;
+            $_aAddingLinks[ ] = ( string ) $_sLinkHTML;
             
         }
         return array_merge( $aLinks, $_aAddingLinks );

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
                 
         // if the 'reset' key in the field definition array is set, this value will be set.
-        if ( ! $this->_shouldProceed( $oFactory, $aSubmits ) ) {
+        if ( !$this->_shouldProceed( $oFactory, $aSubmits ) ) {
             return;
         }
         
@@ -43,7 +43,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__ContactForm.php

Spacing +9 added lines, -9 removed lines

@@ -17,7 +17,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;
  
@@ -34,7 +34,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;
         }
         
@@ -45,13 +45,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;
     
@@ -86,7 +86,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 );
 
@@ -101,13 +101,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( 
@@ -125,7 +125,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( 
@@ -147,7 +147,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 +6 added lines, -6 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' ), 
@@ -81,11 +81,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 );
             }
             
@@ -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__ContactFormConfirm.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      */
     public function _replyToCallback( $aInputs, $aRawInputs, array $aSubmits, $aSubmitInformation, $oFactory ) {
                                 
-        if ( ! $this->_shouldProceed( $oFactory, $aSubmits ) ) {
+        if ( !$this->_shouldProceed( $oFactory, $aSubmits ) ) {
             return;
         }
         
@@ -46,7 +46,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/_view/AdminPageFramework_View__PageMetaboxEnabler.php

Spacing +7 added lines, -7 removed lines

@@ -51,11 +51,11 @@ 
          */
         public function _replyToEnableMetaBox() {
 
-            if ( ! $this->_isMetaBoxAdded() ) {
+            if ( !$this->_isMetaBoxAdded() ) {
                 return;
             }
 
-            $_sCurrentScreenID =  $this->getCurrentScreenID();
+            $_sCurrentScreenID = $this->getCurrentScreenID();
 
             // Trigger the add_meta_boxes hooks to allow meta boxes to be added.
             do_action( "add_meta_boxes_{$_sCurrentScreenID}", null );
@@ -85,7 +85,7 @@ 
             // the network admin adds '-network' in the screen ID and the hooks with that id won't be triggered so use the 'page_hook' global variable.
             if ( isset( $GLOBALS[ 'page_hook' ] ) ) {
                 add_action( 
-                    "admin_footer-{$GLOBALS['page_hook']}", 
+                    "admin_footer-{$GLOBALS[ 'page_hook' ]}", 
                     array( $this, '_replyToAddMetaboxScript' ) 
                 );    
             }
@@ -109,11 +109,11 @@ 
                 }
                 
                 $_sPageSlug = $this->getElement( $_GET, 'page', '' );
-                if ( ! $_sPageSlug ) {     
+                if ( !$_sPageSlug ) {     
                     return false;
                 }
                 
-                foreach( $_aPageMetaBoxClasses as $_sClassName => $_oMetaBox ) {
+                foreach ( $_aPageMetaBoxClasses as $_sClassName => $_oMetaBox ) {
                     if ( $this->_isPageOfMetaBox( $_sPageSlug, $_oMetaBox ) ) { 
                         return true; 
                     }
@@ -131,10 +131,10 @@ 
                  */
                 private function _isPageOfMetaBox( $sPageSlug, $oMetaBox ) {
                     
-                    if ( in_array( $sPageSlug , $oMetaBox->oProp->aPageSlugs ) ) {
+                    if ( in_array( $sPageSlug, $oMetaBox->oProp->aPageSlugs ) ) {
                         return true; // for numeric keys with a string value.
                     }
-                    if ( ! array_key_exists( $sPageSlug , $oMetaBox->oProp->aPageSlugs ) ) {
+                    if ( !array_key_exists( $sPageSlug, $oMetaBox->oProp->aPageSlugs ) ) {
                         return false; // for keys of page slugs, the key does not exist, it means not added.
                     }
                     

Braces +2 added lines, -2 removed lines

@@ -109,12 +109,12 @@
                 }
                 
                 $_sPageSlug = $this->getElement( $_GET, 'page', '' );
-                if ( ! $_sPageSlug ) {     
+                if ( ! $_sPageSlug ) {
                     return false;
                 }
                 
                 foreach( $_aPageMetaBoxClasses as $_sClassName => $_oMetaBox ) {
-                    if ( $this->_isPageOfMetaBox( $_sPageSlug, $_oMetaBox ) ) { 
+                    if ( $this->_isPageOfMetaBox( $_sPageSlug, $_oMetaBox ) ) {
                         return true; 
                     }
                 }

development/factory/admin_page/form/AdminPageFramework_Form_admin_page.php

Spacing +19 added lines, -19 removed lines

@@ -52,16 +52,16 @@ 
     public function getPageOnlyOptions( $aOptions, $sPageSlug ) {
 
         $_aStoredOptionsOfThePage = array();
-        foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
             
             // Check the section
-            if ( ! $this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
+            if ( !$this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
                 continue;
             }
 
             // At this point, the element belongs the given page slug as the section is of the given page slug's.
             $this->_setPageOnlyOptions( 
-                $_aStoredOptionsOfThePage,  // by reference - gets updated in the method.
+                $_aStoredOptionsOfThePage, // by reference - gets updated in the method.
                 $aOptions, 
                 $_aSubSectionsOrFields, 
                 $sPageSlug,
@@ -81,7 +81,7 @@ 
          * @internal
          */
         private function _setPageOnlyOptions( array &$_aStoredOptionsOfThePage, array $aOptions, array $_aSubSectionsOrFields, $sPageSlug, $_sSectionID ) {
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
                 
                 // If it's a sub-section array,
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -153,7 +153,7 @@ 
     public function getOtherPageOptions( $aOptions, $sPageSlug ) {
 
         $_aStoredOptionsNotOfThePage = array();
-        foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
             
             // Check the section
             if ( $this->_isThisSectionSetToThisPage( $_sSectionID, $sPageSlug ) ) {
@@ -182,7 +182,7 @@ 
          * @internal
          */
         private function _setOtherPageOptions( array &$_aStoredOptionsNotOfThePage, array $aOptions, array $_aSubSectionsOrFields, $sPageSlug ) {
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
 
                 // It's a sub-section array. 
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -245,7 +245,7 @@ 
     public function getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug ) {
 
         $_aStoredOptionsNotOfTheTab = array();
-        foreach( $this->aFieldsets as $_sSectionPath => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionPath => $_aSubSectionsOrFields ) {
                         
             // If the section is of the given page and the given tab, skip.
             if ( $this->_isThisSectionSetToThisTab( $_sSectionPath, $sPageSlug, $sTabSlug ) ) {
@@ -276,7 +276,7 @@ 
         private function _setOtherTabOptions( array &$_aStoredOptionsNotOfTheTab, array $aOptions, array $_aSubSectionsOrFields, $sSectionPath ) {
             
             // At this point, the passed element belongs to the other tabs since the section of the given tab is skipped.
-            foreach ( $_aSubSectionsOrFields as $_isSubSectionIndexOrFieldID => $_aSubSectionOrField  ) {
+            foreach ( $_aSubSectionsOrFields as $_isSubSectionIndexOrFieldID => $_aSubSectionOrField ) {
                 
                 // If it's a sub section
                 if ( $this->isNumericInteger( $_isSubSectionIndexOrFieldID ) ) {
@@ -334,7 +334,7 @@ 
      * @since       3.7.0      Moved from `AdminPageFramework_FormDefinition_Page`.
      * @return      array
      */
-    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {     
+    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug = '' ) {     
                 
         $_aOtherTabOptions = $this->getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug );
         $_aTabOptions      = $this->invertCastArrayContents( $aOptions, $_aOtherTabOptions );       
@@ -352,17 +352,17 @@ 
      * @since       3.7.0      Moved from `AdminPageFramework_FormDefinition_Page`.
      * @return      array
      */
-    public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug='' ) {
+    public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug = '' ) {
         
         $_aStoredOptionsOfTheTab = array();
-        if ( ! $sTabSlug ) { 
+        if ( !$sTabSlug ) { 
             return $_aStoredOptionsOfTheTab; 
         }
         
-        foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
              
             // Check the section
-            if ( ! $this->_isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) ) {
+            if ( !$this->_isThisSectionSetToThisTab( $_sSectionID, $sPageSlug, $sTabSlug ) ) {
                 continue;
             }
             
@@ -388,7 +388,7 @@ 
          */
         private function _setTabOnlyOptions( array &$_aStoredOptionsOfTheTab, array $aOptions, array $_aSubSectionsOrFields, $_sSectionID ) {
             
-            foreach( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
+            foreach ( $_aSubSectionsOrFields as $_sFieldID => $_aFieldset ) {
                                 
                 // if it's a sub-section array.
                 if ( $this->isNumericInteger( $_sFieldID ) ) {
@@ -445,7 +445,7 @@ 
      */
     private function _isThisSectionSetToThisPage( $sSectionPath, $sPageSlug ) {
         
-        if ( ! isset( $this->aSectionsets[ $sSectionPath ][ 'page_slug' ] ) ) {
+        if ( !isset( $this->aSectionsets[ $sSectionPath ][ 'page_slug' ] ) ) {
             return false;
         }
         return ( 
@@ -463,10 +463,10 @@ 
      */
     private function _isThisSectionSetToThisTab( $sSectionPath, $sPageSlug, $sTabSlug ) {
         
-        if ( ! $this->_isThisSectionSetToThisPage( $sSectionPath, $sPageSlug ) ) {
+        if ( !$this->_isThisSectionSetToThisPage( $sSectionPath, $sPageSlug ) ) {
             return false;
         }
-        if ( ! isset( $this->aSectionsets[ $sSectionPath ][ 'tab_slug' ] ) ) {
+        if ( !isset( $this->aSectionsets[ $sSectionPath ][ 'tab_slug' ] ) ) {
             return false;
         }
         return (
@@ -483,9 +483,9 @@ 
      */
     private function _setOptionValue( &$aSubject, $asDimensionalPath, $aOptions ) {
         $_aDimensionalPath = $this->getAsArray( $asDimensionalPath );
-        $_mValue     = $this->getElement(
+        $_mValue = $this->getElement(
             $aOptions,
-            $_aDimensionalPath,    // as of 3.7.0, it can be an array or string
+            $_aDimensionalPath, // as of 3.7.0, it can be an array or string
             null
         );
         if ( isset( $_mValue ) ) {

Doc Comments +1 added lines

@@ -458,6 +458,7 @@
      * @internal
      * @since       3.5.3
      * @since       3.7.0      Moved from `AdminPageFramework_FormDefinition_Page`.
+     * @param string $sTabSlug
      * @return      boolean
      */
     private function _isThisSectionSetToThisTab( $sSectionPath, $sPageSlug, $sTabSlug ) {

Braces +3 added lines, -3 removed lines

@@ -106,7 +106,7 @@ 
                 );
                 // @todo Examine whether this check can be removed 
                 // as the section that hods this field is already checked above outside this loop.
-                if ( $sPageSlug !== $_aFieldset[ 'page_slug' ] ) { 
+                if ( $sPageSlug !== $_aFieldset[ 'page_slug' ] ) {
                     continue; 
                 }        
                 
@@ -333,7 +333,7 @@ 
      * @since       3.7.0      Moved from `AdminPageFramework_FormDefinition_Page`.
      * @return      array
      */
-    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {     
+    public function getTabOptions( $aOptions, $sPageSlug, $sTabSlug='' ) {
                 
         $_aOtherTabOptions = $this->getOtherTabOptions( $aOptions, $sPageSlug, $sTabSlug );
         $_aTabOptions      = $this->invertCastArrayContents( $aOptions, $_aOtherTabOptions );       
@@ -354,7 +354,7 @@ 
     public function getTabOnlyOptions( array $aOptions, $sPageSlug, $sTabSlug='' ) {
         
         $_aStoredOptionsOfTheTab = array();
-        if ( ! $sTabSlug ) { 
+        if ( ! $sTabSlug ) {
             return $_aStoredOptionsOfTheTab; 
         }