Inspection of "Fix some HTML errors in form Settings" - Strategy11/formidable-forms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 21ab07...7286a7 )

by Jamie

created 2016-11-17 20:18 UTC

Status

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -1,22 +1,22 @@
 block discarded – undo
 <?php
 if ( ! is_array($field['options']) ) {
-    return;
+	return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+	$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+	$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
 
-    // Get string for Other text field, if needed
+	// Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+	$checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
-    } else {
+	} else {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
-    }
+	}
 
-    unset($checked, $other_val);
+	unset($checked, $other_val);
 }

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 <?php
-if ( ! is_array($field['options']) ) {
+if ( ! is_array( $field['options'] ) ) {
     return;
 }
 
 foreach ( $field['options'] as $opt_key => $opt ) {
-    $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-    $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+    $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+    $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
 
     // Get string for Other text field, if needed
 	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
 
-    $checked = ( $other_val || isset($field['value']) &&  (( ! is_array($field['value']) && $field['value'] == $field_val ) || (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
+    $checked = ( $other_val || isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) || ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
 
 	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
@@ -18,5 +18,5 @@  discard block
 block discarded – undo
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
     }
 
-    unset($checked, $other_val);
+    unset( $checked, $other_val );
 }

Please login to merge, or discard this patch.

classes/views/frm-fields/import_choices.php 2 patches

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -4,18 +4,18 @@  discard block
 block discarded – undo
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
     <title><?php bloginfo('name'); ?></title>
     <?php
-    wp_admin_css( 'global' );
-    wp_admin_css();
-    wp_admin_css( 'colors' );
-    wp_admin_css( 'ie' );
+	wp_admin_css( 'global' );
+	wp_admin_css();
+	wp_admin_css( 'colors' );
+	wp_admin_css( 'ie' );
 	if ( is_multisite() ) {
-    	wp_admin_css( 'ms' );
+		wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+	do_action('admin_print_styles');
+	do_action('admin_print_scripts');
 
-    ?>
+	?>
 </head>
 <body class="wp-admin no-js wp-core-ui frm_field_opts_popup <?php echo esc_attr( apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class ); ?>">
 <div class="frm_med_padding">
@@ -29,21 +29,21 @@  discard block
 block discarded – undo
 <?php
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
-    //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
-        continue;
-    }
+	//If it is an other option, don't include it
+	if ( $fkey && strpos( $fkey, 'other') !== false ) {
+		continue;
+	}
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+		$label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
+		$value = (isset($fopt['value'])) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
-            echo "$label|$value\n";
+			echo "$label|$value\n";
 		} else {
 			echo $label . "\n";
-        }
+		}
 	} else {
 		echo $fopt . "\n";
-    }
+	}
 } ?>
 </textarea>
 

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="<?php bloginfo( 'charset' ); ?>" />
-    <title><?php bloginfo('name'); ?></title>
+    <title><?php bloginfo( 'name' ); ?></title>
     <?php
     wp_admin_css( 'global' );
     wp_admin_css();
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
     	wp_admin_css( 'ms' );
 	}
 
-    do_action('admin_print_styles');
-    do_action('admin_print_scripts');
+    do_action( 'admin_print_styles' );
+    do_action( 'admin_print_scripts' );
 
     ?>
 </head>
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 <p class="howto"><?php _e( 'Edit or add field options (one per line)', 'formidable' ) ?></p>
 <ul class="frm_prepop">
 	<?php foreach ( $prepop as $label => $pop ) { ?>
-    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace("'", '&#145;', json_encode($pop)) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
+    <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace( "'", '&#145;', json_encode( $pop ) ) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
     <?php } ?>
 </ul>
 <textarea name="frm_bulk_options" id="frm_bulk_options">
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
 $other_array = array();
 foreach ( $field->options as $fkey => $fopt ) {
     //If it is an other option, don't include it
-    if ( $fkey && strpos( $fkey, 'other') !== false ) {
+    if ( $fkey && strpos( $fkey, 'other' ) !== false ) {
         continue;
     }
 	if ( is_array( $fopt ) ) {
-        $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
-        $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
+        $label = ( isset( $fopt['label'] ) ) ? $fopt['label'] : reset( $fopt );
+        $value = ( isset( $fopt['value'] ) ) ? $fopt['value'] : $label;
 		if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
             echo "$label|$value\n";
 		} else {

Please login to merge, or discard this patch.

classes/views/shared/mb_adv_info.php 2 patches

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch

@@ -42,51 +42,51 @@  discard block
 block discarded – undo
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
+					if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
 						$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
-                        if ( ! in_array( $linked_form, $linked_forms ) ) {
-                            $linked_forms[] = $linked_form;
+						if ( ! in_array( $linked_form, $linked_forms ) ) {
+							$linked_forms[] = $linked_form;
 							$linked_fields = FrmField::getAll( array( 'fi.type not' => FrmField::no_save_fields(), 'fi.form_id' => $linked_form ) );
-                            $ldfe = '';
+							$ldfe = '';
 							if ( $linked_fields ) {
 								foreach ( $linked_fields as $linked_field ) {
-                                    FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
-
-                                    $ldfe = $linked_field->id;
-                                    unset($linked_field);
-                                }
-                            }
-                        }
-                    }
-                    $dfe = $f->id;
-        	    }
-                unset($f);
-                }
-            } ?>
+									FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
+
+									$ldfe = $linked_field->id;
+									unset($linked_field);
+								}
+							}
+						}
+					}
+					$dfe = $f->id;
+				}
+				unset($f);
+				}
+			} ?>
         </ul>
 
         <?php _e( 'Helpers', 'formidable' ) ?>:
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $entry_shortcodes as $skey => $sname ) {
 			if ( empty( $skey ) ) {
-                 $col = 'one';
-                 echo '<li class="clear frm_block"></li>';
-                 continue;
-            }
-        ?>
+				 $col = 'one';
+				 echo '<li class="clear frm_block"></li>';
+				 continue;
+			}
+		?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
             <a href="javascript:void(0)" class="frmbutton button <?php
 			echo ( in_array( $skey, array( 'siteurl', 'sitename', 'entry_count' ) ) ) ? 'show_before_content show_after_content' : '';
-            echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
-            ?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
+			echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
+			?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
         </li>
         <?php
