Strategy11 / formidable-forms

classes/views/frm-entries/form.php

Indentation +6 added lines, -6 removed lines

@@ -5,7 +5,7 @@ 
     </div>
 </div>
 <?php
-    return;
+	return;
 }
 
 global $frm_vars;
@@ -38,7 +38,7 @@ 
 		} else {
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
 		}
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
+		do_action('frm_get_field_scripts', $field, $form, $form->id);
 	}
 }
 
@@ -63,8 +63,8 @@ 
 
 // close open collapsible toggle div
 if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
-    echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+	echo "</div>\n";
+	unset($frm_vars['collapse_div']);
 }
 
 echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
@@ -77,8 +77,8 @@ 
 }
 
 if ( FrmForm::show_submit( $form ) ) {
-    unset($values['fields']);
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
+	unset($values['fields']);
+	FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
 }
 ?>
 </fieldset>

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( empty($values) || ! isset($values['fields']) || empty($values['fields']) ) { ?>
-<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class($form); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
+if ( empty( $values ) || ! isset( $values['fields'] ) || empty( $values['fields'] ) ) { ?>
+<div class="frm_forms <?php echo FrmFormsHelper::get_form_style_class( $form ); ?>" id="frm_form_<?php echo esc_attr( $form->id ) ?>_container">
 	<div class="frm_error_style"><strong><?php _e( 'Oops!', 'formidable' ) ?></strong> <?php printf( __( 'You did not add any fields to your form. %1$sGo back%2$s and add some.', 'formidable' ), '<a href="' . esc_url( admin_url( '?page=formidable&frm_action=edit&id=' . $form->id ) ) . '">', '</a>' ) ?>
     </div>
 </div>
@@ -21,11 +21,11 @@ 
 <div class="frm_form_fields <?php echo esc_attr( apply_filters( 'frm_form_fields_class', '', $values ) ); ?>">
 <fieldset>
 <?php echo FrmFormsHelper::replace_shortcodes( $values['before_html'], $form, $title, $description ); ?>
-<input type="hidden" name="frm_action" value="<?php echo esc_attr($form_action) ?>" />
-<input type="hidden" name="form_id" value="<?php echo esc_attr($form->id) ?>" />
-<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr($frm_hide_fields) ?>" />
+<input type="hidden" name="frm_action" value="<?php echo esc_attr( $form_action ) ?>" />
+<input type="hidden" name="form_id" value="<?php echo esc_attr( $form->id ) ?>" />
+<input type="hidden" name="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" id="frm_hide_fields_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_hide_fields ) ?>" />
 <input type="hidden" name="frm_helpers_<?php echo esc_attr( $form->id ) ?>" id="frm_helpers_<?php echo esc_attr( $form->id ) ?>" value="<?php echo esc_attr( $frm_helpers ) ?>" />
-<input type="hidden" name="form_key" value="<?php echo esc_attr($form->form_key) ?>" />
+<input type="hidden" name="form_key" value="<?php echo esc_attr( $form->form_key ) ?>" />
 <input type="hidden" name="item_meta[0]" value="" />
 <?php wp_nonce_field( 'frm_submit_entry_nonce', 'frm_submit_entry_' . $form->id ); ?>
 
@@ -38,7 +38,7 @@ 
 		} else {
 			do_action( 'frm_show_other_field_type', $field, $form, array( 'action' => $form_action ) );
 		}
-    	do_action('frm_get_field_scripts', $field, $form, $form->id);
+    	do_action( 'frm_get_field_scripts', $field, $form, $form->id );
 	}
 }
 
@@ -46,13 +46,13 @@ 
 if ( FrmAppHelper::is_admin() ) { ?>
 <div class="frm_form_field form-field">
 <label class="frm_primary_label"><?php _e( 'Entry Key', 'formidable' ) ?></label>
-<input type="text" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="text" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 </div>
 <?php } else { ?>
-<input type="hidden" name="item_key" value="<?php echo esc_attr($values['item_key']) ?>" />
+<input type="hidden" name="item_key" value="<?php echo esc_attr( $values['item_key'] ) ?>" />
 <?php }
 
-do_action('frm_entry_form', $form, $form_action, $errors);
+do_action( 'frm_entry_form', $form, $form_action, $errors );
 
 global $frm_vars;
 // close open section div
