Completed
Push — master ( 783a21...0b389d )
by Jamie
04:37
created
classes/models/FrmEntryFormat.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -126,19 +126,19 @@
 block discarded – undo
126 126
 	}
127 127
 
128 128
 	/**
129
-	* Flatten multi-dimensional array for multi-file upload fields
130
-	* @since 2.0.9
131
-	*/
129
+	 * Flatten multi-dimensional array for multi-file upload fields
130
+	 * @since 2.0.9
131
+	 */
132 132
 	public static function flatten_multi_file_upload( $field, &$val ) {
133 133
 		if ( $field->type == 'file' && FrmField::is_option_true( $field, 'multiple' ) ) {
134 134
 			$val = FrmAppHelper::array_flatten( $val );
135 135
 		}
136 136
 	}
137 137
 
138
-    /**
139
-     * Replace returns with HTML line breaks for display
140
-     * @since 2.0.9
141
-     */
138
+	/**
139
+	 * Replace returns with HTML line breaks for display
140
+	 * @since 2.0.9
141
+	 */
142 142
 	public static function textarea_display_value( $type, $plain_text, &$value ) {
143 143
 		if ( $type == 'textarea' && ! $plain_text ) {
144 144
 			$value = str_replace( array( "\r\n", "\r", "\n" ), ' <br/>', $value );
Please login to merge, or discard this patch.
classes/views/frm-entries/_sidebar-shared-pub.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 if ( ! isset( $entry) ) {
3
-    $entry = $record;
3
+	$entry = $record;
4 4
 } ?>
5 5
 
6 6
 <div class="misc-pub-section curtime misc-pub-curtime">
7 7
     <span id="timestamp">
8 8
     <?php
9
-    $date_format = __( 'M j, Y @ G:i' );
9
+	$date_format = __( 'M j, Y @ G:i' );
10 10
 	printf( __( 'Published on: <b>%1$s</b>' ), FrmAppHelper::get_localized_date( $date_format, $entry->created_at ) ); ?>
11 11
     </span>
12 12
 </div>
Please login to merge, or discard this patch.
classes/views/frm-entries/form.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
     </div>
6 6
 </div>
7 7
 <?php
8
-    return;
8
+	return;
9 9
 }
10 10
 
11 11
 global $frm_vars;
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		} else {
39 39
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
40 40
 		}
41
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
41
+		do_action('frm_get_field_scripts', $field, $form, $form->id);
42 42
 	}
43 43
 }
44 44
 
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
 
64 64
 // close open collapsible toggle div
65 65
 if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
66
-    echo "</div>\n";
67
-    unset($frm_vars['collapse_div']);
66
+	echo "</div>\n";
67
+	unset($frm_vars['collapse_div']);
68 68
 }
69 69
 
70 70
 echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
77 77
 }
78 78
 
79 79
 if ( FrmForm::show_submit( $form ) ) {
80
-    unset($values['fields']);
81
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
80
+	unset($values['fields']);
81
+	FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
82 82
 }
83 83
 ?>
84 84
 </fieldset>
Please login to merge, or discard this patch.
classes/views/frm-entries/show.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -15,43 +15,43 @@
 block discarded – undo
15 15
                     <div class="inside">
16 16
                         <table class="form-table"><tbody>
17 17
                         <?php