-            $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
-        }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 
@@ -99,11 +99,11 @@  discard block
 block discarded – undo
 	    <ul class="alignleft"><li><?php _e( 'Fields from your form', 'formidable' ) ?>:</li></ul>
 	    <ul class="frm_code_list frm_full_width">
 		    <?php if ( ! empty( $fields ) ) {
-		        foreach ( $fields as $f ) {
+				foreach ( $fields as $f ) {
 					if ( FrmField::is_no_save_field( $f->type ) || ( $f->type == 'data' && ( ! isset( $f->field_options['data_type'] ) || $f->field_options['data_type'] == 'data' || $f->field_options['data_type'] == '' ) ) ) {
-                        continue;
-                }
-            ?>
+						continue;
+				}
+			?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
                 	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
@@ -111,30 +111,30 @@  discard block
 block discarded – undo
                 </li>
                 <?php
 
-                    if ( $f->type == 'user_id' ) {
-                        $uid = $f;
-                    } else if ( $f->type == 'file' ) {
-                        $file = $f;
-                    }
-        		    unset($f);
-		        }
-		    } ?>
+					if ( $f->type == 'user_id' ) {
+						$uid = $f;
+					} else if ( $f->type == 'file' ) {
+						$file = $f;
+					}
+					unset($f);
+				}
+			} ?>
         </ul>
 
         <p class="howto"><?php _e( 'Click a button below to insert sample logic into your view', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $cond_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
-	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ( $col == 'one' ) ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         </ul>
 	</div>
 	<?php } ?>
@@ -142,19 +142,19 @@  discard block
 block discarded – undo
 	<div id="frm-adv-info-tab" class="tabs-panel">
 		<ul class="frm_code_list">
         <?php
-        $col = 'one';
+		$col = 'one';
 		foreach ( $adv_shortcodes as $skey => $sname ) {
-	    ?>
+		?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 			<a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="x <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>>
 				<?php echo is_array( $sname ) ? $sname['label'] : $sname; ?>
 			</a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
-	    }
-        ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($skey, $sname);
+		}
+		?>
         <?php if ( isset($file) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
 	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
-            $col = 'one'; ?>
+		if ( isset($uid) && ! empty($user_fields) ) {
+			$col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
         <?php foreach ( $user_fields as $uk => $uf ) { ?>
@@ -180,14 +180,14 @@  discard block
 block discarded – undo
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
-        }
-        unset($uid); ?>
+			$col = ($col == 'one') ? 'two' : 'one';
+			unset($uf, $uk);
+		}
+		unset($uid); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+		if ( isset($repeat_field) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -196,9 +196,9 @@  discard block
 block discarded – undo
         	    </li>
             </ul>
         <?php
-        }
+		}
 
-        if ( isset($dfe) ) { ?>
+		if ( isset($dfe) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
 	</div>
 
     <?php
-    if ( $settings_tab ) {
+	if ( $settings_tab ) {
 		include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/mb_html_tab.php' );
-    }
-    ?>
+	}
+	?>
 </div>

Please login to merge, or discard this patch.

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 
 				if ( $f->type == 'data' ) {
 					//get all fields from linked form
-                    if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
+                    if ( isset( $f->field_options['form_select'] ) && is_numeric( $f->field_options['form_select'] ) ) {
 						$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
                         if ( ! in_array( $linked_form, $linked_forms ) ) {
                             $linked_forms[] = $linked_form;
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
                                     FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
 
                                     $ldfe = $linked_field->id;
-                                    unset($linked_field);
+                                    unset( $linked_field );
                                 }
                             }
                         }
                     }
                     $dfe = $f->id;
         	    }
-                unset($f);
+                unset( $f );
                 }
             } ?>
         </ul>
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
         </li>
         <?php
             $col = ( $col == 'one' ) ? 'two' : 'one';
-            unset($skey, $sname);
+            unset( $skey, $sname );
         }
         ?>
         </ul>
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
             ?>
                 <li>
                     <a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
-                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
-                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr($f->id) ?>"><?php echo FrmAppHelper::truncate($f->name, 60) ?></a>
+                	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate( $f->field_key, 10 ) ?>]</a>
+                	<a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr( $f->id ) ?>"><?php echo FrmAppHelper::truncate( $f->name, 60 ) ?></a>
                 </li>
                 <?php
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
                     } else if ( $f->type == 'file' ) {
                         $file = $f;
                     }
-        		    unset($f);
+        		    unset( $f );
 		        }
 		    } ?>
         </ul>
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
 		foreach ( $cond_shortcodes as $skey => $sname ) {
 	    ?>
 	    <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr( $skey ) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
 	    </li>
 	    <?php
 	        $col = ( $col == 'one' ) ? 'two' : 'one';
-	        unset($skey, $sname);
+	        unset( $skey, $sname );
 	    }
         ?>
         </ul>
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
 			</a>
 	    </li>
 	    <?php
-	        $col = ($col == 'one') ? 'two' : 'one';
-	        unset($skey, $sname);
+	        $col = ( $col == 'one' ) ? 'two' : 'one';
+	        unset( $skey, $sname );
 	    }
         ?>