@@ -62,23 +62,23 @@ 
 }
 
 // close open collapsible toggle div
-if ( isset($frm_vars['collapse_div']) && $frm_vars['collapse_div'] ) {
+if ( isset( $frm_vars['collapse_div'] ) && $frm_vars['collapse_div'] ) {
     echo "</div>\n";
-    unset($frm_vars['collapse_div']);
+    unset( $frm_vars['collapse_div'] );
 }
 
-echo FrmFormsHelper::replace_shortcodes($values['after_html'], $form);
+echo FrmFormsHelper::replace_shortcodes( $values['after_html'], $form );
 
 
-if ( has_action('frm_entries_footer_scripts') ) { ?>
+if ( has_action( 'frm_entries_footer_scripts' ) ) { ?>
 <script type="text/javascript">
-<?php do_action('frm_entries_footer_scripts', $values['fields'], $form); ?>
+<?php do_action( 'frm_entries_footer_scripts', $values['fields'], $form ); ?>
 </script><?php
 }
 
 if ( FrmForm::show_submit( $form ) ) {
-    unset($values['fields']);
-    FrmFormsHelper::get_custom_submit($values['submit_html'], $form, $submit, $form_action, $values);
+    unset( $values['fields'] );
+    FrmFormsHelper::get_custom_submit( $values['submit_html'], $form, $submit, $form_action, $values );
 }
 ?>
 </fieldset>

classes/views/frm-entries/list.php

Spacing +3 added lines, -3 removed lines

@@ -1,16 +1,16 @@
 <div id="form_entries_page" class="wrap">
     <div class="frmicon icon32"><br/></div>
     <h2><?php _e( 'Entries', 'formidable' ); ?>
-        <?php do_action('frm_entry_inside_h2', $form); ?>
+        <?php do_action( 'frm_entry_inside_h2', $form ); ?>
     </h2>
 
-    <?php require(FrmAppHelper::plugin_path() .'/classes/views/shared/errors.php'); ?>
+    <?php require( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
 
     <form id="posts-filter" method="get">
         <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" />

classes/views/frm-entries/new.php

Spacing +5 added lines, -5 removed lines

@@ -1,17 +1,17 @@
-<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
 }
 
-include(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/errors.php');
+include( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/errors.php' );
 $form_action = 'create';
-require(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/form.php');
+require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/form.php' );
 
 if ( ! isset( $include_form_tag ) || $include_form_tag ) {
 ?>

classes/views/frm-entries/no_entries.php

Spacing +5 added lines, -5 removed lines

@@ -1,18 +1,18 @@
 <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>
+<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 {
 ?>
 <div class="frm_no_entries_header"><?php _e( 'You have not created any forms yet.', 'formidable' ); ?></div>
-<p class="frm_no_entries_text"><?php printf( __( 'To view entries, you must first %1$sbuild a form%2$s', 'formidable' ), '<a href="'. esc_url( admin_url( 'admin.php?page=formidable&frm_action=new' ) ) . '">', '</a>' ); ?></p>
+<p class="frm_no_entries_text"><?php printf( __( 'To view entries, you must first %1$sbuild a form%2$s', 'formidable' ), '<a href="' . esc_url( admin_url( 'admin.php?page=formidable&frm_action=new' ) ) . '">', '</a>' ); ?></p>
 <?php
 } ?>
 </div>

classes/views/frm-entries/show.php

Indentation +21 added lines, -21 removed lines

@@ -15,43 +15,43 @@
                     <div class="inside">
                         <table class="form-table"><tbody>
                         <?php
-                        $first_h3 = 'frm_first_h3';
-                        foreach ( $fields as $field ) {
+						$first_h3 = 'frm_first_h3';
+						foreach ( $fields as $field ) {
 							if ( in_array( $field->type, array( 'captcha', 'html', 'end_divider', 'form' ) ) ) {
-                                continue;
-                            }
+								continue;
+							}
 
-                            if ( in_array($field->type, array( 'break', 'divider' ) ) ) {
-                            ?>
+							if ( in_array($field->type, array( 'break', 'divider' ) ) ) {
+							?>
                         </tbody></table>
                         <br/><h3 class="<?php echo esc_attr( $first_h3 ) ?>"><?php echo esc_html( $field->name ) ?></h3>
                         <table class="form-table"><tbody>
                         <?php
-                                $first_h3 = '';
-                            } else {
-                        ?>
+								$first_h3 = '';
+							} else {
+						?>
                         <tr>
                             <th scope="row"><?php echo esc_html( $field->name ) ?>:</th>
                             <td>
                             <?php
 							$embedded_field_id = ( $entry->form_id != $field->form_id ) ? 'form' . $field->form_id : 0;
-                            $atts = array(
-                                'type' => $field->type, 'post_id' => $entry->post_id,
-                                'show_filename' => true, 'show_icon' => true, 'entry_id' => $entry->id,
-                                'embedded_field_id' => $embedded_field_id,
-                            );
-                            echo $display_value = FrmEntriesHelper::prepare_display_value($entry, $field, $atts);
+							$atts = array(
+								'type' => $field->type, 'post_id' => $entry->post_id,
+								'show_filename' => true, 'show_icon' => true, 'entry_id' => $entry->id,
+								'embedded_field_id' => $embedded_field_id,
+							);
+							echo $display_value = FrmEntriesHelper::prepare_display_value($entry, $field, $atts);
 
-                            if ( is_email($display_value) && ! in_array($display_value, $to_emails) ) {
-                                $to_emails[] = $display_value;
-                            }
-                            ?>
+							if ( is_email($display_value) && ! in_array($display_value, $to_emails) ) {
+								$to_emails[] = $display_value;
+							}
+							?>
                             </td>
                         </tr>
                         <?php }
-                        }
+						}
 
-                        ?>
+						?>
 
                         <?php if ( $entry->parent_item_id ) { ?>
                         <tr><th><?php _e( 'Parent Entry ID', 'formidable' ) ?>:</th>

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <div id="form_show_entry_page" class="wrap">
     <div class="frmicon icon32"><br/></div>
     <h2><?php _e( 'View Entry', 'formidable' ) ?>
-        <?php do_action('frm_entry_inside_h2', $entry->form_id); ?>
+        <?php do_action( 'frm_entry_inside_h2', $entry->form_id ); ?>
     </h2>
 
     <div class="frm_forms">
@@ -9,7 +9,7 @@ 
         <div id="poststuff">
             <div id="post-body" class="metabox-holder columns-2">
             <div id="post-body-content">
-                <?php FrmAppController::get_form_nav($entry->form_id, true); ?>
+                <?php FrmAppController::get_form_nav( $entry->form_id, true ); ?>
                 <div class="postbox">
                     <h3 class="hndle"><span><?php _e( 'Entry', 'formidable' ) ?></span></h3>
                     <div class="inside">
@@ -21,7 +21,7 @@ 
                                 continue;
                             }
 
-                            if ( in_array($field->type, array( 'break', 'divider' ) ) ) {
+                            if ( in_array( $field->type, array( 'break', 'divider' ) ) ) {
                             ?>
                         </tbody></table>
                         <br/><h3 class="<?php echo esc_attr( $first_h3 ) ?>"><?php echo esc_html( $field->name ) ?></h3>
@@ -40,9 +40,9 @@ 
                                 'show_filename' => true, 'show_icon' => true, 'entry_id' => $entry->id,
                                 'embedded_field_id' => $embedded_field_id,
                             );
-                            echo $display_value = FrmEntriesHelper::prepare_display_value($entry, $field, $atts);
+                            echo $display_value = FrmEntriesHelper::prepare_display_value( $entry, $field, $atts );
 
-                            if ( is_email($display_value) && ! in_array($display_value, $to_emails) ) {
+                            if ( is_email( $display_value ) && ! in_array( $display_value, $to_emails ) ) {
                                 $to_emails[] = $display_value;
                             }
                             ?>
@@ -59,14 +59,14 @@ 
                         </td></tr>
                         <?php } ?>
                         </tbody></table>
-                        <?php do_action('frm_show_entry', $entry); ?>
+                        <?php do_action( 'frm_show_entry', $entry ); ?>
                     </div>
                 </div>
 
-                <?php do_action('frm_after_show_entry', $entry); ?>
+                <?php do_action( 'frm_after_show_entry', $entry ); ?>
 
             </div>
-            <?php require(FrmAppHelper::plugin_path() .'/classes/views/frm-entries/sidebar-show.php'); ?>
+            <?php require( FrmAppHelper::plugin_path() . '/classes/views/frm-entries/sidebar-show.php' ); ?>
             </div>
         </div>
     </div>

classes/views/frm-entries/sidebar-shared.php

Indentation +7 added lines, -7 removed lines

@@ -66,18 +66,18 @@
         <?php } ?>
 
         <?php
-        foreach ( (array) $data as $k => $d ) {
+		foreach ( (array) $data as $k => $d ) {
 			if ( in_array( $k, array( 'browser', 'referrer' ) ) ) {
-                continue;
-            }
-        ?>
+				continue;
+			}
+		?>
         <div class="misc-pub-section">
 			<b><?php echo sanitize_text_field( ucfirst( str_replace( '-', ' ', $k ) ) ); ?></b>:
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
-        }
-        ?>
+			unset($k, $d);
+		}
+		?>
     </div>
 </div>

Spacing +6 added lines, -6 removed lines

@@ -6,8 +6,8 @@ 
         <div class="misc-pub-section">
             <span class="dashicons dashicons-admin-post wp-media-buttons-icon"></span>
             <?php _e( 'Post', 'formidable' ) ?>:
-            <b><?php echo get_the_title($entry->post_id) ?></b>
-            <span><a href="<?php echo esc_url( admin_url('post.php?post='. $entry->post_id .'&action=edit') ) ?>"><?php _e( 'Edit', 'formidable' ) ?></a>
+            <b><?php echo get_the_title( $entry->post_id ) ?></b>
+            <span><a href="<?php echo esc_url( admin_url( 'post.php?post=' . $entry->post_id . '&action=edit' ) ) ?>"><?php _e( 'Edit', 'formidable' ) ?></a>
             <a href="<?php echo esc_url( get_permalink( $entry->post_id ) ) ?>"><?php _e( 'View', 'formidable' ) ?></a></span>
         </div>
         <?php } ?>
@@ -35,7 +35,7 @@ 
         <?php if ( $entry->updated_by && $entry->updated_by != $entry->user_id ) { ?>
         <div class="misc-pub-section">
             <span class="dashicons dashicons-admin-users wp-media-buttons-icon"></span>
-			<?php printf( __( 'Updated by: %1$s', 'formidable' ), FrmProFieldsHelper::get_display_name( $entry->updated_by,  'display_name', array( 'link' => true ) ) ); ?>
+			<?php printf( __( 'Updated by: %1$s', 'formidable' ), FrmProFieldsHelper::get_display_name( $entry->updated_by, 'display_name', array( 'link' => true ) ) ); ?>
         </div>
         <?php } ?>
         <?php } ?>
@@ -58,10 +58,10 @@ 
         </div>
         <?php } ?>
 
-        <?php if ( isset($data['referrer']) ) { ?>
+        <?php if ( isset( $data['referrer'] ) ) { ?>
         <div class="misc-pub-section">
             <b><?php _e( 'Referrer', 'formidable' ) ?></b>:<br/>
-			<?php echo wp_kses_post( str_replace( "\r\n", '<br/>', $data['referrer'] ) );  ?>
+			<?php echo wp_kses_post( str_replace( "\r\n", '<br/>', $data['referrer'] ) ); ?>
         </div>
         <?php } ?>
 
@@ -76,7 +76,7 @@ 
 			<?php echo wp_kses_post( implode( ', ', (array) $d ) ); ?>
         </div>
         <?php
-            unset($k, $d);
+            unset( $k, $d );
         }
         ?>
     </div>

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

Spacing +9 added lines, -9 removed lines

@@ -5,11 +5,11 @@ 
         <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">
-                <?php include(dirname(__FILE__) .'/_sidebar-shared-pub.php'); ?>
+                <?php include( dirname( __FILE__ ) . '/_sidebar-shared-pub.php' ); ?>
                 <div class="misc-pub-section">
                     <span class="dashicons dashicons-format-aside wp-media-buttons-icon"></span>
                     <a href="#" onclick="window.print();return false;"><?php _e( 'Print', 'formidable' ) ?></a>
@@ -17,22 +17,22 @@ 
             </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 _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) ) { ?>
-        	    <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>
+    	        <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 _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 ) ) { ?>
+        	    <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>
         	    <?php } ?>
     	    </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>