18
-                        $first_h3 = 'frm_first_h3';
19
-                        foreach ( $fields as $field ) {
18
+						$first_h3 = 'frm_first_h3';
19
+						foreach ( $fields as $field ) {
20 20
 							if ( in_array( $field->type, array( 'captcha', 'html', 'end_divider', 'form' ) ) ) {
21
-                                continue;
22
-                            }
21
+								continue;
22
+							}
23 23
 
24
-                            if ( in_array($field->type, array( 'break', 'divider' ) ) ) {
25
-                            ?>
24
+							if ( in_array($field->type, array( 'break', 'divider' ) ) ) {
25
+							?>
26 26
                         </tbody></table>
27 27
                         <br/><h3 class="<?php echo esc_attr( $first_h3 ) ?>"><?php echo esc_html( $field->name ) ?></h3>
28 28
                         <table class="form-table"><tbody>
29 29
                         <?php
30
-                                $first_h3 = '';
31
-                            } else {
32
-                        ?>
30
+								$first_h3 = '';
31
+							} else {
32
+						?>
33 33
                         <tr>
34 34
                             <th scope="row"><?php echo esc_html( $field->name ) ?>:</th>
35 35
                             <td>
36 36
                             <?php
37 37
 							$embedded_field_id = ( $entry->form_id != $field->form_id ) ? 'form' . $field->form_id : 0;
38
-                            $atts = array(
39
-                                'type' => $field->type, 'post_id' => $entry->post_id,
40
-                                'show_filename' => true, 'show_icon' => true, 'entry_id' => $entry->id,
41
-                                'embedded_field_id' => $embedded_field_id,
42
-                            );
43
-                            echo $display_value = FrmEntriesHelper::prepare_display_value($entry, $field, $atts);
38
+							$atts = array(
39
+								'type' => $field->type, 'post_id' => $entry->post_id,
40
+								'show_filename' => true, 'show_icon' => true, 'entry_id' => $entry->id,
41
+								'embedded_field_id' => $embedded_field_id,
42
+							);
43
+							echo $display_value = FrmEntriesHelper::prepare_display_value($entry, $field, $atts);
44 44
 
45
-                            if ( is_email($display_value) && ! in_array($display_value, $to_emails) ) {
46
-                                $to_emails[] = $display_value;
47
-                            }
48
-                            ?>
45
+							if ( is_email($display_value) && ! in_array($display_value, $to_emails) ) {
46
+								$to_emails[] = $display_value;
47
+							}
48
+							?>
49 49
                             </td>
50 50
                         </tr>
51 51
                         <?php }
52
-                        }
52
+						}
53 53
 
54
-                        ?>
54
+						?>
55 55
 
56 56
                         <?php if ( $entry->parent_item_id ) { ?>
57 57
                         <tr><th><?php _e( 'Parent Entry ID', 'formidable' ) ?>:</th>
Please login to merge, or discard this patch.
classes/views/frm-entries/sidebar-shared.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -66,18 +66,18 @@
 block discarded – undo
66 66
         <?php } ?>
67 67
 
68 68
         <?php
69
-        foreach ( (array) $data as $k => $d ) {
69
+		foreach ( (array) $data as $k => $d ) {
70 70
 			if ( in_array( $k, array( 'browser', 'referrer' ) ) ) {
71
-                continue;
72
-            }
73
-        ?>
71
+				continue;
72
+			}
73
+		?>
74 74
         <div class="misc-pub-section">
75 75
 			<b><?php echo sanitize_text_field( ucfirst( str_replace( '-', ' ', $k ) ) ); ?></b>:
76 76
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
77 77
         </div>
78 78
         <?php
79
-            unset($k, $d);
80
-        }
81
-        ?>
79
+			unset($k, $d);
80
+		}
81
+		?>
82 82
     </div>
83 83
 </div>
Please login to merge, or discard this patch.
classes/views/frm-form-actions/default_actions.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 class FrmDefPostAction extends FrmFormAction {
4 4
 	public function __construct() {
5 5
 		$action_ops = FrmFormAction::default_action_opts();
6
-	    $action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
6
+		$action_ops['classes'] = 'ab-icon frm_dashicon_font dashicons-before';
7 7
 
8 8
 		parent::__construct( 'wppost', __( 'Create Post', 'formidable' ), $action_ops );
9 9
 	}
Please login to merge, or discard this patch.
classes/views/frm-forms/_publish_box.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
             <?php } ?>
13 13
             <div id="preview-action">
14 14
                 <?php