-        <?php if ( isset($file) ) { ?>
+        <?php if ( isset( $file ) ) { ?>
         <li class="frm_col_<?php echo esc_attr( $col ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
 	    </li>
 	    <li class="frm_col_<?php echo esc_attr( $col = ( $col == 'one' ? 'two' : 'one' ) ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
 	    </li>
 	    <li class="frm_col_<?php echo esc_attr( $col = ( $col == 'one' ? 'two' : 'one' ) ) ?>">
-	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
+	        <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
 	    </li>
 	    <?php } ?>
         </ul>
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
         <div class="clear"></div>
         <?php
 
-        if ( isset($uid) && ! empty($user_fields) ) {
+        if ( isset( $uid ) && ! empty( $user_fields ) ) {
             $col = 'one'; ?>
         <p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
         <ul class="frm_code_list">
@@ -180,14 +180,14 @@  discard block
 block discarded – undo
 				<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
     	    </li>
         <?php
-            $col = ($col == 'one') ? 'two' : 'one';
-            unset($uf, $uk);
+            $col = ( $col == 'one' ) ? 'two' : 'one';
+            unset( $uf, $uk );
         }
-        unset($uid); ?>
+        unset( $uid ); ?>
         </ul>
         <?php }
 
-        if ( isset($repeat_field) ) { ?>
+        if ( isset( $repeat_field ) ) { ?>
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
             <ul class="frm_code_list">
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
         <?php
         }
 
-        if ( isset($dfe) ) { ?>
+        if ( isset( $dfe ) ) { ?>
 
         <div class="clear"></div>
         <p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
         	    <li class="frm_col_one">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="created-at"' ) ?>"><?php _e( 'Creation Date', 'formidable' ) ?></a>
         	    </li>
-        	    <?php if ( isset($ldfe) ) { ?>
+        	    <?php if ( isset( $ldfe ) ) { ?>
         	    <li class="frm_col_two">
 					<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="' . $ldfe . '"' ) ?>"><?php _e( 'Field From Entry', 'formidable' ) ?></a>
         	    </li>

Please login to merge, or discard this patch.

classes/views/frm-entries/no_entries.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@
 block discarded – undo
 <div class="frmcenter frm_no_entries_form">
 <?php
-if ( $form && isset($form->options['no_save']) && $form->options['no_save'] ) { ?>
+if ( $form && isset( $form->options['no_save'] ) && $form->options['no_save'] ) { ?>
 <h3><?php _e( 'This form is not set to save any entries.', 'formidable' ) ?></h3>
 <p>If you would like entries in this form to be saved, go to the <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable' ) . '&frm_action=settings&id=' . $form->id ) ?>">form Settings</a> page and uncheck the "Do not store any entries submitted from this form" box.</p>
 <?php
 } else if ( $form ) {
 ?>
-<div class="frm_no_entries_header"><?php printf(__( 'No Entries for form: %s', 'formidable' ), $form->name); ?></div>
-<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url('admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
+<div class="frm_no_entries_header"><?php printf( __( 'No Entries for form: %s', 'formidable' ), $form->name ); ?></div>
+<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
 <?php
 } else {
 ?>

Please login to merge, or discard this patch.

classes/views/frm-entries/new.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($values); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $values ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 <?php
 if ( ! isset( $include_form_tag ) || $include_form_tag ) {
 ?>
-<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
+<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
 <?php
 } else { ?>
-<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" >
+<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" >
 <?php
 }
 

Please login to merge, or discard this patch.

classes/views/frm-entries/list.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <div id="form_entries_page" class="wrap">
     <div class="frmicon icon32"><br/></div>
 	<h1><?php _e( 'Entries', 'formidable' ); ?>
-        <?php do_action('frm_entry_inside_h2', $form); ?>
+        <?php do_action( 'frm_entry_inside_h2', $form ); ?>
 	</h1>
 
 	<?php require( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
         <div id="poststuff">
             <div id="post-body" class="metabox-holder columns-2">
             <div id="post-body-content">
-                <?php FrmAppController::get_form_nav($form, true, 'hide'); ?>
+                <?php FrmAppController::get_form_nav( $form, true, 'hide' ); ?>
             </div>
             <div id="postbox-container-1" class="postbox-container">
                 <input type="hidden" name="page" value="formidable-entries" />

Please login to merge, or discard this patch.

classes/views/frm-entries/sidebar-show.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
         <div class="submitbox">
         <div id="minor-publishing" class="frm_remove_border">
             <div class="misc-pub-section">
-                <?php do_action('frm_show_entry_publish_box', $entry); ?>
+                <?php do_action( 'frm_show_entry_publish_box', $entry ); ?>
                 <div class="clear"></div>
             </div>
             <div id="misc-publishing-actions">
@@ -17,12 +17,12 @@  discard block
 block discarded – undo
             </div>
         </div>
     	<div id="major-publishing-actions">
-    	    <?php if ( current_user_can('frm_delete_entries') ) { ?>
+    	    <?php if ( current_user_can( 'frm_delete_entries' ) ) { ?>
     	    <div id="delete-action">
 				<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id ) ) ?>" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that entry?', 'formidable' ) ?>');" title="<?php esc_attr_e( 'Delete' ) ?>">
 					<?php _e( 'Delete' ) ?>
 				</a>
-    	        <?php if ( ! empty($entry->post_id) ) { ?>
+    	        <?php if ( ! empty( $entry->post_id ) ) { ?>
 				<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id . '&keep_post=1' ) ) ?>" class="submitdelete deletion frm_delete_wo_post" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete this entry?', 'formidable' ) ?>);" title="<?php esc_attr_e( 'Delete entry but leave the post', 'formidable' ) ?>">
 					<?php _e( 'Delete without Post', 'formidable' ) ?>
 				</a>
@@ -30,13 +30,13 @@  discard block
 block discarded – undo
     	    </div>
     	    <?php } ?>
 
-            <?php do_action('frm_entry_major_pub', $entry); ?>
+            <?php do_action( 'frm_entry_major_pub', $entry ); ?>
             <div class="clear"></div>
         </div>
         </div>
     </div>
 </div>
-<?php do_action('frm_show_entry_sidebar', $entry);
-FrmEntriesController::entry_sidebar($entry);
+<?php do_action( 'frm_show_entry_sidebar', $entry );
+FrmEntriesController::entry_sidebar( $entry );
 ?>
 </div>

Please login to merge, or discard this patch.

classes/views/xml/xml.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,15 +7,15 @@
 block discarded – undo
 <?php
 foreach ( $type as $tb_type ) {
 
-    if ( ! isset( $tables[ $tb_type ] ) ) {
+	if ( ! isset( $tables[ $tb_type ] ) ) {
 		do_action( 'frm_xml_import_' . $tb_type, $args );
-        continue;
-    }
+		continue;
+	}
 
-    //no records
-    if ( ! isset( $records[ $tb_type ] ) ) {
-        continue;
-    }
+	//no records
+	if ( ! isset( $records[ $tb_type ] ) ) {
+		continue;
+	}
 
 	$item_ids = $records[ $tb_type ];
 	if ( in_array( $tb_type, array( 'styles', 'actions' ) ) ) {

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -7,17 +7,17 @@  discard block
 block discarded – undo
 <?php
 foreach ( $type as $tb_type ) {
 
-    if ( ! isset( $tables[ $tb_type ] ) ) {
+    if ( ! isset( $tables[$tb_type] ) ) {
 		do_action( 'frm_xml_import_' . $tb_type, $args );
         continue;
     }
 
     //no records
-    if ( ! isset( $records[ $tb_type ] ) ) {
+    if ( ! isset( $records[$tb_type] ) ) {
         continue;
     }
 
-	$item_ids = $records[ $tb_type ];
+	$item_ids = $records[$tb_type];
 	if ( in_array( $tb_type, array( 'styles', 'actions' ) ) ) {
 		include( dirname( __FILE__ ) . '/posts_xml.php' );
 	} else if ( file_exists( dirname( __FILE__ ) . '/' . $tb_type . '_xml.php' ) ) {
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 		include( FrmAppHelper::plugin_path() . '/pro/classes/views/xml/' . $tb_type . '_xml.php' );
 	}
 
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
+	unset( $item_ids, $records[$tb_type], $tb_type );
 }
 
 ?>

Please login to merge, or discard this patch.

classes/views/styles/show.php 2 patches

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -64,7 +64,7 @@
 block discarded – undo
 							<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=destroy&id=' . $style->ID ) ); ?>" id="frm_delete_style" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that style?', 'formidable' ) ?>')"><?php _e( 'Delete Style', 'formidable' ) ?></a>
 						    <?php } ?>
 						    <?php
-						    if ( $style->ID ) {
+							if ( $style->ID ) {
 								echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
 							} ?>
                             <div class="publishing-action">

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 	<form id="frm_styling_form" action="" name="frm_styling_form" method="post">
 	    <input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
 		<input type="hidden" name="frm_action" value="save" />
-        <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
+        <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
 		<?php wp_nonce_field( 'frm_style_nonce', 'frm_style' ); ?>
 		<?php FrmTipsHelper::pro_tip( 'get_styling_tip', 'p' ); ?>
 	<div id="nav-menus-frame">
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
 
 		<div class="styling_settings">
 		    <input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
-			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact('style', 'frm_style') ); ?>
+			<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact( 'style', 'frm_style' ) ); ?>
 		</div>
 
 	</div><!-- /#menu-settings-column -->
@@ -31,17 +31,17 @@  discard block
 block discarded – undo
 						<div class="major-publishing-actions">
 							<label class="menu-name-label howto open-label" for="menu-name">
 								<span><?php _e( 'Style Name', 'formidable' ) ?></span>
-								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
+								<input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
 							</label>
 
-							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr($style->menu_order) ?>" />
+							<input name="prev_menu_order" type="hidden" value="<?php echo esc_attr( $style->menu_order ) ?>" />
 							<label class="menu-name-label howto open-label default-style-box" for="menu_order">
 							<span>
 							<?php if ( $style->menu_order ) { ?>
-							    <input name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="hidden" value="1" />
-							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+							    <input name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="hidden" value="1" />
+							    <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } else { ?>
-								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
+								<input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
 							<?php } ?>
 							    <?php _e( 'Make default style', 'formidable' ) ?></span>
 							</label>

Please login to merge, or discard this patch.

		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42
43	43	if ( $f->type == 'data' ) {
44	44	//get all fields from linked form
45		- if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
	45	+ if ( isset( $f->field_options['form_select'] ) && is_numeric( $f->field_options['form_select'] ) ) {
46	46	$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
47	47	if ( ! in_array( $linked_form, $linked_forms ) ) {
48	48	$linked_forms[] = $linked_form;
		@@ -53,14 +53,14 @@ discard block
		block discarded – undo
53	53	FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
54	54
55	55	$ldfe = $linked_field->id;
56		- unset($linked_field);
	56	+ unset( $linked_field );
57	57	}
58	58	}
59	59	}
60	60	}
61	61	$dfe = $f->id;
62	62	}
63		- unset($f);
	63	+ unset( $f );
64	64	}
65	65	} ?>
66	66	</ul>
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	</li>
85	85	<?php
86	86	$col = ( $col == 'one' ) ? 'two' : 'one';
87		- unset($skey, $sname);
	87	+ unset( $skey, $sname );
88	88	}
89	89	?>
90	90	</ul>
		@@ -106,8 +106,8 @@ discard block
		block discarded – undo
106	106	?>
107	107	<li>
108	108	<a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
109		- <a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
110		- <a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr($f->id) ?>"><?php echo FrmAppHelper::truncate($f->name, 60) ?></a>
	109	+ <a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate( $f->field_key, 10 ) ?>]</a>
	110	+ <a href="javascript:void(0)" class="frm_insert_code" data-code="<?php echo esc_attr( $f->id ) ?>"><?php echo FrmAppHelper::truncate( $f->name, 60 ) ?></a>
111	111	</li>
112	112	<?php
113	113
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	} else if ( $f->type == 'file' ) {
117	117	$file = $f;
118	118	}
119		- unset($f);
	119	+ unset( $f );
120	120	}
121	121	} ?>
122	122	</ul>
		@@ -128,11 +128,11 @@ discard block
		block discarded – undo
128	128	foreach ( $cond_shortcodes as $skey => $sname ) {
129	129	?>
130	130	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
131		- <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
	131	+ <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr( $skey ) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
132	132	</li>
133	133	<?php
134	134	$col = ( $col == 'one' ) ? 'two' : 'one';
135		- unset($skey, $sname);
	135	+ unset( $skey, $sname );
136	136	}
137	137	?>
138	138	</ul>
		@@ -151,19 +151,19 @@ discard block
		block discarded – undo
151	151	</a>
152	152	</li>
153	153	<?php
154		- $col = ($col == 'one') ? 'two' : 'one';
155		- unset($skey, $sname);
	154	+ $col = ( $col == 'one' ) ? 'two' : 'one';
	155	+ unset( $skey, $sname );
156	156	}
157	157	?>
158		- <?php if ( isset($file) ) { ?>
	158	+ <?php if ( isset( $file ) ) { ?>
159	159	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
160		- <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
	160	+ <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
161	161	</li>
162	162	<li class="frm_col_<?php echo esc_attr( $col = ( $col == 'one' ? 'two' : 'one' ) ) ?>">
163		- <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
	163	+ <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show=id"><?php _e( 'Image ID', 'formidable' ) ?></a>
164	164	</li>
165	165	<li class="frm_col_<?php echo esc_attr( $col = ( $col == 'one' ? 'two' : 'one' ) ) ?>">
166		- <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
	166	+ <a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $file->id ) ?> show_filename=1"><?php _e( 'Image Name', 'formidable' ) ?></a>
167	167	</li>
168	168	<?php } ?>
169	169	</ul>
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	<div class="clear"></div>
172	172	<?php
173	173
174		- if ( isset($uid) && ! empty($user_fields) ) {
	174	+ if ( isset( $uid ) && ! empty( $user_fields ) ) {
175	175	$col = 'one'; ?>
176	176	<p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
177	177	<ul class="frm_code_list">
		@@ -180,14 +180,14 @@ discard block
		block discarded – undo
180	180	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
181	181	</li>
182	182	<?php
183		- $col = ($col == 'one') ? 'two' : 'one';
184		- unset($uf, $uk);
	183	+ $col = ( $col == 'one' ) ? 'two' : 'one';
	184	+ unset( $uf, $uk );
185	185	}
186		- unset($uid); ?>
	186	+ unset( $uid ); ?>
187	187	</ul>
188	188	<?php }
189	189
190		- if ( isset($repeat_field) ) { ?>
	190	+ if ( isset( $repeat_field ) ) { ?>
191	191	<div class="clear"></div>
192	192	<p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
193	193	<ul class="frm_code_list">
		@@ -198,7 +198,7 @@ discard block
		block discarded – undo
198	198	<?php
199	199	}
200	200
201		- if ( isset($dfe) ) { ?>
	201	+ if ( isset( $dfe ) ) { ?>
202	202
203	203	<div class="clear"></div>
204	204	<p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	<li class="frm_col_one">
207	207	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="created-at"' ) ?>"><?php _e( 'Creation Date', 'formidable' ) ?></a>
208	208	</li>
209		- <?php if ( isset($ldfe) ) { ?>
	209	+ <?php if ( isset( $ldfe ) ) { ?>
210	210	<li class="frm_col_two">
211	211	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $dfe . ' show="' . $ldfe . '"' ) ?>"><?php _e( 'Field From Entry', 'formidable' ) ?></a>
212	212	</li>

		@@ -1,22 +1,22 @@
		block discarded – undo
1	1	<?php
2	2	if ( ! is_array($field['options']) ) {
3		- return;
	3	+ return;
4	4	}
5	5
6	6	foreach ( $field['options'] as $opt_key => $opt ) {
7		- $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
8		- $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
	7	+ $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
	8	+ $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
9	9
10		- // Get string for Other text field, if needed
	10	+ // Get string for Other text field, if needed
11	11	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
12	12
13		- $checked = ( $other_val \|\| isset($field['value']) && (( ! is_array($field['value']) && $field['value'] == $field_val ) \|\| (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
	13	+ $checked = ( $other_val \|\| isset($field['value']) && (( ! is_array($field['value']) && $field['value'] == $field_val ) \|\| (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
14	14
15	15	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
16	16	include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
17		- } else {
	17	+ } else {
18	18	include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
19		- }
	19	+ }
20	20
21		- unset($checked, $other_val);
	21	+ unset($checked, $other_val);
22	22	}

		@@ -1,16 +1,16 @@ discard block
		block discarded – undo
1	1	<?php
2		-if ( ! is_array($field['options']) ) {
	2	+if ( ! is_array( $field['options'] ) ) {
3	3	return;
4	4	}
5	5
6	6	foreach ( $field['options'] as $opt_key => $opt ) {
7		- $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
8		- $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
	7	+ $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
	8	+ $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
9	9
10	10	// Get string for Other text field, if needed
11	11	$other_val = FrmFieldsHelper::get_other_val( compact( 'opt_key', 'field' ) );
12	12
13		- $checked = ( $other_val \|\| isset($field['value']) && (( ! is_array($field['value']) && $field['value'] == $field_val ) \|\| (is_array($field['value']) && in_array($field_val, $field['value']) ) ) ) ? ' checked="checked"':'';
	13	+ $checked = ( $other_val \|\| isset( $field['value'] ) && ( ( ! is_array( $field['value'] ) && $field['value'] == $field_val ) \|\| ( is_array( $field['value'] ) && in_array( $field_val, $field['value'] ) ) ) ) ? ' checked="checked"' : '';
14	14
15	15	if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
16	16	include( FrmAppHelper::plugin_path() . '/pro/classes/views/frmpro-fields/other-option.php' );
		@@ -18,5 +18,5 @@ discard block
		block discarded – undo
18	18	include( FrmAppHelper::plugin_path() . '/classes/views/frm-fields/single-option.php' );
19	19	}
20	20
21		- unset($checked, $other_val);
	21	+ unset( $checked, $other_val );
22	22	}

		@@ -4,18 +4,18 @@ discard block
		block discarded – undo
4	4	<meta charset="<?php bloginfo( 'charset' ); ?>" />
5	5	<title><?php bloginfo('name'); ?></title>
6	6	<?php
7		- wp_admin_css( 'global' );
8		- wp_admin_css();
9		- wp_admin_css( 'colors' );
10		- wp_admin_css( 'ie' );
	7	+ wp_admin_css( 'global' );
	8	+ wp_admin_css();
	9	+ wp_admin_css( 'colors' );
	10	+ wp_admin_css( 'ie' );
11	11	if ( is_multisite() ) {
12		- wp_admin_css( 'ms' );
	12	+ wp_admin_css( 'ms' );
13	13	}
14	14
15		- do_action('admin_print_styles');
16		- do_action('admin_print_scripts');
	15	+ do_action('admin_print_styles');
	16	+ do_action('admin_print_scripts');
17	17
18		- ?>
	18	+ ?>
19	19	</head>
20	20	<body class="wp-admin no-js wp-core-ui frm_field_opts_popup <?php echo esc_attr( apply_filters( 'admin_body_class', '' ) . ' ' . $admin_body_class ); ?>">
21	21	<div class="frm_med_padding">
		@@ -29,21 +29,21 @@ discard block
		block discarded – undo
29	29	<?php
30	30	$other_array = array();
31	31	foreach ( $field->options as $fkey => $fopt ) {
32		- //If it is an other option, don't include it
33		- if ( $fkey && strpos( $fkey, 'other') !== false ) {
34		- continue;
35		- }
	32	+ //If it is an other option, don't include it
	33	+ if ( $fkey && strpos( $fkey, 'other') !== false ) {
	34	+ continue;
	35	+ }
36	36	if ( is_array( $fopt ) ) {
37		- $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
38		- $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
	37	+ $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
	38	+ $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
39	39	if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
40		- echo "$label\|$value\n";
	40	+ echo "$label\|$value\n";
41	41	} else {
42	42	echo $label . "\n";
43		- }
	43	+ }
44	44	} else {
45	45	echo $fopt . "\n";
46		- }
	46	+ }
47	47	} ?>
48	48	</textarea>
49	49

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2	<html <?php language_attributes(); ?>>
3	3	<head>
4	4	<meta charset="<?php bloginfo( 'charset' ); ?>" />
5		- <title><?php bloginfo('name'); ?></title>
	5	+ <title><?php bloginfo( 'name' ); ?></title>
6	6	<?php
7	7	wp_admin_css( 'global' );
8	8	wp_admin_css();
		@@ -12,8 +12,8 @@ discard block
		block discarded – undo
12	12	wp_admin_css( 'ms' );
13	13	}
14	14
15		- do_action('admin_print_styles');
16		- do_action('admin_print_scripts');
	15	+ do_action( 'admin_print_styles' );
	16	+ do_action( 'admin_print_scripts' );
17	17
18	18	?>
19	19	</head>
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	<p class="howto"><?php _e( 'Edit or add field options (one per line)', 'formidable' ) ?></p>
23	23	<ul class="frm_prepop">
24	24	<?php foreach ( $prepop as $label => $pop ) { ?>
25		- <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace("'", '', json_encode($pop)) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
	25	+ <li><a href="javascript:void(0)" onclick='frmPrePop(<?php echo str_replace( "'", '', json_encode( $pop ) ) ?>); return false;'><?php echo esc_html( $label ) ?></a></li>
26	26	<?php } ?>
27	27	</ul>
28	28	<textarea name="frm_bulk_options" id="frm_bulk_options">
		@@ -30,12 +30,12 @@ discard block
		block discarded – undo
30	30	$other_array = array();
31	31	foreach ( $field->options as $fkey => $fopt ) {
32	32	//If it is an other option, don't include it
33		- if ( $fkey && strpos( $fkey, 'other') !== false ) {
	33	+ if ( $fkey && strpos( $fkey, 'other' ) !== false ) {
34	34	continue;
35	35	}
36	36	if ( is_array( $fopt ) ) {
37		- $label = (isset($fopt['label'])) ? $fopt['label'] : reset($fopt);
38		- $value = (isset($fopt['value'])) ? $fopt['value'] : $label;
	37	+ $label = ( isset( $fopt['label'] ) ) ? $fopt['label'] : reset( $fopt );
	38	+ $value = ( isset( $fopt['value'] ) ) ? $fopt['value'] : $label;
39	39	if ( $label != $value && FrmField::is_option_true( $field, 'separate_value' ) ) {
40	40	echo "$label\|$value\n";
41	41	} else {

		@@ -42,51 +42,51 @@ discard block
		block discarded – undo
42	42
43	43	if ( $f->type == 'data' ) {
44	44	//get all fields from linked form
45		- if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
	45	+ if ( isset($f->field_options['form_select']) && is_numeric($f->field_options['form_select']) ) {
46	46	$linked_form = FrmDb::get_var( $wpdb->prefix . 'frm_fields', array( 'id' => $f->field_options['form_select'] ), 'form_id' );
47		- if ( ! in_array( $linked_form, $linked_forms ) ) {
48		- $linked_forms[] = $linked_form;
	47	+ if ( ! in_array( $linked_form, $linked_forms ) ) {
	48	+ $linked_forms[] = $linked_form;
49	49	$linked_fields = FrmField::getAll( array( 'fi.type not' => FrmField::no_save_fields(), 'fi.form_id' => $linked_form ) );
50		- $ldfe = '';
	50	+ $ldfe = '';
51	51	if ( $linked_fields ) {
52	52	foreach ( $linked_fields as $linked_field ) {
53		- FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
54		-
55		- $ldfe = $linked_field->id;
56		- unset($linked_field);
57		- }
58		- }
59		- }
60		- }
61		- $dfe = $f->id;
62		- }
63		- unset($f);
64		- }
65		- } ?>
	53	+ FrmAppHelper::insert_opt_html( array( 'id' => $f->id . ' show=' . $linked_field->id, 'key' => $f->field_key . ' show=' . $linked_field->field_key, 'name' => $linked_field->name, 'type' => $linked_field->type ) );
	54	+
	55	+ $ldfe = $linked_field->id;
	56	+ unset($linked_field);
	57	+ }
	58	+ }
	59	+ }
	60	+ }
	61	+ $dfe = $f->id;
	62	+ }
	63	+ unset($f);
	64	+ }
	65	+ } ?>