classes/views/frm-fields/import_choices.php

Indentation +19 added lines, -19 removed lines

@@ -4,18 +4,18 @@ 
     <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 @@ 
 <?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";
-        }
+			echo $label ."\n";
+		}
 	} else {
-        echo $fopt ."\n";
-    }
+		echo $fopt ."\n";
+	}
 } ?>
 </textarea>
 

Spacing +9 added lines, -9 removed lines

@@ -2,7 +2,7 @@ 
 <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 @@ 
     	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 @@ 
 <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,19 +30,19 @@ 
 $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 {
-            echo $label ."\n";
+            echo $label . "\n";
         }
 	} else {
-        echo $fopt ."\n";
+        echo $fopt . "\n";
     }
 } ?>
 </textarea>

classes/views/frm-fields/input.php

Indentation +66 added lines, -66 removed lines

@@ -3,48 +3,48 @@ 
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
 <textarea name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php
 if ( $field['max'] ) {
-    echo 'rows="'. esc_attr( $field['max'] ) .'" ';
+	echo 'rows="'. esc_attr( $field['max'] ) .'" ';
 }
 do_action('frm_field_input_html', $field);
 ?>><?php echo FrmAppHelper::esc_textarea($field['value']) ?></textarea>
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
-    $read_only = false;
+	$read_only = false;
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true; ?>
+		$read_only = true; ?>
 <input type="hidden" value="<?php echo esc_attr( $field['value'] ) ?>" name="<?php echo esc_attr( $field_name ) ?>" />
 <?php
