michaeluno / admin-page-framework

development/factory/_abstract/utility/AdminPageFramework_RegisterClasses.php

Doc Comments +1 added lines

@@ -170,6 +170,7 @@
         
         /**
          * The recursive version of the glob() function.
+         * @param string $sPathPatten
          */
         protected function doRecursiveGlob( $sPathPatten, $nFlags=0, array $aExcludeDirs=array(), array $aExcludeDirNames=array() ) {
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Admin Page Framework
- * 
- * Helps to set up auto-load classes.
- * 
- * http://en.michaeluno.jp/admin-page-framework/
- * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
- * 
- */
+         * Admin Page Framework
+         * 
+         * Helps to set up auto-load classes.
+         * 
+         * http://en.michaeluno.jp/admin-page-framework/
+         * Copyright (c) 2013-2015 Michael Uno; Licensed MIT
+         * 
+         */
 
 /**
  * Registers classes in the given directory to be auto-loaded.

Spacing +27 added lines, -27 removed lines

@@ -37,7 +37,7 @@ 
         'is_recursive'          => true,
         'exclude_dir_paths'     => array(),
         'exclude_dir_names'     => array( 'asset', 'assets', 'css', 'js', 'image', 'images', 'license', 'document', 'documents' ),
-        'allowed_extensions'    => array( 'php', ), // 'inc'
+        'allowed_extensions'    => array( 'php',), // 'inc'
         'include_function'      => 'include',
         'exclude_class_names'   => array( /* 'SomeClass', 'SomeOtherClass' */ ),
     );
@@ -65,13 +65,13 @@ 
      * </code>
      * @remark The directory paths set for the 'exclude_dir_paths' option should use the system directory separator.
      */
-    function __construct( $asScanDirPaths, array $aOptions=array(), array $aClasses=array() ) {
+    function __construct( $asScanDirPaths, array $aOptions = array(), array $aClasses = array() ) {
         
         $_aOptions = $aOptions + self::$_aStructure_Options;
         $this->_aClasses   = $aClasses + $this->_constructClassArray( $asScanDirPaths, $_aOptions );
-        $_sIncludeFunciton = in_array( $_aOptions['include_function'], array( 'require', 'require_once', 'include', 'include_once' ) )
-            ? $_aOptions['include_function']
-            : 'include';    // default      
+        $_sIncludeFunciton = in_array( $_aOptions[ 'include_function' ], array( 'require', 'require_once', 'include', 'include_once' ) )
+            ? $_aOptions[ 'include_function' ]
+            : 'include'; // default      
         $this->_registerClasses( $_sIncludeFunciton );        
         
     }
@@ -95,7 +95,7 @@ 
             return array();
         }
         $_aFilePaths = array();