66	66	</ul>
67	67
68	68	<?php _e( 'Helpers', 'formidable' ) ?>:
69	69	<ul class="frm_code_list">
70	70	<?php
71		- $col = 'one';
	71	+ $col = 'one';
72	72	foreach ( $entry_shortcodes as $skey => $sname ) {
73	73	if ( empty( $skey ) ) {
74		- $col = 'one';
75		- echo '<li class="clear frm_block"></li>';
76		- continue;
77		- }
78		- ?>
	74	+ $col = 'one';
	75	+ echo '<li class="clear frm_block"></li>';
	76	+ continue;
	77	+ }
	78	+ ?>
79	79	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
80	80	<a href="javascript:void(0)" class="frmbutton button <?php
81	81	echo ( in_array( $skey, array( 'siteurl', 'sitename', 'entry_count' ) ) ) ? 'show_before_content show_after_content' : '';
82		- echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
83		- ?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
	82	+ echo ( strpos( $skey, 'default-' ) === 0 ) ? 'hide_frm_not_email_subject' : '';
	83	+ ?> frm_insert_code" data-code="<?php echo esc_attr( $skey ) ?>"><?php echo esc_html( $sname ) ?></a>
84	84	</li>
85	85	<?php
86		- $col = ( $col == 'one' ) ? 'two' : 'one';
87		- unset($skey, $sname);
88		- }
89		- ?>
	86	+ $col = ( $col == 'one' ) ? 'two' : 'one';
	87	+ unset($skey, $sname);
	88	+ }
	89	+ ?>