-    }
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
+	} else if ( is_array($field['options']) ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
-                continue;
-            }
+				continue;
+			}
 
-            $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); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+			}
+			$checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
 
-            $other_opt = false;
-            $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
-            ?>
+			$other_opt = false;
+			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
+			?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
-            echo $checked;
-            do_action('frm_field_input_html', $field);
+			echo $checked;
+			do_action('frm_field_input_html', $field);
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
-            }
+				echo ' '. $opt .'</label>';
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -53,14 +53,14 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args );
+			unset( $other_opt, $other_args );
 ?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'select' ) {
-    $read_only = false;
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	$read_only = false;
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
 	} else {
 		if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
@@ -93,7 +93,7 @@ 
 			?>
 		<option value="<?php echo esc_attr($field_val) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : '';?>><?php echo ($opt == '') ? ' ' : $opt; ?></option>
     <?php
-    	} ?>
+		} ?>
 </select>
 <?php
 		FrmFieldsHelper::include_other_input( array(
@@ -102,52 +102,52 @@ 
 			'value' => $other_args['value'], 'field' => $field,
 			'html_id' => $html_id, 'opt_key' => false,
 		) );
-    }
+	}
 } else if ( $field['type'] == 'checkbox' ) {
-    $checked_values = $field['value'];
-    $read_only = false;
+	$checked_values = $field['value'];
+	$read_only = false;
 
 	if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
-        $read_only = true;
-        if ( $checked_values ) {
-            foreach ( (array) $checked_values as $checked_value ) { ?>
+		$read_only = true;
+		if ( $checked_values ) {
+			foreach ( (array) $checked_values as $checked_value ) { ?>
 <input type="hidden" value="<?php echo esc_attr( $checked_value ) ?>" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-            }
-        } else { ?>
+			}
+		} else { ?>
 <input type="hidden" value="" name="<?php echo esc_attr( $field_name ) ?>[]" />
 <?php
-        }
-    }
+		}
+	}
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+	if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( $field['options'] ) {
-        foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
-                continue;
-            }
-
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
-
-            // Check if other opt, and get values for other field if needed
-            $other_opt = false;
+	} else if ( $field['options'] ) {
+		foreach ( $field['options'] as $opt_key => $opt ) {
+			if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+				continue;
+			}
+
+			$field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
+			$opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
+			$checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+
+			// Check if other opt, and get values for other field if needed
+			$other_opt = false;
 			$other_args = FrmFieldsHelper::prepare_other_input( compact( 'field', 'field_name', 'opt_key' ), $other_opt, $checked );
 
-            ?>
+			?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_checkbox_class', 'frm_checkbox', $field, $field_val ) ) ?>" id="frm_checkbox_<?php echo esc_attr( $field['id'] ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
-            }
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
+			}
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+			?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
 
