michaeluno / admin-page-framework

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

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
      * @return      string
      * @since       3.7.0
      */
-    public function get( $bTableRow=true ) {
+    public function get( $bTableRow = true ) {
         
         $_sMethodName = $this->getAOrB(
             $bTableRow,
@@ -68,7 +68,7 @@ 
         );
         
         $_sOutput = '';
-        foreach( $this->aFieldsetsPerSection as $_aFieldset ) {
+        foreach ( $this->aFieldsetsPerSection as $_aFieldset ) {
 
             $_oFieldsetOutputFormatter = new AdminPageFramework_Form_Model___Format_FieldsetOutput(
                 $_aFieldset, 
@@ -77,7 +77,7 @@ 
             );        
             
             $_aFieldset = $_oFieldsetOutputFormatter->get();
-            if ( ! $_aFieldset[ 'if' ] ) {
+            if ( !$_aFieldset[ 'if' ] ) {
                 continue;
             }
             

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

Spacing +11 added lines, -11 removed lines

@@ -56,7 +56,7 @@ 
     public function get() {
 
         // Get the set value(s)
-        $_mSavedValue    = $this->_getStoredInputFieldValue( 
+        $_mSavedValue = $this->_getStoredInputFieldValue( 
             $this->aField, 
             $this->aOptions 
         );
@@ -116,9 +116,9 @@ 
              * @return      void
              */
             private function _divideMainAndSubFields( $aField, array &$aFirstField, array &$aSubFields ) {
-                foreach( $aField as $_nsIndex => $_mFieldElement ) {
+                foreach ( $aField as $_nsIndex => $_mFieldElement ) {
                     if ( is_numeric( $_nsIndex ) ) {
-                        $aSubFields[] = $_mFieldElement;
+                        $aSubFields[ ] = $_mFieldElement;
                     } else {
                         $aFirstField[ $_nsIndex ] = $_mFieldElement;
                     }
@@ -144,7 +144,7 @@ 
                 // We are collecting elements from the second sub-field.
                 unset( $_aSavedValues[ 0 ] ); 
                    
-                foreach( $_aSavedValues as $_iIndex => $vValue ) {
+                foreach ( $_aSavedValues as $_iIndex => $vValue ) {
                     $aSubFields[ $_iIndex - 1 ] = isset( $aSubFields[ $_iIndex - 1 ] ) && is_array( $aSubFields[ $_iIndex - 1 ] )
                         ? $aSubFields[ $_iIndex - 1 ] 
                         : array();     
@@ -159,7 +159,7 @@ 
              */
             private function _fillSubFields( array &$aSubFields, array $aFirstField ) {
                         
-                foreach( $aSubFields as &$_aSubField ) {
+                foreach ( $aSubFields as &$_aSubField ) {
                     
                     // Evacuate the label element which should not be merged.
                     $_aLabel = $this->getElement( 
@@ -190,15 +190,15 @@ 
          
             // Determine whether the elements are saved in an array.
             // $_bHasSubFields = count( $aFields ) > 1 || $aField[ 'repeatable' ] || $aField[ 'sortable' ];
-            if ( ! $this->hasSubFields( $aFields, $aField ) ) {
+            if ( !$this->hasSubFields( $aFields, $aField ) ) {
                 $aFields[ 0 ][ '_saved_value' ] = $mSavedValue;
                 $aFields[ 0 ][ '_is_multiple_fields' ] = false;
                 return;                    
             }
      
-            foreach( $aFields as $_iIndex => &$_aThisField ) {
+            foreach ( $aFields as $_iIndex => &$_aThisField ) {
                 $_aThisField[ '_saved_value' ]        = $this->getElement( $mSavedValue, $_iIndex, null );
-                $_aThisField[ '_subfield_index' ]     = $_iIndex;   // 3.8.0+
+                $_aThisField[ '_subfield_index' ]     = $_iIndex; // 3.8.0+
                 $_aThisField[ '_is_multiple_fields' ] = true;
             }
     
@@ -212,7 +212,7 @@ 
          * @since       3.6.0       Moved from `AdminPageFramework_FieldDefinition`.
          */
         private function _setFieldsValue( &$aFields ) {
-            foreach( $aFields as &$_aField ) {
+            foreach ( $aFields as &$_aField ) {
                 $_aField[ '_is_value_set_by_user' ] = isset( $_aField[ 'value' ] );
                 $_aField[ 'value' ]                 = $this->_getSetFieldValue( $_aField );
             }
@@ -257,10 +257,10 @@ 
          */
         private function _getStoredInputFieldValue( $aField, $aOptions ) {    
 
-            $_aFieldPath   = $aField[ '_field_path_array' ];
+            $_aFieldPath = $aField[ '_field_path_array' ];
         
             // If a section is not set, check the first dimension element.
-            if ( ! isset( $aField[ 'section_id' ] ) || '_default' === $aField[ 'section_id' ] ) {
+            if ( !isset( $aField[ 'section_id' ] ) || '_default' === $aField[ 'section_id' ] ) {
                 return $this->getElement( 
                     $aOptions, 
                     $_aFieldPath, // $aField[ 'field_id' ],  // @todo this may have to be a field path instead of field id.

Braces +1 added lines, -1 removed lines

@@ -254,7 +254,7 @@
          * @since       3.7.0       Changed the `_field_type` element to `_structure_type`.
          * @return      null|string|array
          */
-        private function _getStoredInputFieldValue( $aField, $aOptions ) {    
+        private function _getStoredInputFieldValue( $aField, $aOptions ) {
 
             $_aFieldPath   = $aField[ '_field_path_array' ];
         

development/factory/_common/form/_view/attribute/AdminPageFramework_Form_View___Attribute_Fields.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
             $this->aAttributes,
             $this->iFieldsCount,
         );
-        $this->aArguments    = $_aParameters[ 0 ];        
+        $this->aArguments = $_aParameters[ 0 ];        
         $this->aAttributes  = $_aParameters[ 1 ];
         $this->iFieldsCount = $_aParameters[ 2 ];
         
@@ -52,17 +52,17 @@ 
      */
     protected function _getAttributes() {
         return array(
-            'id'            => $this->sContext . '-' . $this->aArguments[ 'tag_id' ],
-            'class'         => 'admin-page-framework-' . $this->sContext
-                . $this->getAOrB( ! empty( $this->aArguments[ 'repeatable' ] ), ' repeatable dynamic-fields', '' ) // 3.6.0+ Added the 'dynamic-fields' class selector.
-                . $this->getAOrB( ! empty( $this->aArguments[ 'sortable' ] ), ' sortable dynamic-fields', '' ),
+            'id'            => $this->sContext.'-'.$this->aArguments[ 'tag_id' ],
+            'class'         => 'admin-page-framework-'.$this->sContext
+                . $this->getAOrB( !empty( $this->aArguments[ 'repeatable' ] ), ' repeatable dynamic-fields', '' ) // 3.6.0+ Added the 'dynamic-fields' class selector.
+                . $this->getAOrB( !empty( $this->aArguments[ 'sortable' ] ), ' sortable dynamic-fields', '' ),
 
             // referred by the sortable field JavaScript script.
             'data-type'     => $this->aArguments[ 'type' ], 
 
             // 3.6.0+ Stores the total number of dynamic fields, used to generate the input id and name of repeated fields which contain an incremented index number.
             'data-largest_index'            => max(     
-                ( int ) $this->iFieldsCount - 1,  // zero-base index
+                ( int ) $this->iFieldsCount - 1, // zero-base index
                 0 
             ), // convert negative numbers to zero.
             

development/factory/_common/form/_view/fieldset/AdminPageFramework_Form_View___Fieldset.php

Spacing +31 added lines, -31 removed lines

@@ -38,7 +38,7 @@ 
             $this->aFieldset[ '_field_path_array' ],
             $this->aFieldset[ 'error_message' ]
         );
-        $_aOutputs[]     = $_oFieldError->get();
+        $_aOutputs[ ] = $_oFieldError->get();
 
         // 2. Construct fields array for sub-fields.
         $_oFieldsFormatter = new AdminPageFramework_Form_Model___Format_Fields(
@@ -48,7 +48,7 @@ 
         $_aFields = $_oFieldsFormatter->get();
             
         // 3. Get the field and its sub-fields output.
-        $_aOutputs[] = $this->_getFieldsOutput( 
+        $_aOutputs[ ] = $this->_getFieldsOutput( 
             $this->aFieldset,
             $_aFields, 
             $this->aCallbacks 
@@ -71,11 +71,11 @@ 
          * @since   3.8.0   Added the `$aFieldset` parameter
          * @return  string
          */ 
-        private function _getFieldsOutput( $aFieldset, array $aFields, array $aCallbacks=array() ) {
+        private function _getFieldsOutput( $aFieldset, array $aFields, array $aCallbacks = array() ) {
 
             $_aOutput = array();
-            foreach( $aFields as $_isIndex => $_aField ) {
-                $_aOutput[] = $this->_getEachFieldOutput( 
+            foreach ( $aFields as $_isIndex => $_aField ) {
+                $_aOutput[ ] = $this->_getEachFieldOutput( 
                     $_aField, 
                     $_isIndex, 
                     $aCallbacks,
@@ -94,11 +94,11 @@ 
              * @since       3.5.3
              * @return      string      the HTML output of the given field.
              */
-            private function _getEachFieldOutput( $aField, $isIndex, array $aCallbacks, $bIsLastElement=false ) {
+            private function _getEachFieldOutput( $aField, $isIndex, array $aCallbacks, $bIsLastElement = false ) {
                 
                 // Field type definition - allows mixed field types in sub-fields 
                 $_aFieldTypeDefinition = $this->_getFieldTypeDefinition( $aField[ 'type' ] );
-                if ( ! is_callable( $_aFieldTypeDefinition[ 'hfRenderField' ] ) ) {
+                if ( !is_callable( $_aFieldTypeDefinition[ 'hfRenderField' ] ) ) {
                     return '';
                 }     
 
@@ -132,7 +132,7 @@ 
                 private function _getFieldOutput( $sContent, $aField, $bIsLastElement ) {
                     $_oFieldAttribute = new AdminPageFramework_Form_View___Attribute_Field( $aField );
                     return $aField[ 'before_field' ]
-                        . "<div " . $_oFieldAttribute->get() . ">"
+                        . "<div ".$_oFieldAttribute->get().">"
                             . $sContent
                             . $this->_getUnsetFlagFieldInputTag( $aField )
                             . $this->_getDelimiter( $aField, $bIsLastElement )
@@ -154,7 +154,7 @@ 
                         'input',
                         array(
                             'type'  => 'hidden',
-                            'name'  => '__unset_' . $aField[ '_fields_type' ] . '[' . $aField[ '_input_name_flat' ] . ']',
+                            'name'  => '__unset_'.$aField[ '_fields_type' ].'['.$aField[ '_input_name_flat' ].']',
                             'value' => $aField[ '_input_name_flat' ],
                             'class' => 'unset-element-names element-address',
                         )
@@ -185,7 +185,7 @@ 
                  */
                 private function _getDelimiter( $aField, $bIsLastElement ) {
                     return $aField[ 'delimiter' ]
-                        ? "<div " . $this->getAttributes( 
+                        ? "<div ".$this->getAttributes( 
                                 array(
                                     'class' => 'delimiter',
                                     'id'    => "delimiter-{$aField[ 'input_id' ]}",
@@ -195,7 +195,7 @@ 
                                         ""
                                     ),
                                 ) 
-                            ) . ">"
+                            ).">"
                                 . $aField[ 'delimiter' ]
                             . "</div>"
                         : '';
@@ -209,9 +209,9 @@ 
          */
         private function _getFinalOutput( $aFieldset, array $aFieldsOutput, $iFieldsCount ) {
                             
-            $_oFieldsetAttributes   = new AdminPageFramework_Form_View___Attribute_Fieldset( $aFieldset );
+            $_oFieldsetAttributes = new AdminPageFramework_Form_View___Attribute_Fieldset( $aFieldset );
             return $aFieldset[ 'before_fieldset' ]
-                . "<fieldset " . $_oFieldsetAttributes->get() . ">"
+                . "<fieldset ".$_oFieldsetAttributes->get().">"
                     . $this->_getEmbeddedFieldTitle( $aFieldset )
                     . $this->_getChildFieldTitle( $aFieldset )                
                     . $this->_getFieldsetContent( $aFieldset, $aFieldsOutput, $iFieldsCount )
@@ -228,7 +228,7 @@ 
              */
             private function _getEmbeddedFieldTitle( $aFieldset ) {
                 
-                if ( ! $aFieldset[ '_is_title_embedded' ] ) {
+                if ( !$aFieldset[ '_is_title_embedded' ] ) {
                     return '';
                 }
 
@@ -253,7 +253,7 @@ 
              */
             private function _getChildFieldTitle( $aFieldset ) {
 
-                if ( ! $aFieldset[ '_nested_depth' ] ) {
+                if ( !$aFieldset[ '_nested_depth' ] ) {
                     return '';
                 }
                 if ( $aFieldset[ '_is_title_embedded' ] ) {
@@ -282,12 +282,12 @@ 
                     return $aFieldset[ 'content' ];
                 }
             
-                $_oFieldsAttributes     = new AdminPageFramework_Form_View___Attribute_Fields( 
+                $_oFieldsAttributes = new AdminPageFramework_Form_View___Attribute_Fields( 
                     $aFieldset, 
-                    array(),    // attribute array
+                    array(), // attribute array
                     $iFieldsCount
                 );
-                return "<div " . $_oFieldsAttributes->get() . ">"
+                return "<div ".$_oFieldsAttributes->get().">"
                         . $aFieldset[ 'before_fields' ]
                             . implode( PHP_EOL, $aFieldsOutput )
                         . $aFieldset[ 'after_fields' ]
@@ -310,13 +310,13 @@ 
                     $aField[ 'description' ],
                     'admin-page-framework-fields-description'   // class selector
                 );
-                $_aOutput[] = $_oFieldDescription->get();
+                $_aOutput[ ] = $_oFieldDescription->get();
                     
                 // Dimensional keys of repeatable and sortable fields
-                $_aOutput[] = $this->_getDynamicElementFlagFieldInputTag( $aField );
+                $_aOutput[ ] = $this->_getDynamicElementFlagFieldInputTag( $aField );
                     
                 // Repeatable and sortable scripts 
-                $_aOutput[] = $this->_getFieldScripts( $aField, $iFieldsCount );
+                $_aOutput[ ] = $this->_getFieldScripts( $aField, $iFieldsCount );
                 
                 return implode( PHP_EOL, array_filter( $_aOutput ) );
                 
@@ -328,10 +328,10 @@ 
                  */
                 private function _getDynamicElementFlagFieldInputTag( $aFieldset ) {
                     
-                    if ( ! empty( $aFieldset[ 'repeatable' ] ) ) {
+                    if ( !empty( $aFieldset[ 'repeatable' ] ) ) {
                         return $this->_getRepeatableFieldFlagTag( $aFieldset );
                     }
-                    if ( ! empty( $aFieldset[ 'sortable' ] ) ) {
+                    if ( !empty( $aFieldset[ 'sortable' ] ) ) {
                         return $this->_getSortableFieldFlagTag( $aFieldset );
                     }
                     return '';
@@ -346,8 +346,8 @@ 
                             'input',
                             array(
                                 'type'                      => 'hidden',
-                                'name'                      => '__repeatable_elements_' . $aFieldset[ '_structure_type' ] 
-                                    . '[' . $aFieldset[ '_field_address' ] . ']',
+                                'name'                      => '__repeatable_elements_'.$aFieldset[ '_structure_type' ] 
+                                    . '['.$aFieldset[ '_field_address' ].']',
                                 'class'                     => 'element-address',
                                 'value'                     => $aFieldset[ '_field_address' ],
                                 'data-field_address_model'  => $aFieldset[ '_field_address_model' ],
@@ -363,8 +363,8 @@ 
                             'input',
                             array(
                                 'type'                      => 'hidden',
-                                'name'                      => '__sortable_elements_' . $aFieldset[ '_structure_type' ] 
-                                    . '[' . $aFieldset[ '_field_address' ] . ']',
+                                'name'                      => '__sortable_elements_'.$aFieldset[ '_structure_type' ] 
+                                    . '['.$aFieldset[ '_field_address' ].']',
                                 'class'                     => 'element-address',
                                 'value'                     => $aFieldset[ '_field_address' ],
                                 'data-field_address_model'  => $aFieldset[ '_field_address_model' ],
@@ -383,14 +383,14 @@ 
                     $_aOutput   = array();
                     
                     // Add the repeater script 
-                    $_aOutput[] = ! empty( $aField[ 'repeatable' ] )
-                        ? $this->_getRepeaterFieldEnablerScript( 'fields-' . $aField[ 'tag_id' ], $iFieldsCount, $aField[ 'repeatable' ] )
+                    $_aOutput[ ] = !empty( $aField[ 'repeatable' ] )
+                        ? $this->_getRepeaterFieldEnablerScript( 'fields-'.$aField[ 'tag_id' ], $iFieldsCount, $aField[ 'repeatable' ] )
                         : '';
 
                     // Add the sortable script - if the number of fields is only one, no need to sort the field. 
                     // Repeatable fields can make the number increase so here it checks the repeatability.
-                    $_aOutput[] = ! empty( $aField[ 'sortable' ] ) && ( $iFieldsCount > 1 || ! empty( $aField[ 'repeatable' ] ) )
-                        ? $this->_getSortableFieldEnablerScript( 'fields-' . $aField[ 'tag_id' ] )
+                    $_aOutput[ ] = !empty( $aField[ 'sortable' ] ) && ( $iFieldsCount > 1 || !empty( $aField[ 'repeatable' ] ) )
+                        ? $this->_getSortableFieldEnablerScript( 'fields-'.$aField[ 'tag_id' ] )
                         : '';     
                     
                     return implode( PHP_EOL, $_aOutput );

Doc Comments +2 added lines

@@ -126,6 +126,7 @@ 
                  * Retrieves a field output.
                  * 
                  * @since       3.8.0
+                 * @param boolean $bIsLastElement
                  * @return      string
                  */ 
                 private function _getFieldOutput( $sContent, $aField, $bIsLastElement ) {
@@ -204,6 +205,7 @@ 
          * Returns the final fields output.
          * 
          * @since       3.1.0
+         * @param integer $iFieldsCount
          * @return      string
          */
         private function _getFinalOutput( $aFieldset, array $aFieldsOutput, $iFieldsCount ) {

Braces +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
                  */
                 private function _getUnsetFlagFieldInputTag( $aField ) {
                     
-                    if ( false !== $aField[ 'save' ] ) {                
+                    if ( false !== $aField[ 'save' ] ) {
                         return '';
                     }
                     return $this->getHTMLTag( 

development/factory/_common/_abstract/_model/AdminPageFramework_Message.php

Spacing +17 added lines, -17 removed lines

@@ -82,11 +82,11 @@ 
         'confirm_perform_task'                  => 'Please confirm your action.', 
         'specified_option_been_deleted'         => 'The specified options have been deleted.', 
         'nonce_verification_failed'             => 'A problem occurred while processing the form data. Please try again.', 
-        'check_max_input_vars'                  => 'Not all form fields could not be sent. Please check your server settings of PHP <code>max_input_vars</code> and consult the server administrator to increase the value. <code>max input vars</code>: %1$s. <code>$_POST</code> count: %2$s',  // 3.5.11+
-        'send_email'                            => 'Is it okay to send the email?',     // 3.3.0+
-        'email_sent'                            => 'The email has been sent.',  // 3.3.0+, 3.3.5+ deprecated 
+        'check_max_input_vars'                  => 'Not all form fields could not be sent. Please check your server settings of PHP <code>max_input_vars</code> and consult the server administrator to increase the value. <code>max input vars</code>: %1$s. <code>$_POST</code> count: %2$s', // 3.5.11+
+        'send_email'                            => 'Is it okay to send the email?', // 3.3.0+
+        'email_sent'                            => 'The email has been sent.', // 3.3.0+, 3.3.5+ deprecated 
         'email_scheduled'                       => 'The email has been scheduled.', // 3.3.5+
-        'email_could_not_send'                  => 'There was a problem sending the email',     // 3.3.0+
+        'email_could_not_send'                  => 'There was a problem sending the email', // 3.3.0+
         
         // AdminPageFramework_PostType
         'title'                                 => 'Title',     
@@ -113,14 +113,14 @@ 
         'upload_file'                           => 'Upload File', 
         'use_this_file'                         => 'Use This File', 
         'select_file'                           => 'Select File', 
-        'remove_value'                          => 'Remove Value',  // 3.2.0+
-        'select_all'                            => 'Select All',    // 3.3.0+
-        'select_none'                           => 'Select None',   // 3.3.0+                       
+        'remove_value'                          => 'Remove Value', // 3.2.0+
+        'select_all'                            => 'Select All', // 3.3.0+
+        'select_none'                           => 'Select None', // 3.3.0+                       
         'no_term_found'                         => 'No term found.', // 3.3.2+
 
         // AdminPageFramework_Form_View___Script_{...}
         'select'                                => 'Select', // 3.4.2+             
-        'insert'                                => 'Insert',  // 3.4.2+
+        'insert'                                => 'Insert', // 3.4.2+
         'use_this'                              => 'Use This', // 3.4.2+
         'return_to_library'                     => 'Return to Library', // 3.4.2+
             
@@ -132,8 +132,8 @@ 
 
         // Repeatable sections & fields
         'repeatable_section_is_disabled'        => 'The ability to repeat sections is disabled.', // 3.8.13+
-        'repeatable_field_is_disabled'          => 'The ability to repeat fields is disabled.',   // 3.8.13+
-        'warning_caption'                       => 'Warning',   // 3.8.13+
+        'repeatable_field_is_disabled'          => 'The ability to repeat fields is disabled.', // 3.8.13+
+        'warning_caption'                       => 'Warning', // 3.8.13+
 
         // AdminPageFramework_FormField
         'allowed_maximum_number_of_fields'      => 'The allowed maximum number of fields is {0}.', 
@@ -210,7 +210,7 @@ 
      * @since       3.2.0       Changed it to create an instance per text domain basis.
      * @remark      This class should be instantiated via this method.
      */
-    public static function getInstance( $sTextDomain='admin-page-framework' ) {
+    public static function getInstance( $sTextDomain = 'admin-page-framework' ) {
         
         $_oInstance = isset( self::$_aInstancesByTextDomain[ $sTextDomain ] ) && ( self::$_aInstancesByTextDomain[ $sTextDomain ] instanceof AdminPageFramework_Message )
             ? self::$_aInstancesByTextDomain[ $sTextDomain ]
@@ -223,21 +223,21 @@ 
          * Ensures that only one instance of this class object exists. ( no multiple instances of this object ) 
          * @deprecated  3.2.0
          */
-        public static function instantiate( $sTextDomain='admin-page-framework' ) {
+        public static function instantiate( $sTextDomain = 'admin-page-framework' ) {
             return self::getInstance( $sTextDomain );
         }
         
     /**
      * Sets up properties.
      */
-    public function __construct( $sTextDomain='admin-page-framework' ) {
+    public function __construct( $sTextDomain = 'admin-page-framework' ) {
         
         $this->_sTextDomain = $sTextDomain;  
         
         // Fill the $aMessages property with the keys extracted from the $aDefaults property
         // with the value of null.  The null is set to let it trigger the __get() method 
         // so that each translation item gets processed individually.
-        $this->aMessages    = array_fill_keys( 
+        $this->aMessages = array_fill_keys( 
             array_keys( $this->aDefaults ),
             null        
         );
@@ -271,13 +271,13 @@ 
      * @since       3.7.0      If no key is specified, return the entire mesage array.
      * @return      string|array
      */
-    public function get( $sKey='' ) {
-        if ( ! $sKey ) {
+    public function get( $sKey = '' ) {
+        if ( !$sKey ) {
             return $this->_getAllMessages();
         }
         return isset( $this->aMessages[ $sKey ] )
             ? __( $this->aMessages[ $sKey ], $this->_sTextDomain )
-            : __( $this->{$sKey}, $this->_sTextDomain );     // triggers __get()
+            : __( $this->{$sKey}, $this->_sTextDomain ); // triggers __get()
     }
         /**
          * Returns the all registered messag items.

development/factory/_common/form/_view/script/AdminPageFramework_Form_View___Script_RepeatableSection.php

Doc Comments +2 added lines, -2 removed lines

@@ -513,7 +513,7 @@ 
             return self::getAttributes( $_aAttriubtes ) . ' ' . self::getDataAttributes( $aArguments );
         }
         /**
-         * @return  array
+         * @return  string
          * @sicne   3.8.13
          */
         static private function ___getRemoveButtonAttributes( $sContainerTagID, $oMsg, $iSectionCount ) {
@@ -532,7 +532,7 @@ 
 
         /**
          * @since       3.8.13
-         * @return array
+         * @return string
          */
         static private function ___getAddButtonAttributes( $sContainerTagID, $oMsg, $aArguments ) {
             return self::getAttributes(

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

@@ -441,7 +441,7 @@ 
         if ( empty( $asArguments ) ) {
             return ''; 
         }
-        if ( self::hasBeenCalled( 'repeatable_section_' . $sContainerTagID ) ) {
+        if ( self::hasBeenCalled( 'repeatable_section_'.$sContainerTagID ) ) {
             return '';
         }
 
@@ -449,16 +449,16 @@ 
         $_oFormatter    = new AdminPageFramework_Form_Model___Format_RepeatableSection( $asArguments, $oMsg );
         $_aArguments    = $_oFormatter->get();
         $_sButtons      = "<div class='admin-page-framework-repeatable-section-buttons-outer-container'>"
-                . "<div " . self::___getContainerAttributes( $_aArguments, $oMsg ) . ' >'
-                    . "<a " . self::___getRemoveButtonAttributes( $sContainerTagID, $oMsg, $iSectionCount ) . ">-</a>"
-                    . "<a " . self::___getAddButtonAttributes( $sContainerTagID, $oMsg, $_aArguments ) . ">+</a>"
+                . "<div ".self::___getContainerAttributes( $_aArguments, $oMsg ).' >'
+                    . "<a ".self::___getRemoveButtonAttributes( $sContainerTagID, $oMsg, $iSectionCount ).">-</a>"
+                    . "<a ".self::___getAddButtonAttributes( $sContainerTagID, $oMsg, $_aArguments ).">+</a>"
                 . "</div>"
             . "</div>"
             . AdminPageFramework_Form_Utility::getModalForDisabledRepeatableElement(
-                'repeatable_section_disabled_' . $sContainerTagID,
+                'repeatable_section_disabled_'.$sContainerTagID,
                 $_aArguments[ 'disabled' ]
             );
-        $_sButtonsHTML  = '"' . $_sButtons . '"';
+        $_sButtonsHTML  = '"'.$_sButtons.'"';
         $_aJSArray      = json_encode( $_aArguments );
         $_sScript       = <<<JAVASCRIPTS
 jQuery( document ).ready( function() {
@@ -505,12 +505,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( $_aAttriubtes ) . ' ' . self::getDataAttributes( $aArguments );
+            return self::getAttributes( $_aAttriubtes ).' '.self::getDataAttributes( $aArguments );
         }
         /**
          * @return  array
@@ -541,10 +541,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/_model/formatter/AdminPageFramework_Form_Model___Format_RepeatableSection.php

Spacing +5 added lines, -5 removed lines

@@ -36,8 +36,8 @@ 
      * @since   3.8.13
      */
     static protected $_aStructure_Disabled = array(
-        'message'    => 'The ability of repeating sections is disabled.',   // will be reassigned
-        'caption'    => 'Warning',  // will be reassigned
+        'message'    => 'The ability of repeating sections is disabled.', // will be reassigned
+        'caption'    => 'Warning', // will be reassigned
         'box_width'  => 300,
         'box_height' => 72,
     );
@@ -54,7 +54,7 @@ 
      */
     public function __construct( /* array $asArguments, $oMsg */ ) {
 
-        $_aParameters       = func_get_args() + array(
+        $_aParameters = func_get_args() + array(
             $this->_aArguments,
             null
         );
@@ -73,8 +73,8 @@ 
     public function get() {
 
         $_aArguments = $this->_aArguments + self::$_aStructure;
-        unset( $_aArguments[ 0 ] );   // remove the 0 index element converted from `'repeatable   => 'true',`.
-        if ( ! empty( $_aArguments[ 'disabled' ] ) ) {
+        unset( $_aArguments[ 0 ] ); // remove the 0 index element converted from `'repeatable   => 'true',`.
+        if ( !empty( $_aArguments[ 'disabled' ] ) ) {
             $_aArguments[ 'disabled' ] = $_aArguments[ 'disabled' ] + array(
                 'message'    => $this->_getDefaultMessage(),
                 'caption'    => $this->_oMsg->get( 'warning_caption' ),

development/factory/_common/form/field_type/AdminPageFramework_FieldType_Base.php

Spacing +26 added lines, -26 removed lines

@@ -59,7 +59,7 @@ 
         'after_label'       => null,    
         'before_field'      => null,
         'after_field'       => null,
-        'label_min_width'   => '',   // (string|integer) min-width applied to the input label in pixels. 3.8.0+ Changed the default value from 140 to 0 as it is now applied via embedded CSS. When this value is set by the user, it is set inline and the value will be overridden. [3.8.4+] Changed the value from `0`  to `''`.
+        'label_min_width'   => '', // (string|integer) min-width applied to the input label in pixels. 3.8.0+ Changed the default value from 140 to 0 as it is now applied via embedded CSS. When this value is set by the user, it is set inline and the value will be overridden. [3.8.4+] Changed the value from `0`  to `''`.
         'before_fieldset'   => null, // 3.1.1+
         'after_fieldset'    => null, // 3.1.1+
         
@@ -99,7 +99,7 @@ 
      * @param       object              $oMsg                   The framework message object.
      * @param       boolean             $bAutoRegister          Whether or not to register the field type(s).
      */
-    public function __construct( $asClassName='admin_page_framework', $asFieldTypeSlug=null, $oMsg=null, $bAutoRegister=true ) {
+    public function __construct( $asClassName = 'admin_page_framework', $asFieldTypeSlug = null, $oMsg = null, $bAutoRegister = true ) {
             
         $this->aFieldTypeSlugs  = empty( $asFieldTypeSlug ) 
             ? $this->aFieldTypeSlugs 
@@ -110,9 +110,9 @@ 
         
         // This automatically registers the field type. The build-in ones will be registered manually so it will be skipped.
         if ( $bAutoRegister ) {
-            foreach( ( array ) $asClassName as $_sClassName ) {
+            foreach ( ( array ) $asClassName as $_sClassName ) {
                 add_filter( 
-                    'field_types_' . $_sClassName, 
+                    'field_types_'.$_sClassName, 
                     array( $this, '_replyToRegisterInputFieldType' )
                 );
             }
@@ -158,8 +158,8 @@ 
         }
         return is_array( $asLabel ) // if the user sets multiple items
             ? $this->getElement( 
-                $asElement,         // subject
-                $this->getAsArray( $asKey, true /* preserve empty */ ),     // dimensional path 
+                $asElement, // subject
+                $this->getAsArray( $asKey, true /* preserve empty */ ), // dimensional path 
                 ''                  // default - if the element is not found, return an empty
             )
             : $asElement;
@@ -174,7 +174,7 @@ 
      */
     protected function getFieldOutput( array $aFieldset ) {
         
-        if ( ! is_object( $aFieldset[ '_caller_object' ] ) ) {
+        if ( !is_object( $aFieldset[ '_caller_object' ] ) ) {
             return '';
         }
 
@@ -182,14 +182,14 @@ 
         $aFieldset[ '_parent_field_object' ] = $aFieldset[ '_field_object' ]; // 3.6.0+
         
         // 3.7.0+ The caller object is no longer a factory object but a form object.
-        $_oCallerForm   = $aFieldset[ '_caller_object' ];
+        $_oCallerForm = $aFieldset[ '_caller_object' ];
 
         $_oFieldset = new AdminPageFramework_Form_View___Fieldset( 
-            $aFieldset,                          // the field definition array
-            $_oCallerForm->aSavedData,               // the stored form data
-            $_oCallerForm->getFieldErrors(),         // the field error array.
-            $_oCallerForm->aFieldTypeDefinitions,    // the field type definition array.
-            $_oCallerForm->oMsg,                     // the system message object
+            $aFieldset, // the field definition array
+            $_oCallerForm->aSavedData, // the stored form data
+            $_oCallerForm->getFieldErrors(), // the field error array.
+            $_oCallerForm->aFieldTypeDefinitions, // the field type definition array.
+            $_oCallerForm->oMsg, // the system message object
             $_oCallerForm->aCallbacks                // field output element callables.
         );           
         return $_oFieldset->get();
@@ -229,13 +229,13 @@ 
      * @since       3.0.3       Tweaked it to have better execution speed.
      * @internal
      */
-    public function getDefinitionArray( $sFieldTypeSlug='' ) {
+    public function getDefinitionArray( $sFieldTypeSlug = '' ) {
         
         // The uniteArrays() method resulted in somewhat being slow due to overhead on checking array keys for recursive array merges.
         $_aDefaultKeys = $this->aDefaultKeys + self::$_aDefaultKeys;
-        $_aDefaultKeys['attributes'] = isset( $this->aDefaultKeys['attributes'] ) && is_array( $this->aDefaultKeys['attributes'] )
-            ? $this->aDefaultKeys['attributes'] + self::$_aDefaultKeys['attributes'] 
-            : self::$_aDefaultKeys['attributes'];
+        $_aDefaultKeys[ 'attributes' ] = isset( $this->aDefaultKeys[ 'attributes' ] ) && is_array( $this->aDefaultKeys[ 'attributes' ] )
+            ? $this->aDefaultKeys[ 'attributes' ] + self::$_aDefaultKeys[ 'attributes' ] 
+            : self::$_aDefaultKeys[ 'attributes' ];
         
         return array(
             'sFieldTypeSlug'        => $sFieldTypeSlug,
@@ -273,7 +273,7 @@ 
      * @since       3.0.0
      * @internal
      */
-    public function _replyToFieldTypeSetter( $sFieldSetType='' ) {
+    public function _replyToFieldTypeSetter( $sFieldSetType = '' ) {
         $this->_sFieldSetType = $sFieldSetType;
     }
     
@@ -327,8 +327,8 @@ 
             wp_enqueue_script( 'media-upload' );    
         }
 
-        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php', ) ) ) {     
-            add_filter( 'gettext', array( $this, '_replyToReplaceThickBoxText' ) , 1, 2 );     
+        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php',) ) ) {     
+            add_filter( 'gettext', array( $this, '_replyToReplaceThickBoxText' ), 1, 2 );     
         }
         
     }
@@ -343,7 +343,7 @@ 
         public function _replyToReplaceThickBoxText( $sTranslated, $sText ) {
 
             // Replace the button label in the media thick box.
-            if ( ! in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) { 
+            if ( !in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) { 
                 return $sTranslated; 
             }
             if ( $sText !== 'Insert into Post' ) { 
@@ -353,8 +353,8 @@ 
                 return $sTranslated; 
             }
             
-            if ( isset( $_GET['button_label'] ) ) { 
-                return $_GET['button_label']; 
+            if ( isset( $_GET[ 'button_label' ] ) ) { 
+                return $_GET[ 'button_label' ]; 
             }
 
             return $this->oProp->sThickBoxButtonUseThis 
@@ -373,11 +373,11 @@ 
          */
         public function _replyToRemovingMediaLibraryTab( $aTabs ) {
             
-            if ( ! isset( $_REQUEST[ 'enable_external_source' ] ) ) {
+            if ( !isset( $_REQUEST[ 'enable_external_source' ] ) ) {
                 return $aTabs; 
             }
             
-            if ( ! $_REQUEST[ 'enable_external_source' ] ) {
+            if ( !$_REQUEST[ 'enable_external_source' ] ) {
                 unset( $aTabs[ 'type_url' ] ); // removes the 'From URL' tab in the thick box.
             }
             return $aTabs;
@@ -392,7 +392,7 @@ 
      * @since       3.8.0
      * @return      string
      */
-    protected function getLabelContainerAttributes( $aField, $asClassAttributes, array $aAttributes=array() ) {
+    protected function getLabelContainerAttributes( $aField, $asClassAttributes, array $aAttributes = array() ) {
 
         $aAttributes[ 'class' ] = $this->getClassAttribute( $asClassAttributes, $this->getElement( $aAttributes, 'class' ) );
         $aAttributes[ 'style' ] = $this->getStyleAttribute(

Braces +6 added lines, -6 removed lines

@@ -320,14 +320,14 @@ 
         wp_enqueue_script( 'thickbox' );
         wp_enqueue_style( 'thickbox' );
     
-        if ( function_exists( 'wp_enqueue_media' ) ) {     
+        if ( function_exists( 'wp_enqueue_media' ) ) {
             // If the WordPress version is 3.5 or above,
             new AdminPageFramework_Form_View___Script_MediaUploader( $this->oMsg );
         } else {
             wp_enqueue_script( 'media-upload' );    
         }
 
-        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php', ) ) ) {     
+        if ( in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php', ) ) ) {
             add_filter( 'gettext', array( $this, '_replyToReplaceThickBoxText' ) , 1, 2 );     
         }
         
@@ -343,17 +343,17 @@ 
         public function _replyToReplaceThickBoxText( $sTranslated, $sText ) {
 
             // Replace the button label in the media thick box.
-            if ( ! in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) { 
+            if ( ! in_array( $this->getPageNow(), array( 'media-upload.php', 'async-upload.php' ) ) ) {
                 return $sTranslated; 
             }
-            if ( $sText !== 'Insert into Post' ) { 
+            if ( $sText !== 'Insert into Post' ) {
                 return $sTranslated; 
             }
-            if ( $this->getQueryValueInURLByKey( wp_get_referer(), 'referrer' ) !== 'admin_page_framework' ) { 
+            if ( $this->getQueryValueInURLByKey( wp_get_referer(), 'referrer' ) !== 'admin_page_framework' ) {
                 return $sTranslated; 
             }
             
-            if ( isset( $_GET['button_label'] ) ) { 
+            if ( isset( $_GET['button_label'] ) ) {
                 return $_GET['button_label']; 
             }
 

Doc Comments +1 added lines

@@ -390,6 +390,7 @@
      * This is used for element that `label_min_width` is applied.
      * 
      * @since       3.8.0
+     * @param string $asClassAttributes
      * @return      string
      */
     protected function getLabelContainerAttributes( $aField, $asClassAttributes, array $aAttributes=array() ) {

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

Spacing +13 added lines, -13 removed lines

@@ -90,16 +90,16 @@ 
                 'AdminPageFramework_Form_View___CSS_FieldError',
                 'AdminPageFramework_Form_View___CSS_ToolTip',
             );
-            foreach( $_aClassNames as $_sClassName ) {
+            foreach ( $_aClassNames as $_sClassName ) {
                 $_oCSS = new $_sClassName;
-                $this->aResources[ 'internal_styles' ][] = $_oCSS->get();
+                $this->aResources[ 'internal_styles' ][ ] = $_oCSS->get();
             }
             $_aClassNamesForIE = array(
                 'AdminPageFramework_Form_View___CSS_CollapsibleSectionIE',
             );
-            foreach( $_aClassNames as $_sClassName ) {
+            foreach ( $_aClassNames as $_sClassName ) {
                 $_oCSS = new $_sClassName;
-                $this->aResources[ 'internal_styles_ie' ][] = $_oCSS->get();
+                $this->aResources[ 'internal_styles_ie' ][ ] = $_oCSS->get();
             }
             
         }
@@ -117,7 +117,7 @@ 
          * @return      void
          */
         private function ___set( $aAllFieldsets ) {
-            foreach( $aAllFieldsets as $_sSecitonID => $_aFieldsets ) {
+            foreach ( $aAllFieldsets as $_sSecitonID => $_aFieldsets ) {
                 $this->___setFieldResourcesBySection( $_aFieldsets );
             }
         }
@@ -129,7 +129,7 @@ 
             private function ___setFieldResourcesBySection( $_aFieldsets ) {
 
                 $_bIsSubSectionLoaded = false;
-                foreach( $_aFieldsets as $_iSubSectionIndexOrFieldID => $_aSubSectionOrField )  {
+                foreach ( $_aFieldsets as $_iSubSectionIndexOrFieldID => $_aSubSectionOrField ) {
 // @todo Examine if this structure is correct or not.
 // It may not be necessary to check the sub-section dimensions as this is not the saved options array.
                     // if it's a sub-section
@@ -140,7 +140,7 @@ 
                             continue;
                         }
                         $_bIsSubSectionLoaded = true;
-                        foreach( $_aSubSectionOrField as $_aField ) {
+                        foreach ( $_aSubSectionOrField as $_aField ) {
                             $this->___setFieldResources( $_aField );
                         }
                         continue;
@@ -165,7 +165,7 @@ 
                 private function ___setFieldResources( $aFieldset ) {
 
                     // Check the field conditions.
-                    if ( ! $this->___isFieldsetAllowed( $aFieldset ) ) {
+                    if ( !$this->___isFieldsetAllowed( $aFieldset ) ) {
                         return;
                     }
 
@@ -196,7 +196,7 @@ 
                         return $this->callBack(
                             $this->aCallbacks[ 'is_fieldset_registration_allowed' ],
                             array(
-                                true,   // 1st parameter
+                                true, // 1st parameter
                                 $aFieldset, // 2nd parameter
                             )
                         );
@@ -208,7 +208,7 @@ 
                      */
                     private function ___setResourcesOfNestedFields( $aFieldset ) {
 
-                        if ( ! $this->hasFieldDefinitionsInContent( $aFieldset ) ) {
+                        if ( !$this->hasFieldDefinitionsInContent( $aFieldset ) ) {
                             return;
                         }
                         foreach ( $aFieldset[ 'content' ] as $_asNestedFieldset ) {
@@ -248,7 +248,7 @@ 
                         $this->callBack(
                             $this->aCallbacks[ 'load_fieldset_resource' ],
                             array(
-                                $aFieldset,   // 1st parameter
+                                $aFieldset, // 1st parameter
                             )
                         );
 
@@ -256,7 +256,7 @@ 
         // Be careful not to add duplicate items as currently the sub-field items are parsed.
 
                         // Is already registered?
-                        if ( $this->hasBeenCalled( 'registered_' . $_sFieldtype . '_' . $this->aArguments[ 'structure_type' ] ) ) {
+                        if ( $this->hasBeenCalled( 'registered_'.$_sFieldtype.'_'.$this->aArguments[ 'structure_type' ] ) ) {
                             return;
                         }
 
@@ -271,7 +271,7 @@ 
                             $_aFieldTypeDefinition,
                             $this->aResources
                         );
-                        $this->aResources     = $_oFieldTypeResources->get();
+                        $this->aResources = $_oFieldTypeResources->get();
 
                     }
 

Braces +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
             private function ___setFieldResourcesBySection( $_aFieldsets ) {
 
                 $_bIsSubSectionLoaded = false;
-                foreach( $_aFieldsets as $_iSubSectionIndexOrFieldID => $_aSubSectionOrField )  {
+                foreach( $_aFieldsets as $_iSubSectionIndexOrFieldID => $_aSubSectionOrField ) {
 // @todo Examine if this structure is correct or not.
 // It may not be necessary to check the sub-section dimensions as this is not the saved options array.
                     // if it's a sub-section