90	90	</ul>
91	91	</div>
92	92
		@@ -99,11 +99,11 @@ discard block
		block discarded – undo
99	99	<ul class="alignleft"><li><?php _e( 'Fields from your form', 'formidable' ) ?>:</li></ul>
100	100	<ul class="frm_code_list frm_full_width">
101	101	<?php if ( ! empty( $fields ) ) {
102		- foreach ( $fields as $f ) {
	102	+ foreach ( $fields as $f ) {
103	103	if ( FrmField::is_no_save_field( $f->type ) \|\| ( $f->type == 'data' && ( ! isset( $f->field_options['data_type'] ) \|\| $f->field_options['data_type'] == 'data' \|\| $f->field_options['data_type'] == '' ) ) ) {
104		- continue;
105		- }
106		- ?>
	104	+ continue;
	105	+ }
	106	+ ?>
107	107	<li>
108	108	<a href="javascript:void(0)" class="frmids alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->id ) ?>]<?php esc_attr_e( 'Conditional text here', 'formidable' ) ?>[/if <?php echo esc_attr( $f->id ) ?>">[if <?php echo (int) $f->id ?>]</a>
109	109	<a href="javascript:void(0)" class="frmkeys alignright frm_insert_code" data-code="if <?php echo esc_attr( $f->field_key ) ?>]something[/if <?php echo esc_attr( $f->field_key ) ?>">[if <?php echo FrmAppHelper::truncate($f->field_key, 10) ?>]</a>
		@@ -111,30 +111,30 @@ discard block
		block discarded – undo
111	111	</li>
112	112	<?php
113	113
114		- if ( $f->type == 'user_id' ) {
115		- $uid = $f;
116		- } else if ( $f->type == 'file' ) {
117		- $file = $f;
118		- }
119		- unset($f);
120		- }
121		- } ?>
	114	+ if ( $f->type == 'user_id' ) {
	115	+ $uid = $f;
	116	+ } else if ( $f->type == 'file' ) {
	117	+ $file = $f;
	118	+ }
	119	+ unset($f);
	120	+ }
	121	+ } ?>
