michaeluno / admin-page-framework

development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___SectionRepeatableButtons.php

Indentation +1 added lines, -1 removed lines

@@ -520,7 +520,7 @@
             return self::getAttributes(
                     array(
                     'class'     => 'repeatable-section-remove-button button-secondary '
-                                   . 'repeatable-section-button button button-large',
+                                    . 'repeatable-section-button button button-large',
                     'title'     => $oMsg->get( 'remove_section' ),
                     'style'     => $iSectionCount <= 1
                         ? 'display:none'

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
         if ( empty( $asArguments ) ) {
             return '';
         }
-        if ( self::hasBeenCalled( 'repeatable_section_' . $sContainerTagID ) ) {
+        if ( self::hasBeenCalled( 'repeatable_section_'.$sContainerTagID ) ) {
             return '';
         }
 
@@ -35,7 +35,7 @@ 
         $_aArguments    = $_oFormatter->get();
         $_aArguments[ 'id' ] = $sContainerTagID;
         $_sButtons      = self::___getRepeatableSectionButtons( $_aArguments, $oMsg, $sContainerTagID, $iSectionCount );
-        return "<div class='hidden repeatable-section-buttons-model' " . self::getDataAttributes( $_aArguments ) . ">"
+        return "<div class='hidden repeatable-section-buttons-model' ".self::getDataAttributes( $_aArguments ).">"
                 . $_sButtons
             . "</div>";
 
@@ -52,17 +52,17 @@ 
                 $_sIconAdd      = "<span class='dashicons dashicons-plus-alt2'></span>";
             }
             return "<div class='admin-page-framework-repeatable-section-buttons-outer-container'>"
-                . "<div " . self::___getContainerAttributes( $_aArguments, $oMsg ) . ' >'
-                    . "<a " . self::___getRemoveButtonAttributes( $sContainerTagID, $oMsg, $iSectionCount ) . ">"
+                . "<div ".self::___getContainerAttributes( $_aArguments, $oMsg ).' >'
+                    . "<a ".self::___getRemoveButtonAttributes( $sContainerTagID, $oMsg, $iSectionCount ).">"
                         . $_sIconRemove
                     . "</a>"
-                    . "<a " . self::___getAddButtonAttributes( $sContainerTagID, $oMsg, $_aArguments ) . ">"
+                    . "<a ".self::___getAddButtonAttributes( $sContainerTagID, $oMsg, $_aArguments ).">"
                         . $_sIconAdd
                     . "</a>"
                 . "</div>"
             . "</div>"
             . AdminPageFramework_Form_Utility::getModalForDisabledRepeatableElement(
-                    'repeatable_section_disabled_' . $sContainerTagID,
+                    'repeatable_section_disabled_'.$sContainerTagID,
                     $_aArguments[ 'disabled' ]
                 );
         }
@@ -79,12 +79,12 @@ 
                     empty( $aArguments[ 'disabled' ] ) ? '' : 'disabled'
                 ),
             );
-            unset( $aArguments[ 'disabled' ][ 'message' ] );    // this element can contain HTML tags.
+            unset( $aArguments[ 'disabled' ][ 'message' ] ); // this element can contain HTML tags.
             // Needs to remove it if it is empty as its data attribute will be checked in the JavaScript script.
             if ( empty( $aArguments[ 'disabled' ] ) ) {
                 unset( $aArguments[ 'disabled' ] );
             }
