michaeluno / admin-page-framework

development/factory/_abstract/form/_view/generator/section/AdminPageFramework_Form_View___Generate_Section_Base.php

Doc Comments +1 added lines

@@ -51,6 +51,7 @@
     /**
      * Applies the subject string to the set callback filter function.
      * @since       3.6.0
+     * @param string $sSubject
      */
     protected function _getFiltered( $sSubject ) {
         return is_callable( $this->hfCallback )

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
             $this->hfCallback,
         );
         $this->aArguments = $_aParameters[ 0 ];        
-        $this->hfCallback  = $_aParameters[ 1 ];
+        $this->hfCallback = $_aParameters[ 1 ];
 
     }    
     
@@ -83,8 +83,8 @@ 
         
         // Extract the first part as it does not have braces
         $_sName = array_shift( $aParts );
-        foreach( $aParts as $_sPart ) {
-            $_sName .= '[' . $_sPart . ']';
+        foreach ( $aParts as $_sPart ) {
+            $_sName .= '['.$_sPart.']';
         }
         return $_sName;
         

development/factory/_abstract/form/AdminPageFramework_Form_Controller.php

Doc Comments +2 added lines

@@ -121,6 +121,8 @@
     }
     /**
      * @since       DEVVER
+     * @param string $sKey
+     * @param string $sValue
      * @return      void
      */
     public function addResource( $sKey, $sValue ) {

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
      * @param       string      $sType If empty, the method will check if a message exists in all types. Otherwise, it checks the existence of a message of the specified type.
      * @return      boolean     True if a setting notice is set; otherwise, false.
      */
-    public function hasSubmitNotice( $sType='' ) {
+    public function hasSubmitNotice( $sType = '' ) {
         return $this->oSubmitNotice->hasNotice( $sType );
     }
     
@@ -52,7 +52,7 @@ 
      * @param        boolean     $bOverride      (optional) If true, only one message will be shown in the next page load. false: do not override when there is a message of the same id. true: override the previous one.
      * @return       void
      */
-    public function setSubmitNotice( $sMessage, $sType='error', $asAttributes=array(), $bOverride=true ) {
+    public function setSubmitNotice( $sMessage, $sType = 'error', $asAttributes = array(), $bOverride = true ) {
         $this->oSubmitNotice->set(
             $sMessage, 
             $sType, 
@@ -79,7 +79,7 @@ 
         
         $this->aSectionsets[ $aSectionset[ 'section_id' ] ] = $aSectionset;    
         $this->aFieldsets[ $aSectionset[ 'section_id' ] ]   = $this->getElement(
-            $this->aFieldsets,  // subject array
+            $this->aFieldsets, // subject array
             $aSectionset[ 'section_id' ], // key
             array()      // default
         );                                
@@ -94,7 +94,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) { 
             return; 
         }
         unset( 
@@ -124,7 +124,7 @@ 
      * @return      void
      */
     public function addResource( $sKey, $sValue ) {
-        self::$_aResources[ $sKey ][] = $sValue;
+        self::$_aResources[ $sKey ][ ] = $sValue;
     }
     
     /**
@@ -147,7 +147,7 @@ 
     public function addField( $asFieldset ) {
 
         // If it is a target section, update the property and return.
-        if ( ! $this->_isFieldsetDefinition( $asFieldset ) ) {
+        if ( !$this->_isFieldsetDefinition( $asFieldset ) ) {
             $this->_asTargetSectionID = $this->_getTargetSectionID( $asFieldset );
             return $this->_asTargetSectionID;
         }
@@ -156,13 +156,13 @@ 
         
         // Set the target section ID
         $this->_asTargetSectionID = $this->getElement(
-            $_aFieldset,  // subject array
+            $_aFieldset, // subject array
             'section_id', // key
             $this->_asTargetSectionID // default
         );                               
 
         // Required Keys
-        if ( ! isset( $_aFieldset[ 'field_id' ], $_aFieldset[ 'type' ] ) ) { 
+        if ( !isset( $_aFieldset[ 'field_id' ], $_aFieldset[ 'type' ] ) ) { 
             return null; 
         }         
                 
@@ -265,7 +265,7 @@ 
      */     
     public function removeField( $sFieldID ) {
                
-        foreach( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
+        foreach ( $this->aFieldsets as $_sSectionID => $_aSubSectionsOrFields ) {
 
             if ( array_key_exists( $sFieldID, $_aSubSectionsOrFields ) ) {
                 unset( $this->aFieldsets[ $_sSectionID ][ $sFieldID ] );

Braces +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) {
             return; 
         }
         unset( 
@@ -162,7 +162,7 @@ 
         );                               
 
         // Required Keys
-        if ( ! isset( $_aFieldset[ 'field_id' ], $_aFieldset[ 'type' ] ) ) { 
+        if ( ! isset( $_aFieldset[ 'field_id' ], $_aFieldset[ 'type' ] ) ) {
             return null; 
         }         
                 

development/factory/_abstract/form/field_type/AdminPageFramework_FieldType_size.php

Doc Comments +2 added lines

@@ -165,6 +165,7 @@ 
              * Returns the HTML output of the number input part.
              * 
              * @since       3.5.3
+             * @param boolean $bMultiLabels
              * @return      string      The number input output.
              */
             private function _getNumberInputPart( array $aField, array $aBaseAttributes, $isKey, $bMultiLabels ) {
@@ -217,6 +218,7 @@ 
              * Returns the HTML output of the unit select input part.
              * 
              * @since       3.5.3
+             * @param boolean $bMultiLabels
              * @return      string      The unit select input output.
              */
             private function _getUnitSelectInput( array $aField, array $aBaseAttributes, $isKey, $bMultiLabels ) {

Spacing +33 added lines, -33 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'size', );
+    public $aFieldTypeSlugs = array( 'size',);
     
     /**
      * Defines the default key-values of this field type. 
@@ -30,7 +30,7 @@ 
      */
     protected $aDefaultKeys = array(
         'is_multiple'           => false, // indicates whether the select tag alloes multiple selections.
-        'units'                 => null,  // do not define units here since this will be merged with the user defined field array.
+        'units'                 => null, // do not define units here since this will be merged with the user defined field array.
         'attributes'            => array(
             'size'      => array(
                 'size'          => 10,
@@ -59,7 +59,7 @@ 
      */
     protected $aDefaultUnits = array(
         'px'    => 'px', // pixel
-        '%'     => '%',  // percentage
+        '%'     => '%', // percentage
         'em'    => 'em', // font size
         'ex'    => 'ex', // font height
         'in'    => 'in', // inch
@@ -116,8 +116,8 @@ 
         );
         
         $_aOutput = array();
-        foreach( ( array ) $aField[ 'label' ] as $_isKey => $_sLabel ) {
-            $_aOutput[] = $this->_getFieldOutputByLabel( 
+        foreach ( ( array ) $aField[ 'label' ] as $_isKey => $_sLabel ) {
+            $_aOutput[ ] = $this->_getFieldOutputByLabel( 
                 $_isKey, 
                 $_sLabel,
                 $aField
@@ -139,24 +139,24 @@ 
            
             $_aBaseAttributes   = $_bMultiLabels
                 ? array(
-                        'name'  => $aField[ 'attributes' ][ 'name' ] . "[{$isKey}]",
-                        'id'    => $aField[ 'attributes' ][ 'id' ] . "_{$isKey}",
+                        'name'  => $aField[ 'attributes' ][ 'name' ]."[{$isKey}]",
+                        'id'    => $aField[ 'attributes' ][ 'id' ]."_{$isKey}",
                         'value' => $aField[ 'value' ],
                     ) 
                     + $aField[ 'attributes' ]
                 : $aField[ 'attributes' ];
             unset( 
-                $_aBaseAttributes['unit'], 
-                $_aBaseAttributes['size'] 
+                $_aBaseAttributes[ 'unit' ], 
+                $_aBaseAttributes[ 'size' ] 
             );            
             
             $_aOutput = array(
-                $this->getElementByLabel( $aField['before_label'], $isKey, $_bMultiLabels ),
-                    "<div class='admin-page-framework-input-label-container admin-page-framework-select-label' style='min-width: " . $this->sanitizeLength( $aField[ 'label_min_width' ] ) . ";'>",
-                        $this->_getNumberInputPart( $aField, $_aBaseAttributes, $isKey, $_bMultiLabels ),  // The size (number) part
-                        $this->_getUnitSelectInput( $aField, $_aBaseAttributes, $isKey, $_bMultiLabels ),  // The unit (select) part
+                $this->getElementByLabel( $aField[ 'before_label' ], $isKey, $_bMultiLabels ),
+                    "<div class='admin-page-framework-input-label-container admin-page-framework-select-label' style='min-width: ".$this->sanitizeLength( $aField[ 'label_min_width' ] ).";'>",
+                        $this->_getNumberInputPart( $aField, $_aBaseAttributes, $isKey, $_bMultiLabels ), // The size (number) part
+                        $this->_getUnitSelectInput( $aField, $_aBaseAttributes, $isKey, $_bMultiLabels ), // The unit (select) part
                     "</div>",
-                $this->getElementByLabel( $aField['after_label'], $isKey, $_bMultiLabels )
+                $this->getElementByLabel( $aField[ 'after_label' ], $isKey, $_bMultiLabels )
             );
             return implode( '', $_aOutput );                
                 
@@ -170,39 +170,39 @@ 
             private function _getNumberInputPart( array $aField, array $aBaseAttributes, $isKey, $bMultiLabels ) {
                 
                 // Size and Size Label
-                $_aSizeAttributes       = $this->_getSizeAttributes( 
+                $_aSizeAttributes = $this->_getSizeAttributes( 
                     $aField, 
                     $aBaseAttributes,
                     $bMultiLabels
                         ? $isKey
                         : ''
                 );
-                $_aSizeLabelAttributes  = array(
+                $_aSizeLabelAttributes = array(
                     'for'   => $_aSizeAttributes[ 'id' ],
                     'class' => $_aSizeAttributes[ 'disabled' ] 
                         ? 'disabled' 
                         : null,
                 );                  
                 
-                $_sLabel                = $this->getElementByLabel( 
+                $_sLabel = $this->getElementByLabel( 
                     $aField[ 'label' ], 
                     $isKey, 
                     $bMultiLabels 
                 );
-                return "<label " . $this->getAttributes( $_aSizeLabelAttributes ) . ">"
+                return "<label ".$this->getAttributes( $_aSizeLabelAttributes ).">"
                     . $this->getElement( 
                         $aField, 
                         $bMultiLabels
                             ? array( 'before_label', $isKey, 'size' ) 
                             : array( 'before_label', 'size' ) 
                     )
-                    . ( $aField['label'] && ! $aField[ 'repeatable' ]
-                        ? "<span class='admin-page-framework-input-label-string' style='min-width:" . $this->sanitizeLength( $aField[ 'label_min_width' ] ) . ";'>" 
+                    . ( $aField[ 'label' ] && !$aField[ 'repeatable' ]
+                        ? "<span class='admin-page-framework-input-label-string' style='min-width:".$this->sanitizeLength( $aField[ 'label_min_width' ] ).";'>" 
                                 . $_sLabel 
                             . "</span>"
                         : "" 
                     )
-                    . "<input " . $this->getAttributes( $_aSizeAttributes ) . " />" 
+                    . "<input ".$this->getAttributes( $_aSizeAttributes )." />" 
                     . $this->getElement( 
                         $aField, 
                         $bMultiLabels
@@ -244,7 +244,7 @@ 
                     )
                     : $aField[ 'units' ];
                 
-                return "<label " . $this->getAttributes( 
+                return "<label ".$this->getAttributes( 
                         array(
                             'for'       => $_aUnitAttributes[ 'id' ],
                             'class'     => $_aUnitAttributes[ 'disabled' ] 
@@ -275,9 +275,9 @@ 
                  * @since       3.5.3    
                  * @return      array       an unit attribute array
                  */
-                private function _getUnitAttributes( array $aField, array $aBaseAttributes, $isLabelKey='' ) {
+                private function _getUnitAttributes( array $aField, array $aBaseAttributes, $isLabelKey = '' ) {
                     
-                    $_bIsMultiple    = $aField[ 'is_multiple' ] 
+                    $_bIsMultiple = $aField[ 'is_multiple' ] 
                         ? true 
                         : $this->getElement( 
                             $aField,
@@ -289,13 +289,13 @@ 
               
                     $_aSelectAttributes = array(
                         'type'      => 'select',
-                        'id'        => $aField[ 'input_id' ] . ( '' === $isLabelKey ? '' : '_' . $isLabelKey ) . '_' . 'unit',
+                        'id'        => $aField[ 'input_id' ].( '' === $isLabelKey ? '' : '_'.$isLabelKey ).'_'.'unit',
                         'multiple'  => $_bIsMultiple 
                             ? 'multiple' 
                             : null,
                         'name'      => $_bIsMultiple 
-                            ? "{$aField['_input_name']}" . ( '' === $isLabelKey ? '' : '[' . $isLabelKey . ']' ) . "[unit][]" 
-                            : "{$aField['_input_name']}" . ( '' === $isLabelKey ? '' : '[' . $isLabelKey . ']' ) . "[unit]",
+                            ? "{$aField[ '_input_name' ]}".( '' === $isLabelKey ? '' : '['.$isLabelKey.']' )."[unit][]" 
+                            : "{$aField[ '_input_name' ]}".( '' === $isLabelKey ? '' : '['.$isLabelKey.']' )."[unit]",
                         'value'     => $this->getElement( 
                             $aField, 
                             array( 'value', 'unit' ),
@@ -307,7 +307,7 @@ 
                         '' === $isLabelKey
                             ? array( 'attributes', 'unit' )
                             : array( 'attributes', $isLabelKey, 'unit' ),
-                        $this->aDefaultKeys['attributes']['unit'] 
+                        $this->aDefaultKeys[ 'attributes' ][ 'unit' ] 
                     )
                     + $aBaseAttributes;       
                     return $_aSelectAttributes;
@@ -320,15 +320,15 @@ 
              * @since       3.5.3    
              * @return      array       an size attribute array
              */
-            private function _getSizeAttributes( array $aField, array $aBaseAttributes, $sLabelKey='' ) {
+            private function _getSizeAttributes( array $aField, array $aBaseAttributes, $sLabelKey = '' ) {
 
                 return array(
                         'type'  => 'number',
-                        'id'    => $aField['input_id'] . '_' . ( '' !== $sLabelKey ? $sLabelKey . '_' : '' ) . 'size',
-                        'name'  => $aField[ '_input_name' ] . ( '' !== $sLabelKey ? "[{$sLabelKey}]" : '' ) . '[size]',
+                        'id'    => $aField[ 'input_id' ].'_'.( '' !== $sLabelKey ? $sLabelKey.'_' : '' ).'size',
+                        'name'  => $aField[ '_input_name' ].( '' !== $sLabelKey ? "[{$sLabelKey}]" : '' ).'[size]',
                         'value' => $this->getElement(
-                            $aField,        // subject
-                            array( 'value', 'size' ),   // dimensional keys
+                            $aField, // subject
+                            array( 'value', 'size' ), // dimensional keys
                             ''  // default
                         ),
                     ) 

development/factory/_abstract/form/field_type/AdminPageFramework_FieldType_system.php

Doc Comments +3 added lines

@@ -231,6 +231,7 @@ 
             /**
              * Returns the system information by section.
              * @since       3.5.3
+             * @param integer $iPrintType
              * @return      string      The system information by section.
              */
             private function _getSystemInfoBySection( $sSectionName, $aData, $iPrintType ) {
@@ -350,6 +351,8 @@ 
                     /**
                      * 
                      * @since       3.5.12
+                     * @param string $asCategories
+                     * @param string $asRemovingCategories
                      * @return      stirng|array
                      */
                     private function _getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) {

Spacing +69 added lines, -69 removed lines

@@ -30,7 +30,7 @@ 
      *      )
      *  );
      */
-    public $aFieldTypeSlugs = array( 'system', );
+    public $aFieldTypeSlugs = array( 'system',);
     
     /**
      * Defines the default key-values of this field type. 
@@ -47,8 +47,8 @@ 
      * @remark            $_aDefaultKeys holds shared default key-values defined in the base class.
      */
     protected $aDefaultKeys = array(
-        'data'          =>  array(),        // [3.2.0+] Stores the data to be displayed
-        'print_type'    =>  1,              // [3.4.6+] 1: readable representation of array. 2: print_r()
+        'data'          =>  array(), // [3.2.0+] Stores the data to be displayed
+        'print_type'    =>  1, // [3.4.6+] 1: readable representation of array. 2: print_r()
         'attributes'    =>    array(
             'rows'          => 60,
             'autofocus'     => null,
@@ -161,25 +161,25 @@ 
      */
     protected function getField( $aField ) { 
 
-        $_aInputAttributes           = $aField['attributes'];
-        $_aInputAttributes['class'] .= ' system';
-        unset( $_aInputAttributes['value'] );
+        $_aInputAttributes           = $aField[ 'attributes' ];
+        $_aInputAttributes[ 'class' ] .= ' system';
+        unset( $_aInputAttributes[ 'value' ] );
         return 
-            $aField['before_label']
+            $aField[ 'before_label' ]
             . "<div class='admin-page-framework-input-label-container'>"
-                . "<label for='{$aField['input_id']}'>"
-                    . $aField['before_input']
-                    . ( $aField['label'] && ! $aField['repeatable']
-                        ? "<span class='admin-page-framework-input-label-string' style='min-width:" . $this->sanitizeLength( $aField['label_min_width'] ) . ";'>" . $aField['label'] . "</span>"
+                . "<label for='{$aField[ 'input_id' ]}'>"
+                    . $aField[ 'before_input' ]
+                    . ( $aField[ 'label' ] && !$aField[ 'repeatable' ]
+                        ? "<span class='admin-page-framework-input-label-string' style='min-width:".$this->sanitizeLength( $aField[ 'label_min_width' ] ).";'>".$aField[ 'label' ]."</span>"
                         : "" 
                     )
-                    . "<textarea " . $this->getAttributes( $_aInputAttributes ) . " >"    
-                        . esc_textarea( $this->_getSystemInfomation( $aField['value'], $aField['data'], $aField['print_type'] ) )
+                    . "<textarea ".$this->getAttributes( $_aInputAttributes )." >"    
+                        . esc_textarea( $this->_getSystemInfomation( $aField[ 'value' ], $aField[ 'data' ], $aField[ 'print_type' ] ) )
                     . "</textarea>"
-                    . $aField['after_input']
+                    . $aField[ 'after_input' ]
                 . "</label>"
             . "</div>"
-            . $aField['after_label'];
+            . $aField[ 'after_label' ];
         
     }    
         /**
@@ -187,15 +187,15 @@ 
          * 
          * @return      string      The human readable system information.
          */
-        private function _getSystemInfomation( $asValue=null, $asCustomData=null, $iPrintType=1 ) {
+        private function _getSystemInfomation( $asValue = null, $asCustomData = null, $iPrintType = 1 ) {
 
             if ( isset( $asValue ) ) {
                 return $asValue;
             }
 
-            $_aOutput   = array();
-            foreach( $this->_getFormattedSystemInformation( $asCustomData ) as $_sSection => $_aInfo ) {
-                $_aOutput[] = $this->_getSystemInfoBySection( $_sSection, $_aInfo, $iPrintType );
+            $_aOutput = array();
+            foreach ( $this->_getFormattedSystemInformation( $asCustomData ) as $_sSection => $_aInfo ) {
+                $_aOutput[ ] = $this->_getSystemInfoBySection( $_sSection, $_aInfo, $iPrintType );
             }
             return implode( PHP_EOL, $_aOutput );
             
@@ -210,18 +210,18 @@ 
                 
                 $_aData = $this->getAsArray( $asCustomData );
                 $_aData = $_aData + array(
-                    'Admin Page Framework'  => isset( $_aData['Admin Page Framework'] )
+                    'Admin Page Framework'  => isset( $_aData[ 'Admin Page Framework' ] )
                         ? null
                         : AdminPageFramework_Registry::getInfo(),
-                    'WordPress'             => $this->_getSiteInfoWithCache( ! isset( $_aData['WordPress'] ) ),
-                    'PHP'                   => $this->_getPHPInfo( ! isset( $_aData['PHP'] ) ),
-                    'PHP Error Log'         => $this->_getErrorLogByType( 'php', ! isset( $_aData['PHP Error Log'] ) ),
-                    'MySQL'                 => isset( $_aData['MySQL'] )
+                    'WordPress'             => $this->_getSiteInfoWithCache( !isset( $_aData[ 'WordPress' ] ) ),
+                    'PHP'                   => $this->_getPHPInfo( !isset( $_aData[ 'PHP' ] ) ),
+                    'PHP Error Log'         => $this->_getErrorLogByType( 'php', !isset( $_aData[ 'PHP Error Log' ] ) ),
+                    'MySQL'                 => isset( $_aData[ 'MySQL' ] )
                         ? null
-                        : $this->getMySQLInfo(),    // defined in the utility class.
-                    'MySQL Error Log'       => $this->_getErrorLogByType( 'mysql', ! isset( $_aData['MySQL Error Log'] ) ),
-                    'Server'                => $this->_getWebServerInfo( ! isset( $_aData['Server'] ) ),
-                    'Browser'               => $this->_getClientInfo( ! isset( $_aData['Browser'] ) ),
+                        : $this->getMySQLInfo(), // defined in the utility class.
+                    'MySQL Error Log'       => $this->_getErrorLogByType( 'mysql', !isset( $_aData[ 'MySQL Error Log' ] ) ),
+                    'Server'                => $this->_getWebServerInfo( !isset( $_aData[ 'Server' ] ) ),
+                    'Browser'               => $this->_getClientInfo( !isset( $_aData[ 'Browser' ] ) ),
                 );
                 
                 // Dropping empty elements allows the user to remove a section by setting an empty section.
@@ -237,10 +237,10 @@ 
                 switch ( $iPrintType ) {
                     default:
                     case 1: // use the framework readable representation of arrays.
-                        return $this->getReadableArrayContents( $sSectionName, $aData, 32 ) . PHP_EOL;
+                        return $this->getReadableArrayContents( $sSectionName, $aData, 32 ).PHP_EOL;
                     case 2: // use print_r()
-                        return "[{$sSectionName}]" . PHP_EOL
-                            . print_r( $aData, true ) . PHP_EOL;
+                        return "[{$sSectionName}]".PHP_EOL
+                            . print_r( $aData, true ).PHP_EOL;
                 }                      
             }
             /**
@@ -249,17 +249,17 @@ 
              * @since       3.4.6
              * @since       3.5.3       Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method.
              */
-            private function _getClientInfo( $bGenerateInfo=true ) {
+            private function _getClientInfo( $bGenerateInfo = true ) {
                  
-                if ( ! $bGenerateInfo ) {
+                if ( !$bGenerateInfo ) {
                     return '';
                 }
                  
                 // Check the browscap value in the ini file first to prevent warnings from being populated
                 $_aBrowser = @ini_get( 'browscap' ) 
-                    ? get_browser( $_SERVER['HTTP_USER_AGENT'], true )
+                    ? get_browser( $_SERVER[ 'HTTP_USER_AGENT' ], true )
                     : array();
-                unset( $_aBrowser['browser_name_regex'] );  // this element causes output to be blank
+                unset( $_aBrowser[ 'browser_name_regex' ] ); // this element causes output to be blank
                 return empty( $_aBrowser ) 
                     ? __( 'No browser information found.', 'admin-page-framework' )
                     : $_aBrowser;
@@ -274,9 +274,9 @@ 
              * @param       string      $sType          The error log type. Either 'php' or 'mysql' is accepted.
              * @param       boolean     $bGenerateInfo  Whether to generate a log. This is for the caller method to reduce a conditinal statement.
              */
-            private function _getErrorLogByType( $sType, $bGenerateInfo=true ) {
+            private function _getErrorLogByType( $sType, $bGenerateInfo = true ) {
 
-                if ( ! $bGenerateInfo ) {
+                if ( !$bGenerateInfo ) {
                     return '';
                 }
                 switch ( $sType ) {
@@ -307,9 +307,9 @@ 
              * @since       3.5.3       Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method.
              * @return      array      The generated site information array.
              */
-            private function _getSiteInfoWithCache( $bGenerateInfo=true ) {
+            private function _getSiteInfoWithCache( $bGenerateInfo = true ) {
                 
-                if ( ! $bGenerateInfo || isset( self::$_aSiteInfo ) ) {
+                if ( !$bGenerateInfo || isset( self::$_aSiteInfo ) ) {
                     return self::$_aSiteInfo;
                 }
                 self::$_aSiteInfo = self::_getSiteInfo();
@@ -342,8 +342,8 @@ 
                         'wp_remote_get()'                                           => $this->_getWPRemoteGetStatus(),
                         __( 'Multibite String Extension', 'admin-page-framework' )  => $this->getAOrB( function_exists( 'mb_detect_encoding' ), $this->oMsg->get( 'enabled' ), $this->oMsg->get( 'disabled' ) ),
                         __( 'WP_CONTENT_DIR Writeable', 'admin-page-framework' )    => $this->getAOrB( is_writable( WP_CONTENT_DIR ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), 
-                        __( 'Active Plugins', 'admin-page-framework' )              => PHP_EOL . $this->_getActivePlugins(),
-                        __( 'Network Active Plugins', 'admin-page-framework' )      => PHP_EOL . $this->_getNetworkActivePlugins(),
+                        __( 'Active Plugins', 'admin-page-framework' )              => PHP_EOL.$this->_getActivePlugins(),
+                        __( 'Network Active Plugins', 'admin-page-framework' )      => PHP_EOL.$this->_getNetworkActivePlugins(),
                         __( 'Constants', 'admin-page-framework' )                   => $this->_getDefinedConstants( 'user' ),
                     );                        
                 }
@@ -352,9 +352,9 @@ 
                      * @since       3.5.12
                      * @return      stirng|array
                      */
-                    private function _getDefinedConstants( $asCategories=null, $asRemovingCategories=null ) {
+                    private function _getDefinedConstants( $asCategories = null, $asRemovingCategories = null ) {
                         $_asConstants = $this->getDefinedConstants( $asCategories, $asRemovingCategories );
-                        if ( ! is_array( $_asConstants ) ) {
+                        if ( !is_array( $_asConstants ) ) {
                             return $_asConstants;
                         }
                         if ( isset( $_asConstants[ 'user' ] ) ) {
@@ -388,13 +388,13 @@ 
                 private function _getActiveThemeName() {
                     
                     // If the WordPress version is less than 3.4,
-                    if ( version_compare( $GLOBALS['wp_version'], '3.4', '<' ) ) {
-                        $_aThemeData = get_theme_data( get_stylesheet_directory() . '/style.css' );
-                        return $_aThemeData['Name'] . ' ' . $_aThemeData['Version'];
+                    if ( version_compare( $GLOBALS[ 'wp_version' ], '3.4', '<' ) ) {
+                        $_aThemeData = get_theme_data( get_stylesheet_directory().'/style.css' );
+                        return $_aThemeData[ 'Name' ].' '.$_aThemeData[ 'Version' ];
                     } 
                     
                     $_oThemeData = wp_get_theme();
-                    return $_oThemeData->Name . ' ' . $_oThemeData->Version;
+                    return $_oThemeData->Name.' '.$_oThemeData->Version;
                     
                 }   
                 /**
@@ -407,10 +407,10 @@ 
                     $_aPluginList       = array();
                     $_aActivePlugins    = get_option( 'active_plugins', array() );
                     foreach ( get_plugins() as $_sPluginPath => $_aPlugin ) {
-                        if ( ! in_array( $_sPluginPath, $_aActivePlugins ) ) {
+                        if ( !in_array( $_sPluginPath, $_aActivePlugins ) ) {
                             continue;
                         }
-                        $_aPluginList[] = '    ' . $_aPlugin['Name'] . ': ' . $_aPlugin['Version'];
+                        $_aPluginList[ ] = '    '.$_aPlugin[ 'Name' ].': '.$_aPlugin[ 'Version' ];
                     }
                     return implode( PHP_EOL, $_aPluginList );
                     
@@ -421,17 +421,17 @@ 
                  */
                 private function _getNetworkActivePlugins() {
                     
-                    if ( ! is_multisite() ) {
+                    if ( !is_multisite() ) {
                         return '';
                     }
                     $_aPluginList       = array();
                     $_aActivePlugins    = get_site_option( 'active_sitewide_plugins', array() );
                     foreach ( wp_get_active_network_plugins() as $_sPluginPath ) {
-                        if ( ! array_key_exists( plugin_basename( $_sPluginPath ), $_aActivePlugins ) ) {
+                        if ( !array_key_exists( plugin_basename( $_sPluginPath ), $_aActivePlugins ) ) {
                             continue;
                         }
                         $_aPlugin       = get_plugin_data( $_sPluginPath );
-                        $_aPluginList[] = '    ' . $_aPlugin['Name'] . ' :' . $_aPlugin['Version'];
+                        $_aPluginList[ ] = '    '.$_aPlugin[ 'Name' ].' :'.$_aPlugin[ 'Version' ];
                     }
                     return implode( PHP_EOL, $_aPluginList );
                     
@@ -448,7 +448,7 @@ 
                     $_vResponse = false === $_vResponse
                         ? wp_remote_post( 
                             // 'https://www.paypal.com/cgi-bin/webscr', 
-                            add_query_arg( $_GET, admin_url( $GLOBALS['pagenow'] ) ),
+                            add_query_arg( $_GET, admin_url( $GLOBALS[ 'pagenow' ] ) ),
                             array(
                                 'sslverify'     => false,
                                 'timeout'       => 60,
@@ -470,7 +470,7 @@ 
                     $_vResponse = $this->getTransient( 'apf_rg_check' );
                     $_vResponse = false === $_vResponse
                         ? wp_remote_get( 
-                            add_query_arg( $_GET + array( 'apf_remote_request_test' => '_testing' ), admin_url( $GLOBALS['pagenow'] ) ),
+                            add_query_arg( $_GET + array( 'apf_remote_request_test' => '_testing' ), admin_url( $GLOBALS[ 'pagenow' ] ) ),
                             array(
                                 'sslverify'     => false,
                                 'timeout'       => 60,
@@ -494,10 +494,10 @@ 
                         if ( is_wp_error( $mResponse ) ) {
                             return true;
                         }
-                        if ( $mResponse['response']['code'] < 200 ) {
+                        if ( $mResponse[ 'response' ][ 'code' ] < 200 ) {
                             return true;
                         }
-                        if ( $mResponse['response']['code'] >= 300 ) {
+                        if ( $mResponse[ 'response' ][ 'code' ] >= 300 ) {
                             return true;
                         }
                         return false;
@@ -514,13 +514,13 @@ 
              * @since       3.4.6
              * @since       3.5.3       Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method.
              */
-            private function _getPHPInfo( $bGenerateInfo=true ) {
+            private function _getPHPInfo( $bGenerateInfo = true ) {
                 
-                if ( ! $bGenerateInfo || isset( self::$_aPHPInfo ) ) {
+                if ( !$bGenerateInfo || isset( self::$_aPHPInfo ) ) {
                     return self::$_aPHPInfo;
                 }
                 
-                $_oErrorReporting   = new AdminPageFramework_ErrorReporting;
+                $_oErrorReporting = new AdminPageFramework_ErrorReporting;
                 self::$_aPHPInfo = array(
                     __( 'Version', 'admin-page-framework' )                 => phpversion(),
                     __( 'Safe Mode', 'admin-page-framework' )               => $this->getAOrB( @ini_get( 'safe_mode' ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ), 
@@ -531,16 +531,16 @@ 
                     __( 'Max Execution Time', 'admin-page-framework' )      => @ini_get( 'max_execution_time' ),
                     __( 'Max Input Vars', 'admin-page-framework' )          => @ini_get( 'max_input_vars' ),
                     __( 'Argument Separator', 'admin-page-framework' )      => @ini_get( 'arg_separator.output' ),
-                    __( 'Allow URL File Open', 'admin-page-framework' )     => $this->getAOrB( @ini_get( 'allow_url_fopen' ),    $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ),
-                    __( 'Display Errors', 'admin-page-framework' )          => $this->getAOrB( @ini_get( 'display_errors' ),     $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ),
-                    __( 'Log Errors', 'admin-page-framework' )              => $this->getAOrB( @ini_get( 'log_errors' ),         $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ),
+                    __( 'Allow URL File Open', 'admin-page-framework' )     => $this->getAOrB( @ini_get( 'allow_url_fopen' ), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ),
+                    __( 'Display Errors', 'admin-page-framework' )          => $this->getAOrB( @ini_get( 'display_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ),
+                    __( 'Log Errors', 'admin-page-framework' )              => $this->getAOrB( @ini_get( 'log_errors' ), $this->oMsg->get( 'on' ), $this->oMsg->get( 'off' ) ),
                     __( 'Error log location', 'admin-page-framework' )      => @ini_get( 'error_log' ),
                     __( 'Error Reporting Level', 'admin-page-framework' )   => $_oErrorReporting->getErrorLevel(),
-                    __( 'FSOCKOPEN', 'admin-page-framework' )               => $this->getAOrB( function_exists( 'fsockopen' ),   $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
-                    __( 'cURL', 'admin-page-framework' )                    => $this->getAOrB( function_exists( 'curl_init' ),   $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
-                    __( 'SOAP', 'admin-page-framework' )                    => $this->getAOrB( class_exists( 'SoapClient' ),     $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
-                    __( 'SUHOSIN', 'admin-page-framework' )                 => $this->getAOrB( extension_loaded( 'suhosin' ),    $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
-                    'ini_set()'                                             => $this->getAOrB( function_exists( 'ini_set' ),     $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
+                    __( 'FSOCKOPEN', 'admin-page-framework' )               => $this->getAOrB( function_exists( 'fsockopen' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
+                    __( 'cURL', 'admin-page-framework' )                    => $this->getAOrB( function_exists( 'curl_init' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
+                    __( 'SOAP', 'admin-page-framework' )                    => $this->getAOrB( class_exists( 'SoapClient' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
+                    __( 'SUHOSIN', 'admin-page-framework' )                 => $this->getAOrB( extension_loaded( 'suhosin' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
+                    'ini_set()'                                             => $this->getAOrB( function_exists( 'ini_set' ), $this->oMsg->get( 'supported' ), $this->oMsg->get( 'not_supported' ) ),
                 ) 
                 + $this->getPHPInfo()
                 + array( 
@@ -557,11 +557,11 @@ 
              * @since       3.4.6
              * @since       3.5.3       Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method.
              */                      
-            private function _getWebServerInfo( $bGenerateInfo=true ) {
+            private function _getWebServerInfo( $bGenerateInfo = true ) {
                         
                 return $bGenerateInfo 
                     ? array(
-                        __( 'Web Server', 'admin-page-framework' )                  => $_SERVER['SERVER_SOFTWARE'],
+                        __( 'Web Server', 'admin-page-framework' )                  => $_SERVER[ 'SERVER_SOFTWARE' ],
                         'SSL'                                                       => $this->getAOrB( is_ssl(), $this->oMsg->get( 'yes' ), $this->oMsg->get( 'no' ) ),
                         __( 'Session', 'admin-page-framework' )                     => $this->getAOrB( isset( $_SESSION ), $this->oMsg->get( 'enabled' ), $this->oMsg->get( 'disabled' ) ),
                         __( 'Session Name', 'admin-page-framework' )                => esc_html( @ini_get( 'session.name' ) ),

Braces +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
      *     <li>**attributes** - (optional, array) [3.3.0+] attribute argument array. `array( 'async' => '', 'data-id' => '...' )`</li>
      * </ul>     
      */
-    protected function getEnqueuingScripts() { 
+    protected function getEnqueuingScripts() {
         return array();
     }
     
@@ -110,7 +110,7 @@ 
      *     <li><strong>media</strong> - ( optional, string ) the description of the field which is inserted into the after the input field tag.</li>
      * </ul>
      */
-    protected function getEnqueuingStyles() { 
+    protected function getEnqueuingStyles() {
         return array();
     }            
 
@@ -118,7 +118,7 @@ 
     /**
      * Returns the field type specific JavaScript script.
      */ 
-    protected function getScripts() { 
+    protected function getScripts() {
         return '';
     }
 
@@ -159,7 +159,7 @@ 
     /**
      * Returns the output of the field type.
      */
-    protected function getField( $aField ) { 
+    protected function getField( $aField ) {
 
         $_aInputAttributes           = $aField['attributes'];
         $_aInputAttributes['class'] .= ' system';

development/factory/_abstract/form/field_type/AdminPageFramework_FieldType_taxonomy.php

Doc Comments +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
              * 
              * @since   2.0.0
              * @param   array   $vValue This can be either an one-dimensional array ( for single field ) or a two-dimensional array ( for multiple fields ).
-             * @param   string  $sKey     
+             * @param string $sTaxonomySlug
              * @return  array   Returns an numerically indexed array holding the keys that yield true as the value.
              */ 
             private function _getSelectedKeyArray( $vValue, $sTaxonomySlug ) {

Spacing +44 added lines, -44 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'taxonomy', );
+    public $aFieldTypeSlugs = array( 'taxonomy',);
     
     /**
      * Defines the default key-values of this field type. 
@@ -29,40 +29,40 @@ 
      * @remark  $_aDefaultKeys holds shared default key-values defined in the base class.
      */
     protected $aDefaultKeys = array(
-        'taxonomy_slugs'        => 'category',      // (array|string) This is for the taxonomy field type.
-        'height'                => '250px',         // the tab box height
-        'width'                 => null,            // 3.5.7.2+ the tab box width
-        'max_width'             => '100%',          // for the taxonomy checklist field type, since 2.1.1.     
-        'show_post_count'       => true,            // (boolean) 3.2.0+ whether or not the post count associated with the term should be displayed or not.
+        'taxonomy_slugs'        => 'category', // (array|string) This is for the taxonomy field type.
+        'height'                => '250px', // the tab box height
+        'width'                 => null, // 3.5.7.2+ the tab box width
+        'max_width'             => '100%', // for the taxonomy checklist field type, since 2.1.1.     
+        'show_post_count'       => true, // (boolean) 3.2.0+ whether or not the post count associated with the term should be displayed or not.
         'attributes'            => array(),    
-        'select_all_button'     => true,            // (boolean|string) 3.3.0+ to change the label, set the label here
-        'select_none_button'    => true,            // (boolean|string) 3.3.0+ to change the label, set the label here                
-        'label_no_term_found'   => null,            // (string) 3.3.2+  The label to display when no term is found. null needs to be set here as the default value will be assigned in the field output method.
-        'label_list_title'      => '',              // (string) 3.3.2+ The heading title string for a term list. Default: `''`. Insert an HTML custom string right before the list starts.
+        'select_all_button'     => true, // (boolean|string) 3.3.0+ to change the label, set the label here
+        'select_none_button'    => true, // (boolean|string) 3.3.0+ to change the label, set the label here                
+        'label_no_term_found'   => null, // (string) 3.3.2+  The label to display when no term is found. null needs to be set here as the default value will be assigned in the field output method.
+        'label_list_title'      => '', // (string) 3.3.2+ The heading title string for a term list. Default: `''`. Insert an HTML custom string right before the list starts.
         'query'                 => array(       // (array)  3.3.2+ Defines the default query argument.
             // see the arguments of the get_category() function: http://codex.wordpress.org/Function_Reference/get_categories
             // see the argument of the get_terms() function: http://codex.wordpress.org/Function_Reference/get_terms        
             'child_of'          => 0,
             'parent'            => '',
-            'orderby'           => 'name',      // (string) 'ID' or 'term_id' or 'name'
-            'order'             => 'ASC',       // (string) 'ASC' or 'DESC'
-            'hide_empty'        => false,       // (boolean) whether to show the terms with no post associated. Default: false
-            'hierarchical'      => true,        // (boolean) whether to show the terms as a hierarchical tree.
-            'number'            => '',          // (integer) The maximum number of the terms to show.
-            'pad_counts'        => false,       // (boolean) whether to sum up the post counts with the child post counts.
-            'exclude'           => array(),     // (string) Comma separated term IDs to exclude from the list. for example `1` will remove the 'Uncategorized' category from the list.
+            'orderby'           => 'name', // (string) 'ID' or 'term_id' or 'name'
+            'order'             => 'ASC', // (string) 'ASC' or 'DESC'
+            'hide_empty'        => false, // (boolean) whether to show the terms with no post associated. Default: false
+            'hierarchical'      => true, // (boolean) whether to show the terms as a hierarchical tree.
+            'number'            => '', // (integer) The maximum number of the terms to show.
+            'pad_counts'        => false, // (boolean) whether to sum up the post counts with the child post counts.
+            'exclude'           => array(), // (string) Comma separated term IDs to exclude from the list. for example `1` will remove the 'Uncategorized' category from the list.
             'exclude_tree'      => array(), 
-            'include'           => array(),     // (string) Comma separated term IDs to include in the list.
+            'include'           => array(), // (string) Comma separated term IDs to include in the list.
             'fields'            => 'all', 
             'slug'              => '', 
             'get'               => '', 
             'name__like'        => '',
             'description__like' => '',
             'offset'            => '', 
-            'search'            => '',          // (string) The search keyword to get the term with.
+            'search'            => '', // (string) The search keyword to get the term with.
             'cache_domain'      => 'core',
         ),
-        'queries'   => array(),         // (optional, array) 3.3.2+  Allows to set a query argument for each taxonomy. The array key must be the taxonomy slug and the value is the query argument array.
+        'queries'   => array(), // (optional, array) 3.3.2+  Allows to set a query argument for each taxonomy. The array key must be the taxonomy slug and the value is the query argument array.
     );
     
     /**
@@ -88,7 +88,7 @@ 
 
         $_aJSArray = json_encode( $this->aFieldTypeSlugs );
         
-        return parent::getScripts() . 
+        return parent::getScripts(). 
         // return 
 <<<JAVASCRIPTS
 /* For tabs */
@@ -321,7 +321,7 @@ 
     protected function getField( $aField ) {
         
         // Format
-        $aField['label_no_term_found'] = $this->getElement( 
+        $aField[ 'label_no_term_found' ] = $this->getElement( 
             $aField, 
             'label_no_term_found', 
             $this->oMsg->get( 'no_term_found' ) 
@@ -330,18 +330,18 @@ 
         // Parse
         $_aTabs         = array();
         $_aCheckboxes   = array();      
-        foreach( $this->getAsArray( $aField['taxonomy_slugs'] ) as $sKey => $sTaxonomySlug ) {
-            $_aTabs[]        = $this->_getTaxonomyTab( $aField, $sKey, $sTaxonomySlug );    
-            $_aCheckboxes[]  = $this->_getTaxonomyCheckboxes( $aField, $sKey, $sTaxonomySlug );
+        foreach ( $this->getAsArray( $aField[ 'taxonomy_slugs' ] ) as $sKey => $sTaxonomySlug ) {
+            $_aTabs[ ]        = $this->_getTaxonomyTab( $aField, $sKey, $sTaxonomySlug );    
+            $_aCheckboxes[ ]  = $this->_getTaxonomyCheckboxes( $aField, $sKey, $sTaxonomySlug );
         }
 
         // Output
-        return "<div id='tabbox-{$aField['field_id']}' class='tab-box-container categorydiv' style='max-width:{$aField['max_width']};'>"
+        return "<div id='tabbox-{$aField[ 'field_id' ]}' class='tab-box-container categorydiv' style='max-width:{$aField[ 'max_width' ]};'>"
                 . "<ul class='tab-box-tabs category-tabs'>" 
                     . implode( PHP_EOL, $_aTabs ) 
                 . "</ul>" 
                 . "<div class='tab-box-contents-container'>"
-                    . "<div class='tab-box-contents' style='height: {$aField['height']};'>"
+                    . "<div class='tab-box-contents' style='height: {$aField[ 'height' ]};'>"
                         . implode( PHP_EOL, $_aCheckboxes )
                     . "</div>"
                 . "</div>" 
@@ -358,7 +358,7 @@ 
         private function _getTaxonomyCheckboxes( array $aField, $sKey, $sTaxonomySlug ) {
             
             $_aTabBoxContainerArguments = array(
-                'id'    => "tab_{$aField['input_id']}_{$sKey}",
+                'id'    => "tab_{$aField[ 'input_id' ]}_{$sKey}",
                 'class' => 'tab-box-content',
                 'style' => $this->generateInlineCSS(
                     array(
@@ -367,9 +367,9 @@ 
                     )
                 ),
             );
-            return "<div " . $this->getAttributes( $_aTabBoxContainerArguments ) . ">"
+            return "<div ".$this->getAttributes( $_aTabBoxContainerArguments ).">"
                     . $this->getElement( $aField, array( 'before_label', $sKey ) )
-                    . "<div " . $this->getAttributes( $this->_getCheckboxContainerAttributes( $aField ) ) . "></div>"
+                    . "<div ".$this->getAttributes( $this->_getCheckboxContainerAttributes( $aField ) )."></div>"
                     . "<ul class='list:category taxonomychecklist form-no-clear'>"
                         . $this->_getTaxonomyChecklist( $aField, $sKey, $sTaxonomySlug )
                     . "</ul>"     
@@ -389,23 +389,23 @@ 
                     array(
                         'walker'                => new AdminPageFramework_WalkerTaxonomyChecklist, // the walker class instance
                         'taxonomy'              => $sTaxonomySlug, 
-                        '_name_prefix'          => is_array( $aField['taxonomy_slugs'] ) 
-                            ? "{$aField['_input_name']}[{$sTaxonomySlug}]" 
-                            : $aField['_input_name'],   // name prefix of the input
-                        '_input_id_prefix'      => $aField['input_id'],
+                        '_name_prefix'          => is_array( $aField[ 'taxonomy_slugs' ] ) 
+                            ? "{$aField[ '_input_name' ]}[{$sTaxonomySlug}]" 
+                            : $aField[ '_input_name' ], // name prefix of the input
+                        '_input_id_prefix'      => $aField[ 'input_id' ],
                         '_attributes'           => $this->getElement( 
                             $aField, 
                             array( 'attributes', $sKey ), 
                             array() 
-                        ) + $aField['attributes'],                 
+                        ) + $aField[ 'attributes' ],                 
                         
                         // checked items ( term IDs ) e.g.  array( 6, 10, 7, 15 ), 
-                        '_selected_items'       => $this->_getSelectedKeyArray( $aField['value'], $sTaxonomySlug ),
+                        '_selected_items'       => $this->_getSelectedKeyArray( $aField[ 'value' ], $sTaxonomySlug ),
                         
-                        'echo'                  => false,  // returns the output
-                        'show_post_count'       => $aField['show_post_count'],      // 3.2.0+
-                        'show_option_none'      => $aField['label_no_term_found'],  // 3.3.2+ 
-                        'title_li'              => $aField['label_list_title'],     // 3.3.2+
+                        'echo'                  => false, // returns the output
+                        'show_post_count'       => $aField[ 'show_post_count' ], // 3.2.0+
+                        'show_option_none'      => $aField[ 'label_no_term_found' ], // 3.3.2+ 
+                        'title_li'              => $aField[ 'label_list_title' ], // 3.3.2+
                     ) 
                     + $this->getAsArray( 
                         $this->getElement( 
@@ -415,7 +415,7 @@ 
                         ), 
                         true 
                     )
-                    + $aField['query']                             
+                    + $aField[ 'query' ]                             
                 );
             }
      
@@ -433,10 +433,10 @@ 
 
                 $vValue = ( array ) $vValue; // cast array because the initial value (null) may not be an array.
                 
-                if ( ! isset( $vValue[ $sTaxonomySlug ] ) ) { 
+                if ( !isset( $vValue[ $sTaxonomySlug ] ) ) { 
                     return array(); 
                 }
-                if ( ! is_array( $vValue[ $sTaxonomySlug ] ) ) { 
+                if ( !is_array( $vValue[ $sTaxonomySlug ] ) ) { 
                     return array(); 
                 }
                 
@@ -452,7 +452,7 @@ 
          */
         private function _getTaxonomyTab( array $aField, $sKey, $sTaxonomySlug ) {
             return "<li class='tab-box-tab'>"
-                    . "<a href='#tab_{$aField['input_id']}_{$sKey}'>"
+                    . "<a href='#tab_{$aField[ 'input_id' ]}_{$sKey}'>"
                         . "<span class='tab-box-tab-text'>" 
                             . $this->_getLabelFromTaxonomySlug( $sTaxonomySlug )
                         . "</span>"

Braces +2 added lines, -2 removed lines

@@ -433,10 +433,10 @@
 
                 $vValue = ( array ) $vValue; // cast array because the initial value (null) may not be an array.
                 
-                if ( ! isset( $vValue[ $sTaxonomySlug ] ) ) { 
+                if ( ! isset( $vValue[ $sTaxonomySlug ] ) ) {
                     return array(); 
                 }
-                if ( ! is_array( $vValue[ $sTaxonomySlug ] ) ) { 
+                if ( ! is_array( $vValue[ $sTaxonomySlug ] ) ) {
                     return array(); 
                 }
                 

development/factory/_abstract/form/input/AdminPageFramework_Input_Base.php

Doc Comments +1 added lines, -3 removed lines

@@ -105,10 +105,8 @@
      * If a parameter is not passed, it returns the entire attribute array.
      * 
      * @since       3.5.3
-     * @return      string|array|null        The specified attribute value or the entire attribute array if not specified. 
+     * @return      string        The specified attribute value or the entire attribute array if not specified. 
      * If not set, null will be returned as the `getAttributes()` method will not list an attribute with the null value.
-     * @param       string      $sName      The attribute name.
-     * @param       string      $sDefault   The defaqult value if the value is not set.
      */
     public function getAttribute( /* $sName=null, $sDefault=null */ ) {
         $_aParams = func_get_args() + array(

Spacing +7 added lines, -7 removed lines

@@ -63,9 +63,9 @@ 
      * @param       array       $aAttributes    The attribute array. A field definition array is deprecated.
      * @param       array       $aOptions       options that allows to set custom container tags and class selctors.
      */
-    public function __construct( array $aAttributes, array $aOptions=array() ) {
+    public function __construct( array $aAttributes, array $aOptions = array() ) {
 
-        $this->aAttributes  = $this->getElementAsArray( 
+        $this->aAttributes = $this->getElementAsArray( 
             $aAttributes, 
             'attributes', 
             $aAttributes    // if the above key is not set, this will be set
@@ -127,13 +127,13 @@ 
      * @return      string      The set class selector(s).
      */
     public function addClass( /* $asSelectors1, $asSelectors2 */ ) {
-        foreach( func_get_args() as $_asSelectors ) {            
-            $this->aAttributes['class'] = $this->getClassAttribute( 
-                $this->aAttributes['class'],
+        foreach ( func_get_args() as $_asSelectors ) {            
+            $this->aAttributes[ 'class' ] = $this->getClassAttribute( 
+                $this->aAttributes[ 'class' ],
                 $_asSelectors
             );
         }
-        return $this->aAttributes['class'];
+        return $this->aAttributes[ 'class' ];
     }
     
     /**
@@ -158,7 +158,7 @@ 
         // $this->aAttributes[ $_aParams[ 0 ] ] = $_aParams[ 1 ];
         $this->setMultiDimensionalArray(
             $this->aAttributes, 
-            $this->getElementAsArray( $_aParams, 0 ),   // $asAttributeName
+            $this->getElementAsArray( $_aParams, 0 ), // $asAttributeName
             $_aParams[ 1 ]  // $mValue
         );
     }

Braces +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
      * @return      string      The set class selector(s).
      */
     public function addClass( /* $asSelectors1, $asSelectors2 */ ) {
-        foreach( func_get_args() as $_asSelectors ) {            
+        foreach( func_get_args() as $_asSelectors ) {
             $this->aAttributes['class'] = $this->getClassAttribute( 
                 $this->aAttributes['class'],
                 $_asSelectors

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).

development/factory/_abstract/form/input/AdminPageFramework_Input_checkbox.php

Doc Comments -2 removed lines

@@ -21,8 +21,6 @@
      * Returns the output of the input element.
      * 
      * @since       3.4.0    
-     * @param       string      $sLabel         The label text.
-     * @param       array       $aAttributes    (optional) The attribute array. If set, it will be merged with the attribute set in the constructor.
      */    
     public function get( /* $sLabel, $aAttributes=array() */ ) {
         

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
         // Output
         return 
-           "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
+            "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
                 // the unchecked value must be set prior to the checkbox input field.
                 . "<input " . $this->getAttributes( 
                     array(

Spacing +12 added lines, -12 removed lines

@@ -27,11 +27,11 @@ 
     public function get( /* $sLabel, $aAttributes=array() */ ) {
         
         // Parameters
-        $_aParams       = func_get_args() + array( 
-            0 => '',            // 1st parameter
+        $_aParams = func_get_args() + array( 
+            0 => '', // 1st parameter
             1 => array()        // 2nd parameter
         );
-        $_sLabel        = $_aParams[ 0 ];       // first parameter
+        $_sLabel        = $_aParams[ 0 ]; // first parameter
 
         // Attributes
         $_aAttributes   = $this->uniteArrays(   // second parameter
@@ -46,9 +46,9 @@ 
 
         // Output
         return 
-           "<{$this->aOptions[ 'input_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ) . ">"
+           "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
                 // the unchecked value must be set prior to the checkbox input field.
-                . "<input " . $this->getAttributes( 
+                . "<input ".$this->getAttributes( 
                     array(
                         'type'      => 'hidden',
                         'class'     => $_aAttributes[ 'class' ],
@@ -57,9 +57,9 @@ 
                     ) 
                 ) 
                 . " />"
-                . "<input " . $this->getAttributes( $_aAttributes ) . " />" 
+                . "<input ".$this->getAttributes( $_aAttributes )." />" 
             . "</{$this->aOptions[ 'input_container_tag' ]}>"
-            . "<{$this->aOptions[ 'label_container_tag' ]} " . $this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ) . ">"
+            . "<{$this->aOptions[ 'label_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ).">"
                 . $_sLabel
             . "</{$this->aOptions[ 'label_container_tag' ]}>"
         ;
@@ -75,7 +75,7 @@ 
     public function getAttributesByKey( /* $sKey */ ) {
         
         // Parameters
-        $_aParams       = func_get_args() + array( 0 => '', );
+        $_aParams       = func_get_args() + array( 0 => '',);
         $_sKey          = $_aParams[ 0 ];        
         $_bIsMultiple   = '' !== $_sKey;
         
@@ -87,13 +87,13 @@ 
             // The type needs to be specified since the postytpe field type extends this class. If not set, the 'posttype' will be passed to the type attribute.
             + array(
                 'type'      => 'checkbox', 
-                'id'        => $this->aAttributes[ 'id' ] . '_' . $_sKey,
+                'id'        => $this->aAttributes[ 'id' ].'_'.$_sKey,
                 'checked'   => $this->_getCheckedAttributeValue( $_sKey ),
-                'value'     => 1,   // this must be always 1 because the key value can be zero. In that case, the value always will be false and unchecked.
+                'value'     => 1, // this must be always 1 because the key value can be zero. In that case, the value always will be false and unchecked.
                 'name'      => $_bIsMultiple 
                     ? "{$this->aAttributes[ 'name' ]}[{$_sKey}]" 
                     : $this->aAttributes[ 'name' ],
-                'data-id'   => $this->aAttributes[ 'id' ],       // referenced by the JavaScript scripts such as the revealer script.
+                'data-id'   => $this->aAttributes[ 'id' ], // referenced by the JavaScript scripts such as the revealer script.
             )
             + $this->aAttributes
             ;
@@ -110,7 +110,7 @@ 
                 : array( 'value', $_sKey );
             return $this->getElement( $this->aAttributes, $_aValueDimension )
                 ? 'checked' 
-                : null;    // to not to set, pass null. An empty value '' will still set the attribute.            
+                : null; // to not to set, pass null. An empty value '' will still set the attribute.            
         
         }
         

development/factory/_abstract/form/input/AdminPageFramework_Input_radio.php

Doc Comments -4 removed lines

@@ -21,8 +21,6 @@ 
      * Returns the output of the input element.
      * 
      * @since       3.4.0    
-     * @param       string      $sLabel         The label text.
-     * @param       array       $aAttributes    (optional) The attribute array. If set, it will be merged with the attribute set in the constructor.
      */    
     public function get( /* $sLabel, $aAttributes=array() */ ) {
         
@@ -52,8 +50,6 @@ 
      * 
      * @return      array       The updated attribute array. 
      * @since       3.5.3
-     * @param       string      $sKey       The array element key of the radio button. 
-     * It is assumed that there is an array that holds multiple radio buttons and each of them has an array key.
      */
     public function getAttributesByKey( /* $sKey */ ) {
         

Spacing +10 added lines, -10 removed lines

@@ -36,12 +36,12 @@ 
         
         // Output
         return 
-            "<{$this->aOptions['input_container_tag']} " . $this->getAttributes( $this->aOptions['input_container_attributes'] ) . ">"
-                . "<input " . $this->getAttributes( $_aAttributes ) . " />" 
-            . "</{$this->aOptions['input_container_tag']}>"
-            . "<{$this->aOptions['label_container_tag']} " . $this->getAttributes( $this->aOptions['label_container_attributes'] ) . ">"
+            "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
+                . "<input ".$this->getAttributes( $_aAttributes )." />" 
+            . "</{$this->aOptions[ 'input_container_tag' ]}>"
+            . "<{$this->aOptions[ 'label_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'label_container_attributes' ] ).">"
                 . $_sLabel
-            . "</{$this->aOptions['label_container_tag']}>"
+            . "</{$this->aOptions[ 'label_container_tag' ]}>"
             ;
         
     }    
@@ -58,22 +58,22 @@ 
     public function getAttributesByKey( /* $sKey */ ) {
         
         // Parameters
-        $_aParams       = func_get_args() + array( 0 => '', );
-        $_sKey           = $_aParams[ 0 ];        
+        $_aParams = func_get_args() + array( 0 => '',);
+        $_sKey = $_aParams[ 0 ];        
         
         // Result
         return $this->getElementAsArray( $this->aAttributes, $_sKey, array() )
             + array(
                 'type'          => 'radio',
-                'checked'       => isset( $this->aAttributes['value'] ) && $this->aAttributes['value'] == $_sKey 
+                'checked'       => isset( $this->aAttributes[ 'value' ] ) && $this->aAttributes[ 'value' ] == $_sKey 
                     ? 'checked' 
                     : null,
                 'value'         => $_sKey,
                 // 'id'            => $this->aField['input_id'] . '_' . $_sKey,
-                'id'            => $this->getAttribute( 'id' ) . '_' . $_sKey,
+                'id'            => $this->getAttribute( 'id' ).'_'.$_sKey,
                 // 'data-default'  => $this->aField['default'],        // refered by the repeater script
                 // 'data-id'       => $this->aField['input_id'],       // refered by the JavaScript scripts such as the revealer script.
-                'data-id'       => $this->getAttribute( 'id' ),       // refered by the JavaScript scripts such as the revealer script.
+                'data-id'       => $this->getAttribute( 'id' ), // refered by the JavaScript scripts such as the revealer script.
             ) 
             + $this->aAttributes; 
             

development/factory/_abstract/form/input/AdminPageFramework_Input_select.php

Doc Comments +3 added lines, -1 removed lines

@@ -122,7 +122,7 @@ 
          * @internal
          * @param       string      $sInputID           The input ID that will be the base of each generated option tag ID.
          * @param       array       $aLabels            The array holding labels.
-         * @param       array       $aAttributes        The attribute arrays. Accepts the following arguments.
+         * @param       array       $aBaseAttributes        The attribute arrays. Accepts the following arguments.
          * - optgroup
          * - option
          */     
@@ -160,6 +160,7 @@ 
             /**
              * Returns an HTML output of optgroup tag.
              * @since       3.5.3
+             * @param string $sInputID
              * @return      string      an HTML output of optgroup tag.
              */
             private function _getOptGroup( array $aBaseAttributes, $sInputID, $sKey, $asLabel ) {
@@ -179,6 +180,7 @@ 
             /**
              * 
              * @since        3.5.3
+             * @param string $sInputID
              */
             private function _getOptionTagAttributes( array $aBaseAttributes, $sInputID, $sKey, $aValues ) {
             

Spacing +24 added lines, -24 removed lines

@@ -44,8 +44,8 @@ 
         // For backward compatibility.
         
         // If the $aField property is set, extract certain elements from it and set them to the attribute array.
-        if ( isset( $this->aField['is_multiple'] ) ) {
-            $this->aAttributes['select']['multiple'] = $this->aField['is_multiple']
+        if ( isset( $this->aField[ 'is_multiple' ] ) ) {
+            $this->aAttributes[ 'select' ][ 'multiple' ] = $this->aField[ 'is_multiple' ]
                 ? 'multiple'
                 : $this->getElement( $this->aAttributes, array( 'select', 'multiple' ) );
         }
@@ -69,20 +69,20 @@ 
         );    
 
         return  
-            "<{$this->aOptions['input_container_tag']} " . $this->getAttributes( $this->aOptions['input_container_attributes'] ) . ">"
-                . "<select " . $this->getAttributes( $this->_getSelectAttributes( $_aAttributes ) ) . " >"
+            "<{$this->aOptions[ 'input_container_tag' ]} ".$this->getAttributes( $this->aOptions[ 'input_container_attributes' ] ).">"
+                . "<select ".$this->getAttributes( $this->_getSelectAttributes( $_aAttributes ) )." >"
                     . $this->_getDropDownList( 
                         $this->getAttribute( 'id' ),
                         $this->getAsArray(
                             isset( $_aLabels ) 
                                 ? $_aLabels
-                                : $this->aField['label'],    // backward compatibility
+                                : $this->aField[ 'label' ], // backward compatibility
                             true
                         ),
                         $_aAttributes
                     )
                 . "</select>"
-            . "</{$this->aOptions['input_container_tag']}>"
+            . "</{$this->aOptions[ 'input_container_tag' ]}>"
             ;
             
     }
@@ -104,9 +104,9 @@ 
                         ? 'multiple' 
                         : null,
                     'name'      => $_bIsMultiple 
-                        ? $this->getAttribute( 'name' ) . '[]'
+                        ? $this->getAttribute( 'name' ).'[]'
                         : $this->getAttribute( 'name' ),
-                    'data-id'   => $this->getAttribute( 'id' ),       // referenced by the JavaScript scripts such as the revealer script.
+                    'data-id'   => $this->getAttribute( 'id' ), // referenced by the JavaScript scripts such as the revealer script.
                 )
             );            
             
@@ -128,12 +128,12 @@ 
          */     
         private function _getDropDownList( $sInputID, array $aLabels, array $aBaseAttributes ) {
             
-            $_aOutput   = array();
-            foreach( $aLabels as $__sKey => $__asLabel ) {
+            $_aOutput = array();
+            foreach ( $aLabels as $__sKey => $__asLabel ) {
                 
                 // For an optgroup tag,
                 if ( is_array( $__asLabel ) ) {
-                    $_aOutput[] = $this->_getOptGroup(
+                    $_aOutput[ ] = $this->_getOptGroup(
                         $aBaseAttributes, 
                         $sInputID, 
                         $__sKey, 
@@ -143,13 +143,13 @@ 
                 }
                 
                 // A normal option tag,
-                $_aOutput[] = $this->_getOptionTag( 
-                    $__asLabel,   // the text label the user sees to be selected
+                $_aOutput[ ] = $this->_getOptionTag( 
+                    $__asLabel, // the text label the user sees to be selected
                     $this->_getOptionTagAttributes( 
                         $aBaseAttributes, 
                         $sInputID, 
                         $__sKey,
-                        $this->getAsArray( $aBaseAttributes['value'], true )
+                        $this->getAsArray( $aBaseAttributes[ 'value' ], true )
                     ) 
                 );
                     
@@ -164,13 +164,13 @@ 
              */
             private function _getOptGroup( array $aBaseAttributes, $sInputID, $sKey, $asLabel ) {
              
-                $_aOptGroupAttributes = isset( $aBaseAttributes['optgroup'][ $sKey ] ) && is_array( $aBaseAttributes['optgroup'][ $sKey ] )
-                    ? $aBaseAttributes['optgroup'][ $sKey ] + $aBaseAttributes['optgroup']
-                    : $aBaseAttributes['optgroup'];
+                $_aOptGroupAttributes = isset( $aBaseAttributes[ 'optgroup' ][ $sKey ] ) && is_array( $aBaseAttributes[ 'optgroup' ][ $sKey ] )
+                    ? $aBaseAttributes[ 'optgroup' ][ $sKey ] + $aBaseAttributes[ 'optgroup' ]
+                    : $aBaseAttributes[ 'optgroup' ];
                 $_aOptGroupAttributes = array(
                     'label' => $sKey,
                 ) + $_aOptGroupAttributes;
-                return "<optgroup " . $this->getAttributes( $_aOptGroupAttributes ) . ">"
+                return "<optgroup ".$this->getAttributes( $_aOptGroupAttributes ).">"
                         . $this->_getDropDownList( $sInputID, $asLabel, $aBaseAttributes )
                     . "</optgroup>";
              
@@ -188,14 +188,14 @@ 
                     $aValues 
                 );
                 return array(      
-                        'id'        => $sInputID . '_' . $sKey,
+                        'id'        => $sInputID.'_'.$sKey,
                         'value'     => $sKey,
                         'selected'  => in_array( ( string ) $sKey, $aValues ) 
                             ? 'selected' 
                             : null,                                        
-                    ) + ( isset( $aBaseAttributes['option'][ $sKey ] ) && is_array( $aBaseAttributes['option'][ $sKey ] )
-                        ? $aBaseAttributes['option'][ $sKey ] + $aBaseAttributes['option']
-                        : $aBaseAttributes['option'] );
+                    ) + ( isset( $aBaseAttributes[ 'option' ][ $sKey ] ) && is_array( $aBaseAttributes[ 'option' ][ $sKey ] )
+                        ? $aBaseAttributes[ 'option' ][ $sKey ] + $aBaseAttributes[ 'option' ]
+                        : $aBaseAttributes[ 'option' ] );
             
             }
         
@@ -204,8 +204,8 @@ 
              * @sicne       3.4.0
              * @return      string      The generated option tag HTML output.
              */
-            private function _getOptionTag( $sLabel, array $aOptionTagAttributes=array() ) {
-                return "<option " . $this->getAttributes( $aOptionTagAttributes ) . " >"    
+            private function _getOptionTag( $sLabel, array $aOptionTagAttributes = array() ) {
+                return "<option ".$this->getAttributes( $aOptionTagAttributes )." >"    
                         . $sLabel
                     . "</option>";
             }