122	122	</ul>
123	123
124	124	<p class="howto"><?php _e( 'Click a button below to insert sample logic into your view', 'formidable' ) ?></p>
125	125	<ul class="frm_code_list">
126	126	<?php
127		- $col = 'one';
	127	+ $col = 'one';
128	128	foreach ( $cond_shortcodes as $skey => $sname ) {
129		- ?>
	129	+ ?>
130	130	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
131	131	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="if x <?php echo esc_attr($skey) ?>][/if x"><?php echo esc_html( $sname ) ?></a>
132	132	</li>
133	133	<?php
134		- $col = ( $col == 'one' ) ? 'two' : 'one';
135		- unset($skey, $sname);
136		- }
137		- ?>
	134	+ $col = ( $col == 'one' ) ? 'two' : 'one';
	135	+ unset($skey, $sname);
	136	+ }
	137	+ ?>
138	138	</ul>
139	139	</div>
140	140	<?php } ?>
		@@ -142,19 +142,19 @@ discard block
		block discarded – undo
142	142	<div id="frm-adv-info-tab" class="tabs-panel">
143	143	<ul class="frm_code_list">
144	144	<?php
145		- $col = 'one';
	145	+ $col = 'one';
146	146	foreach ( $adv_shortcodes as $skey => $sname ) {
147		- ?>
	147	+ ?>
148	148	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
149	149	<a href="javascript:void(0)" class="frmbutton button frm_insert_code <?php echo is_array( $sname ) ? 'frm_help' : ''; ?>" data-code="x <?php echo esc_attr( $skey ) ?>" <?php echo is_array( $sname ) ? 'title="' . esc_attr( $sname['title'] ) . '"' : ''; ?>>
150	150	<?php echo is_array( $sname ) ? $sname['label'] : $sname; ?>
151	151	</a>
152	152	</li>
153	153	<?php
154		- $col = ($col == 'one') ? 'two' : 'one';
155		- unset($skey, $sname);
156		- }
157		- ?>
	154	+ $col = ($col == 'one') ? 'two' : 'one';
	155	+ unset($skey, $sname);
	156	+ }
	157	+ ?>