15
-                if ( ! isset($hide_preview) || ! $hide_preview ) {
15
+				if ( ! isset($hide_preview) || ! $hide_preview ) {
16 16
 
17
-                    if ( isset($values['form_key']) ) {
18
-                        $frm_settings = FrmAppHelper::get_settings();
19
-                        if ( empty($frm_settings->preview_page_id) ) { ?>
17
+					if ( isset($values['form_key']) ) {
18
+						$frm_settings = FrmAppHelper::get_settings();
19
+						if ( empty($frm_settings->preview_page_id) ) { ?>
20 20
                     <a href="<?php echo esc_url( FrmFormsHelper::get_direct_link($values['form_key']) ); ?>" class="preview button" target="wp-frm-preview-<?php echo esc_attr( $id ) ?>"><?php _e( 'Preview', 'formidable' ) ?></a>
21 21
                 <?php
22
-                        } else {
23
-                ?>
22
+						} else {
23
+				?>
24 24
                     <div class="preview dropdown">
25 25
                         <a href="#" id="frm-previewDrop" class="frm-dropdown-toggle button" data-toggle="dropdown"><?php _e( 'Preview', 'formidable' ) ?> <b class="caret"></b></a>
26 26
 
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
                     	</ul>
31 31
                     </div>
32 32
                 <?php   }
33
-                    }
34
-                } ?>
33
+					}
34
+				} ?>
35 35
             </div>
36 36
             <?php if ( 'draft' == $values['status'] ) { ?>
37 37
             <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/frm-forms/add_field_links.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -62,16 +62,16 @@  discard block
 block discarded – undo
62 62
                 	</ul>
63 63
                 </li>
64 64
 <?php
65
-                } else {
66
-                    $field_label = $field_type;
67
-                    ?>
65
+				} else {
66
+					$field_label = $field_type;
67
+					?>
68 68
                     <li class="frmbutton button <?php echo esc_attr( $col_class .' '. $no_allow_class .' frm_t'. $field_key ) ?>" id="<?php echo esc_attr( $field_key ) ?>"><?php echo apply_filters( 'frmpro_field_links', $field_label, $id, $field_key ) ?></li>
69 69
                     <?php
70
-                }
70
+				}
71 71
 
72
-                $col_class = empty($col_class) ? 'frm_col_one' : '';
73
-                unset($field_key, $field_type, $field_label);
74
-            } ?>
72
+				$col_class = empty($col_class) ? 'frm_col_one' : '';
73
+				unset($field_key, $field_type, $field_label);
74
+			} ?>
75 75
             </ul>
76 76
             <div class="clear"></div>
77 77
         </div>
@@ -81,33 +81,33 @@  discard block
 block discarded – undo
81 81
 			<p class="howto"><?php _e( 'Add classes in the "CSS layout classes" field option', 'formidable' ) ?></p>
82 82
     	    <ul class="frm_code_list">