-            if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
-            }
+			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
+				echo ' '. $opt .'</label>';
+			}
 
 			FrmFieldsHelper::include_other_input( array(
 				'other_opt' => $other_opt, 'read_only' => $read_only,
@@ -156,17 +156,17 @@ 
 				'html_id' => $html_id, 'opt_key' => $opt_key,
 			) );
 
-            unset( $other_opt, $other_args, $checked );
+			unset( $other_opt, $other_args, $checked );
 
-            ?></div>
+			?></div>
 <?php
-        }
-    }
+		}
+	}
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
-    $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
-    }
+	$frm_settings = FrmAppHelper::get_settings();
+	if ( ! empty($frm_settings->pubkey) ) {
+		FrmFieldsHelper::display_recaptcha($field);
+	}
 } else {
-    do_action('frm_form_fields', $field, $field_name, compact('errors', 'html_id'));
+	do_action('frm_form_fields', $field, $field_name, compact('errors', 'html_id'));
 }

Spacing +26 added lines, -26 removed lines

@@ -1,12 +1,12 @@ 
 <?php if ( in_array( $field['type'], array( 'email', 'url', 'text' ) ) ) { ?>
-<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action('frm_field_input_html', $field) ?>/>
+<input type="<?php echo ( $frm_settings->use_html || $field['type'] == 'password' ) ? $field['type'] : 'text'; ?>" id="<?php echo esc_attr( $html_id ) ?>" name="<?php echo esc_attr( $field_name ) ?>" value="<?php echo esc_attr( $field['value'] ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>/>
 <?php } else if ( $field['type'] == 'textarea' ) { ?>
 <textarea name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php
 if ( $field['max'] ) {
-    echo 'rows="'. esc_attr( $field['max'] ) .'" ';
+    echo 'rows="' . esc_attr( $field['max'] ) . '" ';
 }
-do_action('frm_field_input_html', $field);
-?>><?php echo FrmAppHelper::esc_textarea($field['value']) ?></textarea>
+do_action( 'frm_field_input_html', $field );
+?>><?php echo FrmAppHelper::esc_textarea( $field['value'] ) ?></textarea>
 <?php
 
 } else if ( $field['type'] == 'radio' ) {
@@ -17,33 +17,33 @@ 
 <?php
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
-    } else if ( is_array($field['options']) ) {
+    } else if ( is_array( $field['options'] ) ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
 			if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $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 ); ?>
 			<div class="<?php echo esc_attr( apply_filters( 'frm_radio_class', 'frm_radio', $field, $field_val ) ) ?>"><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
 				?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