-            return self::getAttributes( $_aAttributes ) . ' ' . self::getDataAttributes( $aArguments );
+            return self::getAttributes( $_aAttributes ).' '.self::getDataAttributes( $aArguments );
         }
         /**
          * @return  string
@@ -115,10 +115,10 @@ 
                         . 'repeatable-section-button button button-large',
                     'title'     => $oMsg->get( 'add_section' ),
                     'data-id'   => $sContainerTagID,
-                    'href'      => ! empty( $aArguments[ 'disabled' ] )
-                        ? '#TB_inline?width=' . $aArguments[ 'disabled' ][ 'box_width' ]
-                            . '&height=' . $aArguments[ 'disabled' ][ 'box_height' ]
-                            . '&inlineId=' . 'repeatable_section_disabled_' . $sContainerTagID
+                    'href'      => !empty( $aArguments[ 'disabled' ] )
+                        ? '#TB_inline?width='.$aArguments[ 'disabled' ][ 'box_width' ]
+                            . '&height='.$aArguments[ 'disabled' ][ 'box_height' ]
+                            . '&inlineId='.'repeatable_section_disabled_'.$sContainerTagID
                         : null,
                 )
             );

development/factory/_common/form/_view/sectionset/AdminPageFramework_Form_View___Sectionsets.php

Indentation +1 added lines, -1 removed lines

@@ -549,7 +549,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>"

Spacing +43 added lines, -43 removed lines

@@ -129,16 +129,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,
@@ -155,7 +155,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-sectionsets admin-page-framework-form-js-on'>"
                 . $_sOutput
@@ -189,17 +189,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>"
                 : '';
@@ -231,7 +231,7 @@ 
              * If there is no field overall to the section and its section tab, return an empty string.
              * Otherwise, the section-sets container gets rendered and its CSS rules such as margins give unwanted results.
              */
-            if ( ! count( $aFieldsets ) ) {
+            if ( !count( $aFieldsets ) ) {
                 return '';
             }
 
@@ -243,13 +243,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,
@@ -277,7 +277,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' ],
@@ -305,19 +305,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
                     )
                 );