158	158	<?php if ( isset($file) ) { ?>
159	159	<li class="frm_col_<?php echo esc_attr( $col ) ?>">
160	160	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr($file->id) ?> show_image=1"><?php _e( 'Show image', 'formidable' ) ?></a>
		@@ -171,8 +171,8 @@ discard block
		block discarded – undo
171	171	<div class="clear"></div>
172	172	<?php
173	173
174		- if ( isset($uid) && ! empty($user_fields) ) {
175		- $col = 'one'; ?>
	174	+ if ( isset($uid) && ! empty($user_fields) ) {
	175	+ $col = 'one'; ?>
176	176	<p class="howto"><?php _e( 'Insert user information', 'formidable' ) ?></p>
177	177	<ul class="frm_code_list">
178	178	<?php foreach ( $user_fields as $uk => $uf ) { ?>
		@@ -180,14 +180,14 @@ discard block
		block discarded – undo
180	180	<a href="javascript:void(0)" class="frmbutton button frm_insert_code" data-code="<?php echo esc_attr( $uid->id . ' show="' . $uk . '"' ) ?>"><?php echo esc_html( $uf ) ?></a>
181	181	</li>
182	182	<?php
183		- $col = ($col == 'one') ? 'two' : 'one';
184		- unset($uf, $uk);
185		- }
186		- unset($uid); ?>
	183	+ $col = ($col == 'one') ? 'two' : 'one';
	184	+ unset($uf, $uk);
	185	+ }
	186	+ unset($uid); ?>
187	187	</ul>
188	188	<?php }
189	189
190		- if ( isset($repeat_field) ) { ?>
	190	+ if ( isset($repeat_field) ) { ?>
191	191	<div class="clear"></div>
192	192	<p class="howto"><?php _e( 'Repeating field options', 'formidable' ) ?></p>
193	193	<ul class="frm_code_list">
		@@ -196,9 +196,9 @@ discard block
		block discarded – undo
196	196	</li>
197	197	</ul>
198	198	<?php
199		- }
	199	+ }
200	200
201		- if ( isset($dfe) ) { ?>
	201	+ if ( isset($dfe) ) { ?>
202	202
203	203	<div class="clear"></div>
204	204	<p class="howto"><?php _e( 'Dynamic field options', 'formidable' ) ?></p>
		@@ -217,8 +217,8 @@ discard block
		block discarded – undo
217	217	</div>
218	218
219	219	<?php
220		- if ( $settings_tab ) {
	220	+ if ( $settings_tab ) {
221	221	include( FrmAppHelper::plugin_path() . '/classes/views/frm-forms/mb_html_tab.php' );
222		- }
223		- ?>
	222	+ }
	223	+ ?>
224	224	</div>

		@@ -1,13 +1,13 @@
		block discarded – undo
1	1	<div class="frmcenter frm_no_entries_form">
2	2	<?php
3		-if ( $form && isset($form->options['no_save']) && $form->options['no_save'] ) { ?>
	3	+if ( $form && isset( $form->options['no_save'] ) && $form->options['no_save'] ) { ?>
4	4	<h3><?php _e( 'This form is not set to save any entries.', 'formidable' ) ?></h3>
5	5	<p>If you would like entries in this form to be saved, go to the <a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable' ) . '&frm_action=settings&id=' . $form->id ) ?>">form Settings</a> page and uncheck the "Do not store any entries submitted from this form" box.</p>
6	6	<?php
7	7	} else if ( $form ) {
8	8	?>
9		-<div class="frm_no_entries_header"><?php printf(__( 'No Entries for form: %s', 'formidable' ), $form->name); ?></div>
10		-<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url('admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
	9	+<div class="frm_no_entries_header"><?php printf( __( 'No Entries for form: %s', 'formidable' ), $form->name ); ?></div>
	10	+<p class="frm_no_entries_text"><?php printf( __( 'For instructions on publishing your form see %1$sthis page%2$s <br/> or click "%3$sAdd New%4$s" above to add an entry from here (Requires License)', 'formidable' ), '<a href="https://formidablepro.com/knowledgebase/publish-your-forms/" target="_blank">', '</a>', '<a href="' . esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=new&form=' . $form->id ) ) . '">', '</a>' ); ?></p>
11	11	<?php
12	12	} else {
13	13	?>

		@@ -1,11 +1,11 @@
		block discarded – undo
1		-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($values); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
	1	+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $values ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
2	2	<?php
3	3	if ( ! isset( $include_form_tag ) \|\| $include_form_tag ) {
4	4	?>
5		-<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
	5	+<form enctype="<?php echo esc_attr( apply_filters( 'frm_form_enctype', 'multipart/form-data', $form ) ) ?>" method="post" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" id="form_<?php echo esc_attr( $form->form_key ) ?>" <?php echo $frm_settings->use_html ? '' : 'action=""'; ?>>
6	6	<?php
7	7	} else { ?>
8		-<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action('frm_form_classes', $form) ?>" >
	8	+<div id="form_<?php echo esc_attr( $form->form_key ) ?>" class="frm-show-form <?php do_action( 'frm_form_classes', $form ) ?>" >
9	9	<?php
10	10	}
11	11

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<div id="form_entries_page" class="wrap">
2	2	<div class="frmicon icon32"><br/></div>
3	3	<h1><?php _e( 'Entries', 'formidable' ); ?>
4		- <?php do_action('frm_entry_inside_h2', $form); ?>
	4	+ <?php do_action( 'frm_entry_inside_h2', $form ); ?>
5	5	</h1>
6	6
7	7	<?php require( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	<div id="poststuff">
11	11	<div id="post-body" class="metabox-holder columns-2">
12	12	<div id="post-body-content">
13		- <?php FrmAppController::get_form_nav($form, true, 'hide'); ?>
	13	+ <?php FrmAppController::get_form_nav( $form, true, 'hide' ); ?>
14	14	</div>
15	15	<div id="postbox-container-1" class="postbox-container">
16	16	<input type="hidden" name="page" value="formidable-entries" />

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	<div class="submitbox">
6	6	<div id="minor-publishing" class="frm_remove_border">
7	7	<div class="misc-pub-section">
8		- <?php do_action('frm_show_entry_publish_box', $entry); ?>
	8	+ <?php do_action( 'frm_show_entry_publish_box', $entry ); ?>
9	9	<div class="clear"></div>
10	10	</div>
11	11	<div id="misc-publishing-actions">
		@@ -17,12 +17,12 @@ discard block
		block discarded – undo
17	17	</div>
18	18	</div>
19	19	<div id="major-publishing-actions">
20		- <?php if ( current_user_can('frm_delete_entries') ) { ?>
	20	+ <?php if ( current_user_can( 'frm_delete_entries' ) ) { ?>
21	21	<div id="delete-action">
22	22	<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id ) ) ?>" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that entry?', 'formidable' ) ?>');" title="<?php esc_attr_e( 'Delete' ) ?>">
23	23	<?php _e( 'Delete' ) ?>
24	24	</a>
25		- <?php if ( ! empty($entry->post_id) ) { ?>
	25	+ <?php if ( ! empty( $entry->post_id ) ) { ?>
26	26	<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-entries&frm_action=destroy&id=' . $id . '&form=' . $entry->form_id . '&keep_post=1' ) ) ?>" class="submitdelete deletion frm_delete_wo_post" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete this entry?', 'formidable' ) ?>);" title="<?php esc_attr_e( 'Delete entry but leave the post', 'formidable' ) ?>">
27	27	<?php _e( 'Delete without Post', 'formidable' ) ?>
28	28	</a>
		@@ -30,13 +30,13 @@ discard block
		block discarded – undo
30	30	</div>
31	31	<?php } ?>
32	32
33		- <?php do_action('frm_entry_major_pub', $entry); ?>
	33	+ <?php do_action( 'frm_entry_major_pub', $entry ); ?>
34	34	<div class="clear"></div>
35	35	</div>
36	36	</div>
37	37	</div>
38	38	</div>
39		-<?php do_action('frm_show_entry_sidebar', $entry);
40		-FrmEntriesController::entry_sidebar($entry);
	39	+<?php do_action( 'frm_show_entry_sidebar', $entry );
	40	+FrmEntriesController::entry_sidebar( $entry );
41	41	?>
42	42	</div>

		@@ -7,15 +7,15 @@
		block discarded – undo
7	7	<?php
8	8	foreach ( $type as $tb_type ) {
9	9
10		- if ( ! isset( $tables[ $tb_type ] ) ) {
	10	+ if ( ! isset( $tables[ $tb_type ] ) ) {
11	11	do_action( 'frm_xml_import_' . $tb_type, $args );
12		- continue;
13		- }
	12	+ continue;
	13	+ }
14	14
15		- //no records
16		- if ( ! isset( $records[ $tb_type ] ) ) {
17		- continue;
18		- }
	15	+ //no records
	16	+ if ( ! isset( $records[ $tb_type ] ) ) {
	17	+ continue;
	18	+ }
19	19
20	20	$item_ids = $records[ $tb_type ];
21	21	if ( in_array( $tb_type, array( 'styles', 'actions' ) ) ) {

		@@ -7,17 +7,17 @@ discard block
		block discarded – undo
7	7	<?php
8	8	foreach ( $type as $tb_type ) {
9	9
10		- if ( ! isset( $tables[ $tb_type ] ) ) {
	10	+ if ( ! isset( $tables[$tb_type] ) ) {
11	11	do_action( 'frm_xml_import_' . $tb_type, $args );
12	12	continue;
13	13	}
14	14
15	15	//no records
16		- if ( ! isset( $records[ $tb_type ] ) ) {
	16	+ if ( ! isset( $records[$tb_type] ) ) {
17	17	continue;
18	18	}
19	19
20		- $item_ids = $records[ $tb_type ];
	20	+ $item_ids = $records[$tb_type];
21	21	if ( in_array( $tb_type, array( 'styles', 'actions' ) ) ) {
22	22	include( dirname( __FILE__ ) . '/posts_xml.php' );
23	23	} else if ( file_exists( dirname( __FILE__ ) . '/' . $tb_type . '_xml.php' ) ) {
		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	include( FrmAppHelper::plugin_path() . '/pro/classes/views/xml/' . $tb_type . '_xml.php' );
27	27	}
28	28
29		- unset( $item_ids, $records[ $tb_type ], $tb_type );
	29	+ unset( $item_ids, $records[$tb_type], $tb_type );
30	30	}
31	31
32	32	?>

		@@ -64,7 +64,7 @@
		block discarded – undo
64	64	<a href="<?php echo esc_url( admin_url( 'admin.php?page=formidable-styles&frm_action=destroy&id=' . $style->ID ) ); ?>" id="frm_delete_style" class="submitdelete deletion" onclick="return confirm('<?php esc_attr_e( 'Are you sure you want to delete that style?', 'formidable' ) ?>')"><?php _e( 'Delete Style', 'formidable' ) ?></a>
65	65	<?php } ?>
66	66	<?php
67		- if ( $style->ID ) {
	67	+ if ( $style->ID ) {
68	68	echo '<span class="howto"><span>.frm_style_' . esc_attr( $style->post_name ) . '</span></span>';
69	69	} ?>
70	70	<div class="publishing-action">

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	<form id="frm_styling_form" action="" name="frm_styling_form" method="post">
10	10	<input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
11	11	<input type="hidden" name="frm_action" value="save" />
12		- <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
	12	+ <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" class="frm_hidden"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
13	13	<?php wp_nonce_field( 'frm_style_nonce', 'frm_style' ); ?>
14	14	<?php FrmTipsHelper::pro_tip( 'get_styling_tip', 'p' ); ?>
15	15	<div id="nav-menus-frame">
		@@ -18,7 +18,7 @@ discard block
		block discarded – undo
18	18
19	19	<div class="styling_settings">
20	20	<input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
21		- <?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact('style', 'frm_style') ); ?>
	21	+ <?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact( 'style', 'frm_style' ) ); ?>
22	22	</div>
23	23
24	24	</div><!-- /#menu-settings-column -->
		@@ -31,17 +31,17 @@ discard block
		block discarded – undo
31	31	<div class="major-publishing-actions">
32	32	<label class="menu-name-label howto open-label" for="menu-name">
33	33	<span><?php _e( 'Style Name', 'formidable' ) ?></span>
34		- <input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
	34	+ <input id="menu-name" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" type="text" class="menu-name regular-text menu-item-textbox" title="<?php esc_attr_e( 'Enter style name here', 'formidable' ) ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
35	35	</label>
36	36
37		- <input name="prev_menu_order" type="hidden" value="<?php echo esc_attr($style->menu_order) ?>" />
	37	+ <input name="prev_menu_order" type="hidden" value="<?php echo esc_attr( $style->menu_order ) ?>" />
38	38	<label class="menu-name-label howto open-label default-style-box" for="menu_order">
39	39	<span>
40	40	<?php if ( $style->menu_order ) { ?>
41		- <input name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="hidden" value="1" />
42		- <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
	41	+ <input name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="hidden" value="1" />
	42	+ <input id="menu_order" disabled="disabled" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
43	43	<?php } else { ?>
44		- <input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" type="checkbox" value="1" <?php checked($style->menu_order, 1) ?> />
	44	+ <input id="menu_order" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" type="checkbox" value="1" <?php checked( $style->menu_order, 1 ) ?> />
45	45	<?php } ?>
46	46	<?php _e( 'Make default style', 'formidable' ) ?></span>
47	47	</label>

Strategy11 / formidable-forms

Push — master ( 21ab07...7286a7 )

Status

Category

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +65 added lines, -65 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch