michaeluno / admin-page-framework

development/factory/_abstract/view/script/AdminPageFramework_Script_SortableSection.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Admin Page Framework
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
- * 
- */
+     * Admin Page Framework
+     * 
+     * http://en.michaeluno.jp/admin-page-framework/
+     * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
+     * 
+     */
 
 /**
  * Provides methods for creating fields in the taxonomy page (edit-tags.php).

Spacing +2 added lines, -2 removed lines

@@ -105,12 +105,12 @@
         new self( $oMsg ); 
         
         // $aSettings              = $this->getAsArray( $aSettings );        
-        $_sScript       = <<<JAVASCRIPTS
+        $_sScript = <<<JAVASCRIPTS
 jQuery( document ).ready( function() {    
     jQuery( '#{$sContainerTagID}' ).enableAdminPageFrameworkSortableSections( '{$sContainerTagID}' ); 
 });            
 JAVASCRIPTS;
-        return "<script type='text/javascript' class='admin-page-framework-section-sortable-script'>" . $_sScript . "</script>";
+        return "<script type='text/javascript' class='admin-page-framework-section-sortable-script'>".$_sScript."</script>";
         
     }    
     

Braces +2 added lines, -2 removed lines

@@ -94,10 +94,10 @@
      */
     static public function getEnabler( $sContainerTagID, $aSettings, $oMsg ) {
         
-        if ( empty( $aSettings ) ) { 
+        if ( empty( $aSettings ) ) {
             return ''; 
         }
-        if ( in_array( $sContainerTagID, self::$_aSetContainerIDsForSortableSections ) ) { 
+        if ( in_array( $sContainerTagID, self::$_aSetContainerIDsForSortableSections ) ) {
             return ''; 
         }
         self::$_aSetContainerIDsForSortableSections[ $sContainerTagID ] = $sContainerTagID;        

development/factory/_abstract/view/script/AdminPageFramework_Script_Tab.php

Braces +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
      */
     static public function getEnabler() {
         
-        if ( self::$_bLoadedTabEnablerScript ) { 
+        if ( self::$_bLoadedTabEnablerScript ) {
             return ''; 
         }
         self::$_bLoadedTabEnablerScript = true;

development/factory/admin_page/AdminPageFramework_Model_Form.php

Spacing +16 added lines, -16 removed lines

@@ -66,14 +66,14 @@ 
      * @since       3.3.0
      * @since       3.3.1       Moved from `AdminPageFramework_Setting_Base`.
      */
-    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 );
 
         if ( $this->oProp->bIsAdminAjax ) {
             return;
         }
-        if ( ! $this->oProp->bIsAdmin ) {
+        if ( !$this->oProp->bIsAdmin ) {
             return;
         }
         
@@ -81,7 +81,7 @@ 
         new AdminPageFramework_Model_FormSubmission( $this );
                         
         // Checking the GET and POST methods.
-        if ( isset( $_REQUEST['apf_remote_request_test'] ) && '_testing' === $_REQUEST['apf_remote_request_test'] ) {
+        if ( isset( $_REQUEST[ 'apf_remote_request_test' ] ) && '_testing' === $_REQUEST[ 'apf_remote_request_test' ] ) {
             exit( 'OK' );
         }
         
@@ -100,19 +100,19 @@ 
         AdminPageFramework_FieldTypeRegistration::_setFieldResources( $aField, $this->oProp, $this->oResource ); 
 
         // For the contextual help pane,
-        if ( $aField['help'] ) {
+        if ( $aField[ 'help' ] ) {
             $this->addHelpTab( 
                 array(
-                    'page_slug'                 => $aField['page_slug'],
-                    'page_tab_slug'             => $aField['tab_slug'],
-                    'help_tab_title'            => $aField['section_title'],
-                    'help_tab_id'               => $aField['section_id'],
+                    'page_slug'                 => $aField[ 'page_slug' ],
+                    'page_tab_slug'             => $aField[ 'tab_slug' ],
+                    'help_tab_title'            => $aField[ 'section_title' ],
+                    'help_tab_id'               => $aField[ 'section_id' ],
                     'help_tab_content'          => "<span class='contextual-help-tab-title'>" 
-                            . $aField['title'] 
-                        . "</span> - " . PHP_EOL
-                        . $aField['help'],
-                    'help_tab_sidebar_content'  => $aField['help_aside'] 
-                        ? $aField['help_aside'] 
+                            . $aField[ 'title' ] 
+                        . "</span> - ".PHP_EOL
+                        . $aField[ 'help' ],
+                    'help_tab_sidebar_content'  => $aField[ 'help_aside' ] 
+                        ? $aField[ 'help_aside' ] 
                         : "",
                 )
             );
@@ -120,10 +120,10 @@ 
                           
         // Call the field type callback method to let it know the field type is registered.
         if ( 
-            isset( $this->oProp->aFieldTypeDefinitions[ $aField['type'] ][ 'hfDoOnRegistration' ] ) 
-            && is_callable( $this->oProp->aFieldTypeDefinitions[ $aField['type'] ][ 'hfDoOnRegistration' ] )
+            isset( $this->oProp->aFieldTypeDefinitions[ $aField[ 'type' ] ][ 'hfDoOnRegistration' ] ) 
+            && is_callable( $this->oProp->aFieldTypeDefinitions[ $aField[ 'type' ] ][ 'hfDoOnRegistration' ] )
         ) {
-            call_user_func_array( $this->oProp->aFieldTypeDefinitions[ $aField['type'] ][ 'hfDoOnRegistration' ], array( $aField ) );
+            call_user_func_array( $this->oProp->aFieldTypeDefinitions[ $aField[ 'type' ] ][ 'hfDoOnRegistration' ], array( $aField ) );
         }            
         
     }            

development/factory/admin_page/AdminPageFramework_Router.php

Spacing +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
      * 
      * @since       3.3.0
      */
-    function __construct( $sOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
+    function __construct( $sOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
                 
         // Objects
         $this->oProp = isset( $this->oProp ) 
@@ -66,7 +66,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 );
@@ -77,22 +77,22 @@ 
             'load_pre_',
         );        
         
-        switch( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
+        switch ( $this->_getCallbackName( $sMethodName, $_sPageSlug, $_aKnownMethodPrefixes ) ) {
             case 'setup_pre':
                 $this->_doSetUp();
                 return;
                 
             // A callback of the call_page_{page slug} action hook
-            case $this->oProp->sClassHash . '_page_' . $_sPageSlug:
-                return $this->_renderPage( $_sPageSlug, $_sTabSlug );   // defined in AdminPageFramework_Page.
+            case $this->oProp->sClassHash.'_page_'.$_sPageSlug:
+                return $this->_renderPage( $_sPageSlug, $_sTabSlug ); // defined in AdminPageFramework_Page.
              
             // 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_':
@@ -109,20 +109,20 @@ 
          * @since       3.5.3
          * @return      string      The found callback method name or the prefix of a known callback method name. An empty string if not found.
          */
-        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes=array() ) {
+        private function _getCallbackName( $sMethodName, $sPageSlug, array $aKnownMethodPrefixes = array() ) {
             
             if ( in_array( 
                     $sMethodName, 
                     array( 
                         'setup_pre',  
-                        $this->oProp->sClassHash . '_page_' . $sPageSlug
+                        $this->oProp->sClassHash.'_page_'.$sPageSlug
                     ) 
                 ) 
             ) {
                 return $sMethodName;
             }
             
-            foreach( $aKnownMethodPrefixes as $_sMethodPrefix ) {
+            foreach ( $aKnownMethodPrefixes as $_sMethodPrefix ) {
                 if ( $this->oUtil->hasPrefix( $_sMethodPrefix, $sMethodName ) ) {
                     return $_sMethodPrefix;
                 }
@@ -167,13 +167,13 @@ 
          */ 
         protected function _doPageLoadCall( $sMethodName, $sPageSlug, $sTabSlug, $oScreen ) {
             
-            if ( ! $this->isPageLoadCall( $sMethodName, $sPageSlug, $oScreen->id ) ) {
+            if ( !$this->isPageLoadCall( $sMethodName, $sPageSlug, $oScreen->id ) ) {
                 return;
             }
 
             // [3.4.6+] Set the page and tab slugs to the default form section so that added form fields without a section will appear in different pages and tabs.
-            $this->oForm->aSections[ '_default' ]['page_slug']  = $sPageSlug ? $sPageSlug : null;
-            $this->oForm->aSections[ '_default' ]['tab_slug']   = $sTabSlug ? $sTabSlug : null;
+            $this->oForm->aSections[ '_default' ][ 'page_slug' ]  = $sPageSlug ? $sPageSlug : null;
+            $this->oForm->aSections[ '_default' ][ 'tab_slug' ]   = $sTabSlug ? $sTabSlug : null;
         
             // Do actions, class ->  page -> in-page tab
             $this->oUtil->addAndDoActions( 
@@ -189,7 +189,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.
             );         
             
@@ -217,7 +217,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 ] ) {
@@ -238,12 +238,12 @@ 
     protected function _isInstantiatable() {
         
         // Disable in admin-ajax.php
-        if ( isset( $GLOBALS['pagenow'] ) && 'admin-ajax.php' === $GLOBALS['pagenow'] ) {
+        if ( isset( $GLOBALS[ 'pagenow' ] ) && 'admin-ajax.php' === $GLOBALS[ 'pagenow' ] ) {
             return false;
         }
         
         // Nothing to do in the network admin area.
-        return ! is_network_admin();
+        return !is_network_admin();
         
     }
     
@@ -255,19 +255,19 @@ 
      * @since       3.3.1       Moved from `AdminPageFramework_Base`.
      * @internal
      */
-    public function _isInThePage( $aPageSlugs=array() ) {
+    public function _isInThePage( $aPageSlugs = array() ) {
 
         // Maybe called too early
-        if ( ! isset( $this->oProp ) ) {
+        if ( !isset( $this->oProp ) ) {
             return true;
         }
         
         // If the setUp method is not loaded yet,
-        if ( ! $this->oProp->_bSetupLoaded ) {
+        if ( !$this->oProp->_bSetupLoaded ) {
             return true;
         }    
 
-        if ( ! isset( $_GET['page'] ) ) { return false; }
+        if ( !isset( $_GET[ 'page' ] ) ) { return false; }
                 
         $_oScreen = get_current_screen();
         if ( is_object( $_oScreen ) ) {
@@ -278,7 +278,7 @@ 
             return $this->oProp->isPageAdded();
         }
                 
-        return in_array( $_GET['page'], $aPageSlugs );
+        return in_array( $_GET[ 'page' ], $aPageSlugs );
         
     }    
     

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,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 );

development/factory/admin_page/AdminPageFramework_View.php

Spacing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
      */
     public function _replyToPrintAdminNotices() {
         
-        if ( ! $this->_isInThePage() ) { 
+        if ( !$this->_isInThePage() ) { 
             return; 
         }
         
-        foreach( $this->oProp->aAdminNotices as $_aAdminNotice ) {
+        foreach ( $this->oProp->aAdminNotices as $_aAdminNotice ) {
             
             $_sClassSelectors = $this->oUtil->getClassAttribute(
                 $this->oUtil->getElement(

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public function _replyToDetermineToLoad( /* $oScreen */ ) {
         
-        if ( ! $this->_isInThePage() ) { 
+        if ( ! $this->_isInThePage() ) {
             return; 
         }
 

development/factory/admin_page/AdminPageFramework_View_Form.php

Spacing +24 added lines, -24 removed lines

@@ -28,14 +28,14 @@ 
      */
     public function _replyToGetSectionName( /* $sAttribute, $aSectionset */ ) {
 
-        $_aParams            = func_get_args() + array( null, null,  );
+        $_aParams            = func_get_args() + array( null, null,);
         $sNameAttribute      = $_aParams[ 0 ];
         $aSectionset         = $_aParams[ 1 ];        
         
         $_aDimensionalKeys   = array( $this->oProp->sOptionKey );   
-        $_aDimensionalKeys[] = '[' . $aSectionset[ 'section_id' ] . ']';
+        $_aDimensionalKeys[ ] = '['.$aSectionset[ 'section_id' ].']';
         if ( isset( $aSectionset[ '_index' ] ) ) {
-            $_aDimensionalKeys[] = '[' . $aSectionset[ '_index' ] . ']';
+            $_aDimensionalKeys[ ] = '['.$aSectionset[ '_index' ].']';
         }
         
         return implode( '', $_aDimensionalKeys );
@@ -48,18 +48,18 @@ 
      */
     public function _replyToGetFieldNameAttribute( /* $sAttribute, $aFieldset */ ) {
         
-        $_aParams           = func_get_args() + array( null, null,  );
+        $_aParams           = func_get_args() + array( null, null,);
         $sNameAttribute     = $_aParams[ 0 ];
         $aFieldset          = $_aParams[ 1 ];        
         
         $_aDimensionalKeys  = array( $aFieldset[ 'option_key' ] );
         if ( $this->isSectionSet( $aFieldset ) ) {
-            $_aDimensionalKeys[] = '[' . $aFieldset[ 'section_id' ] . ']';
+            $_aDimensionalKeys[ ] = '['.$aFieldset[ 'section_id' ].']';
         }
         if ( isset( $aFieldset[ 'section_id' ], $aFieldset[ '_section_index' ] ) ) {
-            $_aDimensionalKeys[] = '[' . $aFieldset[ '_section_index' ] . ']';
+            $_aDimensionalKeys[ ] = '['.$aFieldset[ '_section_index' ].']';
         }
-        $_aDimensionalKeys[] = '[' . $aFieldset[ 'field_id' ] . ']';
+        $_aDimensionalKeys[ ] = '['.$aFieldset[ 'field_id' ].']';
         return implode( '', $_aDimensionalKeys );
         
     }
@@ -70,18 +70,18 @@ 
      */
     public function _replyToGetFlatFieldName( /* $sAttribute, $aFieldset */ ) {
 
-        $_aParams           = func_get_args() + array( null, null,  );
+        $_aParams           = func_get_args() + array( null, null,);
         $sNameAttribute     = $_aParams[ 0 ];
         $aFieldset          = $_aParams[ 1 ];        
         
         $_aDimensionalKeys  = array( $aFieldset[ 'option_key' ] );
         if ( $this->isSectionSet( $aFieldset ) ) {
-            $_aDimensionalKeys[] = $aFieldset[ 'section_id' ];
+            $_aDimensionalKeys[ ] = $aFieldset[ 'section_id' ];
         }
         if ( isset( $aFieldset[ 'section_id' ], $aFieldset[ '_section_index' ] ) ) {
-            $_aDimensionalKeys[] = $aFieldset[ '_section_index' ];
+            $_aDimensionalKeys[ ] = $aFieldset[ '_section_index' ];
         }
-        $_aDimensionalKeys[] = $aFieldset[ 'field_id' ];
+        $_aDimensionalKeys[ ] = $aFieldset[ 'field_id' ];
         return implode( '|', $_aDimensionalKeys );        
         
     }
@@ -104,7 +104,7 @@ 
             "[{$sKey}]"
         );   
         
-        return $this->_replyToGetFieldNameAttribute( '', $aField ) . $sKey;
+        return $this->_replyToGetFieldNameAttribute( '', $aField ).$sKey;
         
     }
     /**
@@ -122,10 +122,10 @@ 
         $_sKey              = $this->oUtil->getAOrB(
             '0' !== $_sKey && empty( $_sKey ),
             '',
-            "|" . $_sKey
+            "|".$_sKey
         );        
         
-        return $this->_replyToGetFlatFieldName( '', $aField ) . $_sKey;
+        return $this->_replyToGetFlatFieldName( '', $aField ).$_sKey;
 
     }
     
@@ -141,7 +141,7 @@ 
 
         return $this->oUtil->addAndApplyFilters(
             $this,
-            array( 'section_head_' . $this->oProp->sClassName . '_' . $aSection['section_id'] ), // section_{instantiated class name}_{section id}
+            array( 'section_head_'.$this->oProp->sClassName.'_'.$aSection[ 'section_id' ] ), // section_{instantiated class name}_{section id}
             $sSectionDescription
         );     
         
@@ -158,10 +158,10 @@ 
 
         $_sCurrentPageSlug  = $this->oProp->getCurrentPageSlug();
         $_sSectionID        = $this->oUtil->getElement( $aField, 'section_id', '_default' );
-        $_sFieldID          = $aField['field_id'];
+        $_sFieldID          = $aField[ 'field_id' ];
         
         // If the specified field does not exist, do nothing.
-        if ( $aField['page_slug'] != $_sCurrentPageSlug ) { 
+        if ( $aField[ 'page_slug' ] != $_sCurrentPageSlug ) { 
             return ''; 
         }
 
@@ -171,14 +171,14 @@ 
             : $this->_getFieldErrors( $_sCurrentPageSlug );
 
         // Render the form field.         
-        $sFieldType = isset( $this->oProp->aFieldTypeDefinitions[ $aField['type'] ]['hfRenderField'] ) && is_callable( $this->oProp->aFieldTypeDefinitions[ $aField['type'] ]['hfRenderField'] )
-            ? $aField['type']
+        $sFieldType = isset( $this->oProp->aFieldTypeDefinitions[ $aField[ 'type' ] ][ 'hfRenderField' ] ) && is_callable( $this->oProp->aFieldTypeDefinitions[ $aField[ 'type' ] ][ 'hfRenderField' ] )
+            ? $aField[ 'type' ]
             : 'default'; // the predefined reserved field type is applied if the parsing field type is not defined(not found).
 
-        $_aTemp     = $this->getSavedOptions();    // assigning a variable for the strict standard
+        $_aTemp     = $this->getSavedOptions(); // assigning a variable for the strict standard
         $_oFieldset = new AdminPageFramework_FormFieldset( 
             $aField, 
-            $_aTemp,    // passed by reference. @todo: examine why it needs to be passed by reference.
+            $_aTemp, // passed by reference. @todo: examine why it needs to be passed by reference.
             $this->aFieldErrors, 
             $this->oProp->aFieldTypeDefinitions, 
             $this->oMsg,
@@ -190,9 +190,9 @@ 
         return $this->oUtil->addAndApplyFilters(
             $this,
             array( 
-                isset( $aField['section_id'] ) && '_default' !== $aField['section_id']
-                    ? 'field_' . $this->oProp->sClassName . '_' . $aField['section_id'] . '_' . $_sFieldID
-                    : 'field_' . $this->oProp->sClassName . '_' . $_sFieldID,
+                isset( $aField[ 'section_id' ] ) && '_default' !== $aField[ 'section_id' ]
+                    ? 'field_'.$this->oProp->sClassName.'_'.$aField[ 'section_id' ].'_'.$_sFieldID
+                    : 'field_'.$this->oProp->sClassName.'_'.$_sFieldID,
             ),
             $_sFieldOutput,
             $aField // the field array

Braces +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
         $_sFieldID          = $aField['field_id'];
         
         // If the specified field does not exist, do nothing.
-        if ( $aField['page_slug'] != $_sCurrentPageSlug ) { 
+        if ( $aField['page_slug'] != $_sCurrentPageSlug ) {
             return ''; 
         }
 

development/factory/admin_page/controller/AdminPageFramework_HelpPane_Page.php

Spacing +20 added lines, -20 removed lines

@@ -69,11 +69,11 @@ 
         $_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 );
         }
         
@@ -86,18 +86,18 @@ 
          */
         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;
             }
 
             $this->_setHelpTab( 
-                $aHelpTab['sID'], 
-                $aHelpTab['sTitle'], 
-                $aHelpTab['aContent'], 
-                $aHelpTab['aSidebar']
+                $aHelpTab[ 'sID' ], 
+                $aHelpTab[ 'sTitle' ], 
+                $aHelpTab[ 'aContent' ], 
+                $aHelpTab[ 'aSidebar' ]
             );            
             
         }
@@ -128,24 +128,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'] ) {

development/factory/admin_page/controller/AdminPageFramework_Link_Page.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                 array( $this, '_replyToAddPostTypeQueryInEditPostLink' ), 
                 10, 
                 3 
-           );
+            );
         }        
     }
 

Spacing +35 added lines, -35 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function _replyToSetFooterInfo() {
 
-        if ( ! $this->oProp->isPageAdded() ) { 
+        if ( !$this->oProp->isPageAdded() ) { 
             return; 
         }
         parent::_replyToSetFooterInfo();
@@ -55,10 +55,10 @@ 
      */
     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 , $asLinks );
+            $this->oProp->aPluginDescriptionLinks = array_merge( $this->oProp->aPluginDescriptionLinks, $asLinks );
         }
 
         if ( 'plugins.php' !== $this->oProp->sPageNow ) {
@@ -77,8 +77,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, 
@@ -113,9 +113,9 @@ 
             if ( isset( $_sPluginBaseName ) ) {
                 return;
             }
-            $_sPluginBaseName = plugin_basename( $this->oProp->aScriptInfo['sPath'] );
+            $_sPluginBaseName = plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] );
             add_filter( 
-                $this->_sFilterSuffix_PluginActionLinks . $_sPluginBaseName, 
+                $this->_sFilterSuffix_PluginActionLinks.$_sPluginBaseName, 
                 array( $this, '_replyToAddLinkToPluginTitle' ) 
             );            
         }
@@ -127,14 +127,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();        
@@ -145,11 +145,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
         );        
@@ -162,9 +162,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.
         }
             
@@ -177,13 +177,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' ]
         );             
             
     }
@@ -195,10 +195,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' ] );
 
         }
     /**
@@ -219,17 +219,17 @@ 
             : $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;
         }
         
         // For a custom root slug,
-        $_sLinkURL = preg_match( '/^.+\.php/', $this->oProp->aRootMenu['sPageSlug'] ) 
+        $_sLinkURL = preg_match( '/^.+\.php/', $this->oProp->aRootMenu[ 'sPageSlug' ] ) 
             ? add_query_arg( 
                 array( 
                     'page' => $this->oProp->sDefaultPageSlug 
                 ), 
-                admin_url( $this->oProp->aRootMenu['sPageSlug'] )
+                admin_url( $this->oProp->aRootMenu[ 'sPageSlug' ] )
             )
             : "admin.php?page={$this->oProp->sDefaultPageSlug}";
         
@@ -237,13 +237,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>'
         ); 
@@ -259,22 +259,22 @@ 
      */
     public function _replyToAddLinkToPluginDescription( $aLinks, $sFile ) {
 
-        if ( $sFile != plugin_basename( $this->oProp->aScriptInfo['sPath'] ) ) { 
+        if ( $sFile != plugin_basename( $this->oProp->aScriptInfo[ 'sPath' ] ) ) { 
             return $aLinks; 
         }
         
         // 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 );
@@ -288,16 +288,16 @@ 
     public function _replyToAddLinkToPluginTitle( $aLinks ) {
 
         $_aAddingLinks = array();
-        foreach( array_filter( $this->oProp->aPluginTitleLinks ) as $_sLinkHTML ) {
+        foreach ( array_filter( $this->oProp->aPluginTitleLinks ) as $_sLinkHTML ) {
             
-            if ( ! $_sLinkHTML ) {
+            if ( !$_sLinkHTML ) {
                 continue;
             }
             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();
@@ -210,7 +210,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; 
         }    
         
@@ -259,7 +259,7 @@ 
      */
     public function _replyToAddLinkToPluginDescription( $aLinks, $sFile ) {
 
-        if ( $sFile != plugin_basename( $this->oProp->aScriptInfo['sPath'] ) ) { 
+        if ( $sFile != plugin_basename( $this->oProp->aScriptInfo['sPath'] ) ) {
             return $aLinks; 
         }
         
@@ -270,7 +270,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;
             } 

development/factory/admin_page/controller/AdminPageFramework_Resource_Page.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Admin Page Framework
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
- * 
- */
+     * Admin Page Framework
+     * 
+     * http://en.michaeluno.jp/admin-page-framework/
+     * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
+     * 
+     */
 
 /**
  * Provides methods for creating fields in the taxonomy page (edit-tags.php).

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 );
         }