@@ -359,29 +359,29 @@ 
                 private function ___getSubSections( $_aOutputs, $_sSectionsID, $_aSection, $_aSubSections ) {
 
                     // Add the repeatable sections enabler script.
-                    if ( ! empty( $_aSection[ 'repeatable' ] ) ) {
-                        $_aOutputs[ 'section_contents' ][] = AdminPageFramework_Form_View___SectionRepeatableButtons::get(
+                    if ( !empty( $_aSection[ 'repeatable' ] ) ) {
+                        $_aOutputs[ 'section_contents' ][ ] = AdminPageFramework_Form_View___SectionRepeatableButtons::get(
                             $_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' ] ) ) {
+                    if ( !empty( $_aSection[ 'sortable' ] ) ) {
                         // @deprecated 3.9.0
                         // $_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,
@@ -411,8 +411,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' ],
                         )
@@ -430,8 +430,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' ],
                         )
@@ -453,8 +453,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',
                         )
                     );
@@ -470,7 +470,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' ]
@@ -478,7 +478,7 @@ 
 
                     // Section container
                     $_oSectionTable = new AdminPageFramework_Form_View___Section(
-                        $this->aArguments,  // for nested sections
+                        $this->aArguments, // for nested sections
                         $aSectionset,
                         $this->aStructure,
                         $aFieldsetsPerSection,
@@ -488,7 +488,7 @@ 
                         $this->aCallbacks,
                         $this->oMsg
                     );
-                    $_aOutputs[ 'section_contents' ][] = $_oSectionTable->get();
+                    $_aOutputs[ 'section_contents' ][ ] = $_oSectionTable->get();
 
                     return $_aOutputs;
 
@@ -516,9 +516,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' ],
@@ -535,7 +535,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>";
@@ -566,21 +566,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(
@@ -588,7 +588,7 @@ 
                         'tag'           => 'h4',
                         'section_index' => $iSectionIndex,
 
-                        'sectionset'    => $aSection,   // 3.7.0+      for tooltip
+                        'sectionset'    => $aSection, // 3.7.0+      for tooltip
                     ),
                     $aFields,
                     $this->aSavedData,
@@ -598,7 +598,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/_view/sectionset/AdminPageFramework_Form_View___CollapsibleSectionTitle.php

Spacing +8 added lines, -8 removed lines

@@ -17,15 +17,15 @@ 
  */
 class AdminPageFramework_Form_View___CollapsibleSectionTitle extends AdminPageFramework_Form_View___SectionTitle {
 
-    public $aArguments      = array(
+    public $aArguments = array(
         'title'             => null,
         'tag'               => null,
         'section_index'     => null,
         'collapsible'       => array(),
         'container_type'    => 'section', // section or sections
-        'sectionset'        => array(),  // 3.7.0+ sectionset definition array
+        'sectionset'        => array(), // 3.7.0+ sectionset definition array
     );
-    public $aFieldsets               = array();
+    public $aFieldsets = array();
     public $aSavedData              = array();
     public $aFieldErrors            = array();
     public $aFieldTypeDefinitions   = array();
@@ -69,7 +69,7 @@ 
          * @param       array|boolean   $aCollapsible       The collapsible argument.
          * @param       string          $sContainer          The position context. Accepts either 'sections' or 'section'. If the set position in the argument array does not match this value, the method will return an empty string.
          */
-        private function ___getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer='sections', $iSectionIndex=null ) {
+        private function ___getCollapsibleSectionTitleBlock( array $aCollapsible, $sContainer = 'sections', $iSectionIndex = null ) {
 
             if ( $sContainer !== $aCollapsible[ 'container' ] ) {
                 return '';
@@ -85,9 +85,9 @@ 
             );
 
             $_aSectionset        = $this->aArguments[ 'sectionset' ];
-            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ]  ) . '_' . $iSectionIndex;
+            $_sSectionTitleTagID = str_replace( '|', '_', $_aSectionset[ '_section_path' ] ).'_'.$iSectionIndex;
 
-            return "<div " . $this->getAttributes(
+            return "<div ".$this->getAttributes(
                     array(
                         'id'    => $_sSectionTitleTagID,
                         'class' => $this->getClassAttribute(
@@ -108,11 +108,11 @@ 
                                 'collapsed',
                                 ''
                             ),
-                            'admin-page-framework-collapsible-type-' . $aCollapsible[ 'type' ]
+                            'admin-page-framework-collapsible-type-'.$aCollapsible[ 'type' ]
                         ),
                     )
                     + $this->getDataAttributeArray( $aCollapsible )
-                ) . ">"
+                ).">"
                         . $_sSectionTitle
                     . "</div>";
 

development/factory/_common/form/_model/formatter/AdminPageFramework_Form_Model___FormatFieldsets.php

Spacing +13 added lines, -13 removed lines

@@ -113,10 +113,10 @@ 
             );
 
             $_aNewFieldsets = array();
-            foreach( $aFieldsets as $_sSectionPath => $_aItems ) {
+            foreach ( $aFieldsets as $_sSectionPath => $_aItems ) {
 
                 // If the section is not set, skip.
-                if ( ! isset( $aSectionsets[ $_sSectionPath ] ) ) {
+                if ( !isset( $aSectionsets[ $_sSectionPath ] ) ) {
                     continue;
                 }
 
@@ -125,7 +125,7 @@ 
                     $_aItems,
                     $this->getElement(  // 3.6.0+ Get the section's capability
                         $aSectionsets,
-                        array( $_sSectionPath, 'capability', ),
+                        array( $_sSectionPath, 'capability',),
                         $sCapability
                     ),
                     $aSectionsets
@@ -182,16 +182,16 @@ 
                  */
                 private function ___getNormalFieldsetsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) {
 
-                    $_aNewItems     = array();
-                    foreach( $aItems as $_sFieldID => $_aFieldset ) {
+                    $_aNewItems = array();
+                    foreach ( $aItems as $_sFieldID => $_aFieldset ) {
 
                         // Insert the formatted field definition array. The fields count is needed to set each order value.
-                        $_aFieldset        = $this->___getFieldsetFormatted(
+                        $_aFieldset = $this->___getFieldsetFormatted(
                             $_aFieldset,
                             $aSectionsets,
                             $sCapability,
                             count( $_aNewItems ), // index of elements - zero based
-                            null,   // sub-section index
+                            null, // sub-section index
                             $_abSectionRepeatable,
                             $this->oCallerForm
                         );
@@ -210,7 +210,7 @@ 
                  * @return      boolean
                  */
                 private function ___isSubSections( $aItems, $_abSectionRepeatable ) {
-                    if ( ! empty( $_abSectionRepeatable ) ) {
+                    if ( !empty( $_abSectionRepeatable ) ) {
                         return true;
                     }
                     return ( boolean ) count( $this->getIntegerKeyElements( $aItems ) );
@@ -221,9 +221,9 @@ 
                 private function ___getSubSectionsFormatted( $aItems, $sCapability, $aSectionsets, $_abSectionRepeatable ) {
 
                     $_aNewFieldset = array();
-                    foreach( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) {
+                    foreach ( $this->numerizeElements( $aItems ) as $_iSubSectionIndex => $_aFieldsets ) {
 
-                        foreach( $_aFieldsets as $_aFieldset ) {
+                        foreach ( $_aFieldsets as $_aFieldset ) {
                             $_iCountElement = count( $this->getElementAsArray( $_aNewFieldset, $_iSubSectionIndex ) );
                             $_aFieldset     = $this->___getFieldsetFormatted(
                                 $_aFieldset,
@@ -237,7 +237,7 @@ 
                             if ( empty( $_aFieldset ) ) {
                                 continue;
                             }
-                            $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset['field_id'] ] = $_aFieldset;
+                            $_aNewFieldset[ $_iSubSectionIndex ][ $_aFieldset[ 'field_id' ] ] = $_aFieldset;
                         }
                         uasort( $_aNewFieldset[ $_iSubSectionIndex ], array( $this, 'sortArrayByKey' ) );
 
@@ -264,7 +264,7 @@ 
                 }
 
                 $_aSortedFields = array();
-                foreach( $aSectionsets as $_sSectionPath => $_aSecitonset ) {
+                foreach ( $aSectionsets as $_sSectionPath => $_aSecitonset ) {
                     if ( isset( $aFieldsets[ $_sSectionPath ] ) ) {
                         $_aSortedFields[ $_sSectionPath ] = $aFieldsets[ $_sSectionPath ];
                     }
@@ -283,7 +283,7 @@ 
             private function ___getFieldsetFormatted( $aFieldset, $aSectionsets, $sCapability, $iCountOfElements, $iSubSectionIndex, $bIsSectionRepeatable, $oCallerObject ) {
 
                 // 3.8.0+ Dropped the check for $aFieldset[ 'type' ] to allow it to be omitted.
-                if ( ! isset( $aFieldset[ 'field_id' ] ) ) {
+                if ( !isset( $aFieldset[ 'field_id' ] ) ) {
                     return;
                 }
 

development/factory/_common/form/_model/AdminPageFramework_Form_Model___BuiltInFieldTypeDefinitions.php

Spacing +8 added lines, -8 removed lines

@@ -42,10 +42,10 @@ 
         'posttype',
         'size',
         'section_title', // 3.0.0+
-        'system',        // 3.3.0+
-        'inline_mixed',  // 3.8.0+
-        '_nested',       // 3.8.0+
-        'contact',       // 3.9.0+
+        'system', // 3.3.0+
+        'inline_mixed', // 3.8.0+
+        '_nested', // 3.8.0+
+        'contact', // 3.9.0+
         'table'          // 3.9.0+
     );
 
@@ -76,16 +76,16 @@ 
     public function get() {
 
         $_aFieldTypeDefinitions = array();
-        foreach( self::$_aDefaultFieldTypeSlugs as $_sFieldTypeSlug ) {
+        foreach ( self::$_aDefaultFieldTypeSlugs as $_sFieldTypeSlug ) {
 
             $_sFieldTypeClassName = "AdminPageFramework_FieldType_{$_sFieldTypeSlug}";
             $_oFieldType = new $_sFieldTypeClassName(
-                $this->sCallerID,   // usually an instantiated class name
-                null,               // field type slugs - if it is different from the one defined in the class property
+                $this->sCallerID, // usually an instantiated class name
+                null, // field type slugs - if it is different from the one defined in the class property
                 $this->oMsg,
                 false               // `false` to disable auto-registering.
             );
-            foreach( $_oFieldType->aFieldTypeSlugs as $_sSlug ) {
+            foreach ( $_oFieldType->aFieldTypeSlugs as $_sSlug ) {
                 $_aFieldTypeDefinitions[ $_sSlug ] = $_oFieldType->getDefinitionArray();
             }
         }

development/factory/_common/form/field_type/section_title/AdminPageFramework_FieldType_section_title.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'section_title', );
+    public $aFieldTypeSlugs = array( 'section_title',);
 
     /**
      * Defines the default key-values of this field type.

development/factory/_common/form/field_type/import/AdminPageFramework_FieldType_import.php

Spacing +30 added lines, -30 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'import', );
+    public $aFieldTypeSlugs = array( 'import',);
 
     /**
      * Defines the default key-values of this field type.
@@ -73,7 +73,7 @@ 
         return array(
             array(
                 'handle_id'     => 'admin-page-framework-field-type-import',
-                'src'           => dirname( __FILE__ ) . '/js/import.bundle.js',
+                'src'           => dirname( __FILE__ ).'/js/import.bundle.js',
                 'in_footer'         => true,
                 'dependencies'      => array( 'jquery', 'admin-page-framework-script-form-main' ),
                 'translation_var'   => 'AdminPageFrameworkImportFieldType',
@@ -97,7 +97,7 @@ 
      * @return      string
      */
     protected function getField( $aField ) {
-        $aField[ 'attributes'][ 'name' ]  = "__import[submit][{$aField[ 'input_id' ]}]";
+        $aField[ 'attributes' ][ 'name' ]  = "__import[submit][{$aField[ 'input_id' ]}]";
         $aField[ 'label' ]                = $aField[ 'label' ]
             ? $aField[ 'label' ]
             : $this->oMsg->get( 'import' );
@@ -116,13 +116,13 @@ 
      */
     protected function _getExtraFieldsBeforeLabel( &$aField ) {
         return "<label>"
-                . "<input " . $this->getAttributes(
+                . "<input ".$this->getAttributes(
                     array(
                         'id' => "{$aField[ 'input_id' ]}_file",
                         'type' => 'file',
                         'name' => "__import[{$aField[ 'input_id' ]}]",
                     ) + $aField[ 'attributes' ][ 'file' ]
-                ) . " />"
+                )." />"
             . "</label>";
     }
 
@@ -135,44 +135,44 @@ 
      */
     protected function _getExtraInputFields( &$aField ) {
 
-        $aHiddenAttributes = array( 'type' => 'hidden', );
+        $aHiddenAttributes = array( 'type' => 'hidden',);
         return
-            "<input " . $this->getAttributes(
+            "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][input_id]",
-                    'value' => $aField['input_id'],
+                    'name' => "__import[{$aField[ 'input_id' ]}][input_id]",
+                    'value' => $aField[ 'input_id' ],
                 ) + $aHiddenAttributes
-            ) . "/>"
-            . "<input " . $this->getAttributes(
+            )."/>"
+            . "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][field_id]",
-                    'value' => $aField['field_id'],
+                    'name' => "__import[{$aField[ 'input_id' ]}][field_id]",
+                    'value' => $aField[ 'field_id' ],
                 ) + $aHiddenAttributes
-            ) . "/>"
-            . "<input " . $this->getAttributes(
+            )."/>"
+            . "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][section_id]",
-                    'value' => isset( $aField['section_id'] ) && $aField['section_id'] != '_default' ? $aField['section_id'] : '',
+                    'name' => "__import[{$aField[ 'input_id' ]}][section_id]",
+                    'value' => isset( $aField[ 'section_id' ] ) && $aField[ 'section_id' ] != '_default' ? $aField[ 'section_id' ] : '',
                 ) + $aHiddenAttributes
-            ) . "/>"
-            . "<input " . $this->getAttributes(
+            )."/>"
+            . "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][is_merge]",
-                    'value' => $aField['is_merge'],
+                    'name' => "__import[{$aField[ 'input_id' ]}][is_merge]",
+                    'value' => $aField[ 'is_merge' ],
                 ) + $aHiddenAttributes
-            ) . "/>"
-            . "<input " . $this->getAttributes(
+            )."/>"
+            . "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][option_key]",
-                    'value' => $aField['option_key'],
+                    'name' => "__import[{$aField[ 'input_id' ]}][option_key]",
+                    'value' => $aField[ 'option_key' ],
                 ) + $aHiddenAttributes
-            ) . "/>"
-            . "<input " . $this->getAttributes(
+            )."/>"
+            . "<input ".$this->getAttributes(
                 array(
-                    'name' => "__import[{$aField['input_id']}][format]",
-                    'value' => $aField['format'],
+                    'name' => "__import[{$aField[ 'input_id' ]}][format]",
+                    'value' => $aField[ 'format' ],
                 ) + $aHiddenAttributes
-            ) . "/>"
+            )."/>"
             ;
     }
 

development/factory/_common/form/field_type/taxonomy/AdminPageFramework_FieldType_taxonomy.php

Spacing +39 added lines, -39 removed lines

@@ -118,7 +118,7 @@ 
      * Defines the field type slugs used for this field type.
      * @var     array
      */
-    public $aFieldTypeSlugs = array( 'taxonomy', );
+    public $aFieldTypeSlugs = array( 'taxonomy',);
 
     /**
      * Defines the default key-values of this field type.
@@ -127,41 +127,41 @@ 
      * @var     array
      */
     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+  Sets a query argument for each taxonomy. The array key must be the taxonomy slug and the value is the query argument array.
-        'save_unchecked'        => true,        // (optional, boolean) 3.8.8+   Whether to store the values of unchecked items.
+        'queries'   => array(), // (optional, array) 3.3.2+  Sets a query argument for each taxonomy. The array key must be the taxonomy slug and the value is the query argument array.
+        'save_unchecked'        => true, // (optional, boolean) 3.8.8+   Whether to store the values of unchecked items.
     );
 
     /**
@@ -172,7 +172,7 @@ 
         return array(
             array(
                 'handle_id'         => 'admin-page-framework-field-type-taxonomy',
-                'src'               => dirname( __FILE__ ) . '/js/taxonomy.bundle.js',
+                'src'               => dirname( __FILE__ ).'/js/taxonomy.bundle.js',
                 'in_footer'         => true,
                 'dependencies'      => array( 'jquery', 'admin-page-framework-script-form-main' ),
                 'translation_var'   => 'AdminPageFrameworkFieldTypeTaxonomy',
@@ -208,22 +208,22 @@ 
         // Parse
         $_aTabs         = array();
         $_aCheckboxes   = array();
-        foreach( $this->getAsArray( $aField[ 'taxonomy_slugs' ] ) as $_isKey => $_sTaxonomySlug ) {
+        foreach ( $this->getAsArray( $aField[ 'taxonomy_slugs' ] ) as $_isKey => $_sTaxonomySlug ) {
             $_aAssociatedDataAttributes = $this->___getDataAttributesOfAssociatedPostTypes(
                 $_sTaxonomySlug,
                 $this->___getPostTypesByTaxonomySlug( $_sTaxonomySlug )
             );
-            $_aTabs[]                   = $this->___getTaxonomyTab( $aField, $_isKey, $_sTaxonomySlug, $_aAssociatedDataAttributes );
-            $_aCheckboxes[]             = $this->___getTaxonomyCheckboxes( $aField, $_isKey, $_sTaxonomySlug, $_aAssociatedDataAttributes );
+            $_aTabs[ ]                   = $this->___getTaxonomyTab( $aField, $_isKey, $_sTaxonomySlug, $_aAssociatedDataAttributes );
+            $_aCheckboxes[ ]             = $this->___getTaxonomyCheckboxes( $aField, $_isKey, $_sTaxonomySlug, $_aAssociatedDataAttributes );
         }
 
         // 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>"
@@ -249,7 +249,7 @@ 
         private function ___getDataAttributesOfAssociatedPostTypes( $sTaxonomySlusg, $aPostTypes ) {
             return array(
                 'data-associated-with'       => $sTaxonomySlusg,
-                'data-associated-post-types' => implode( ',', $aPostTypes ) . ',',  // must add a trailing comma for jQuery to detect the item.
+                'data-associated-post-types' => implode( ',', $aPostTypes ).',', // must add a trailing comma for jQuery to detect the item.
             );
         }
 
@@ -264,7 +264,7 @@ 
         private function ___getTaxonomyCheckboxes( array $aField, $sKey, $sTaxonomySlug, $aAttributes ) {
 
             $_aTabBoxContainerArguments = array(
-                'id'    => "tab_{$aField['input_id']}_{$sKey}",
+                'id'    => "tab_{$aField[ 'input_id' ]}_{$sKey}",
                 'class' => 'tab-box-content',
                 'style' => $this->getInlineCSS(
                     array(
@@ -273,9 +273,9 @@ 
                     )
                 ),
             ) + $aAttributes;
-            return "<div " . $this->getAttributes( $_aTabBoxContainerArguments ) . ">"
+            return "<div ".$this->getAttributes( $_aTabBoxContainerArguments ).">"
                     . $this->getElement( $aField, array( 'before_label', $sKey ) )
-                    . "<div " . $this->getAttributes( $this->_getCheckboxContainerAttributes( $aField ) ) . ">"
+                    . "<div ".$this->getAttributes( $this->_getCheckboxContainerAttributes( $aField ) ).">"
                     . "</div>"
                     . "<ul class='list:category taxonomychecklist form-no-clear'>"
                         . $this->___getTaxonomyChecklist( $aField, $sKey, $sTaxonomySlug )
@@ -300,7 +300,7 @@ 
                         'taxonomy'              => $sTaxonomySlug,
                         '_name_prefix'          => is_array( $aField[ 'taxonomy_slugs' ] )
                             ? "{$aField[ '_input_name' ]}[{$sTaxonomySlug}]"
-                            : $aField[ '_input_name' ],   // name prefix of the input
+                            : $aField[ '_input_name' ], // name prefix of the input
                         '_input_id_prefix'      => $aField[ 'input_id' ],
                         '_attributes'           => $this->getElementAsArray(
                             $aField,
@@ -308,12 +308,12 @@ 
                         ) + $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+
 
                         '_save_unchecked'       => $aField[ 'save_unchecked' ], // 3.8.8+ Whether to insert hidden input element for unchecked.
                     )
@@ -358,8 +358,8 @@ 
             $_aLiAttributes = array(
                 'class' => 'tab-box-tab',
             ) + $aAttributes;
-            return "<li " . $this->getAttributes( $_aLiAttributes ) . ">"
-                    . "<a href='#tab_{$aField['input_id']}_{$sKey}'>"
+            return "<li ".$this->getAttributes( $_aLiAttributes ).">"
+                    . "<a href='#tab_{$aField[ 'input_id' ]}_{$sKey}'>"
                         . "<span class='tab-box-tab-text'>"
                             . $this->___getLabelFromTaxonomySlug( $sTaxonomySlug )
                         . "</span>"

development/factory/_common/form/field_type/file/AdminPageFramework_FieldType_file.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Defines the field type slugs used for this field type.
      */
-    public $aFieldTypeSlugs = array( 'file', );
+    public $aFieldTypeSlugs = array( 'file',);
 
     /**
      * Defines the default key-values of this field type.
@@ -96,15 +96,15 @@ 
                 array(
                     'type'  => 'hidden',
                     'value' => '',
-                    'name'  => $aField[ 'attributes' ][ 'name' ] . '[_dummy_value]',
+                    'name'  => $aField[ 'attributes' ][ 'name' ].'[_dummy_value]',
                 )
             )
             . $this->getHTMLTag(
                 'input',
                 array(
                     'type'  => 'hidden',
-                    'name'  => '__unset_' . $aField[ '_structure_type' ] . '[' . $aField[ '_input_name_flat' ] . '|_dummy_value' . ']',
-                    'value' => $aField[ '_input_name_flat' ] . '|_dummy_value',
+                    'name'  => '__unset_'.$aField[ '_structure_type' ].'['.$aField[ '_input_name_flat' ].'|_dummy_value'.']',
+                    'value' => $aField[ '_input_name_flat' ].'|_dummy_value',
                     'class' => 'unset-element-names element-address',
                 )
             );