michaeluno / admin-page-framework

development/factory/_common/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 +2 added lines, -2 removed lines

@@ -93,8 +93,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/_common/form/_view/sectionset/AdminPageFramework_Form_View___Sectionsets.php

Doc Comments +4 added lines, -1 removed lines

@@ -161,6 +161,7 @@ 
     }
         /**
          * @since       DEVVER
+         * @param string $_sOutput
          * @return      string
          */
         private function _getSpinnerOutput( $_sOutput ) {
@@ -297,7 +298,7 @@ 
              * @param       array       $_aOutputs      Holds output elements - contents, section tab list, count of subsections
              * @param       string      $_sSectionsID   The container id of secitons.
              * @param       array       $_aSection
-             * @param       array       $_aFieldsInSections     A fieldsets array already divided by section tab.
+             * @param       array       $aFieldsInSections     A fieldsets array already divided by section tab.
              * @return      array       The updated sections table output array.
              */
             private function _getSectionsetTable( $_aOutputs, $_sSectionsID, array $_aSection, array $aFieldsInSections ) {
@@ -351,6 +352,7 @@ 
             }
                 /**
                  * @since       DEVVER
+                 * @param string $_sSectionsID
                  * @return      array
                  */
                 private function _getSubSections( $_aOutputs, $_sSectionsID, $_aSection, $_aSubSections ) {
@@ -499,6 +501,7 @@ 
              * @since       3.5.3
              * @since       3.6.0       Removed the `$sSectionID` parameter. Added the `$aSectionset` parameter.
              * @since       DEVVER      Moved from `AdminPageFramework_FormPart_Table`.
+             * @param string $sSectionsID
              * @return      string      The formatted sections table HTML output.
              */
             private function _getFormattedSectionsTablesOutput( array $aOutputs, $aSectionset, $sSectionsID, array $aCollapsible, $sSectionTabSlug ) {

Indentation +1 added lines, -1 removed lines

@@ -531,7 +531,7 @@
                  * @return      string      The generated section tab list as HTML.
                  */
                 private function _getSectionTabList( $sSectionTabSlug, array $aSectionTabList ) {
-                   return $sSectionTabSlug 
+                    return $sSectionTabSlug 
                         ? "<ul class='admin-page-framework-section-tabs nav-tab-wrapper'>" 
                             . implode( PHP_EOL, $aSectionTabList ) 
                             . "</ul>"

Braces +4 added lines, -4 removed lines

@@ -204,7 +204,7 @@ 
         private function _getSectionsetsTables( array $aSectionsets, array $aFieldsets, array $aCallbacks ) {
 
 
-            if ( empty( $aSectionsets ) ) { 
+            if ( empty( $aSectionsets ) ) {
                 return ''; 
             } 
             
@@ -258,7 +258,7 @@ 
              * Changed the visibility scope to private. Changed the 1st parameter from `$aSection`.
              * @return      array
              */
-            private function _getCollapsibleArgumentForSections( array $aSectionset=array() ) {  
+            private function _getCollapsibleArgumentForSections( array $aSectionset=array() ) {
                 
                 $_oArgumentFormater = new AdminPageFramework_Form_Model___Format_CollapsibleSection(
                     $aSectionset[ 'collapsible' ],
@@ -363,7 +363,7 @@ 
                     
                     // Get the section tables.
                     $_aSubSections = $this->numerizeElements( $_aSubSections ); // will include the main section as well.
-                    foreach( $_aSubSections as $_iIndex => $_aFields ) { 
+                    foreach( $_aSubSections as $_iIndex => $_aFields ) {
 
                         $_oEachSectionArguments = new AdminPageFramework_Form_Model___Format_EachSection(
                             $_aSection,
@@ -428,7 +428,7 @@ 
                  */
                 private function _getUnsetFlagSectionInputTag( array $aSection ) {
                     
-                    if ( false !== $aSection[ 'save' ] ) {                
+                    if ( false !== $aSection[ 'save' ] ) {
                         return '';
                     }
                     return $this->getHTMLTag( 

Spacing +44 added lines, -44 removed lines

@@ -127,16 +127,16 @@ 
      */
     public function get() {
         
-        $_oFormatSectionsetsByTab  = new AdminPageFramework_Form_View___Format_SectionsetsByTab(
+        $_oFormatSectionsetsByTab = new AdminPageFramework_Form_View___Format_SectionsetsByTab(
             $this->aStructure[ 'sectionsets' ],
             $this->aStructure[ 'fieldsets' ],
             $this->aArguments[ 'nested_depth' ]
         );
 
-        $_aOutput     = array();
-        foreach( $_oFormatSectionsetsByTab->getTabs() as $_sSectionTabSlug ) {
+        $_aOutput = array();
+        foreach ( $_oFormatSectionsetsByTab->getTabs() as $_sSectionTabSlug ) {
 
-            $_aOutput[] = $this->_getFormOutput(
+            $_aOutput[ ] = $this->_getFormOutput(
                 $_oFormatSectionsetsByTab->getSectionsets( $_sSectionTabSlug ),
                 $_oFormatSectionsetsByTab->getFieldsets( $_sSectionTabSlug ),
                 $_sSectionTabSlug,
@@ -150,7 +150,7 @@ 
 
         // Generate id for this output
         $_sOutput = implode( PHP_EOL, $_aOutput );
-        $_sElementID = "admin-page-framework-sectionsets-" . uniqid();
+        $_sElementID = "admin-page-framework-sectionsets-".uniqid();
         return $this->_getSpinnerOutput( $_sOutput )
             .   "<div id='{$_sElementID}' class='admin-page-framework-sctionsets admin-page-framework-form-js-on'>"
                 . $_sOutput
@@ -185,17 +185,17 @@ 
 
             // A sectionset is a set of sections.
             $_sSectionSet = $this->_getSectionsetsTables( 
-                $aSectionsets,  // section-set definition (already divided by section tab)
-                $aFieldsets,    // field-set definitions (already divided by section tab)
+                $aSectionsets, // section-set definition (already divided by section tab)
+                $aFieldsets, // field-set definitions (already divided by section tab)
                 $aCallbacks
             );
             return $_sSectionSet
-                ? "<div " . $this->getAttributes(
+                ? "<div ".$this->getAttributes(
                         array(
                             'class' => 'admin-page-framework-sectionset',
-                            'id'    => "sectionset-{$sSectionTabSlug}_" . md5( serialize( $aSectionsets ) ),
+                            'id'    => "sectionset-{$sSectionTabSlug}_".md5( serialize( $aSectionsets ) ),
                         ) 
-                    ) . ">"
+                    ).">"
                         . $_sSectionSet
                     . "</div>"
                 : '';
@@ -227,7 +227,7 @@ 
              * If there is no field overall to the section and its section tab, return an empty string.
              * Otherwise, the sectionsets container gets rendered and its CSS rules such as margins give unwanted results.
              */
-            if ( ! count( $aFieldsets ) ) {
+            if ( !count( $aFieldsets ) ) {
                 return ''; 
             }
 
@@ -239,13 +239,13 @@ 
             );
             $_sSectionTabSlug   = $_aFirstSectionset[ 'section_tab_slug' ];
             $_sThisSectionID    = $_aFirstSectionset[ 'section_id' ];
-            $_sSectionsID       = 'sections-' . $_sThisSectionID;
+            $_sSectionsID       = 'sections-'.$_sThisSectionID;
             $_aCollapsible      = $this->_getCollapsibleArgumentForSections( 
                 $_aFirstSectionset 
             );
                         
-            foreach( $aSectionsets as $_aSectionset ) {
-                $_aOutputs          = $this->_getSectionsetTable(
+            foreach ( $aSectionsets as $_aSectionset ) {
+                $_aOutputs = $this->_getSectionsetTable(
                     $_aOutputs,
                     $_sSectionsID,
                     $_aSectionset,
@@ -273,7 +273,7 @@ 
              * Changed the visibility scope to private. Changed the 1st parameter from `$aSection`.
              * @return      array
              */
-            private function _getCollapsibleArgumentForSections( array $aSectionset=array() ) {  
+            private function _getCollapsibleArgumentForSections( array $aSectionset = array() ) {  
                 
                 $_oArgumentFormater = new AdminPageFramework_Form_Model___Format_CollapsibleSection(
                     $aSectionset[ 'collapsible' ],
@@ -301,19 +301,19 @@ 
              */
             private function _getSectionsetTable( $_aOutputs, $_sSectionsID, array $_aSection, array $aFieldsInSections ) {
             
-                if ( ! $this->isSectionsetVisible( $_aSection ) ) {
+                if ( !$this->isSectionsetVisible( $_aSection ) ) {
                     return $_aOutputs;
                 }
 
                 // If the 'save' argument is false, insert a flag that disables saving the section inputs.
-                $_aOutputs[ 'section_contents' ][] = $this->_getUnsetFlagSectionInputTag( $_aSection );
+                $_aOutputs[ 'section_contents' ][ ] = $this->_getUnsetFlagSectionInputTag( $_aSection );
                 
                 // For repeatable sections - sub-sections are divided field definition arrays by sub-section index, 
                 // not section definition arrays.
-                $_aSubSections      = $this->getIntegerKeyElements( 
+                $_aSubSections = $this->getIntegerKeyElements( 
                     $this->getElementAsArray(
                         $aFieldsInSections, // subject array
-                        $_aSection[ '_section_path' ],  // dimensional path
+                        $_aSection[ '_section_path' ], // dimensional path
                         array() // default
                     )
                 );
@@ -356,28 +356,28 @@ 
                 private function _getSubSections( $_aOutputs, $_sSectionsID, $_aSection, $_aSubSections ) {
 
                     // Add the repeatable sections enabler script.
-                    if ( ! empty( $_aSection[ 'repeatable' ] ) ) {
-                        $_aOutputs[ 'section_contents' ][] = AdminPageFramework_Form_View___Script_RepeatableSection::getEnabler( 
+                    if ( !empty( $_aSection[ 'repeatable' ] ) ) {
+                        $_aOutputs[ 'section_contents' ][ ] = AdminPageFramework_Form_View___Script_RepeatableSection::getEnabler( 
                             $_sSectionsID, 
                             $_aOutputs[ 'count_subsections' ], 
                             $_aSection[ 'repeatable' ],
                             $this->oMsg
                         );
-                        $_aOutputs[ 'section_contents' ][] = $this->_getRepeatableSectionFlagTag( $_aSection );
+                        $_aOutputs[ 'section_contents' ][ ] = $this->_getRepeatableSectionFlagTag( $_aSection );
                     }
                     // Add the sortable sections enabler script. 3.6.0+
-                    if ( ! empty( $_aSection[ 'sortable' ] ) ) {
-                        $_aOutputs[ 'section_contents' ][] = AdminPageFramework_Form_View___Script_SortableSection::getEnabler( 
+                    if ( !empty( $_aSection[ 'sortable' ] ) ) {
+                        $_aOutputs[ 'section_contents' ][ ] = AdminPageFramework_Form_View___Script_SortableSection::getEnabler( 
                             $_sSectionsID, 
                             $_aSection[ 'sortable' ],
                             $this->oMsg
                         );
-                        $_aOutputs[ 'section_contents' ][] = $this->_getSortableSectionFlagTag( $_aSection );
+                        $_aOutputs[ 'section_contents' ][ ] = $this->_getSortableSectionFlagTag( $_aSection );
                     }
                     
                     // Get the section tables.
                     $_aSubSections = $this->numerizeElements( $_aSubSections ); // will include the main section as well.
-                    foreach( $_aSubSections as $_iIndex => $_aFields ) { 
+                    foreach ( $_aSubSections as $_iIndex => $_aFields ) { 
 
                         $_oEachSectionArguments = new AdminPageFramework_Form_Model___Format_EachSection(
                             $_aSection,
@@ -407,8 +407,8 @@ 
                         array(
                             'class'                     => 'element-address',
                             'type'                      => 'hidden',
-                            'name'                      => '__repeatable_elements_' . $aSection[ '_structure_type' ] 
-                                . '[' . $aSection[ 'section_id' ] . ']',
+                            'name'                      => '__repeatable_elements_'.$aSection[ '_structure_type' ] 
+                                . '['.$aSection[ 'section_id' ].']',
                             // @todo examine whether this value should include a section index.
                             'value' => $aSection[ 'section_id' ],                            
                         )
@@ -426,8 +426,8 @@ 
                         array(
                             'class'                     => 'element-address',
                             'type'                      => 'hidden',
-                            'name'                      => '__sortable_elements_' . $aSection[ '_structure_type' ] 
-                                . '[' . $aSection[ 'section_id' ] . ']',
+                            'name'                      => '__sortable_elements_'.$aSection[ '_structure_type' ] 
+                                . '['.$aSection[ 'section_id' ].']',
                             // @todo examine whether this value should include a section index.
                             'value' => $aSection[ 'section_id' ],                            
                         )
@@ -449,8 +449,8 @@ 
                         'input',
                         array(
                             'type'  => 'hidden',
-                            'name'  => '__unset_' .  $aSection[ '_structure_type' ] . '[' . $aSection[ 'section_id' ] . ']',
-                            'value' => "__dummy_option_key|" . $aSection[ 'section_id' ],
+                            'name'  => '__unset_'.$aSection[ '_structure_type' ].'['.$aSection[ 'section_id' ].']',
+                            'value' => "__dummy_option_key|".$aSection[ 'section_id' ],
                             'class' => 'unset-element-names element-address',
                         )
                     );            
@@ -466,7 +466,7 @@ 
                 private function _getSectionTableWithTabList( array $_aOutputs, array $aSectionset, $aFieldsetsPerSection ) {
                                         
                     // Tab list
-                    $_aOutputs[ 'section_tab_list' ][] = $this->_getTabList( 
+                    $_aOutputs[ 'section_tab_list' ][ ] = $this->_getTabList( 
                         $aSectionset, 
                         $aFieldsetsPerSection, 
                         $this->aCallbacks[ 'fieldset_output' ]
@@ -474,7 +474,7 @@ 
 
                     // Section container
                     $_oSectionTable = new AdminPageFramework_Form_View___Section(
-                        $this->aArguments,  // for nested sections
+                        $this->aArguments, // for nested sections
                         $aSectionset,
                         $this->aStructure,
                         $aFieldsetsPerSection,
@@ -484,7 +484,7 @@ 
                         $this->aCallbacks,
                         $this->oMsg
                     );
-                    $_aOutputs[ 'section_contents' ][] = $_oSectionTable->get();                    
+                    $_aOutputs[ 'section_contents' ][ ] = $_oSectionTable->get();                    
                    
                     return $_aOutputs;
                  
@@ -512,9 +512,9 @@ 
                         'section_index'     => null,
                         'collapsible'       => $aCollapsible,
                         'container_type'    => 'sections', // section or sections                    
-                        'sectionset'        => $aSectionset,    // 3.7.0+ for tooltip
+                        'sectionset'        => $aSectionset, // 3.7.0+ for tooltip
                     ),
-                    array(),            // fieldsets
+                    array(), // fieldsets
                     $this->aSavedData,   
                     $this->aFieldErrors, 
                     $this->aStructure[ 'field_type_definitions' ], 
@@ -531,7 +531,7 @@ 
                     $aOutputs[ 'count_subsections' ]
                 );
                 return $_oCollapsibleSectionTitle->get()
-                    . "<div " . $_oSectionsTablesContainerAttributes->get() . ">"
+                    . "<div ".$_oSectionsTablesContainerAttributes->get().">"
                         . $this->_getSectionTabList( $sSectionTabSlug, $aOutputs[ 'section_tab_list' ] )
                         . implode( PHP_EOL, $aOutputs[ 'section_contents' ] )
                     . "</div>";
@@ -562,21 +562,21 @@ 
              */
             private function _getTabList( array $aSection, array $aFields, $hfFieldCallback ) {
                                 
-                if ( ! $aSection[ 'section_tab_slug' ] ) {
+                if ( !$aSection[ 'section_tab_slug' ] ) {
                     return '';
                 }
                 
                 $iSectionIndex      = $aSection[ '_index' ];
 
-                $_sSectionTagID     = 'section-' . $aSection[ 'section_id' ] . '__' . $iSectionIndex;
+                $_sSectionTagID     = 'section-'.$aSection[ 'section_id' ].'__'.$iSectionIndex;
                 $_aTabAttributes    = $aSection[ 'attributes' ][ 'tab' ]
                     + array(
                         'class' => 'admin-page-framework-section-tab nav-tab',
                         'id'    => "section_tab-{$_sSectionTagID}",
                         'style' => null
                     );
-                $_aTabAttributes[ 'class' ] = $this->getClassAttribute( $_aTabAttributes[ 'class' ], $aSection[ 'class' ][ 'tab' ] );  // 3.3.1+
-                $_aTabAttributes[ 'style' ] = $this->getStyleAttribute( $_aTabAttributes[ 'style' ], $aSection[ 'hidden' ] ? 'display:none' : null );  // 3.3.1+
+                $_aTabAttributes[ 'class' ] = $this->getClassAttribute( $_aTabAttributes[ 'class' ], $aSection[ 'class' ][ 'tab' ] ); // 3.3.1+
+                $_aTabAttributes[ 'style' ] = $this->getStyleAttribute( $_aTabAttributes[ 'style' ], $aSection[ 'hidden' ] ? 'display:none' : null ); // 3.3.1+
                 
                 $_oSectionTitle = new AdminPageFramework_Form_View___SectionTitle(                    
                     array(
@@ -584,7 +584,7 @@ 
                         'tag'           => 'h4',
                         'section_index' => $iSectionIndex,
                         
-                        'sectionset'    => $aSection,   // 3.7.0+      for tooltip
+                        'sectionset'    => $aSection, // 3.7.0+      for tooltip
                     ),
                     $aFields,            
                     $this->aSavedData,   
@@ -594,7 +594,7 @@ 
                     $this->aCallbacks // field output element callables.                    
                 );                        
                 
-                return "<li " . $this->getAttributes( $_aTabAttributes ) . ">"
+                return "<li ".$this->getAttributes( $_aTabAttributes ).">"
                     . "<a href='#{$_sSectionTagID}'>"
                         . $_oSectionTitle->get()
                     ."</a>"

development/factory/_common/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

@@ -45,7 +45,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 );
     }
     
@@ -71,7 +71,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, 
@@ -98,7 +98,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
         );                                
@@ -113,7 +113,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) { 
             return; 
         }
         unset( 
@@ -143,7 +143,7 @@ 
      * @return      void
      */
     public function addResource( $sKey, $sValue ) {
-        self::$_aResources[ $sKey ][] = $sValue;
+        self::$_aResources[ $sKey ][ ] = $sValue;
     }
     
     /**
@@ -166,7 +166,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;
         }
@@ -175,13 +175,13 @@ 
         
         // Set the target section ID
         $this->_asTargetSectionID = $this->getElement(
-            $_aFieldset,  // subject array
+            $_aFieldset, // subject array
             'section_id', // key
             $this->_asTargetSectionID // default
         );                               
 
         // Required Keys - 3.8.0+ Now 'type' can be omitted.
-        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { 
+        if ( !isset( $_aFieldset[ 'field_id' ] ) ) { 
             return null; 
         }         
                 
@@ -284,7 +284,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

@@ -113,7 +113,7 @@ 
      */
     public function removeSection( $sSectionID ) {
         
-        if ( '_default' === $sSectionID ){ 
+        if ( '_default' === $sSectionID ) {
             return; 
         }
         unset( 
@@ -181,7 +181,7 @@ 
         );                               
 
         // Required Keys - 3.8.0+ Now 'type' can be omitted.
-        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) { 
+        if ( ! isset( $_aFieldset[ 'field_id' ] ) ) {
             return null; 
         }         
                 

development/factory/_common/form/AdminPageFramework_Form_Model.php

Doc Comments -2 removed lines

@@ -391,7 +391,6 @@ 
      * 
      * @since       DEVVER
      * @param       array       $aSavedData
-     * @param       boolean     $bOnlyFieldsets     Whether to format only the fieldsets. The taxonomy field factory uses this parameter.
      */
     protected function _formatElementDefinitions( array $aSavedData ) {
                 
@@ -427,7 +426,6 @@ 
      * Changed the name from `_getFieldErrors()`. 
      * @access      public      The field type class accesses this method to render nested fields.
      * @internal
-     * @param       boolean     $bDelete    whether or not the transient should be deleted after retrieving it. 
      * @return      array
      */
     public function getFieldErrors() {

Spacing +20 added lines, -20 removed lines

@@ -43,10 +43,10 @@ 
      * @since       3.7.0
      * @return      array
      */
-    public function getSubmittedData( array $aDataToParse, $bExtractFromFieldStructure=true, $bStripSlashes=true ) {
+    public function getSubmittedData( array $aDataToParse, $bExtractFromFieldStructure = true, $bStripSlashes = true ) {
                 
         // Extracts the form data from the subject data for parsing
-        $_aSubmittedFormData    = $bExtractFromFieldStructure
+        $_aSubmittedFormData = $bExtractFromFieldStructure
             ? $this->castArrayContents( 
                 $this->getDataStructureFromAddedFieldsets(), // form data (options) structure
                 $aDataToParse   // the subject data array, usually $_POST.
@@ -54,7 +54,7 @@ 
             : $aDataToParse;
 
         // 3.6.0 - sorts dynamic eleemnts.        
-        $_aSubmittedFormData    = $this->getSortedInputs( $_aSubmittedFormData ); 
+        $_aSubmittedFormData = $this->getSortedInputs( $_aSubmittedFormData ); 
         
         return $bStripSlashes
             ? stripslashes_deep( $_aSubmittedFormData ) // fixes magic quotes
@@ -79,12 +79,12 @@ 
             array_merge(
                 $this->getElementAsArray( 
                     $_POST,
-                    '__repeatable_elements_' . $this->aArguments[ 'structure_type' ],
+                    '__repeatable_elements_'.$this->aArguments[ 'structure_type' ],
                     array()
                 ),
                 $this->getElementAsArray( 
                     $_POST,
-                    '__sortable_elements_' . $this->aArguments[ 'structure_type' ],
+                    '__sortable_elements_'.$this->aArguments[ 'structure_type' ],
                     array()
                 )
             )
@@ -147,9 +147,9 @@ 
      * Changed the name from `getFieldsModel()`.
      * @return      array
      */
-    public function getDataStructureFromAddedFieldsets()  {
+    public function getDataStructureFromAddedFieldsets() {
                     
-        $_aFormDataStructure  = array();
+        $_aFormDataStructure = array();
         foreach ( $this->getAsArray( $this->aFieldsets ) as $_sSectionID => $_aFieldsets ) {
 
             if ( $_sSectionID != '_default' ) {                
@@ -158,7 +158,7 @@ 
             }
             
             // For default field items.
-            foreach( $_aFieldsets as $_sFieldID => $_aFieldset ) {
+            foreach ( $_aFieldsets as $_sFieldID => $_aFieldset ) {
                 $_aFormDataStructure[ $_aFieldset[ 'field_id' ] ] = $_aFieldset;
             }
 
@@ -190,7 +190,7 @@ 
             $aSubject,
             $this->getElementAsArray(
                 $_POST,
-                '__repeatable_elements_' . $this->aArguments[ 'structure_type' ]
+                '__repeatable_elements_'.$this->aArguments[ 'structure_type' ]
             )
         );
         return $_oFilterRepeatableElements->get();
@@ -203,13 +203,13 @@ 
     public function _replyToRegisterFormItems() {
 
         // Check if the form should be created or not.
-        if ( ! $this->isInThePage() ) {
+        if ( !$this->isInThePage() ) {
             return;
         }
                 
         // Load field type definitions.
-        $this->_setFieldTypeDefinitions( 'admin_page_framework' );      // site-wide
-        $this->_setFieldTypeDefinitions( $this->aArguments[ 'caller_id' ] );  // per class 
+        $this->_setFieldTypeDefinitions( 'admin_page_framework' ); // site-wide
+        $this->_setFieldTypeDefinitions( $this->aArguments[ 'caller_id' ] ); // per class 
         
         // Set the options array
         $this->aSavedData = $this->_getSavedData(
@@ -237,7 +237,7 @@ 
             $this->aArguments,
             $this->aFieldsets,
             self::$_aResources,
-            $this->aFieldTypeDefinitions,   // must be called after performing `_setFieldTypeDefinitions()`.
+            $this->aFieldTypeDefinitions, // must be called after performing `_setFieldTypeDefinitions()`.
             $this->aCallbacks
         );
         self::$_aResources = $_oFieldResources->get(); // updates the property
@@ -254,10 +254,10 @@ 
         $this->callBack(
             $this->aCallbacks[ 'handle_form_data' ],
             array(
-                $this->aSavedData,      // 1st parameter
-                $this->aArguments,      // 2nd parameter
-                $this->aSectionsets,    // 3rd parameter
-                $this->aFieldsets,      // 4th parameter
+                $this->aSavedData, // 1st parameter
+                $this->aArguments, // 2nd parameter
+                $this->aSectionsets, // 3rd parameter
+                $this->aFieldsets, // 4th parameter
             )
         );        
 
@@ -271,15 +271,15 @@ 
             $this->aSectionsets = $this->callBack(
                 $this->aCallbacks[ 'secitonsets_before_registration' ],
                 array(
-                    $this->aSectionsets,    // 1st parameter
+                    $this->aSectionsets, // 1st parameter
                 )
             );
             // Let the main routine modify the fieldsets definition array.
             $this->aFieldsets = $this->callBack(
                 $this->aCallbacks[ 'fieldsets_before_registration' ],
                 array(
-                    $this->aFieldsets,    // 1st parameter
-                    $this->aSectionsets,  // 2nd parameter
+                    $this->aFieldsets, // 1st parameter
+                    $this->aSectionsets, // 2nd parameter
                 )
             );
 

Braces +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
                 array( $this, '_replyToRegisterFormItems' ),
                 100 // priority - low value is set as meta boxes use the `current_screen` action hook for `setUp()`.
             );
-        } else {                
+        } else {
             add_action(
                 $this->aArguments[ 'action_hook_form_registration' ],
                 array( $this, '_replyToRegisterFormItems' )
@@ -147,12 +147,12 @@ 
      * Changed the name from `getFieldsModel()`.
      * @return      array
      */
-    public function getDataStructureFromAddedFieldsets()  {
+    public function getDataStructureFromAddedFieldsets() {
                     
         $_aFormDataStructure  = array();
         foreach ( $this->getAsArray( $this->aFieldsets ) as $_sSectionID => $_aFieldsets ) {
 
-            if ( $_sSectionID != '_default' ) {                
+            if ( $_sSectionID != '_default' ) {
                 $_aFormDataStructure[ $_sSectionID ] = $_aFieldsets;
                 continue;
             }
@@ -185,7 +185,7 @@ 
      * @param       array       $aSubject       The subject array to modify. Usually the saved option data.
      * @return      array       The modified options array.
      */
-    public function dropRepeatableElements( array $aSubject ) {        
+    public function dropRepeatableElements( array $aSubject ) {
         $_oFilterRepeatableElements = new AdminPageFramework_Form_Model___Modifier_FilterRepeatableElements( 
             $aSubject,
             $this->getElementAsArray(

development/factory/_common/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 ) {

Braces +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
      * @internal
      * @return      array
      */
-    protected function getEnqueuingScripts() { 
+    protected function getEnqueuingScripts() {
         return array();
     }
     
@@ -162,7 +162,7 @@ 
      * @return      array
      * @internal
      */
-    protected function getEnqueuingStyles() { 
+    protected function getEnqueuingStyles() {
         return array();
     }            
 
@@ -172,7 +172,7 @@ 
      * @internal
      * @return      string
      */ 
-    protected function getScripts() { 
+    protected function getScripts() {
         return '';
     }
 
@@ -182,7 +182,7 @@ 
      * @internal
      * @return      string
      */
-    protected function getIEStyles() { 
+    protected function getIEStyles() {
         return ''; 
     }
 
@@ -223,7 +223,7 @@ 
      * @internal
      * @return      string
      */
-    protected function getField( $aField ) { 
+    protected function getField( $aField ) {
 
         $_aInputAttributes           = $aField['attributes'];
         $_aInputAttributes['class'] .= ' system';

Spacing +59 added lines, -59 removed lines

@@ -73,7 +73,7 @@ 
      * </code>
      * @var         array
      */
-    public $aFieldTypeSlugs = array( 'system', );
+    public $aFieldTypeSlugs = array( 'system',);
     
     /**
      * Defines the default key-values of this field type. 
@@ -93,8 +93,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,
@@ -233,13 +233,13 @@ 
             . "<div class='admin-page-framework-input-label-container'>"
                 . "<label for='{$aField[ 'input_id' ]}'>"
                     . $aField[ 'before_input' ]
-                    . ( $aField[ 'label' ] && ! $aField[ 'repeatable' ]
-                        ? "<span " . $this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ) . ">" 
+                    . ( $aField[ 'label' ] && !$aField[ 'repeatable' ]
+                        ? "<span ".$this->getLabelContainerAttributes( $aField, 'admin-page-framework-input-label-string' ).">" 
                                 . $aField[ 'label' ] 
                             . "</span>"
                         : "" 
                     )
-                    . "<textarea " . $this->getAttributes( $_aInputAttributes ) . " >"    
+                    . "<textarea ".$this->getAttributes( $_aInputAttributes )." >"    
                         . esc_textarea( $this->_getSystemInfomation( $aField[ 'value' ], $aField[ 'data' ], $aField[ 'print_type' ] ) )
                     . "</textarea>"
                     . $aField[ 'after_input' ]
@@ -254,15 +254,15 @@ 
          * @return      string      The human readable system information.
          * @internal
          */
-        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 );
             
@@ -277,18 +277,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.
@@ -305,10 +305,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;
                 }                      
             }
             /**
@@ -318,17 +318,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;
@@ -344,9 +344,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 ) {
@@ -378,9 +378,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();
@@ -414,8 +414,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' ),
                     );                        
                 }
@@ -425,9 +425,9 @@ 
                      * @return      string|array
                      * @internal
                      */
-                    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' ] ) ) {
@@ -463,13 +463,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;
                     
                 }   
                 /**
@@ -483,10 +483,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 );
                     
@@ -498,17 +498,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 );
                     
@@ -526,7 +526,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,
@@ -549,7 +549,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,
@@ -574,7 +574,7 @@ 
                         if ( is_wp_error( $mResponse ) ) {
                             return true;
                         }
-                        if ( $mResponse[ 'response'][ 'code' ] < 200 ) {
+                        if ( $mResponse[ 'response' ][ 'code' ] < 200 ) {
                             return true;
                         }
                         if ( $mResponse[ 'response' ][ 'code' ] >= 300 ) {
@@ -597,13 +597,13 @@ 
              * @since       3.4.6
              * @since       3.5.3       Added the $bGenerateInfo parameter. This is to reduce conditional statement 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' ) ), 
@@ -614,16 +614,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( 
@@ -642,11 +642,11 @@ 
              * @since       3.5.3       Added the $bGenerateInfo paramter. This is to reduce conditional statment in the caller method.
              * @return      array|string
              */                      
-            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' ) ),

development/factory/_common/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/_common/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

development/factory/_common/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/_common/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;