-            $checked = FrmAppHelper::check_selected($field['value'], $field_val) ? 'checked="checked" ' : ' ';
+            $checked = FrmAppHelper::check_selected( $field['value'], $field_val ) ? 'checked="checked" ' : ' ';
 
             $other_opt = false;
             $other_args = FrmFieldsHelper::prepare_other_input( compact( 'field_name', 'opt_key', 'field' ), $other_opt, $checked );
             ?>
             <input type="radio" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id . '-' . $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php
             echo $checked;
-            do_action('frm_field_input_html', $field);
+            do_action( 'frm_field_input_html', $field );
 ?>/><?php
 
 			if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
+                echo ' ' . $opt . '</label>';
             }
 
 			FrmFieldsHelper::include_other_input( array(
@@ -60,7 +60,7 @@ 
     }
 } else if ( $field['type'] == 'select' ) {
     $read_only = false;
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		echo FrmFieldsHelper::dropdown_categories( array( 'name' => $field_name, 'field' => $field ) );
 	} else {
 		if ( FrmField::is_read_only( $field ) && ! FrmAppHelper::is_admin() ) {
@@ -71,12 +71,12 @@ 
 					<input type="hidden" value="<?php echo esc_attr( $selected_value ) ?>" name="<?php echo esc_attr( $field_name ) ?>[]" /> <?php
 				}
 			} else { ?>
-				<input type="hidden" value="<?php echo esc_attr($field['value']) ?>" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" /> <?php
+				<input type="hidden" value="<?php echo esc_attr( $field['value'] ) ?>" name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" /> <?php
 			} ?>
