Completed
Branch master (4b970b)
by Michael
05:13
created
_common/form/field_type/AdminPageFramework_FieldType_inline_mixed.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -218,7 +218,7 @@
 block discarded – undo
218 218
      * @remark $_aDefaultKeys holds shared default key-values defined in the base class.
219 219
      */
220 220
     protected $aDefaultKeys = array(
221
-        'label_min_width'  => '',   // disabled as the embedded elements are all inline.
221
+        'label_min_width'  => '', // disabled as the embedded elements are all inline.
222 222
     );
223 223
 
224 224
     
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
      * @since       2.1.5
44 44
      * @since       3.3.1       Changed from `_replyToGetStyles()`.
45 45
      */        
46
-    protected function getStyles() { 
46
+    protected function getStyles() {
47 47
         return <<<CSSRULES
48 48
 /* Text Field Type */
49 49
 .admin-page-framework-field.admin-page-framework-field-text > .admin-page-framework-input-label-container {
Please login to merge, or discard this patch.
factory/_common/form/field_type/AdminPageFramework_FieldType_submit.php 2 patches
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
          * @return      array       The label container attribute array.
305 305
          * @internal
306 306
          */        
307
-        private function _getLabelContainerAttributes( array $aField ) {           
307
+        private function _getLabelContainerAttributes( array $aField ) {
308 308
             return array(
309 309
                 'style' => $aField['label_min_width'] 
310 310
                     ? "min-width:" . $this->sanitizeLength( $aField['label_min_width'] ) . ";" 
@@ -540,19 +540,19 @@  discard block
 block discarded – undo
540 540
      * @since       2.1.5       Moved from `AdminPageFramwrork_InputField`. Changed the scope to protected from private. Removed the second parameter.
541 541
      * @internal
542 542
      */ 
543
-    protected function _getInputFieldValueFromLabel( $aField ) {    
543
+    protected function _getInputFieldValueFromLabel( $aField ) {
544 544
         
545 545
         // If the value key is explicitly set, use it. But the empty string will be ignored.
546
-        if ( isset( $aField[ 'value' ] ) && $aField[ 'value' ] != '' ) { 
546
+        if ( isset( $aField[ 'value' ] ) && $aField[ 'value' ] != '' ) {
547 547
             return $aField[ 'value' ]; 
548 548
         }
549 549
         
550
-        if ( isset( $aField[ 'label' ] ) ) { 
550
+        if ( isset( $aField[ 'label' ] ) ) {
551 551
             return $aField[ 'label' ]; 
552 552
         }
553 553
         
554 554
         // If the default value is set,
555
-        if ( isset( $aField[ 'default' ] ) ) { 
555
+        if ( isset( $aField[ 'default' ] ) ) {
556 556
             return $aField[ 'default' ]; 
557 557
         }
558 558
         
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
     /**
188 188
      * Defines the field type slugs used for this field type.
189 189
      */
190
-    public $aFieldTypeSlugs = array( 'submit', );
190
+    public $aFieldTypeSlugs = array( 'submit',);
191 191
     
192 192
     /**
193 193
      * Defines the default key-values of this field type. 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         'redirect_url'  => null,
199 199
         'href'          => null,
200 200
         'reset'         => null, 
201
-        'email'         => null,    // [3.3.0+] string of an email address to send to or it can be an array with the following keys.
201
+        'email'         => null, // [3.3.0+] string of an email address to send to or it can be an array with the following keys.
202 202
         /* 
203 203
             array(
204 204
                 'to'            => null,    // string|array     The email address to send to or an array representing the key structure of the submitted form data holding the value. The first key should be the section ID and the second key is the the field ID.
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 'attachments'   => null,    // string|array     The file path(s) or an array representing the key structure of the submitted form data holding the value. The first key should be the section ID and the second key is the the field ID.
209 209
             )
210 210
         */
211
-        'skip_confirmation' => false,   // 3.7.6+ For emails.
211
+        'skip_confirmation' => false, // 3.7.6+ For emails.
212 212
         'attributes'    => array(
213 213
             'class' => 'button button-primary',
214 214
         ),    
@@ -248,16 +248,16 @@  discard block
 block discarded – undo
248 248
 
249 249
         return 
250 250
             $aField[ 'before_label' ]
251
-            . "<div " . $this->getAttributes( $_aLabelContainerAttributes ) . ">"
251
+            . "<div ".$this->getAttributes( $_aLabelContainerAttributes ).">"
252 252
                 . $this->_getExtraFieldsBeforeLabel( $aField ) // this is for the import field type that cannot place file input tag inside the label tag.
253
-                . "<label " . $this->getAttributes( $_aLabelAttributes ) . ">"
253
+                . "<label ".$this->getAttributes( $_aLabelAttributes ).">"
254 254
                     . $aField[ 'before_input' ]
255 255
                     . $this->_getExtraInputFields( $aField )
256
-                    . "<input " . $this->getAttributes( $_aInputAttributes ) . " />" // this method is defined in the base class
256
+                    . "<input ".$this->getAttributes( $_aInputAttributes )." />" // this method is defined in the base class
257 257
                     . $aField[ 'after_input' ]
258 258
                 . "</label>"
259 259
             . "</div>"
260
-            . $aField['after_label'];
260
+            . $aField[ 'after_label' ];
261 261
         
262 262
     }
263 263
         /**
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
         private function _getLabelAttributes( array $aField, array $aInputAttributes ) {
290 290
             return array(
291 291
                 'style' => $aField[ 'label_min_width' ] 
292
-                    ? "min-width:" . $this->getLengthSanitized( $aField[ 'label_min_width' ] ) . ";" 
292
+                    ? "min-width:".$this->getLengthSanitized( $aField[ 'label_min_width' ] ).";" 
293 293
                     : null,
294 294
                 'for'   => $aInputAttributes[ 'id' ],
295 295
                 'class' => $aInputAttributes[ 'disabled' ] 
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
         private function _getLabelContainerAttributes( array $aField ) {           
308 308
             return array(
309 309
                 'style' => $aField[ 'label_min_width' ] 
310
-                    ? "min-width:" . $this->getLengthSanitized( $aField[ 'label_min_width' ] ) . ";" 
310
+                    ? "min-width:".$this->getLengthSanitized( $aField[ 'label_min_width' ] ).";" 
311 311
                     : null,
312 312
                 'class' => 'admin-page-framework-input-label-container'
313 313
                     . ' admin-page-framework-input-button-container'
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
     protected function _getExtraInputFields( &$aField ) {
359 359
         
360 360
         $_aOutput   = array();
361
-        $_aOutput[] = $this->getHTMLTag( 
361
+        $_aOutput[ ] = $this->getHTMLTag( 
362 362
             'input',
363 363
             array(
364 364
                 'type'  => 'hidden',
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
                 'value' => $aField[ 'input_id' ],
367 367
             )
368 368
         );
369
-        $_aOutput[] = $this->getHTMLTag( 
369
+        $_aOutput[ ] = $this->getHTMLTag( 
370 370
             'input',
371 371
             array(
372 372
                 'type'  => 'hidden',
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
                 'value' => $aField[ 'field_id' ],
375 375
             ) 
376 376
         );            
377
-        $_aOutput[] = $this->getHTMLTag( 
377
+        $_aOutput[ ] = $this->getHTMLTag( 
378 378
             'input',
379 379
             array(
380 380
                 'type'  => 'hidden',
@@ -382,11 +382,11 @@  discard block
 block discarded – undo
382 382
                 'value' => $aField[ '_input_name_flat' ],
383 383
             ) 
384 384
         );         
385
-        $_aOutput[] = $this->_getHiddenInput_SectionID( $aField );
386
-        $_aOutput[] = $this->_getHiddenInputByKey( $aField, 'redirect_url' );       
387
-        $_aOutput[] = $this->_getHiddenInputByKey( $aField, 'href' );       
388
-        $_aOutput[] = $this->_getHiddenInput_Reset( $aField );
389
-        $_aOutput[] = $this->_getHiddenInput_Email( $aField );
385
+        $_aOutput[ ] = $this->_getHiddenInput_SectionID( $aField );
386
+        $_aOutput[ ] = $this->_getHiddenInputByKey( $aField, 'redirect_url' );       
387
+        $_aOutput[ ] = $this->_getHiddenInputByKey( $aField, 'href' );       
388
+        $_aOutput[ ] = $this->_getHiddenInput_Reset( $aField );
389
+        $_aOutput[ ] = $this->_getHiddenInput_Email( $aField );
390 390
         return implode( PHP_EOL, array_filter( $_aOutput ) );  
391 391
         
392 392
     }
@@ -402,9 +402,9 @@  discard block
 block discarded – undo
402 402
                 'input',
403 403
                 array(
404 404
                     'type'  => 'hidden',
405
-                    'name'  => "__submit[{$aField['input_id']}][section_id]",
406
-                    'value' => isset( $aField['section_id'] ) && '_default' !== $aField['section_id'] 
407
-                        ? $aField['section_id'] 
405
+                    'name'  => "__submit[{$aField[ 'input_id' ]}][section_id]",
406
+                    'value' => isset( $aField[ 'section_id' ] ) && '_default' !== $aField[ 'section_id' ] 
407
+                        ? $aField[ 'section_id' ] 
408 408
                         : '',
409 409
                 ) 
410 410
             );                  
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
                     'input',
423 423
                     array(
424 424
                         'type'  => 'hidden',
425
-                        'name'  => "__submit[{$aField['input_id']}][{$sKey}]",
425
+                        'name'  => "__submit[{$aField[ 'input_id' ]}][{$sKey}]",
426 426
                         'value' => $aField[ $sKey ],
427 427
                     ) 
428 428
                 )
@@ -436,15 +436,15 @@  discard block
 block discarded – undo
436 436
          * @return      string      the HTML input tag output for the 'reset' argument.
437 437
          */        
438 438
         private function _getHiddenInput_Reset( array $aField ) {
439
-            if ( ! $aField['reset'] ) {
439
+            if ( !$aField[ 'reset' ] ) {
440 440
                 return '';
441 441
             }
442
-            return ! $this->_checkConfirmationDisplayed( $aField, $aField[ '_input_name_flat' ], 'reset' )
442
+            return !$this->_checkConfirmationDisplayed( $aField, $aField[ '_input_name_flat' ], 'reset' )
443 443
                 ? $this->getHTMLTag( 
444 444
                     'input',
445 445
                     array(
446 446
                         'type'  => 'hidden',
447
-                        'name'  => "__submit[{$aField['input_id']}][is_reset]",
447
+                        'name'  => "__submit[{$aField[ 'input_id' ]}][is_reset]",
448 448
                         'value' => '1',
449 449
                     ) 
450 450
                 )
@@ -452,10 +452,10 @@  discard block
 block discarded – undo
452 452
                     'input',
453 453
                     array(
454 454
                         'type'  => 'hidden',
455
-                        'name'  => "__submit[{$aField['input_id']}][reset_key]",
456
-                        'value' => is_array( $aField['reset'] )   // set the option array key to delete.
457
-                            ? implode( '|', $aField['reset'] )
458
-                            : $aField['reset'],
455
+                        'name'  => "__submit[{$aField[ 'input_id' ]}][reset_key]",
456
+                        'value' => is_array( $aField[ 'reset' ] )   // set the option array key to delete.
457
+                            ? implode( '|', $aField[ 'reset' ] )
458
+                            : $aField[ 'reset' ],
459 459
                     )
460 460
                 );      
461 461
         }
@@ -472,10 +472,10 @@  discard block
 block discarded – undo
472 472
                 return '';
473 473
             }
474 474
             $this->setTransient( 
475
-                'apf_em_' . md5( $aField[ '_input_name_flat' ] . get_current_user_id() ), 
475
+                'apf_em_'.md5( $aField[ '_input_name_flat' ].get_current_user_id() ), 
476 476
                 $aField[ 'email' ] 
477 477
             );
478
-            return ! $this->_checkConfirmationDisplayed( $aField, $aField[ '_input_name_flat' ], 'email' )
478
+            return !$this->_checkConfirmationDisplayed( $aField, $aField[ '_input_name_flat' ], 'email' )
479 479
                 ? $this->getHTMLTag( 
480 480
                     'input',
481 481
                     array(
@@ -500,19 +500,19 @@  discard block
 block discarded – undo
500 500
          * @return      boolean
501 501
          * @internal
502 502
          */
503
-        private function _checkConfirmationDisplayed( $aField, $sFlatFieldName, $sType='reset' ) {
503
+        private function _checkConfirmationDisplayed( $aField, $sFlatFieldName, $sType = 'reset' ) {
504 504
                             
505
-            switch( $sType ) {
505
+            switch ( $sType ) {
506 506
                 default:
507 507
                 case 'reset':       // admin page framework _ reset confirmation
508
-                    $_sTransientKey = 'apf_rc_' . md5( $sFlatFieldName . get_current_user_id() );
508
+                    $_sTransientKey = 'apf_rc_'.md5( $sFlatFieldName.get_current_user_id() );
509 509
                     break;
510 510
                 case 'email':       // admin page framework _ email confirmation
511
-                    $_sTransientKey = 'apf_ec_' . md5( $sFlatFieldName . get_current_user_id() );   
511
+                    $_sTransientKey = 'apf_ec_'.md5( $sFlatFieldName.get_current_user_id() );   
512 512
                     break;
513 513
             }
514 514
             
515
-            $_bConfirmed = false === $this->getTransient( $_sTransientKey ) && ! $aField[ 'skip_confirmation' ]
515
+            $_bConfirmed = false === $this->getTransient( $_sTransientKey ) && !$aField[ 'skip_confirmation' ]
516 516
                 ? false
517 517
                 : true;
518 518
             
Please login to merge, or discard this patch.
form/_view/attribute/AdminPageFramework_Form_View___Attribute_Fieldset.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
      * 
26 26
      * @since       3.6.0
27 27
      */
28
-    public $sContext    = 'fieldset';
28
+    public $sContext = 'fieldset';
29 29
 
30 30
     /**
31 31
      * Returns an attribute array.
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
      */
34 34
     protected function _getAttributes() {
35 35
         return array(
36
-            'id'            => $this->sContext . '-' . $this->aArguments[ 'tag_id' ],
36
+            'id'            => $this->sContext.'-'.$this->aArguments[ 'tag_id' ],
37 37
             'class'         => implode( 
38 38
                 ' ', 
39 39
                 array(
40
-                    'admin-page-framework-' . $this->sContext,
40
+                    'admin-page-framework-'.$this->sContext,
41 41
                     $this->_getSelectorForChildFieldset()
42 42
                 )
43 43
             ),
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
                 return '';
57 57
             }            
58 58
             if ( $this->aArguments[ '_nested_depth' ] == 1 ) {
59
-                return 'child-fieldset nested-depth-' . $this->aArguments[ '_nested_depth' ];
59
+                return 'child-fieldset nested-depth-'.$this->aArguments[ '_nested_depth' ];
60 60
             }
61
-            return 'child-fieldset multiple-nesting nested-depth-' . $this->aArguments[ '_nested_depth' ];
61
+            return 'child-fieldset multiple-nesting nested-depth-'.$this->aArguments[ '_nested_depth' ];
62 62
             
63 63
         }
64 64
            
Please login to merge, or discard this patch.
development/factory/_common/form/AdminPageFramework_Form_Utility.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
         }
71 71
         
72 72
         // If the first element is a string, it is a inline mixed field definition.
73
-       return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
73
+        return is_array( self::getElement( $aFieldset[ 'content' ], 0 ) );
74 74
        
75 75
     }  
76 76
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
      */
60 60
     static public function hasNestedFields( array $aFieldset ) {
61 61
         
62
-        if ( ! self::hasFieldDefinitionsInContent( $aFieldset ) ) {
62
+        if ( !self::hasFieldDefinitionsInContent( $aFieldset ) ) {
63 63
             return false;
64 64
         }
65 65
         // At this point, the `content` argument contains either the definition of nested fields or inline-mixed fields.
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
      */
104 104
     static public function hasFieldDefinitionsInContent( array $aFieldset ) {
105 105
         
106
-        if ( ! isset( $aFieldset[ 'content' ] ) ) {
106
+        if ( !isset( $aFieldset[ 'content' ] ) ) {
107 107
             return false;
108 108
         }
109 109
         if ( empty( $aFieldset[ 'content' ] ) ) {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         if ( empty( $sString ) ) {
156 156
             return $sString;
157 157
         }
158
-        return $sString . '|';
158
+        return $sString.'|';
159 159
     }    
160 160
     
161 161
     /**
@@ -171,17 +171,17 @@  discard block
 block discarded – undo
171 171
      */
172 172
     static public function getFieldsetReformattedBySubFieldIndex( array $aFieldset, $iSubFieldIndex, $bHasSubFields, array $aParentFieldset ) {
173 173
         
174
-        $_oCallerForm   = $aFieldset[ '_caller_object' ];
174
+        $_oCallerForm = $aFieldset[ '_caller_object' ];
175 175
         
176 176
         // Add sub-field index to the parent field path for repeated nested items.
177
-        $aFieldset[ '_parent_field_path' ]   = self::getAOrB(
177
+        $aFieldset[ '_parent_field_path' ] = self::getAOrB(
178 178
             $bHasSubFields,
179
-            $aFieldset[ '_parent_field_path' ] . '|' . $iSubFieldIndex,
179
+            $aFieldset[ '_parent_field_path' ].'|'.$iSubFieldIndex,
180 180
             $aFieldset[ '_parent_field_path' ]
181 181
         );
182
-        $aFieldset[ '_parent_tag_id' ]       = self::getAOrB(
182
+        $aFieldset[ '_parent_tag_id' ] = self::getAOrB(
183 183
             $bHasSubFields,
184
-            $aParentFieldset[ 'tag_id' ] . '__' . $iSubFieldIndex,
184
+            $aParentFieldset[ 'tag_id' ].'__'.$iSubFieldIndex,
185 185
             $aParentFieldset[ 'tag_id' ]
186 186
         );
187 187
         
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
             $aFieldset, 
191 191
             $aFieldset[ '_structure_type' ],
192 192
             $aFieldset[ 'capability' ], 
193
-            ( integer ) $iSubFieldIndex + 1,   // 1-based count (not index)
193
+            ( integer ) $iSubFieldIndex + 1, // 1-based count (not index)
194 194
             $aFieldset[ '_subsection_index' ], 
195 195
             $aFieldset[ '_is_section_repeatable' ],
196 196
             $aFieldset[ '_caller_object' ]
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
         
200 200
         $_oFieldsetOutputFormatter = new AdminPageFramework_Form_Model___Format_FieldsetOutput(
201 201
             $aFieldset,
202
-            $aFieldset[ '_section_index' ],    // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
202
+            $aFieldset[ '_section_index' ], // `_section_index` is defined in the ...FieldsetOutput class. Since this is a nested item, it should be already set.
203 203
             $_oCallerForm->aFieldTypeDefinitions
204 204
         );         
205 205
         return $_oFieldsetOutputFormatter->get();
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
         
62 62
         $aFieldset = $this->aFieldset;
63 63
 
64
-        if ( 'section_title' === $aFieldset[ 'type' ] ) { 
64
+        if ( 'section_title' === $aFieldset[ 'type' ] ) {
65 65
             return ''; 
66 66
         }
67 67
         
Please login to merge, or discard this patch.
form/_model/AdminPageFramework_Form_Model___FieldTypeRegistration.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
                 call_user_func_array( 
45 45
                     $aFieldTypeDefinition[ 'hfFieldSetTypeSetter' ], 
46 46
                     array( $sStructureType ) 
47
-               );
47
+                );
48 48
             }
49 49
             
50 50
             if ( is_callable( $aFieldTypeDefinition[ 'hfFieldLoader' ] ) ) {
Please login to merge, or discard this patch.
form/_model/formatter/AdminPageFramework_Form_Model___Format_Fieldset.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
         $_aFieldset[ 'class' ] = $this->getAsArray( $_aFieldset[ 'class' ] );
190 190
 
191 191
         // 3.8.0+ Support nested fields and inline_mized field type.
192
-        if ( $this->hasFieldDefinitionsInContent( $_aFieldset ) ) {        
192
+        if ( $this->hasFieldDefinitionsInContent( $_aFieldset ) ) {
193 193
             $_aFieldset[ 'content' ] = $this->_getChildFieldsetsFormatted( $_aFieldset[ 'content' ], $_aFieldset );
194 194
         }        
195 195
         
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
             foreach( $aNestedFieldsets as $_isIndex => &$_aNestedFieldset ) {
240 240
                 
241 241
                 // The inline-mixed type has a string element.
242
-                if ( is_scalar( $_aNestedFieldset ) ) {                    
242
+                if ( is_scalar( $_aNestedFieldset ) ) {
243 243
                     $_aNestedFieldset = array( 
244 244
                         'field_id'              => $aParentFieldset[ 'field_id' ] . '_' . uniqid(),
245 245
                         'content'               => $_aNestedFieldset,
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -29,38 +29,38 @@  discard block
 block discarded – undo
29 29
     static public $aStructure = array(
30 30
     
31 31
         // Required Keys
32
-        'field_id'                  => null,    // (string)
33
-        'section_id'                => null,    // (string)
32
+        'field_id'                  => null, // (string)
33
+        'section_id'                => null, // (string)
34 34
 
35 35
         // Optional Keys        
36
-        'type'                      => null,    // (string) (3.8.0+ Became okay to omit.)
37
-        'section_title'             => null,    // This will be assigned automatically in the formatting method.
38
-        'page_slug'                 => null,    // This will be assigned automatically in the formatting method.
39
-        'tab_slug'                  => null,    // This will be assigned automatically in the formatting method.
40
-        'option_key'                => null,    // This will be assigned automatically in the formatting method.
41
-        'class_name'                => null,    // Stores the instantiated class name. Used by the export field type. Also a third party custom field type uses it.
36
+        'type'                      => null, // (string) (3.8.0+ Became okay to omit.)
37
+        'section_title'             => null, // This will be assigned automatically in the formatting method.
38
+        'page_slug'                 => null, // This will be assigned automatically in the formatting method.
39
+        'tab_slug'                  => null, // This will be assigned automatically in the formatting method.
40
+        'option_key'                => null, // This will be assigned automatically in the formatting method.
41
+        'class_name'                => null, // Stores the instantiated class name. Used by the export field type. Also a third party custom field type uses it.
42 42
         'capability'                => null,        
43 43
         'title'                     => null,    
44 44
         'tip'                       => null,    
45 45
         'description'               => null,    
46
-        'error_message'             => null,    // error message for the field
46
+        'error_message'             => null, // error message for the field
47 47
         'before_label'              => null,    
48 48
         'after_label'               => null,    
49 49
         'if'                        => true,    
50
-        'order'                     => null,    // do not set the default number here for this key.     
50
+        'order'                     => null, // do not set the default number here for this key.     
51 51
         'default'                   => null,
52 52
         'value'                     => null,
53
-        'help'                      => null,    // 2.1.0
54
-        'help_aside'                => null,    // 2.1.0
55
-        'repeatable'                => null,    // 2.1.3
56
-        'sortable'                  => null,    // 2.1.3
57
-        'show_title_column'         => true,    // 3.0.0
58
-        'hidden'                    => null,    // 3.0.0
53
+        'help'                      => null, // 2.1.0
54
+        'help_aside'                => null, // 2.1.0
55
+        'repeatable'                => null, // 2.1.3
56
+        'sortable'                  => null, // 2.1.3
57
+        'show_title_column'         => true, // 3.0.0
58
+        'hidden'                    => null, // 3.0.0
59 59
         
60
-        'placement'                 => 'normal',    // 3.8.0 (string) accepts either 'section_title', 'field_title', or 'normal'
60
+        'placement'                 => 'normal', // 3.8.0 (string) accepts either 'section_title', 'field_title', or 'normal'
61 61
         
62 62
         // @todo    Examine why an array is not set but null here for the attributes argument.
63
-        'attributes'                => null,    // 3.0.0 - the array represents the attributes of input tag
63
+        'attributes'                => null, // 3.0.0 - the array represents the attributes of input tag
64 64
         'class'                     => array(   // 3.3.1
65 65
             'fieldrow'  =>  array(),
66 66
             'fieldset'  =>  array(),
@@ -68,27 +68,27 @@  discard block
 block discarded – undo
68 68
             'field'     =>  array(),
69 69
         ), 
70 70
 
71
-        'save'                      => true,    // 3.6.0
72
-        'content'                   => null,    // 3.6.1 - (string) An overriding field-set output.
71
+        'save'                      => true, // 3.6.0
72
+        'content'                   => null, // 3.6.1 - (string) An overriding field-set output.
73 73
         
74 74
         // Internal Keys
75
-        '_fields_type'              => null,    // @deprecated  3.7.0, 3.0.0 - an internal key that indicates the fields type such as page, meta box for pages, meta box for posts, or taxonomy.
76
-        '_structure_type'           => null,    // 3.7.0
77
-        '_caller_object'            => null,    // 3.4.0 (object) stores the object of the caller class. The object is referenced when creating nested fields.
75
+        '_fields_type'              => null, // @deprecated  3.7.0, 3.0.0 - an internal key that indicates the fields type such as page, meta box for pages, meta box for posts, or taxonomy.
76
+        '_structure_type'           => null, // 3.7.0
77
+        '_caller_object'            => null, // 3.4.0 (object) stores the object of the caller class. The object is referenced when creating nested fields.
78 78
                                                          
79
-        '_section_path'             => '',      // 3.7.0 (string) Stores the section path that indicates the structural address of the nested section. e.g. my_section|nested_one
80
-        '_section_path_array'       => '',      // 3.7.0 (array) An array version of the above section path.
81
-        '_nested_depth'             => 0,       // 3.4.0 (integer) stores the level of the nesting depth. This is mostly used for debugging by checking if the field is a nested field or not.        
82
-        '_subsection_index'         => null,    // 3.7.0 Passed to the `field_definition_{...}` filter hook callbacks.
83
-        '_section_repeatable'       => false,   // @deprecated
84
-        '_is_section_repeatable'    => false,   // 3.8.0 (boolean) Whether the belonging section is repeatable or not.
79
+        '_section_path'             => '', // 3.7.0 (string) Stores the section path that indicates the structural address of the nested section. e.g. my_section|nested_one
80
+        '_section_path_array'       => '', // 3.7.0 (array) An array version of the above section path.
81
+        '_nested_depth'             => 0, // 3.4.0 (integer) stores the level of the nesting depth. This is mostly used for debugging by checking if the field is a nested field or not.        
82
+        '_subsection_index'         => null, // 3.7.0 Passed to the `field_definition_{...}` filter hook callbacks.
83
+        '_section_repeatable'       => false, // @deprecated
84
+        '_is_section_repeatable'    => false, // 3.8.0 (boolean) Whether the belonging section is repeatable or not.
85 85
                
86
-        '_field_path'               => '',      // 3.7.0 (string) Stores the field path that indicates the structural location of the field. This is relative to the belonging section.
86
+        '_field_path'               => '', // 3.7.0 (string) Stores the field path that indicates the structural location of the field. This is relative to the belonging section.
87 87
         '_field_path_array'         => array(), // 3.7.0 (array) An array version of the above field path.
88
-        '_parent_field_path'        => '',      // 3.8.0 (string)
88
+        '_parent_field_path'        => '', // 3.8.0 (string)
89 89
         '_parent_field_path_array'  => array(), // 3.8.0 (array)
90 90
         
91
-        '_is_title_embedded'        => false,   // 3.8.0 (boolean) whether the field title is in the fieldset element, not in the table th element. This becomes `true` for `section_title` fields and fields with the `placement` argument with the value of `section_title` or `field_title`.
91
+        '_is_title_embedded'        => false, // 3.8.0 (boolean) whether the field title is in the fieldset element, not in the table th element. This becomes `true` for `section_title` fields and fields with the `placement` argument with the value of `section_title` or `field_title`.
92 92
         
93 93
     );        
94 94
     
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
             array( 
166 166
                 '_fields_type'           => $this->sStructureType, // @deprecated 3.7.0 backward-compatibility
167 167
                 '_structure_type'        => $this->sStructureType,  
168
-                '_caller_object'         => $this->oCallerObject,  // 3.4.1+ Stores the caller framework factory object. 
169
-                '_subsection_index'      => $this->iSubSectionIndex,  // 3.7.0+
168
+                '_caller_object'         => $this->oCallerObject, // 3.4.1+ Stores the caller framework factory object. 
169
+                '_subsection_index'      => $this->iSubSectionIndex, // 3.7.0+
170 170
             )
171 171
             + $this->aFieldset,
172 172
             array( 
173 173
                 'capability'             => $this->sCapability,
174 174
                 'section_id'             => '_default',             
175
-                '_section_repeatable'    => $this->bIsSectionRepeatable,   // @deprecated  3.8.0   This was not used.
175
+                '_section_repeatable'    => $this->bIsSectionRepeatable, // @deprecated  3.8.0   This was not used.
176 176
                 '_is_section_repeatable' => $this->bIsSectionRepeatable,
177 177
             )
178 178
             + self::$aStructure
@@ -265,12 +265,12 @@  discard block
 block discarded – undo
265 265
           
266 266
             );
267 267
 
268
-            foreach( $aNestedFieldsets as $_isIndex => &$_aNestedFieldset ) {
268
+            foreach ( $aNestedFieldsets as $_isIndex => &$_aNestedFieldset ) {
269 269
                 
270 270
                 // The inline-mixed type has a string element.
271 271
                 if ( is_scalar( $_aNestedFieldset ) ) {                    
272 272
                     $_aNestedFieldset = array( 
273
-                        'field_id'              => $aParentFieldset[ 'field_id' ] . '_' . uniqid(),
273
+                        'field_id'              => $aParentFieldset[ 'field_id' ].'_'.uniqid(),
274 274
                         'content'               => $_aNestedFieldset,
275 275
                     );                    
276 276
                 }
Please login to merge, or discard this patch.
form/_model/formatter/AdminPageFramework_Form_Model___Format_EachField.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
      * Represents the structure of the sub-field definition array.
25 25
      */
26 26
     static public $aStructure = array(
27
-        '_is_sub_field'                 => false,   // @todo change this key name as all the parsed field is technically a sub-field.
28
-        '_index'                        => 0,       // indicates the field index
27
+        '_is_sub_field'                 => false, // @todo change this key name as all the parsed field is technically a sub-field.
28
+        '_index'                        => 0, // indicates the field index
29 29
         '_is_multiple_fields'           => false,
30 30
         '_saved_value'                  => null,
31 31
         '_is_value_set_by_user'         => false,
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
         '_fields_container_id'          => '',
40 40
         '_fieldset_container_id'        => '',
41 41
         
42
-        '_field_object'                 => null,        // 3.6.0+
43
-        '_parent_field_object'          => null,        // 3.6.0+ Stores the parent field object to be accessed from the nested fields to generate id and name attribute models.
42
+        '_field_object'                 => null, // 3.6.0+
43
+        '_parent_field_object'          => null, // 3.6.0+ Stores the parent field object to be accessed from the nested fields to generate id and name attribute models.
44 44
     );
45 45
     
46 46
     /**
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
         $_aField = $this->aField + self::$aStructure;
89 89
         
90
-        $_aField[ '_is_sub_field' ]            = is_numeric( $this->isIndex ) && 0 < $this->isIndex;      // 3.5.3+
90
+        $_aField[ '_is_sub_field' ]            = is_numeric( $this->isIndex ) && 0 < $this->isIndex; // 3.5.3+
91 91
         $_aField[ '_index' ]                   = $this->isIndex;
92 92
 
93 93
         // 'input_id' - something like ({section id}_){field_id}__{index} e.g. my_section_id_my_field_id__0
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
                     'value'             => $_aField[ 'value' ],
135 135
                     'type'              => $_aField[ 'type' ], // text, password, etc.
136 136
                     'disabled'          => null,
137
-                    'data-id_model'     => $_aField[ '_input_id_model' ],    // 3.3.1+
138
-                    'data-name_model'   => $_aField[ '_input_name_model' ],  // 3.3.1+
137
+                    'data-id_model'     => $_aField[ '_input_id_model' ], // 3.3.1+
138
+                    'data-name_model'   => $_aField[ '_input_name_model' ], // 3.3.1+
139 139
                 )
140 140
             ),
141 141
             // this allows sub-fields with different field types to set the default key-values for the sub-field.
Please login to merge, or discard this patch.
_model/formatter/AdminPageFramework_Form_Model___Format_FieldsetOutput.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -33,23 +33,23 @@  discard block
 block discarded – undo
33 33
      * @internal
34 34
      */ 
35 35
     static public $aStructure = array(       
36
-        '_section_index'            => null,    // 3.0.0+ - internally set to indicate the section index for repeatable sections.        
36
+        '_section_index'            => null, // 3.0.0+ - internally set to indicate the section index for repeatable sections.        
37 37
         
38 38
         'tag_id'                    => null,
39
-        '_tag_id_model'             => '',      // 3.6.0+   
39
+        '_tag_id_model'             => '', // 3.6.0+   
40 40
         
41
-        '_field_name'               => '',      // 3.6.0+   
42
-        '_field_name_model'         => '',      // 3.6.0+           
41
+        '_field_name'               => '', // 3.6.0+   
42
+        '_field_name_model'         => '', // 3.6.0+           
43 43
         
44
-        '_field_name_flat'          => '',      // 3.6.0+
45
-        '_field_name_flat_model'    => '',      // 3.6.0+   
44
+        '_field_name_flat'          => '', // 3.6.0+
45
+        '_field_name_flat_model'    => '', // 3.6.0+   
46 46
                 
47
-        '_field_address'            => '',      // 3.6.0+
48
-        '_field_address_model'      => '',      // 3.6.0+
47
+        '_field_address'            => '', // 3.6.0+
48
+        '_field_address_model'      => '', // 3.6.0+
49 49
                
50
-        '_parent_field_object'      => null,    // 3.6.0+   Assigned when a field creates a nested field.
50
+        '_parent_field_object'      => null, // 3.6.0+   Assigned when a field creates a nested field.
51 51
         
52
-        '_parent_tag_id'            => null,    // 3.8.0+   Set outside the class.
52
+        '_parent_tag_id'            => null, // 3.8.0+   Set outside the class.
53 53
         
54 54
     );        
55 55
     
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $_aFieldset = $this->aFieldset + self::$aStructure;
93 93
 
94 94
         // The section index must be set before generating a field tag id as it uses a section index.
95
-        $_aFieldset[ '_section_index' ]   = $this->iSectionIndex;
95
+        $_aFieldset[ '_section_index' ] = $this->iSectionIndex;
96 96
         $_oFieldTagIDGenerator = new AdminPageFramework_Form_View___Generate_FieldTagID( 
97 97
             $_aFieldset,
98 98
             $_aFieldset[ '_caller_object' ]->aCallbacks[ 'hfTagID' ]
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         
127 127
         // 3.8.0+ Format nested fieldsets.
128 128
         if ( $this->hasFieldDefinitionsInContent( $_aFieldset ) ) {
129
-            foreach( $_aFieldset[ 'content' ] as &$_aNestedFieldset ) {
129
+            foreach ( $_aFieldset[ 'content' ] as &$_aNestedFieldset ) {
130 130
                 // The inline-mixed type has a string element.
131 131
                 if ( is_scalar( $_aNestedFieldset ) ) {
132 132
                     continue;
Please login to merge, or discard this patch.
factory/_common/utility/admin_notice/AdminPageFramework_AdminNotice.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
     public $sNotice     = '';    
47 47
     public $aAttributes = array();
48 48
     public $aCallbacks  = array(
49
-        'should_show'   => null,    // determines whether the admin notice should be displayed.
49
+        'should_show'   => null, // determines whether the admin notice should be displayed.
50 50
     );
51 51
     /**#@-*/     
52 52
      
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
      * </ul>
63 63
      * @since       3.5.0
64 64
      */
65
-    public function __construct( $sNotice, array $aAttributes=array( 'class' => 'error' ), array $aCallbacks=array() ) {
65
+    public function __construct( $sNotice, array $aAttributes = array( 'class' => 'error' ), array $aCallbacks = array() ) {
66 66
 
67 67
         $this->aAttributes            = $aAttributes + array(
68 68
             'class' => 'error', // 'updated' etc.
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
         $this->aAttributes[ 'class' ] = $this->getClassAttribute(
71 71
             $this->aAttributes[ 'class' ],
72 72
             'admin-page-framework-settings-notice-message',
73
-            'admin-page-framework-settings-notice-container',   // Moved from `AdminPageFramework_Factory_View`.
73
+            'admin-page-framework-settings-notice-container', // Moved from `AdminPageFramework_Factory_View`.
74 74
             'notice',
75 75
             'is-dismissible'    // 3.5.12+
76 76
         );
77
-        $this->aCallbacks             = $aCallbacks + $this->aCallbacks;
77
+        $this->aCallbacks = $aCallbacks + $this->aCallbacks;
78 78
   
79 79
         // Load resources.
80 80
         new AdminPageFramework_AdminNotice___Script;
81 81
         
82 82
         // An empty value may be set in oreder only to laode the fade-in script.
83
-        if ( ! $sNotice ) {
83
+        if ( !$sNotice ) {
84 84
             return;
85 85
         }
86 86
         
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
          */
109 109
         public function _replyToDisplayAdminNotice() {
110 110
             
111
-            if ( ! $this->_shouldProceed() ) {
111
+            if ( !$this->_shouldProceed() ) {
112 112
                 return;
113 113
             }
114 114
             
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
                 'display: none' 
120 120
             );
121 121
             
122
-            echo "<div " . $this->getAttributes( $_aAttributes ) . ">"
122
+            echo "<div ".$this->getAttributes( $_aAttributes ).">"
123 123
                     . "<p>"
124 124
                         . self::$_aNotices[ $this->sNotice ]
125 125
                     . "</p>"
126 126
                 . "</div>"
127 127
                 // Insert the same message except it is not hidden.
128 128
                 . "<noscript>"
129
-                    . "<div " . $this->getAttributes( $this->aAttributes ) . ">"
129
+                    . "<div ".$this->getAttributes( $this->aAttributes ).">"
130 130
                         . "<p>" 
131 131
                             . self::$_aNotices[ $this->sNotice ]
132 132
                         . "</p>"
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
              */
145 145
             private function _shouldProceed() {
146 146
                 
147
-                if ( ! is_callable( $this->aCallbacks[ 'should_show' ] ) ) {
147
+                if ( !is_callable( $this->aCallbacks[ 'should_show' ] ) ) {
148 148
                     return true;
149 149
                 }
150 150
                 return call_user_func_array(
Please login to merge, or discard this patch.