-        foreach( ( array ) $asScanDirPaths as $_sClassDirPath ) {
+        foreach ( ( array ) $asScanDirPaths as $_sClassDirPath ) {
             if ( realpath( $_sClassDirPath ) ) {
                 $_aFilePaths = array_merge( $this->getFilePaths( $_sClassDirPath, $aSearchOptions ), $_aFilePaths );
             }
@@ -103,11 +103,11 @@ 
         
         // Store classes in an array.
         $_aClasses = array();
-        foreach( $_aFilePaths as $_sFilePath ) {
+        foreach ( $_aFilePaths as $_sFilePath ) {
             
             // Class name without a file extension.
             $_sClassNameWOExt = pathinfo( $_sFilePath, PATHINFO_FILENAME );
-            if ( in_array( $_sClassNameWOExt, $aSearchOptions['exclude_class_names'] ) ) {
+            if ( in_array( $_sClassNameWOExt, $aSearchOptions[ 'exclude_class_names' ] ) ) {
                 continue;
             }
             $_aClasses[ $_sClassNameWOExt ] = $_sFilePath; 
@@ -131,26 +131,26 @@ 
          */
         protected function getFilePaths( $sClassDirPath, array $aSearchOptions ) {
             
-            $sClassDirPath = rtrim( $sClassDirPath, '\\/' ) . DIRECTORY_SEPARATOR; // ensures the trailing (back/)slash exists. 
-            $_aAllowedExtensions = $aSearchOptions['allowed_extensions'];
-            $_aExcludeDirPaths = ( array ) $aSearchOptions['exclude_dir_paths'];
-            $_aExcludeDirNames = ( array ) $aSearchOptions['exclude_dir_names'];
+            $sClassDirPath = rtrim( $sClassDirPath, '\\/' ).DIRECTORY_SEPARATOR; // ensures the trailing (back/)slash exists. 
+            $_aAllowedExtensions = $aSearchOptions[ 'allowed_extensions' ];
+            $_aExcludeDirPaths = ( array ) $aSearchOptions[ 'exclude_dir_paths' ];
+            $_aExcludeDirNames = ( array ) $aSearchOptions[ 'exclude_dir_names' ];
             $_bIsRecursive = $aSearchOptions[ 'is_recursive' ];
             
             if ( defined( 'GLOB_BRACE' ) ) { // in some OSes this flag constant is not available.
                 $_aFilePaths = $_bIsRecursive
-                    ? $this->doRecursiveGlob( $sClassDirPath . '*.' . $this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE, $_aExcludeDirPaths, $_aExcludeDirNames )
-                    : ( array ) glob( $sClassDirPath . '*.' . $this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE );
+                    ? $this->doRecursiveGlob( $sClassDirPath.'*.'.$this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE, $_aExcludeDirPaths, $_aExcludeDirNames )
+                    : ( array ) glob( $sClassDirPath.'*.'.$this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE );
                 return array_filter( $_aFilePaths ); // drop non-value elements.    
             } 
                 
             // For the Solaris operation system.
             $_aFilePaths = array();
-            foreach( $_aAllowedExtensions as $__sAllowedExtension ) {
+            foreach ( $_aAllowedExtensions as $__sAllowedExtension ) {
                                 
                 $__aFilePaths = $_bIsRecursive
-                    ? $this->doRecursiveGlob( $sClassDirPath . '*.' . $__sAllowedExtension, 0, $_aExcludeDirPaths, $_aExcludeDirNames )
-                    : ( array ) glob( $sClassDirPath . '*.' . $__sAllowedExtension );
+                    ? $this->doRecursiveGlob( $sClassDirPath.'*.'.$__sAllowedExtension, 0, $_aExcludeDirPaths, $_aExcludeDirNames )
+                    : ( array ) glob( $sClassDirPath.'*.'.$__sAllowedExtension );
 
                 $_aFilePaths = array_merge( $__aFilePaths, $_aFilePaths );
                 
@@ -162,27 +162,27 @@ 
         /**
          * Constructs the file pattern of the file extension part used for the glob() function with the given file extensions.
          */
-        protected function _getGlobPatternExtensionPart( array $aExtensions=array( 'php', 'inc' ) ) {
+        protected function _getGlobPatternExtensionPart( array $aExtensions = array( 'php', 'inc' ) ) {
             return empty( $aExtensions ) 
                 ? '*'
-                : '{' . implode( ',', $aExtensions ) . '}';
+                : '{'.implode( ',', $aExtensions ).'}';
         }
         
         /**
          * The recursive version of the glob() function.
          */
-        protected function doRecursiveGlob( $sPathPatten, $nFlags=0, array $aExcludeDirs=array(), array $aExcludeDirNames=array() ) {
+        protected function doRecursiveGlob( $sPathPatten, $nFlags = 0, array $aExcludeDirs = array(), array $aExcludeDirNames = array() ) {
 
             $_aFiles = glob( $sPathPatten, $nFlags );    
             $_aFiles = is_array( $_aFiles ) ? $_aFiles : array(); // glob() can return false.
-            $_aDirs = glob( dirname( $sPathPatten ) . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR|GLOB_NOSORT );
+            $_aDirs = glob( dirname( $sPathPatten ).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR | GLOB_NOSORT );
             $_aDirs = is_array( $_aDirs ) ? $_aDirs : array();
             foreach ( $_aDirs as $_sDirPath ) {
 
                 if ( in_array( $_sDirPath, $aExcludeDirs ) ) { continue; }
                 if ( in_array( pathinfo( $_sDirPath, PATHINFO_DIRNAME ), $aExcludeDirNames ) ) { continue; }
                 
-                $_aFiles = array_merge( $_aFiles, $this->doRecursiveGlob( $_sDirPath . DIRECTORY_SEPARATOR . basename( $sPathPatten ), $nFlags, $aExcludeDirs ) );
+                $_aFiles = array_merge( $_aFiles, $this->doRecursiveGlob( $_sDirPath.DIRECTORY_SEPARATOR.basename( $sPathPatten ), $nFlags, $aExcludeDirs ) );
                 
             }
             return $_aFiles;
@@ -196,25 +196,25 @@ 
      * 
      */
     protected function _registerClasses( $sIncludeFunction ) {
-        spl_autoload_register( array( $this, '_replyToAutoLoad_' . $sIncludeFunction ) );
+        spl_autoload_register( array( $this, '_replyToAutoLoad_'.$sIncludeFunction ) );
     }    
         /**
          * Responds to the PHP auto-loader and includes the passed class based on the previously stored path associated with the class name in the constructor.
          */
         public function _replyToAutoLoad_include( $sCalledUnknownClassName ) {            
-            if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
+            if ( !isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             include( $this->_aClasses[ $sCalledUnknownClassName ] );
         }
         public function _replyToAutoLoad_include_once( $sCalledUnknownClassName ) {            
-            if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
+            if ( !isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             include_once( $this->_aClasses[ $sCalledUnknownClassName ] );
         }        
         public function _replyToAutoLoad_require( $sCalledUnknownClassName ) {            
-            if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
+            if ( !isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             require( $this->_aClasses[ $sCalledUnknownClassName ] );
         }        
         public function _replyToAutoLoad_require_once( $sCalledUnknownClassName ) {            
-            if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
+            if ( !isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             require_once( $this->_aClasses[ $sCalledUnknownClassName ] );
         } 
     

Braces +6 added lines, -5 removed lines

@@ -137,7 +137,8 @@ 
             $_aExcludeDirNames = ( array ) $aSearchOptions['exclude_dir_names'];
             $_bIsRecursive = $aSearchOptions[ 'is_recursive' ];
             
-            if ( defined( 'GLOB_BRACE' ) ) { // in some OSes this flag constant is not available.
+            if ( defined( 'GLOB_BRACE' ) ) {
+// in some OSes this flag constant is not available.
                 $_aFilePaths = $_bIsRecursive
                     ? $this->doRecursiveGlob( $sClassDirPath . '*.' . $this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE, $_aExcludeDirPaths, $_aExcludeDirNames )
                     : ( array ) glob( $sClassDirPath . '*.' . $this->_getGlobPatternExtensionPart( $_aAllowedExtensions ), GLOB_BRACE );
@@ -201,19 +202,19 @@ 
         /**
          * Responds to the PHP auto-loader and includes the passed class based on the previously stored path associated with the class name in the constructor.
          */
-        public function _replyToAutoLoad_include( $sCalledUnknownClassName ) {            
+        public function _replyToAutoLoad_include( $sCalledUnknownClassName ) {
             if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             include( $this->_aClasses[ $sCalledUnknownClassName ] );
         }
-        public function _replyToAutoLoad_include_once( $sCalledUnknownClassName ) {            
+        public function _replyToAutoLoad_include_once( $sCalledUnknownClassName ) {
             if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             include_once( $this->_aClasses[ $sCalledUnknownClassName ] );
         }        
-        public function _replyToAutoLoad_require( $sCalledUnknownClassName ) {            
+        public function _replyToAutoLoad_require( $sCalledUnknownClassName ) {
             if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             require( $this->_aClasses[ $sCalledUnknownClassName ] );
         }        
-        public function _replyToAutoLoad_require_once( $sCalledUnknownClassName ) {            
+        public function _replyToAutoLoad_require_once( $sCalledUnknownClassName ) {
             if ( ! isset( $this->_aClasses[ $sCalledUnknownClassName ] ) ) { return; }
             require_once( $this->_aClasses[ $sCalledUnknownClassName ] );
         } 

development/factory/_abstract/utility/base_utility/AdminPageFramework_Utility_String.php

Doc Comments +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
      * Converts non-alphabetic characters to underscore.
      * 
      * @since       2.0.0
-     * @return      string|null     The sanitized string.
+     * @return      string     The sanitized string.
      * @todo        Change the method name as it does not tell for what it will sanitized.
      * @todo        Examine why null needs to be returned.
      */ 
@@ -90,7 +90,7 @@ 
     /**
      * Returns the given string length.
      * @since       3.3.0
-     * @return      integer|null        Null if an array is given.
+     * @return      integer        Null if an array is given.
      */
     static public function getStringLength( $sString ) {
         return function_exists( 'mb_strlen' )

Spacing +6 added lines, -6 removed lines

@@ -56,9 +56,9 @@ 
      * @since       2.0.0
      * @return      string|integer      A numeric value will be returned. 
      */ 
-    static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) {
+    static public function fixNumber( $nToFix, $nDefault, $nMin = '', $nMax = '' ) {
 
-        if ( ! is_numeric( trim( $nToFix ) ) ) { 
+        if ( !is_numeric( trim( $nToFix ) ) ) { 
             return $nDefault; 
         }
         if ( $nMin !== '' && $nToFix < $nMin ) { 
@@ -80,7 +80,7 @@ 
     static public function minifyCSS( $sCSSRules ) {
         
         return str_replace( 
-            array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    '),     // remove line breaks, tab, and white sspaces.
+            array( "\r\n", "\r", "\n", "\t", '  ', '    ', '    ' ), // remove line breaks, tab, and white sspaces.
             '', 
             preg_replace( '!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $sCSSRules ) // remove comments
         );
@@ -105,8 +105,8 @@ 
      */     
     static public function getNumberOfReadableSize( $nSize ) {
         
-        $_nReturn     = substr( $nSize, 0, -1 );
-        switch( strtoupper( substr( $nSize, -1 ) ) ) {
+        $_nReturn = substr( $nSize, 0, -1 );
+        switch ( strtoupper( substr( $nSize, -1 ) ) ) {
             case 'P':
                 $_nReturn *= 1024;
             case 'T':
@@ -132,7 +132,7 @@ 
         $_nLog      = log( $nBytes, 1024 );
         $_iPower    = ( int ) $_nLog;
         $_iSize     = pow( 1024, $_nLog - $_iPower );
-        return $_iSize . $_aUnits[ $_iPower ];
+        return $_iSize.$_aUnits[ $_iPower ];
     }
     
     /**

Braces +3 added lines, -3 removed lines

@@ -58,13 +58,13 @@
      */ 
     static public function fixNumber( $nToFix, $nDefault, $nMin='', $nMax='' ) {
 
-        if ( ! is_numeric( trim( $nToFix ) ) ) { 
+        if ( ! is_numeric( trim( $nToFix ) ) ) {
             return $nDefault; 
         }
-        if ( $nMin !== '' && $nToFix < $nMin ) { 
+        if ( $nMin !== '' && $nToFix < $nMin ) {
             return $nMin; 
         }
-        if ( $nMax !== '' && $nToFix > $nMax ) { 
+        if ( $nMax !== '' && $nToFix > $nMax ) {
             return $nMax; 
         }
         return $nToFix;

development/factory/_abstract/utility/base_utility/AdminPageFramework_Utility_SystemInformation.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      * Returns an array of constants.
      * 
      * @since       3.4.6
-     * @param       array|string      $asCategory      The category key names of the returning array.
+     * @param       array|string      $asCategories      The category key names of the returning array.
      */
     static public function getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) {
         

Spacing +11 added lines, -11 removed lines

@@ -41,7 +41,7 @@ 
         $_sOutput = preg_replace(
             array(
                 '#^.*<body>(.*)</body>.*$#ms', '#<h2>PHP License</h2>.*$#ms',
-                '#<h1>Configuration</h1>#',  "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
+                '#<h1>Configuration</h1>#', "#\r?\n#", "#</(h1|h2|h3|tr)>#", '# +<#',
                 "#[ \t]+#", '#&nbsp;#', '#  +#', '# class=".*?"#', '%&#039;%',
                 '#<tr>(?:.*?)" src="(?:.*?)=(.*?)" alt="PHP Logo" /></a>'
                     .'<h1>PHP Version (.*?)</h1>(?:\n+?)</td></tr>#',
@@ -52,11 +52,11 @@ 
                 '#</tr>#'
             ),
             array(
-                '$1', '', '', '', '</$1>' . "\n", '<', ' ', ' ', ' ', '', ' ',
+                '$1', '', '', '', '</$1>'."\n", '<', ' ', ' ', ' ', '', ' ',
                 '<h2>PHP Configuration</h2>'."\n".'<tr><td>PHP Version</td><td>$2</td></tr>'.
                 "\n".'<tr><td>PHP Egg</td><td>$1</td></tr>',
                 '<tr><td>PHP Credits Egg</td><td>$1</td></tr>',
-                '<tr><td>Zend Engine</td><td>$2</td></tr>' . "\n" . '<tr><td>Zend Egg</td><td>$1</td></tr>',
+                '<tr><td>Zend Engine</td><td>$2</td></tr>'."\n".'<tr><td>Zend Egg</td><td>$1</td></tr>',
                 ' ',
                 '%S%',
                 '%E%'
@@ -68,7 +68,7 @@ 
         unset( $_aSections[ 0 ] );
 
         $_aOutput = array();
-        foreach( $_aSections as $_sSection ) {
+        foreach ( $_aSections as $_sSection ) {
             $_iIndex = substr( $_sSection, 0, strpos( $_sSection, '</h2>' ) );
             preg_match_all(
                 '#%S%(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?(?:<td>(.*?)</td>)?%E%#',
@@ -76,12 +76,12 @@ 
                 $_aAskApache, 
                 PREG_SET_ORDER
             );
-            foreach( $_aAskApache as $_aMatches ) {
-                if ( ! isset( $_aMatches[ 1 ], $_aMatches[ 2 ] ) ) {
+            foreach ( $_aAskApache as $_aMatches ) {
+                if ( !isset( $_aMatches[ 1 ], $_aMatches[ 2 ] ) ) {
                     array_slice( $_aMatches, 2 );
                     continue;
                 }
-                $_aOutput[ $_iIndex ][ $_aMatches[ 1 ] ] = ! isset( $_aMatches[ 3 ] ) || $_aMatches[ 2 ] == $_aMatches[ 3 ]
+                $_aOutput[ $_iIndex ][ $_aMatches[ 1 ] ] = !isset( $_aMatches[ 3 ] ) || $_aMatches[ 2 ] == $_aMatches[ 3 ]
                     ? $_aMatches[ 2 ] 
                     : array_slice( $_aMatches, 2 );
             }
@@ -97,7 +97,7 @@ 
      * @since       3.4.6
      * @param       array|string      $asCategory      The category key names of the returning array.
      */
-    static public function getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) {
+    static public function getDefinedConstants( $asCategories = null, $asRemovingCategories = null ) {
         
         $_aCategories           = is_array( $asCategories ) ? $asCategories : array( $asCategories );
         $_aCategories           = array_filter( $_aCategories );
@@ -124,8 +124,8 @@ 
     static public function getPHPErrorLogPath() {
                 
         $_aPHPInfo = self::getPHPInfo();
-        return isset( $_aPHPInfo['PHP Core']['error_log'] ) 
-            ? $_aPHPInfo['PHP Core']['error_log']
+        return isset( $_aPHPInfo[ 'PHP Core' ][ 'error_log' ] ) 
+            ? $_aPHPInfo[ 'PHP Core' ][ 'error_log' ]
             : '';
         
     }
@@ -134,7 +134,7 @@ 
      * Returns a PHP error log.
      * @since       3.4.6
      */
-    static public function getPHPErrorLog( $iLines=1 ) {
+    static public function getPHPErrorLog( $iLines = 1 ) {
         
         $_sLog = self::getFileTailContents( self::getPHPErrorLogPath(), $iLines );
         

development/factory/_abstract/utility/base_utility/AdminPageFramework_Utility_URL.php

Doc Comments +2 added lines

@@ -23,6 +23,7 @@ 
      * 
      * @since       2.0.0
      * @since       3.5.7       Moved from `AdminPageFramework_Utility`.
+     * @param string $sQueryKey
      * @return      string|null
      */ 
     static public function getQueryValueInURLByKey( $sURL, $sQueryKey ) {
@@ -72,6 +73,7 @@ 
         /**
          * Returns the port suffix in the currently loading url.
          * @since       3.5.7
+         * @param boolean $_bSSL
          * @return      string
          */
         static private function _getURLPortSuffix( $_bSSL ) {

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
             0 => '',
             1 => 's',
         );
-        $_sProtocol         = substr( $_sServerProtocol, 0, strpos( $_sServerProtocol, '/' ) )
+        $_sProtocol = substr( $_sServerProtocol, 0, strpos( $_sServerProtocol, '/' ) )
             . $_aProrocolSuffix[ ( int ) $_bSSL ];
         
         // Port: e.g. :80
@@ -66,7 +66,7 @@ 
                 : $_SERVER[ 'SERVER_NAME' ] 
             );
             
-        return $_sProtocol . '://' . $_sHost . $_sPort . $_SERVER[ 'REQUEST_URI' ];
+        return $_sProtocol.'://'.$_sHost.$_sPort.$_SERVER[ 'REQUEST_URI' ];
         
     }
         /**
@@ -79,10 +79,10 @@ 
                 ? ( string ) $_SERVER[ 'SERVER_PORT' ]
                 : '';
             $_aPort     = array(
-                0 => ':' . $_sPort,
+                0 => ':'.$_sPort,
                 1 => '',
             );
-            $_bPortSet  = ( ! $_bSSL && '80' === $_sPort ) || ( $_bSSL && '443' === $_sPort );
+            $_bPortSet = ( !$_bSSL && '80' === $_sPort ) || ( $_bSSL && '443' === $_sPort );
             return $_aPort[ ( int ) $_bPortSet ];
         }
     

development/factory/_abstract/utility/wp_utility/AdminPageFramework_WPUtility_Page.php

Doc Comments +1 added lines

@@ -284,6 +284,7 @@
              * Checkes whether the passed base url name is of the admin index page.
              * @since       3.5.3
              * return       boolean      Whether the passed base url name is of the admin index page.
+             * @param string $sPageNow
              */
             static private function _isInAdminIndex( $sPageNow ) {
                 return in_array(

Braces +7 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
         
         // Since the current page will be the same throughout the execution of the script, 
         // once it's found, there is no need to find it again.
-        if ( $_sCurrentPostType ) { 
+        if ( $_sCurrentPostType ) {
             return $_sCurrentPostType; 
         }
         $_sCurrentPostType = self::_getCurrentPostType();
@@ -139,7 +139,7 @@ 
     static public function isPostDefinitionPage( $asPostTypes=array() ) {
         
         // If it's not the post definition page, 
-        if ( ! in_array( self::getPageNow(), array( 'post.php', 'post-new.php', ) ) ) { 
+        if ( ! in_array( self::getPageNow(), array( 'post.php', 'post-new.php', ) ) ) {
             return false;
         }
         return self::isCurrentPostTypeIn( $asPostTypes );
@@ -158,7 +158,7 @@ 
         $_aPostTypes = self::getAsArray( $asPostTypes );        
         
         // If the parameter is empty, 
-        if ( empty( $_aPostTypes ) ) { 
+        if ( empty( $_aPostTypes ) ) {
             return true;
         }
 
@@ -174,13 +174,13 @@ 
      */
     static public function isPostListingPage( $asPostTypes=array() ) {
                 
-        if ( 'edit.php' != self::getPageNow() ) { 
+        if ( 'edit.php' != self::getPageNow() ) {
             return false;
         }
         
         $_aPostTypes = self::getAsArray( $asPostTypes );    
         
-        if ( ! isset( $_GET['post_type'] )  ) { 
+        if ( ! isset( $_GET['post_type'] )  ) {
             return in_array( 'post', $_aPostTypes );
         }
 
@@ -269,11 +269,9 @@ 
                 
                 if ( is_network_admin() ) {
                     $_sNeedle = '#/wp-admin/network/?(.*?)$#i';
-                }
-                else if ( is_user_admin() ) {
+                } else if ( is_user_admin() ) {
                     $_sNeedle = '#/wp-admin/user/?(.*?)$#i';
-                }
-                else {
+                } else {
                     $_sNeedle = '#/wp-admin/?(.*?)$#i';
                 }                
                 preg_match( $_sNeedle, $_SERVER['PHP_SELF'], $_aMatches );

Spacing +25 added lines, -25 removed lines

@@ -56,7 +56,7 @@ 
                 'getPostTypeByTypeNow',
                 'getPostTypeByScreenObject',
                 'getPostTypeByREQUEST',
-                'getPostTypeByPostObject',  // 3.6.0+ Moved to the last as it is not reliable.
+                'getPostTypeByPostObject', // 3.6.0+ Moved to the last as it is not reliable.
             );
             foreach ( $_aMethodsToTry as $_sMethodName ) {
                 $_sPostType = call_user_func( array( __CLASS__, $_sMethodName ) );
@@ -75,28 +75,28 @@ 
              * @since       3.5.3
              */            
             static public function getPostTypeByTypeNow() {
-                if ( isset( $GLOBALS['typenow'] ) && $GLOBALS['typenow'] ) {
-                    return $GLOBALS['typenow'];
+                if ( isset( $GLOBALS[ 'typenow' ] ) && $GLOBALS[ 'typenow' ] ) {
+                    return $GLOBALS[ 'typenow' ];
                 }                
             }
             static public function getPostTypeByScreenObject() {
                 if ( 
-                    isset( $GLOBALS['current_screen']->post_type )
-                    && $GLOBALS['current_screen']->post_type 
+                    isset( $GLOBALS[ 'current_screen' ]->post_type )
+                    && $GLOBALS[ 'current_screen' ]->post_type 
                 ) {
-                    return $GLOBALS['current_screen']->post_type;
+                    return $GLOBALS[ 'current_screen' ]->post_type;
                 }    
             }         
             /**
              * Tries to find the post type from the URL query for type.
              */
             static public function getPostTypeByREQUEST() {
-                if ( isset( $_REQUEST['post_type'] ) ) {
-                    return sanitize_key( $_REQUEST['post_type'] );
+                if ( isset( $_REQUEST[ 'post_type' ] ) ) {
+                    return sanitize_key( $_REQUEST[ 'post_type' ] );
                 }
-                if ( isset( $_GET['post'] ) && $_GET['post'] ) {
+                if ( isset( $_GET[ 'post' ] ) && $_GET[ 'post' ] ) {
                     // It will perform a database query.
-                    return get_post_type( $_GET['post'] );
+                    return get_post_type( $_GET[ 'post' ] );
                 }                                
             }
             /**
@@ -104,10 +104,10 @@ 
              */
             static public function getPostTypeByPostObject() {
                 if ( 
-                    isset( $GLOBALS['post'], $GLOBALS['post']->post_type ) 
-                    && $GLOBALS['post']->post_type 
+                    isset( $GLOBALS[ 'post' ], $GLOBALS[ 'post' ]->post_type ) 
+                    && $GLOBALS[ 'post' ]->post_type 
                 ) {
-                    return $GLOBALS['post']->post_type;
+                    return $GLOBALS[ 'post' ]->post_type;
                 }
             }            
             /**#@-*/
@@ -119,9 +119,9 @@ 
      * @param       array|string        The post type slug(s) to check. If this is empty, the method just checks the current page is a taxonomy page.
      * @return      boolean
      */    
-    static public function isCustomTaxonomyPage( $asPostTypes=array() ) {
+    static public function isCustomTaxonomyPage( $asPostTypes = array() ) {
         
-        if ( ! in_array( self::getPageNow(), array( 'tags.php', 'edit-tags.php', ) ) ) {
+        if ( !in_array( self::getPageNow(), array( 'tags.php', 'edit-tags.php',) ) ) {
             return false;
         }
         return self::isCurrentPostTypeIn( $asPostTypes );
@@ -136,10 +136,10 @@ 
      * Otherwise, it will check if the page belongs to the given post type(s).
      * @return      boolean
      */
-    static public function isPostDefinitionPage( $asPostTypes=array() ) {
+    static public function isPostDefinitionPage( $asPostTypes = array() ) {
         
         // If it's not the post definition page, 
-        if ( ! in_array( self::getPageNow(), array( 'post.php', 'post-new.php', ) ) ) { 
+        if ( !in_array( self::getPageNow(), array( 'post.php', 'post-new.php',) ) ) { 
             return false;
         }
         return self::isCurrentPostTypeIn( $asPostTypes );
@@ -172,7 +172,7 @@ 
      * 
      * @since 3.0.0
      */
-    static public function isPostListingPage( $asPostTypes=array() ) {
+    static public function isPostListingPage( $asPostTypes = array() ) {
                 
         if ( 'edit.php' != self::getPageNow() ) { 
             return false;
@@ -180,11 +180,11 @@ 
         
         $_aPostTypes = self::getAsArray( $asPostTypes );    
         
-        if ( ! isset( $_GET['post_type'] )  ) { 
+        if ( !isset( $_GET[ 'post_type' ] ) ) { 
             return in_array( 'post', $_aPostTypes );
         }
 
-        return in_array( $_GET['post_type'], $_aPostTypes );
+        return in_array( $_GET[ 'post_type' ], $_aPostTypes );
         
     }
     
@@ -209,8 +209,8 @@ 
         }
         
         // If already set, use that.
-        if ( isset( $GLOBALS['pagenow'] ) ) {
-            self::$_sPageNow = $GLOBALS['pagenow'];
+        if ( isset( $GLOBALS[ 'pagenow' ] ) ) {
+            self::$_sPageNow = $GLOBALS[ 'pagenow' ];
             return self::$_sPageNow;
         }
                         
@@ -230,7 +230,7 @@ 
          * @return      string      The current page url base name.
          */
         static private function _getPageNow_FrontEnd() {
-            if ( preg_match( '#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $_aMatches ) ) {
+            if ( preg_match( '#([^/]+\.php)([?/].*?)?$#i', $_SERVER[ 'PHP_SELF' ], $_aMatches ) ) {
                 return strtolower( $_aMatches[ 1 ] );
             }
             return 'index.php';                
@@ -276,7 +276,7 @@ 
                 else {
                     $_sNeedle = '#/wp-admin/?(.*?)$#i';
                 }                
-                preg_match( $_sNeedle, $_SERVER['PHP_SELF'], $_aMatches );
+                preg_match( $_sNeedle, $_SERVER[ 'PHP_SELF' ], $_aMatches );
                 return preg_replace( '#\?.*?$#', '', trim( $_aMatches[ 1 ], '/' ) );
                 
             }
@@ -311,7 +311,7 @@ 
         
         if ( isset( $GLBOALS[ 'page_hook' ] ) ) {
             return is_network_admin() 
-                ? $GLBOALS[ 'page_hook' ] . '-network'
+                ? $GLBOALS[ 'page_hook' ].'-network'
                 : $GLBOALS[ 'page_hook' ];
         }
         

development/factory/admin_page/AdminPageFramework.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * @since       2.0.0
      * @see         http://codex.wordpress.org/Roles_and_Capabilities
      * @see         http://codex.wordpress.org/I18n_for_WordPress_Developers#Text_Domains
-     * @param       array|integer|string    $aisOptionKey    (optional) specifies the option key name to store in the options table. If this is not set, the instantiated class name will be used as default. 
+     * @param       array|integer|string    $isOptionKey    (optional) specifies the option key name to store in the options table. If this is not set, the instantiated class name will be used as default. 
      * [3.5.9+] If an integer is given, a transient will be used. If an array of option key arguments is given, the argument values will be set to the framework properties.
      * - type - either `options_table` or `transient`.
      * - key - the option key or the transient key

Spacing +5 added lines, -5 removed lines

@@ -56,9 +56,9 @@ 
      * @param       string                  $sCapability    (optional) sets the overall access level to the admin pages created by the framework. The used capabilities are listed <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. The capability can be set per page, tab, setting section, setting field. Default: `manage_options`
      * @param       string                  $sTextDomain    (optional) the <a href="http://codex.wordpress.org/I18n_for_WordPress_Developers#Text_Domains" target="_blank">text domain</a> used for the framework's system messages. Default: admin-page-framework.
      */
-    public function __construct( $isOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ){
+    public function __construct( $isOptionKey = null, $sCallerPath = null, $sCapability = 'manage_options', $sTextDomain = 'admin-page-framework' ) {
                         
-        if ( ! $this->_isInstantiatable() ) {
+        if ( !$this->_isInstantiatable() ) {
             return;
         }
                         
@@ -66,15 +66,15 @@ 
             $isOptionKey, 
             $sCallerPath 
                 ? trim( $sCallerPath )
-                : $sCallerPath = ( is_admin() && ( isset( $GLOBALS['pagenow'] ) && in_array( $GLOBALS['pagenow'], array( 'plugins.php', ) ) || isset( $_GET['page'] ) ) 
+                : $sCallerPath = ( is_admin() && ( isset( $GLOBALS[ 'pagenow' ] ) && in_array( $GLOBALS[ 'pagenow' ], array( 'plugins.php',) ) || isset( $_GET[ 'page' ] ) ) 
                     ? AdminPageFramework_Utility::getCallerScriptPath( __FILE__ ) 
                     : null 
-                ),     // this is important to attempt to find the caller script path here when separating the library into multiple files.    
+                ), // this is important to attempt to find the caller script path here when separating the library into multiple files.    
             $sCapability, 
             $sTextDomain 
         );
         
-        $this->oUtil->addAndDoAction( $this, 'start_' . $this->oProp->sClassName, $this );
+        $this->oUtil->addAndDoAction( $this, 'start_'.$this->oProp->sClassName, $this );
 
     }    
         

Braces +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      * @param       string                  $sCapability    (optional) sets the overall access level to the admin pages created by the framework. The used capabilities are listed <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. The capability can be set per page, tab, setting section, setting field. Default: `manage_options`
      * @param       string                  $sTextDomain    (optional) the <a href="http://codex.wordpress.org/I18n_for_WordPress_Developers#Text_Domains" target="_blank">text domain</a> used for the framework's system messages. Default: admin-page-framework.
      */
-    public function __construct( $isOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ){
+    public function __construct( $isOptionKey=null, $sCallerPath=null, $sCapability='manage_options', $sTextDomain='admin-page-framework' ) {
                         
         if ( ! $this->_isInstantiatable() ) {
             return;

development/factory/admin_page/AdminPageFramework_Controller.php

Doc Comments +6 added lines

@@ -142,6 +142,7 @@ 
      *     <li>**media** - (optional, string) the description of the field which is inserted into the after the input field tag.</li>
      *     <li>**attributes** - (optional, array) [3.3.0+] attributes array. `array( 'data-id' => '...' )`</li>
      * </ul>
+     * @param string $sSRC
      * @return      string      The style handle ID. If the passed url is not a valid url string, an empty string will be returned.
      */    
     public function enqueueStyle( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
@@ -234,6 +235,7 @@ 
     * @param        string      the tagged HTML link text.
     * @param        string      (optional) another tagged HTML link text.
     * @param        string      (optional) add more as many as want by adding items to the next parameters.
+    * @param string $sTaggedLinkHTML1
     * @access       public
     * @return       void
     */     
@@ -258,6 +260,9 @@ 
     * @param        string      the tagged HTML link text.
     * @param        string      (optional) another tagged HTML link text.
     * @param        string      (optional) add more as many as want by adding items to the next parameters.
+    * @param null|string $sTaggedLinkHTML1
+    * @param string $sTaggedLinkHTML2
+    * @param string $_and_more
     * @access       public
     * @return       void
     */    
@@ -274,6 +279,7 @@ 
      * 
      * @since       3.1.0
      * @since       3.3.1       Moved from `AdminPageFramework`.
+     * @param string $sLabel
      */  
     public function setPluginSettingsLinkLabel( $sLabel ) {
         $this->oProp->sLabelPluginSettingsLink = $sLabel;

Indentation +35 added lines, -35 removed lines

@@ -219,24 +219,24 @@ 
     }
     
     /**
-    * Adds the given link(s) into the description cell of the plugin listing table.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->addLinkToPluginDescription( 
-    *       "<a href='http://www.google.com'>Google</a>",
-    *       "<a href='http://www.yahoo.com'>Yahoo!</a>"
-    * );</code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public from protected.
-    * @since        3.3.1       Moved from `AdminPageFramework`.
-    * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        string      the tagged HTML link text.
-    * @param        string      (optional) another tagged HTML link text.
-    * @param        string      (optional) add more as many as want by adding items to the next parameters.
-    * @access       public
-    * @return       void
-    */     
+     * Adds the given link(s) into the description cell of the plugin listing table.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->addLinkToPluginDescription( 
+     *       "<a href='http://www.google.com'>Google</a>",
+     *       "<a href='http://www.yahoo.com'>Yahoo!</a>"
+     * );</code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public from protected.
+     * @since        3.3.1       Moved from `AdminPageFramework`.
+     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
+     * @param        string      the tagged HTML link text.
+     * @param        string      (optional) another tagged HTML link text.
+     * @param        string      (optional) add more as many as want by adding items to the next parameters.
+     * @access       public
+     * @return       void
+     */     
     public function addLinkToPluginDescription( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {
         if ( method_exists( $this->oLink, '_addLinkToPluginDescription' ) ) {
             $this->oLink->_addLinkToPluginDescription( func_get_args() );     
@@ -244,23 +244,23 @@ 
     }
 
     /**
-    * Adds the given link(s) into the title cell of the plugin listing table.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->addLinkToPluginTitle( 
-    *       "<a href='http://www.wordpress.org'>WordPress</a>"
-    * );</code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public from protected.
-    * @since        3.3.1       Moved from `AdminPageFramework`.
-    * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        string      the tagged HTML link text.
-    * @param        string      (optional) another tagged HTML link text.
-    * @param        string      (optional) add more as many as want by adding items to the next parameters.
-    * @access       public
-    * @return       void
-    */    
+     * Adds the given link(s) into the title cell of the plugin listing table.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->addLinkToPluginTitle( 
+     *       "<a href='http://www.wordpress.org'>WordPress</a>"
+     * );</code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public from protected.
+     * @since        3.3.1       Moved from `AdminPageFramework`.
+     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
+     * @param        string      the tagged HTML link text.
+     * @param        string      (optional) another tagged HTML link text.
+     * @param        string      (optional) add more as many as want by adding items to the next parameters.
+     * @access       public
+     * @return       void
+     */    
     public function addLinkToPluginTitle( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {    
         if ( method_exists( $this->oLink, '_addLinkToPluginTitle' ) ) {
             $this->oLink->_addLinkToPluginTitle( func_get_args() );     

Spacing +10 added lines, -10 removed lines

@@ -107,7 +107,7 @@ 
      * @param       array       $aCustomArgs    (optional) The argument array for more advanced parameters.
      * @return      array       The array holing the queued items.
      */
-    public function enqueueStyles( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function enqueueStyles( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         if ( method_exists( $this->oResource, '_enqueueStyles' ) ) {
             return $this->oResource->_enqueueStyles( $aSRCs, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
@@ -144,7 +144,7 @@ 
      * </ul>
      * @return      string      The style handle ID. If the passed url is not a valid url string, an empty string will be returned.
      */    
-    public function enqueueStyle( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function enqueueStyle( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         if ( method_exists( $this->oResource, '_enqueueStyle' ) ) {
             return $this->oResource->_enqueueStyle( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );     
         }
@@ -171,7 +171,7 @@ 
      * @param       array       (optional) The argument array for more advanced parameters.
      * @return      array        The array holding the queued items.
      */
-    public function enqueueScripts( $aSRCs, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
+    public function enqueueScripts( $aSRCs, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {
         if ( method_exists( $this->oResource, '_enqueueScripts' ) ) {
             return $this->oResource->_enqueueScripts( $aSRCs, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
@@ -212,7 +212,7 @@ 
      * </ul>
      * @return      string      The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      */
-    public function enqueueScript( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {    
+    public function enqueueScript( $sSRC, $sPageSlug = '', $sTabSlug = '', $aCustomArgs = array() ) {    
         if ( method_exists( $this->oResource, '_enqueueScript' ) ) {
             return $this->oResource->_enqueueScript( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
@@ -237,7 +237,7 @@ 
     * @access       public
     * @return       void
     */     
-    public function addLinkToPluginDescription( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {
+    public function addLinkToPluginDescription( $sTaggedLinkHTML1, $sTaggedLinkHTML2 = null, $_and_more = null ) {
         if ( method_exists( $this->oLink, '_addLinkToPluginDescription' ) ) {
             $this->oLink->_addLinkToPluginDescription( func_get_args() );     
         }
@@ -261,7 +261,7 @@ 
     * @access       public
     * @return       void
     */    
-    public function addLinkToPluginTitle( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {    
+    public function addLinkToPluginTitle( $sTaggedLinkHTML1, $sTaggedLinkHTML2 = null, $_and_more = null ) {    
         if ( method_exists( $this->oLink, '_addLinkToPluginTitle' ) ) {
             $this->oLink->_addLinkToPluginTitle( func_get_args() );     
         }
@@ -317,7 +317,7 @@ 
      * @param       string      (optional) The class selector used in the message HTML element. 'error' and 'updated' are prepared by WordPress but it's not limited to them and can pass a custom name. Default: 'error'.
      * @param       string      (optional) The ID of the message. If not set, the hash of the message will be used.
      */
-    public function setAdminNotice( $sMessage, $sClassSelector='error', $sID='' ) {
+    public function setAdminNotice( $sMessage, $sClassSelector = 'error', $sID = '' ) {
             
         $sID = $sID ? $sID : md5( $sMessage );
         
@@ -354,9 +354,9 @@ 
      * @param       boolean         If true, the passed key(s) will be appended to the property; otherwise, it will override the property.
      * @return      void
      */
-    public function setDisallowedQueryKeys( $asQueryKeys, $bAppend=true ) {
+    public function setDisallowedQueryKeys( $asQueryKeys, $bAppend = true ) {
         
-        if ( ! $bAppend ) {
+        if ( !$bAppend ) {
             $this->oProp->aDisallowedQueryKeys = ( array ) $asQueryKeys;
             return;
         }
@@ -399,7 +399,7 @@ 
      * @param       mixed       $vDefault       the default value that will be returned if nothing is stored.
      * @return      mixed       If the field ID is not specified
      */
-    static public function getOption( $sOptionKey, $asKey=null, $vDefault=null ) {
+    static public function getOption( $sOptionKey, $asKey = null, $vDefault = null ) {
         return AdminPageFramework_WPUtility::getOption( $sOptionKey, $asKey, $vDefault );
     }    
     

Braces +2 added lines, -2 removed lines

@@ -212,7 +212,7 @@ 
      * </ul>
      * @return      string      The script handle ID. If the passed url is not a valid url string, an empty string will be returned.
      */
-    public function enqueueScript( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {    
+    public function enqueueScript( $sSRC, $sPageSlug='', $sTabSlug='', $aCustomArgs=array() ) {
         if ( method_exists( $this->oResource, '_enqueueScript' ) ) {
             return $this->oResource->_enqueueScript( $sSRC, $sPageSlug, $sTabSlug, $aCustomArgs );
         }
@@ -261,7 +261,7 @@ 
     * @access       public
     * @return       void
     */    
-    public function addLinkToPluginTitle( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {    
+    public function addLinkToPluginTitle( $sTaggedLinkHTML1, $sTaggedLinkHTML2=null, $_and_more=null ) {
         if ( method_exists( $this->oLink, '_addLinkToPluginTitle' ) ) {
             $this->oLink->_addLinkToPluginTitle( func_get_args() );     
         }

development/factory/admin_page/AdminPageFramework_Controller_Form.php

Doc Comments -3 removed lines

@@ -153,9 +153,6 @@
     * @since        3.5.3       Removed the parameter declarations as they are caught with the func_get_args().
     * @access       public
     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        string      $sSectionID1        the section ID to remove.
-    * @param        string      $sSectionID2        (optional) another section ID to remove.
-    * @param        string      $_and_more          (optional) add more section IDs to the next parameters as many as necessary.
     * @return       void
     */    
     public function removeSettingSections( /* $sSectionID1=null, $sSectionID2=null, $_and_more=null */ ) {    

Indentation +45 added lines, -45 removed lines

@@ -140,24 +140,24 @@ 
     }
     
     /**
-    * Removes the given section(s) by section ID.
-    * 
-    * This accesses the property storing the added section arrays and removes the specified ones.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->removeSettingSections( 'text_fields', 'selectors', 'another_section', 'yet_another_section' );
-    * </code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public from protected.
-    * @since        3.5.3       Removed the parameter declarations as they are caught with the func_get_args().
-    * @access       public
-    * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        string      $sSectionID1        the section ID to remove.
-    * @param        string      $sSectionID2        (optional) another section ID to remove.
-    * @param        string      $_and_more          (optional) add more section IDs to the next parameters as many as necessary.
-    * @return       void
-    */    
+     * Removes the given section(s) by section ID.
+     * 
+     * This accesses the property storing the added section arrays and removes the specified ones.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->removeSettingSections( 'text_fields', 'selectors', 'another_section', 'yet_another_section' );
+     * </code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public from protected.
+     * @since        3.5.3       Removed the parameter declarations as they are caught with the func_get_args().
+     * @access       public
+     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
+     * @param        string      $sSectionID1        the section ID to remove.
+     * @param        string      $sSectionID2        (optional) another section ID to remove.
+     * @param        string      $_and_more          (optional) add more section IDs to the next parameters as many as necessary.
+     * @return       void
+     */    
     public function removeSettingSections( /* $sSectionID1=null, $sSectionID2=null, $_and_more=null */ ) {    
         
         foreach( func_get_args() as $_sSectionID ) {
@@ -224,38 +224,38 @@ 
         }
     }
     /**
-    * Adds the given field array items into the field array property.
-    * 
-    * Identical to the `addSettingFields()` method except that this method does not accept enumerated parameters. 
-    * 
-    * @since        2.1.2
-    * @since        3.0.0           Changed the scope to public from protected.
-    * @access       public
-    * @param        array|string    $asField        the field array or the target section ID. If the target section ID is set, the section_id key can be omitted from the next passing field array.
-    * @return       void
-    */    
+     * Adds the given field array items into the field array property.
+     * 
+     * Identical to the `addSettingFields()` method except that this method does not accept enumerated parameters. 
+     * 
+     * @since        2.1.2
+     * @since        3.0.0           Changed the scope to public from protected.
+     * @access       public
+     * @param        array|string    $asField        the field array or the target section ID. If the target section ID is set, the section_id key can be omitted from the next passing field array.
+     * @return       void
+     */    
     public function addSettingField( $asField ) {
         $this->oForm->addField( $asField );    
     }    
     
     /**
-    * Removes the given field(s) by field ID.
-    * 
-    * This accesses the property storing the added field arrays and removes the specified ones.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->removeSettingFields( 'fieldID_A', 'fieldID_B', 'fieldID_C', 'fieldID_D' );
-    * </code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public from protected.
-    * @access       public
-    * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        string      $sFieldID1      the field ID to remove.
-    * @param        string      $sFieldID2      (optional) another field ID to remove.
-    * @param        string      $_and_more      (optional) add more field IDs to the next parameters as many as necessary.
-    * @return void
-    */    
+     * Removes the given field(s) by field ID.
+     * 
+     * This accesses the property storing the added field arrays and removes the specified ones.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->removeSettingFields( 'fieldID_A', 'fieldID_B', 'fieldID_C', 'fieldID_D' );
+     * </code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public from protected.
+     * @access       public
+     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
+     * @param        string      $sFieldID1      the field ID to remove.
+     * @param        string      $sFieldID2      (optional) another field ID to remove.
+     * @param        string      $_and_more      (optional) add more field IDs to the next parameters as many as necessary.
+     * @return void
+     */    
     public function removeSettingFields( $sFieldID1, $sFieldID2=null, $_and_more ) {
         foreach( func_get_args() as $_sFieldID ) { 
             $this->oForm->removeField( $_sFieldID ); 

Braces +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
      */     
     public function addSettingSections( /* $aSection1, $aSection2=null, $_and_more=null */ ) {
         
-        foreach( func_get_args() as $asSection ) { 
+        foreach( func_get_args() as $asSection ) {
             $this->addSettingSection( $asSection ); 
         }
         
@@ -158,7 +158,7 @@ 
     * @param        string      $_and_more          (optional) add more section IDs to the next parameters as many as necessary.
     * @return       void
     */    
-    public function removeSettingSections( /* $sSectionID1=null, $sSectionID2=null, $_and_more=null */ ) {    
+    public function removeSettingSections( /* $sSectionID1=null, $sSectionID2=null, $_and_more=null */ ) {
         
         foreach( func_get_args() as $_sSectionID ) {
             $this->oForm->removeSection( $_sSectionID );
@@ -218,8 +218,8 @@ 
      * @remark      Accepts variadic parameters; the number of accepted parameters are not limited to three.
      * @remark      The actual registration will be performed in the <em>_replyToRegisterSettings()</em> method with the <em>admin_menu</em> hook.
      */     
-    public function addSettingFields( /* $aField1, $aField2=null, $_and_more=null */ ) {    
-        foreach( func_get_args() as $aField ) { 
+    public function addSettingFields( /* $aField1, $aField2=null, $_and_more=null */ ) {
+        foreach( func_get_args() as $aField ) {
             $this->addSettingField( $aField ); 
         }
     }
@@ -257,7 +257,7 @@ 
     * @return void
     */    
     public function removeSettingFields( $sFieldID1, $sFieldID2=null, $_and_more ) {
-        foreach( func_get_args() as $_sFieldID ) { 
+        foreach( func_get_args() as $_sFieldID ) {
             $this->oForm->removeField( $_sFieldID ); 
         }
     }    

Spacing +16 added lines, -16 removed lines

@@ -72,7 +72,7 @@ 
      */     
     public function addSettingSections( /* $aSection1, $aSection2=null, $_and_more=null */ ) {
         
-        foreach( func_get_args() as $asSection ) { 
+        foreach ( func_get_args() as $asSection ) { 
             $this->addSettingSection( $asSection ); 
         }
         
@@ -95,7 +95,7 @@ 
      */
     public function addSettingSection( $asSection ) {
                 
-        if ( ! is_array( $asSection ) ) {
+        if ( !is_array( $asSection ) ) {
             $this->_sTargetPageSlug = is_string( $asSection )
                 ? $asSection 
                 : $this->_sTargetPageSlug;
@@ -122,17 +122,17 @@ 
             )
         ); // avoid undefined index warnings.
         
-        $aSection['page_slug']          = $aSection['page_slug'] 
-            ? $this->oUtil->sanitizeSlug( $aSection['page_slug'] ) 
+        $aSection[ 'page_slug' ] = $aSection[ 'page_slug' ] 
+            ? $this->oUtil->sanitizeSlug( $aSection[ 'page_slug' ] ) 
             : ( $this->oProp->sDefaultPageSlug 
                 ? $this->oProp->sDefaultPageSlug 
                 : null 
             );
-        $aSection['tab_slug']           = $this->oUtil->sanitizeSlug( $aSection['tab_slug'] );
-        $aSection['section_tab_slug']   = $this->oUtil->sanitizeSlug( $aSection['section_tab_slug'] );
+        $aSection[ 'tab_slug' ]           = $this->oUtil->sanitizeSlug( $aSection[ 'tab_slug' ] );
+        $aSection[ 'section_tab_slug' ]   = $this->oUtil->sanitizeSlug( $aSection[ 'section_tab_slug' ] );
         
         // A page slug is required.
-        if ( ! $aSection['page_slug'] ) {
+        if ( !$aSection[ 'page_slug' ] ) {
             return; 
         }
         $this->oForm->addSection( $aSection );
@@ -160,7 +160,7 @@ 
     */    
     public function removeSettingSections( /* $sSectionID1=null, $sSectionID2=null, $_and_more=null */ ) {    
         
-        foreach( func_get_args() as $_sSectionID ) {
+        foreach ( func_get_args() as $_sSectionID ) {
             $this->oForm->removeSection( $_sSectionID );
         }
         
@@ -219,7 +219,7 @@ 
      * @remark      The actual registration will be performed in the <em>_replyToRegisterSettings()</em> method with the <em>admin_menu</em> hook.
      */     
     public function addSettingFields( /* $aField1, $aField2=null, $_and_more=null */ ) {    
-        foreach( func_get_args() as $aField ) { 
+        foreach ( func_get_args() as $aField ) { 
             $this->addSettingField( $aField ); 
         }
     }
@@ -256,8 +256,8 @@ 
     * @param        string      $_and_more      (optional) add more field IDs to the next parameters as many as necessary.
     * @return void
     */    
-    public function removeSettingFields( $sFieldID1, $sFieldID2=null, $_and_more ) {
-        foreach( func_get_args() as $_sFieldID ) { 
+    public function removeSettingFields( $sFieldID1, $sFieldID2 = null, $_and_more ) {
+        foreach ( func_get_args() as $_sFieldID ) { 
             $this->oForm->removeField( $_sFieldID ); 
         }
     }    
@@ -304,7 +304,7 @@ 
             $this->oProp->sOptionKey, 
             empty( $_aParams ) 
                 ? null                  // will return the entire options array
-                : $_aDimensionalKeys,   // dimensional keys
+                : $_aDimensionalKeys, // dimensional keys
             $_mDefault, // default
             $this->getSavedOptions() + $this->oProp->getDefaultOptions( $this->oForm->aFields ) // additional array to merge with the options
         );
@@ -323,18 +323,18 @@ 
      * If the user has not submitted the form, the framework will try to return the default value set in the field definition array.
      * @deprecated  3.3.0
      */
-    public function getFieldValue( $sFieldID, $sSectionID='' ) {
+    public function getFieldValue( $sFieldID, $sSectionID = '' ) {
                                
-        trigger_error( 'Admin Page Framework: ' . ' : ' . sprintf( __( 'The method is deprecated: %1$s. Use %2$s instead.', $this->oProp->sTextDomain ), __METHOD__, 'getValue()' ), E_USER_WARNING );
+        trigger_error( 'Admin Page Framework: '.' : '.sprintf( __( 'The method is deprecated: %1$s. Use %2$s instead.', $this->oProp->sTextDomain ), __METHOD__, 'getValue()' ), E_USER_WARNING );
     
         $_aOptions = $this->oUtil->uniteArrays( $this->oProp->aOptions, $this->oProp->getDefaultOptions( $this->oForm->aFields ) );
         /* If it's saved, return it */
-        if ( ! $sSectionID ) {
+        if ( !$sSectionID ) {
             if ( array_key_exists( $sFieldID, $_aOptions ) ) {
                 return $_aOptions[ $sFieldID ];
             }    
             // loop through section elements
-            foreach( $_aOptions as $aOptions ) {
+            foreach ( $_aOptions as $aOptions ) {
                 if ( array_key_exists( $sFieldID, $aOptions ) ) {
                     return $aOptions[ $sFieldID ];
                 }

development/factory/admin_page/AdminPageFramework_Controller_Menu.php

Doc Comments +3 added lines

@@ -48,6 +48,8 @@ 
      *  <li>a base64-encoded SVG using a data URI, which will be colored to match the color scheme. This should begin with 'data:image/svg+xml;base64,'.</li>
      * </ul>
      * @param       string      (optional) the position number that is passed to the <var>$position</var> parameter of the <a href="http://codex.wordpress.org/Function_Reference/add_menu_page">add_menu_page()</a> function.
+     * @param string $sIcon16x16
+     * @param integer $iMenuPosition
      * @return      void
      */
     public function setRootMenuPage( $sRootMenuLabel, $sIcon16x16=null, $iMenuPosition=null ) {
@@ -70,6 +72,7 @@ 
          * 
          * @since       2.0.0
          * @internal
+         * @param string $sMenuLabel
          * @return      void|string Returns the associated slug string, if true.
          */ 
         private function _isBuiltInMenuItem( $sMenuLabel ) {

Indentation +91 added lines, -91 removed lines

@@ -104,39 +104,39 @@ 
     }
     
     /**
-    * Adds sub-menu items on the left sidebar menu of the administration panel. 
-    * 
-    * It supports pages and links. Each of them has the specific array structure.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->addSubMenuItems(
-    *       array(
-    *           'title'         => 'Various Form Fields',
-    *           'page_slug'     => 'first_page',
-    *           'screen_icon'   => 'options-general',
-    *       ),
-    *       array(
-    *           'title'         => 'Manage Options',
-    *           'page_slug'     => 'second_page',
-    *           'screen_icon'   => 'link-manager',
-    *       ),
-    *       array(
-    *           'title'         => 'Google',
-    *           'href'          => 'http://www.google.com',    
-    *           'show_page_heading_tab' => false, // this removes the title from the page heading tabs.
-    *       )
-    * );</code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public.
-    * @remark       The sub menu page slug should be unique because add_submenu_page() can add one callback per page slug.
-    * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
-    * @param        array       $aSubMenuItem1      a first sub-menu array. A sub-menu array can be a link or a page. For the specifications of the array structures and its arguments, refer to the parameter section of the `addSubMenuItem()` method.
-    * @param        array       $aSubMenuItem2      (optional) a second sub-menu array.
-    * @param        array       $_and_more          (optional) a third and add items as many as necessary with next parameters.
-    * @access       public
-    * @return       void
-    */     
+     * Adds sub-menu items on the left sidebar menu of the administration panel. 
+     * 
+     * It supports pages and links. Each of them has the specific array structure.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->addSubMenuItems(
+     *       array(
+     *           'title'         => 'Various Form Fields',
+     *           'page_slug'     => 'first_page',
+     *           'screen_icon'   => 'options-general',
+     *       ),
+     *       array(
+     *           'title'         => 'Manage Options',
+     *           'page_slug'     => 'second_page',
+     *           'screen_icon'   => 'link-manager',
+     *       ),
+     *       array(
+     *           'title'         => 'Google',
+     *           'href'          => 'http://www.google.com',    
+     *           'show_page_heading_tab' => false, // this removes the title from the page heading tabs.
+     *       )
+     * );</code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public.
+     * @remark       The sub menu page slug should be unique because add_submenu_page() can add one callback per page slug.
+     * @remark       Accepts variadic parameters; the number of accepted parameters are not limited to three.
+     * @param        array       $aSubMenuItem1      a first sub-menu array. A sub-menu array can be a link or a page. For the specifications of the array structures and its arguments, refer to the parameter section of the `addSubMenuItem()` method.
+     * @param        array       $aSubMenuItem2      (optional) a second sub-menu array.
+     * @param        array       $_and_more          (optional) a third and add items as many as necessary with next parameters.
+     * @access       public
+     * @return       void
+     */     
     public function addSubMenuItems( $aSubMenuItem1, $aSubMenuItem2=null, $_and_more=null ) {
         foreach ( func_get_args() as $_aSubMenuItem ) {
             $this->addSubMenuItem( $_aSubMenuItem );     
@@ -144,50 +144,50 @@ 
     }
     
     /**
-    * Adds the given sub-menu item on the left sidebar menu of the administration panel.
-    * 
-    * It supports pages and links. Each of them has the specific array structure.
-    * 
-    * <h4>Example</h4>
-    * <code>$this->addSubMenuItem(
-    *       array(
-    *           'title'         => 'Read Me',
-    *           'menu_title'    => 'About'
-    *           'page_slug'     => 'my_plugin_readme',
-    *       )
-    * );</code>
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public.
-    * @remark       The sub menu page slug should be unique because add_submenu_page() can add one callback per page slug.
-    * @param        array       a sub-menu array. It can be a page or a link. The array structures are as follows:
-    * <h4>Sub-menu Page Array</h4>
-    * <ul>
-    *   <li>**title** - (string) the page title of the page.</li>
-    *   <li>**page_slug** - (string) the page slug of the page. Non-alphabetical characters should not be used including dots(.) and hyphens(-).</li>
-    *   <li>**screen_icon** - (optional, string) either the ID selector name from the following list or the icon URL. The size of the icon should be 32 by 32 in pixel. This is for WordPress 3.7.x or below.
-    *       <pre>edit, post, index, media, upload, link-manager, link, link-category, edit-pages, page, edit-comments, themes, plugins, users, profile, user-edit, tools, admin, options-general, ms-admin, generic</pre>
-    *       <p>( Notes: the `generic` icon is available WordPress version 3.5 or above.)</p> 
-    *   </li>
-    *   <li>**capability** - (optional, string) the access level to the created admin pages defined <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. If not set, the overall capability assigned in the class constructor, which is `manage_options` by default, will be used.</li>
-    *   <li>**order** - (optional, integer) the order number of the page. The lager the number is, the lower the position it is placed in the menu.</li>
-    *   <li>**show_page_heading_tab** - (optional, boolean) if this is set to false, the page title won't be displayed in the page heading tab. Default: `true`.</li>
-    *   <li>**show_in_menu** - (optional) If this is set to false, the page title won't be displayed in the sidebar menu while the page is still accessible. Default: true.</li>
-    *   <li>**page_title** - (optional) [3.3.0+] When the page title differs from the menu title, use this argument.</li>
-    *   <li>**menu_title** - (optional) [3.3.0+] When the menu title differs from the menu title, use this argument.</li>
-    * </ul>
-    * <h4>Sub-menu Link Array</h4>
-    * <ul>
-    *   <li>**title** - (string) the link title.</li>
-    *   <li>**href** - (string) the URL of the target link.</li>
-    *   <li>**capability** - (optional, string) the access level to show the item, defined <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. If not set, the overall capability assigned in the class constructor, which is `manage_options` by default, will be used.</li>
-    *   <li>**order** - (optional, integer) the order number of the page. The lager the number is, the lower the position it is placed in the menu.</li>
-    *   <li>**show_page_heading_tab** - (optional, boolean) if this is set to false, the page title won't be displayed in the page heading tab. Default: `true`.</li>
-    *   <li>**show_in_menu** - (optional) If this is set to false, the page title won't be displayed in the sidebar menu while the page is still accessible. Default: true.</li>
-    * </ul>
-    * @access       public
-    * @return       void
-    */    
+     * Adds the given sub-menu item on the left sidebar menu of the administration panel.
+     * 
+     * It supports pages and links. Each of them has the specific array structure.
+     * 
+     * <h4>Example</h4>
+     * <code>$this->addSubMenuItem(
+     *       array(
+     *           'title'         => 'Read Me',
+     *           'menu_title'    => 'About'
+     *           'page_slug'     => 'my_plugin_readme',
+     *       )
+     * );</code>
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public.
+     * @remark       The sub menu page slug should be unique because add_submenu_page() can add one callback per page slug.
+     * @param        array       a sub-menu array. It can be a page or a link. The array structures are as follows:
+     * <h4>Sub-menu Page Array</h4>
+     * <ul>
+     *   <li>**title** - (string) the page title of the page.</li>
+     *   <li>**page_slug** - (string) the page slug of the page. Non-alphabetical characters should not be used including dots(.) and hyphens(-).</li>
+     *   <li>**screen_icon** - (optional, string) either the ID selector name from the following list or the icon URL. The size of the icon should be 32 by 32 in pixel. This is for WordPress 3.7.x or below.
+     *       <pre>edit, post, index, media, upload, link-manager, link, link-category, edit-pages, page, edit-comments, themes, plugins, users, profile, user-edit, tools, admin, options-general, ms-admin, generic</pre>
+     *       <p>( Notes: the `generic` icon is available WordPress version 3.5 or above.)</p> 
+     *   </li>
+     *   <li>**capability** - (optional, string) the access level to the created admin pages defined <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. If not set, the overall capability assigned in the class constructor, which is `manage_options` by default, will be used.</li>
+     *   <li>**order** - (optional, integer) the order number of the page. The lager the number is, the lower the position it is placed in the menu.</li>
+     *   <li>**show_page_heading_tab** - (optional, boolean) if this is set to false, the page title won't be displayed in the page heading tab. Default: `true`.</li>
+     *   <li>**show_in_menu** - (optional) If this is set to false, the page title won't be displayed in the sidebar menu while the page is still accessible. Default: true.</li>
+     *   <li>**page_title** - (optional) [3.3.0+] When the page title differs from the menu title, use this argument.</li>
+     *   <li>**menu_title** - (optional) [3.3.0+] When the menu title differs from the menu title, use this argument.</li>
+     * </ul>
+     * <h4>Sub-menu Link Array</h4>
+     * <ul>
+     *   <li>**title** - (string) the link title.</li>
+     *   <li>**href** - (string) the URL of the target link.</li>
+     *   <li>**capability** - (optional, string) the access level to show the item, defined <a href="http://codex.wordpress.org/Roles_and_Capabilities">here</a>. If not set, the overall capability assigned in the class constructor, which is `manage_options` by default, will be used.</li>
+     *   <li>**order** - (optional, integer) the order number of the page. The lager the number is, the lower the position it is placed in the menu.</li>
+     *   <li>**show_page_heading_tab** - (optional, boolean) if this is set to false, the page title won't be displayed in the page heading tab. Default: `true`.</li>
+     *   <li>**show_in_menu** - (optional) If this is set to false, the page title won't be displayed in the sidebar menu while the page is still accessible. Default: true.</li>
+     * </ul>
+     * @access       public
+     * @return       void
+     */    
     public function addSubMenuItem( array $aSubMenuItem ) {
         if ( isset( $aSubMenuItem[ 'href' ] ) ) {
             $this->addSubMenuLink( $aSubMenuItem );
@@ -197,20 +197,20 @@ 
     }
 
     /**
-    * Adds the given link into the menu on the left sidebar of the administration panel.
-    * 
-    * @since        2.0.0
-    * @since        3.0.0       Changed the scope to public from protected.
-    * @since        3.5.0       Changed the scope to public as it was still protected.
-    * @param        string      the menu title.
-    * @param        string      the URL linked to the menu.
-    * @param        string      (optional) the <a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">access level</a>.
-    * @param        string      (optional) the order number. The larger it is, the lower the position it gets.
-    * @param        string      (optional) if set to false, the menu title will not be listed in the tab navigation menu at the top of the page.
-    * @access       public
-    * @return       void
-    * @internal
-    */    
+     * Adds the given link into the menu on the left sidebar of the administration panel.
+     * 
+     * @since        2.0.0
+     * @since        3.0.0       Changed the scope to public from protected.
+     * @since        3.5.0       Changed the scope to public as it was still protected.
+     * @param        string      the menu title.
+     * @param        string      the URL linked to the menu.
+     * @param        string      (optional) the <a href="http://codex.wordpress.org/Roles_and_Capabilities" target="_blank">access level</a>.
+     * @param        string      (optional) the order number. The larger it is, the lower the position it gets.
+     * @param        string      (optional) if set to false, the menu title will not be listed in the tab navigation menu at the top of the page.
+     * @access       public
+     * @return       void
+     * @internal
+     */    
     public function addSubMenuLink( array $aSubMenuLink ) {
         
         // If required keys are not set, return.

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
      * @param       string      (optional) the position number that is passed to the <var>$position</var> parameter of the <a href="http://codex.wordpress.org/Function_Reference/add_menu_page">add_menu_page()</a> function.
      * @return      void
      */
-    public function setRootMenuPage( $sRootMenuLabel, $sIcon16x16=null, $iMenuPosition=null ) {
+    public function setRootMenuPage( $sRootMenuLabel, $sIcon16x16 = null, $iMenuPosition = null ) {
 
         $sRootMenuLabel = trim( $sRootMenuLabel );
         $_sSlug         = $this->_isBuiltInMenuItem( $sRootMenuLabel ); // if true, this method returns the slug
@@ -98,8 +98,8 @@ 
      */ 
     public function setRootMenuPageBySlug( $sRootMenuSlug ) {
         
-        $this->oProp->aRootMenu['sPageSlug']    = $sRootMenuSlug; // do not sanitize the slug here because post types includes a question mark.
-        $this->oProp->aRootMenu['fCreateRoot']  = false; // indicates to use an existing menu item. 
+        $this->oProp->aRootMenu[ 'sPageSlug' ]    = $sRootMenuSlug; // do not sanitize the slug here because post types includes a question mark.
+        $this->oProp->aRootMenu[ 'fCreateRoot' ]  = false; // indicates to use an existing menu item. 
         
     }
     
@@ -137,7 +137,7 @@ 
     * @access       public
     * @return       void
     */     
-    public function addSubMenuItems( $aSubMenuItem1, $aSubMenuItem2=null, $_and_more=null ) {
+    public function addSubMenuItems( $aSubMenuItem1, $aSubMenuItem2 = null, $_and_more = null ) {
         foreach ( func_get_args() as $_aSubMenuItem ) {
             $this->addSubMenuItem( $_aSubMenuItem );     
         }
@@ -214,16 +214,16 @@ 
     public function addSubMenuLink( array $aSubMenuLink ) {
         
         // If required keys are not set, return.
-        if ( ! isset( $aSubMenuLink['href'], $aSubMenuLink['title'] ) ) { 
+        if ( !isset( $aSubMenuLink[ 'href' ], $aSubMenuLink[ 'title' ] ) ) { 
             return; 
         }
         
         // If the set URL is not valid, return.
-        if ( ! filter_var( $aSubMenuLink['href'], FILTER_VALIDATE_URL ) ) { 
+        if ( !filter_var( $aSubMenuLink[ 'href' ], FILTER_VALIDATE_URL ) ) { 
             return; 
         }
 
-        $_oFormatter   = new AdminPageFramework_Format_SubMenuLink( 
+        $_oFormatter = new AdminPageFramework_Format_SubMenuLink( 
             $aSubMenuLink, 
             $this 
         );
@@ -312,11 +312,11 @@ 
      */ 
     public function addSubMenuPage( array $aSubMenuPage ) {
 
-        if ( ! isset( $aSubMenuPage[ 'page_slug' ] ) ) { 
+        if ( !isset( $aSubMenuPage[ 'page_slug' ] ) ) { 
             return; 
         }
             
-        $_oFormatter   = new AdminPageFramework_Format_SubMenuPage( 
+        $_oFormatter = new AdminPageFramework_Format_SubMenuPage( 
             $aSubMenuPage,
             $this 
         );

Braces +6 added lines, -5 removed lines

@@ -75,8 +75,9 @@ 
         private function _isBuiltInMenuItem( $sMenuLabel ) {
             
             $_sMenuLabelLower = strtolower( $sMenuLabel );
-            if ( array_key_exists( $_sMenuLabelLower, $this->_aBuiltInRootMenuSlugs ) )
-                return $this->_aBuiltInRootMenuSlugs[ $_sMenuLabelLower ];
+            if ( array_key_exists( $_sMenuLabelLower, $this->_aBuiltInRootMenuSlugs ) ) {
+                            return $this->_aBuiltInRootMenuSlugs[ $_sMenuLabelLower ];
+            }
             
         }    
 
@@ -214,12 +215,12 @@ 
     public function addSubMenuLink( array $aSubMenuLink ) {
         
         // If required keys are not set, return.
-        if ( ! isset( $aSubMenuLink['href'], $aSubMenuLink['title'] ) ) { 
+        if ( ! isset( $aSubMenuLink['href'], $aSubMenuLink['title'] ) ) {
             return; 
         }
         
         // If the set URL is not valid, return.
-        if ( ! filter_var( $aSubMenuLink['href'], FILTER_VALIDATE_URL ) ) { 
+        if ( ! filter_var( $aSubMenuLink['href'], FILTER_VALIDATE_URL ) ) {
             return; 
         }
 
@@ -312,7 +313,7 @@ 
      */ 
     public function addSubMenuPage( array $aSubMenuPage ) {
 
-        if ( ! isset( $aSubMenuPage[ 'page_slug' ] ) ) { 
+        if ( ! isset( $aSubMenuPage[ 'page_slug' ] ) ) {
             return; 
         }