83 83
     	    <?php $classes = array(
84
-                    'frm_first'     => array(
85
-                        'label' => __( 'First', 'formidable' ),
86
-                        'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
87
-                    ),
88
-                    'frm_half'      => __( '1/2', 'formidable' ),
89
-                    'frm_third'     => __( '1/3', 'formidable' ),
90
-                    'frm_two_thirds' => __( '2/3', 'formidable' ),
91
-    	            'frm_fourth'    => __( '1/4', 'formidable' ),
84
+					'frm_first'     => array(
85
+						'label' => __( 'First', 'formidable' ),
86
+						'title' => __( 'Add this to the first field in each row along with a width. ie frm_first frm_third', 'formidable' ),
87
+					),
88
+					'frm_half'      => __( '1/2', 'formidable' ),
89
+					'frm_third'     => __( '1/3', 'formidable' ),
90
+					'frm_two_thirds' => __( '2/3', 'formidable' ),
91
+					'frm_fourth'    => __( '1/4', 'formidable' ),
92 92
 					'frm_three_fourths' => __( '3/4', 'formidable' ),
93
-                    'frm_fifth'     => __( '1/5', 'formidable' ),
93
+					'frm_fifth'     => __( '1/5', 'formidable' ),
94 94
 					'frm_two_fifths' => __( '2/5', 'formidable' ),
95
-                    'frm_sixth'     => __( '1/6', 'formidable' ),
96
-                    'frm_seventh'   => __( '1/7', 'formidable' ),
95
+					'frm_sixth'     => __( '1/6', 'formidable' ),
96
+					'frm_seventh'   => __( '1/7', 'formidable' ),
97 97
 					'frm_eighth'    => __( '1/8', 'formidable' ),
98 98
 					'frm_alignright' => __( 'Right', 'formidable' ),
99
-    	            'frm_inline'    => array(
100
-                        'label' => __( 'Inline', 'formidable' ),
99
+					'frm_inline'    => array(
100
+						'label' => __( 'Inline', 'formidable' ),
101 101
 						'title' => __( 'Align fields in a row without a specific width.', 'formidable' ),
102
-                    ),
102
+					),
103 103
 
104
-    	            'frm_full' => array(
105
-                        'label' => __( '100% width', 'formidable' ),
104
+					'frm_full' => array(
105
+						'label' => __( '100% width', 'formidable' ),
106 106
 						'title' => __( 'Force the field to fill the full space with 100% width.', 'formidable' ),
107
-                    ),
108
-    	            'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
109
-    	            'frm_grid' => __( 'Even Grid Row', 'formidable' ),
110
-    	            'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
107
+					),
108
+					'frm_grid_first' => __( 'First Grid Row', 'formidable' ),
109
+					'frm_grid' => __( 'Even Grid Row', 'formidable' ),
110
+					'frm_grid_odd' => __( 'Odd Grid Row', 'formidable' ),
111 111
 					'frm_two_col' => array( 'label' => __( '2 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into two columns.', 'formidable' ) ),
112 112
 					'frm_three_col' => array( 'label' => __( '3 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into three columns.', 'formidable' ) ),
113 113
 					'frm_four_col' => array( 'label' => __( '4 Col Options', 'formidable' ), 'title' => __( 'Put your radio button or checkbox options into four columns.', 'formidable' ) ),
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 					'frm_scroll_box' => array( 'label' => __( 'Scroll Box', 'formidable' ), 'title' => __( 'If you have many checkbox or radio button options, you may add this class to allow your user to easily scroll through the options.', 'formidable' ) ),
116 116
 					'frm_text_block' => array( 'label' => __( 'Align Option Text', 'formidable' ), 'title' => __( 'If you have a large amount of text in a checkbox or radio button field, use this class to align all the text in a block.', 'formidable' ) ),
117 117
 					'frm_capitalize' => array( 'label' => __( 'Capitalize', 'formidable' ), 'title' => __( 'Automatically capitalize the first letter in each word.', 'formidable' ) ),
118
-    	        );
118
+				);
119 119
 
120 120
 $classes = apply_filters( 'frm_layout_classes', $classes );
121 121
 $col = 'one';
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 	} ?>>
133 133
 <?php
134 134
 	if ( empty( $d ) ) {
135
-    	echo $c;
135
+		echo $c;
136 136
 	} else if ( ! is_array( $d ) ) {
137
-    	echo $d;
137
+		echo $d;
138 138
 	} else if ( isset( $d['label'] ) ) {
139
-    	echo $d['label'];
139
+		echo $d['label'];
140 140
 	}
141 141
 ?>
142 142
                     </a>
Please login to merge, or discard this patch.
classes/views/frm-forms/edit.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 		FrmAppController::get_form_nav( $id, true, 'hide' );
21 21
 	}
22 22
 
23
-    ?>
23
+	?>
24 24
     <div class="frm_form_builder<?php echo FrmFormsHelper::get_form_style_class($form); ?>">
25 25
 
26 26
         <p class="frm_hidden frm-no-margin">
Please login to merge, or discard this patch.