michaeluno / admin-page-framework

development/factory/admin_page/AdminPageFramework_Model_Menu.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
      * 
      * @internal
      */
-    public function __construct( $sOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $sOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
         
         parent::__construct( $sOptionKey, $sCallerPath, $sCapability, $sTextDomain );
         

development/factory/admin_page/AdminPageFramework_Router.php

Braces +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
      * @since       3.3.1       Moved from `AdminPageFramework_Base`.
      * @internal
      */
-    public function __call( $sMethodName, $aArgs=null ) {     
+    public function __call( $sMethodName, $aArgs=null ) {
 
         $_sPageSlug             = $this->oProp->getCurrentPageSlug();
         $_sTabSlug              = $this->oProp->getCurrentTabSlug( $_sPageSlug );
@@ -263,7 +263,7 @@ 
             return true;
         }    
 
-        if ( ! isset( $_GET[ 'page' ] ) ) { 
+        if ( ! isset( $_GET[ 'page' ] ) ) {
             return false; 
         }        
         

Spacing +16 added lines, -16 removed lines

@@ -27,11 +27,11 @@ 
      * 
      * @since       3.3.0
      */
-    public function __construct( $sOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    public function __construct( $sOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
         
         $_sProprtyClassName = isset( $this->aSubClassNames[ 'oProp' ] )
             ? $this->aSubClassNames[ 'oProp' ]
-            : 'AdminPageFramework_Property_' . $this->_sStructureType;
+            : 'AdminPageFramework_Property_'.$this->_sStructureType;
             
         $this->oProp = new $_sProprtyClassName( 
             $this, 
@@ -47,7 +47,7 @@ 
         if ( $this->oProp->bIsAdminAjax ) {
             return;
         }     
-        if ( ! $this->oProp->bIsAdmin ) {
+        if ( !$this->oProp->bIsAdmin ) {
             return;
         }
         
@@ -93,7 +93,7 @@ 
      * @since       3.3.1       Moved from `AdminPageFramework_Base`.
      * @internal
      */
-    public function __call( $sMethodName, $aArgs=null ) {     
+    public function __call( $sMethodName, $aArgs = null ) {     
 
         $_sPageSlug             = $this->oProp->getCurrentPageSlug();
         $_sTabSlug              = $this->oProp->getCurrentTabSlug( $_sPageSlug );
@@ -104,15 +104,15 @@ 
             'load_pre_',
         );        
         
-        switch( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
+        switch ( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
                 
             // add_settings_section() callback 
             case 'section_pre_':
-                return $this->_renderSectionDescription( $sMethodName );    // defined in AdminPageFramework_Setting
+                return $this->_renderSectionDescription( $sMethodName ); // defined in AdminPageFramework_Setting
                 
             // add_settings_field() callback
             case 'field_pre_':
-                return $this->_renderSettingField( $_mFirstArg, $_sPageSlug );  // defined in AdminPageFramework_Setting
+                return $this->_renderSettingField( $_mFirstArg, $_sPageSlug ); // defined in AdminPageFramework_Setting
             
             // load-{page} callback            
             case 'load_pre_':
@@ -130,9 +130,9 @@ 
          * @return      string      The found callback method name or the prefix of a known callback method name. An empty string if not found.
          * @internal
          */
-        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes=array() ) {
+        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes = array() ) {
                         
-            foreach( $aKnownMethodPrefixes as $_sMethodPrefix ) {
+            foreach ( $aKnownMethodPrefixes as $_sMethodPrefix ) {
                 if ( $this->oUtil->hasPrefix( $_sMethodPrefix, $sMethodName ) ) {
                     return $_sMethodPrefix;
                 }
@@ -156,7 +156,7 @@ 
          */ 
         protected function _doPageLoadCall( $sMethodName, $sPageSlug, $sTabSlug, $oScreen ) {
             
-            if ( ! $this->_isPageLoadCall( $sMethodName, $sPageSlug, $oScreen->id ) ) {
+            if ( !$this->_isPageLoadCall( $sMethodName, $sPageSlug, $oScreen->id ) ) {
                 return;
             }
 
@@ -165,7 +165,7 @@ 
             $this->oForm->aSections[ '_default' ][ 'tab_slug' ]   = $sTabSlug ? $sTabSlug : null;
         
             // Do actions, class ->  page -> in-page tab
-            $this->load();  // 3.7.12+
+            $this->load(); // 3.7.12+
             $this->oUtil->addAndDoActions( 
                 $this, // the caller object
                 array( 
@@ -179,7 +179,7 @@ 
             
             $this->oUtil->addAndDoActions( 
                 $this, // the caller object
-                array( "load_{$sPageSlug}_" . $this->oProp->getCurrentTabSlug( $sPageSlug ) ),
+                array( "load_{$sPageSlug}_".$this->oProp->getCurrentTabSlug( $sPageSlug ) ),
                 $this // the admin page object - this lets third-party scripts use the framework methods.
             );         
             
@@ -207,7 +207,7 @@ 
                 if ( substr( $sMethodName, strlen( 'load_pre_' ) ) !== $sPageSlug ) {
                     return false;
                 }
-                if ( ! isset( $this->oProp->aPageHooks[ $sPageSlug ] ) ) {
+                if ( !isset( $this->oProp->aPageHooks[ $sPageSlug ] ) ) {
                     return false;
                 }
                 if ( $sScreenID !== $this->oProp->aPageHooks[ $sPageSlug ] ) {
@@ -234,7 +234,7 @@ 
         }
         
         // Nothing to do in the network admin area.
-        return ! is_network_admin();
+        return !is_network_admin();
         
     }
     
@@ -249,11 +249,11 @@ 
     public function _isInThePage() {
         
         // If the setUp method is not loaded yet,
-        if ( ! did_action( 'set_up_' . $this->oProp->sClassName ) ) {
+        if ( !did_action( 'set_up_'.$this->oProp->sClassName ) ) {
             return true;
         }    
 
-        if ( ! isset( $_GET[ 'page' ] ) ) { 
+        if ( !isset( $_GET[ 'page' ] ) ) { 
             return false; 
         }        
         

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

Spacing +17 added lines, -17 removed lines

@@ -66,18 +66,18 @@ 
      */  
     public function _replyToRegisterHelpTabs() {
 
-        if ( ! $this->_isInThePage() ) {
+        if ( !$this->_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 );
         }
         
@@ -90,10 +90,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;
             }
 
@@ -132,24 +132,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' ] );
         }
         
     }

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'] ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Admin Page Framework
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
- * 
- */
+     * Admin Page Framework
+     * 
+     * http://en.michaeluno.jp/admin-page-framework/
+     * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
+     * 
+     */
 
 /**
  * Provides an abstract base class to create meta boxes in generic admin pages created by the framework.

development/factory/admin_page/_controller/AdminPageFramework_Link_admin_page.php

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();
@@ -55,8 +55,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, 
@@ -81,8 +81,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, 
@@ -116,7 +116,7 @@ 
             }
             $_sPluginBaseName = plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] );
             add_filter( 
-                $this->_sFilterSuffix_PluginActionLinks . $_sPluginBaseName, 
+                $this->_sFilterSuffix_PluginActionLinks.$_sPluginBaseName, 
                 array( $this, '_replyToAddPluginActionLinks' ) 
             );            
         }
@@ -128,14 +128,14 @@ 
      * @callback    filter      admin_footer_text
      * @return      string
      */ 
-    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();        
@@ -146,11 +146,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
         );        
@@ -163,9 +163,9 @@ 
      * @callback    filter      update_footer
      * @return      string
      */
-    public function _replyToAddInfoInFooterRight( $sLinkHTML='' ) {
+    public function _replyToAddInfoInFooterRight( $sLinkHTML = '' ) {
 
-        if ( ! $this->_isPageAdded() ) {
+        if ( !$this->_isPageAdded() ) {
             return $sLinkHTML; // $sLinkTHML is given by the hook.
         }
             
@@ -178,13 +178,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' ]
         );             
             
     }
@@ -196,10 +196,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' ] );
 
         }
     /**
@@ -220,7 +220,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;
         }
 
@@ -238,13 +238,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>'
         ); 
@@ -266,16 +266,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 );
@@ -291,13 +291,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 );

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 +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Admin Page Framework
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
- * 
- */
+     * Admin Page Framework
+     * 
+     * http://en.michaeluno.jp/admin-page-framework/
+     * Copyright (c) 2013-2016 Michael Uno; Licensed MIT
+     * 
+     */
 
 /**
  * Provides methods for HTML link elements to be embedded in admin pages created by the framework.
@@ -87,7 +87,7 @@ 
             $this->oProp->aPluginTitleLinks = array_merge( 
                 $this->oProp->aPluginTitleLinks, 
                 $asLinks 
-           );
+            );
         }
                 
         $this->_addFilterHook_PluginTitleActionLink();

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/_model/AdminPageFramework_Property_admin_page.php

Spacing +15 added lines, -15 removed lines

@@ -218,7 +218,7 @@ 
      */
     public $aDisallowedQueryKeys = array( 
         'settings-updated', 
-        'confirmation',     // 3.3.0+
+        'confirmation', // 3.3.0+
         'field_errors'      // 3.4.1+
     );
         
@@ -264,7 +264,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.
@@ -273,10 +273,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, 
@@ -352,7 +352,7 @@ 
                 }
                 // The user want to save options in a transient.
                 if ( in_array( $_sType, array( 'integer' ) ) ) {
-                    return 'apf_' . $sClassName . '_' . get_current_user_id();
+                    return 'apf_'.$sClassName.'_'.get_current_user_id();
                 }
                 
                 // Unknown type - maybe the user is trying to do something advanced.
@@ -379,7 +379,7 @@ 
          */
         protected function _isAdminPage() {
             
-            if ( ! is_admin() ) {
+            if ( !is_admin() ) {
                 return false;
             }
             return isset( $_GET[ 'page' ] );
@@ -419,7 +419,7 @@ 
                 case 'transient':
                     return $this->getAsArray(
                         $this->getTransient( 
-                            $this->sOptionKey,  // transient key
+                            $this->sOptionKey, // transient key
                             array() // default
                         )
                     );
@@ -433,7 +433,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;
@@ -461,7 +461,7 @@ 
                     );
                 case 'transient':
                     return $this->setTransient( 
-                        $this->sOptionKey,  // transient key
+                        $this->sOptionKey, // transient key
                         $aOptions,
                         $this->iOptionTransientDuration
                     );
@@ -476,7 +476,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 
@@ -495,7 +495,7 @@ 
      */
     public function getCurrentPageSlug() {
         return $this->getElement( 
-            $_GET,  // subject array
+            $_GET, // subject array
             'page', // key
             ''      // default
         );            
@@ -513,7 +513,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( $_GET, 'tab' );
@@ -533,7 +533,7 @@ 
          * 
          * @deprecated  3.5.3
          */
-        public function getCurrentTab( $sCurrentPageSlug='' ) {
+        public function getCurrentTab( $sCurrentPageSlug = '' ) {
             return $this->getCurrentTabSlug( $sCurrentPageSlug );            
         }
     
@@ -548,11 +548,11 @@ 
      */         
     public function getDefaultInPageTab( $sPageSlug ) {
     
-        if ( ! $sPageSlug ) { 
+        if ( !$sPageSlug ) { 
             return ''; 
         }
         return $this->getElement( 
-            $this->aDefaultInPageTabs,  // subject array
+            $this->aDefaultInPageTabs, // subject array
             $sPageSlug, // key
             ''    // default
         );

Braces +4 added lines, -4 removed lines

@@ -322,7 +322,7 @@ 
          * @since       3.5.9
          * @return      void
          */
-        private function _setOptionsProperties( $aisOptionKey, $sClassName ) {            
+        private function _setOptionsProperties( $aisOptionKey, $sClassName ) {
                         
             $_aArguments = is_array( $aisOptionKey ) 
                 ? $aisOptionKey
@@ -513,7 +513,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 
@@ -554,7 +554,7 @@ 
         
         // It is possible that the tab slug is not set if it is the default tab.
         $_sTabSlug = $this->getElement( $_GET, 'tab' );
-        if ( $_sTabSlug ) { 
+        if ( $_sTabSlug ) {
             return $_sTabSlug;
         }
         $sCurrentPageSlug = $sCurrentPageSlug
@@ -585,7 +585,7 @@ 
      */         
     public function getDefaultInPageTab( $sPageSlug ) {
     
-        if ( ! $sPageSlug ) { 
+        if ( ! $sPageSlug ) {
             return ''; 
         }
         return $this->getElement(