-				<select disabled="disabled" <?php do_action('frm_field_input_html', $field) ?>> <?php
+				<select disabled="disabled" <?php do_action( 'frm_field_input_html', $field ) ?>> <?php
 
 		} else { ?>
-<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action('frm_field_input_html', $field) ?>>
+<select name="<?php echo esc_attr( $field_name ) ?>" id="<?php echo esc_attr( $html_id ) ?>" <?php do_action( 'frm_field_input_html', $field ) ?>>
 <?php   }
 
 		$other_opt = $other_checked = false;
@@ -91,7 +91,7 @@ 
 				}
 			}
 			?>
-		<option value="<?php echo esc_attr($field_val) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : '';?>><?php echo ($opt == '') ? ' ' : $opt; ?></option>
+		<option value="<?php echo esc_attr( $field_val ) ?>" <?php echo $selected ? ' selected="selected"' : ''; ?><?php echo ( FrmFieldsHelper::is_other_opt( $opt_key ) ) ? ' class="frm_other_trigger"' : ''; ?>><?php echo ( $opt == '' ) ? ' ' : $opt; ?></option>
     <?php
     	} ?>
 </select>
@@ -120,17 +120,17 @@ 
         }
     }
 
-    if ( isset($field['post_field']) && $field['post_field'] == 'post_category' ) {
+    if ( isset( $field['post_field'] ) && $field['post_field'] == 'post_category' ) {
 		do_action( 'frm_after_checkbox', array( 'field' => $field, 'field_name' => $field_name, 'type' => $field['type'] ) );
     } else if ( $field['options'] ) {
         foreach ( $field['options'] as $opt_key => $opt ) {
-            if ( isset($atts) && isset($atts['opt']) && ($atts['opt'] != $opt_key) ) {
+            if ( isset( $atts ) && isset( $atts['opt'] ) && ( $atts['opt'] != $opt_key ) ) {
                 continue;
             }
 
-            $field_val = apply_filters('frm_field_value_saved', $opt, $opt_key, $field);
-            $opt = apply_filters('frm_field_label_seen', $opt, $opt_key, $field);
-            $checked = FrmAppHelper::check_selected($checked_values, $field_val) ? ' checked="checked"' : '';
+            $field_val = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field );
+            $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field );
+            $checked = FrmAppHelper::check_selected( $checked_values, $field_val ) ? ' checked="checked"' : '';
 
             // Check if other opt, and get values for other field if needed
             $other_opt = false;
@@ -143,10 +143,10 @@ 
                 ?><label for="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>"><?php
             }
 
-            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action('frm_field_input_html', $field) ?> /><?php
+            ?><input type="checkbox" name="<?php echo esc_attr( $field_name ) ?>[<?php echo ( $other_opt ? esc_attr( $opt_key ) : '' ) ?>]" id="<?php echo esc_attr( $html_id ) ?>-<?php echo esc_attr( $opt_key ) ?>" value="<?php echo esc_attr( $field_val ) ?>" <?php echo $checked ?> <?php do_action( 'frm_field_input_html', $field ) ?> /><?php
 
             if ( ! isset( $atts ) || ! isset( $atts['label'] ) || $atts['label'] ) {
-                echo ' '. $opt .'</label>';
+                echo ' ' . $opt . '</label>';
             }
 
 			FrmFieldsHelper::include_other_input( array(
@@ -164,9 +164,9 @@ 
     }
 } else if ( $field['type'] == 'captcha' && ! FrmAppHelper::is_admin() ) {
     $frm_settings = FrmAppHelper::get_settings();
-    if ( ! empty($frm_settings->pubkey) ) {
-        FrmFieldsHelper::display_recaptcha($field);
+    if ( ! empty( $frm_settings->pubkey ) ) {
+        FrmFieldsHelper::display_recaptcha( $field );
     }
 } else {
-    do_action('frm_form_fields', $field, $field_name, compact('errors', 'html_id'));
+    do_action( 'frm_form_fields', $field, $field_name, compact( 'errors', 'html_id' ) );
 }