Inspection of "Merge branch 'develop' of https://github.com/gravi..." - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 406a4f...613d21 )

by Zack

created 2018-11-13 23:11 UTC

Status

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

@@ -41,22 +41,22 @@
 block discarded – undo
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+		$search_value = \GV\Utils::_GET( $search_field['name'] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+		foreach ( $search_field['choices'] as $k => $choice ) {
 
-            if ( 0 != $k ) {
-                echo esc_html( $links_sep );
-            }
+			if ( 0 != $k ) {
+				echo esc_html( $links_sep );
+			}
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
 
-            if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
-            } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
-            }
-            ?>
+			if ( $active ) {
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+			} else {
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+			}
+			?>
 
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
 

Please login to merge, or discard this patch.

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

@@ -13,12 +13,12 @@  discard block
 block discarded – undo
 $base_url = GravityView_Widget_Search::get_search_form_action();
 
 // Make sure that there are choices to display
-if ( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
 	return;
 }
 
-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
 
 /**
  * @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
@@ -41,24 +41,24 @@  discard block
 block discarded – undo
 
         <?php
 
-        $search_value = \GV\Utils::_GET( $search_field['name'] );
+        $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
 
-        foreach ( $search_field['choices'] as $k => $choice ) {
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
 
             if ( 0 != $k ) {
                 echo esc_html( $links_sep );
             }
 
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
 
             if ( $active ) {
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
             } else {
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
             }
             ?>
 
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
 
 		<?php } ?>
 	</p>

Please login to merge, or discard this patch.

includes/widgets/search-widget/templates/search-field-select.php 1 patch

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

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
 	return;
 }
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
  * @param string $default_option Default: `&mdash;` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'select' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'select' );
 
 ?>
 <div class="gv-search-box gv-search-field-select">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>

Please login to merge, or discard this patch.

includes/widgets/search-widget/templates/search-field-checkbox.php 1 patch

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

@@ -10,22 +10,22 @@
 block discarded – undo
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-checkbox">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>

Please login to merge, or discard this patch.

includes/widgets/search-widget/templates/widget-search.php 2 patches

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

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
 		/**
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
-         * @param array $search_field
+		 * @param array $search_field
 		 */
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 		/**
 		 * @action `gravityview_search_widget_field_after` After each search input is rendered (other than the submit button)
 		 * @param GravityView_Widget_Search $this GravityView Widget instance
-         * @param array $search_field
+		 * @param array $search_field
 		 */
 		do_action( 'gravityview_search_widget_field_after', $this, $search_field );
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 	do_action( 'gravityview_search_widget_fields_after', $this );
 
 	if( $has_inputs ) {
-	    $this->render( 'search-field', 'submit', false );
-    }
+		$this->render( 'search-field', 'submit', false );
+	}
 ?>
 </form>

Please login to merge, or discard this patch.

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

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
 	 */
 	do_action( 'gravityview_search_widget_fields_before', $this );
 
-	foreach( $this->search_fields as $search_field ) {
+	foreach ( $this->search_fields as $search_field ) {
 
 		/**
 		 * @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
 		do_action( 'gravityview_search_widget_field_before', $this, $search_field );
 
 		$gravityview_view->search_field = $search_field;
-		$this->render( 'search-field', $search_field['input'], false );
+		$this->render( 'search-field', $search_field[ 'input' ], false );
 
 		// show/hide the search button if there are input type fields
-		if( !$has_inputs &&  $search_field['input'] != 'link' ) {
+		if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
 			$has_inputs = true;
 		}
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	 */
 	do_action( 'gravityview_search_widget_fields_after', $this );
 
-	if( $has_inputs ) {
+	if ( $has_inputs ) {
 	    $this->render( 'search-field', 'submit', false );
     }
 ?>

Please login to merge, or discard this patch.

includes/widgets/search-widget/templates/search-field-radio.php 1 patch

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

@@ -10,22 +10,22 @@
 block discarded – undo
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-radio.php - No choices for field' );
 	return;
 }
 
 ?>
 <div class="gv-search-box gv-search-field-radio">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-	<?php foreach( $search_field['choices'] as $choice ) { ?>
+	<?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
 
-		<label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
-			<input type="radio" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php checked( $choice['value'], $search_field['value'], true ); ?>>
-			<?php echo esc_html( $choice['text'] ); ?>
+		<label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
+			<input type="radio" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php checked( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>>
+			<?php echo esc_html( $choice[ 'text' ] ); ?>
 		</label>
 
 	<?php } ?>

Please login to merge, or discard this patch.

includes/widgets/search-widget/templates/search-field-multiselect.php 1 patch

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

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 $search_field = $gravityview_view->search_field;
 
 // Make sure that there are choices to display
-if( empty( $search_field['choices'] ) ) {
+if ( empty( $search_field[ 'choices' ] ) ) {
 	gravityview()->log->debug( 'search-field-multiselect.php - No choices for field' );
 	return;
 }
@@ -21,19 +21,19 @@  discard block
 block discarded – undo
  * @param string $default_option Default: `&mdash;` (—)
  * @param string $field_type Field type: "select" or "multiselect"
  */
-$default_option = apply_filters('gravityview/extension/search/select_default', '&mdash;', 'multiselect' );
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '&mdash;', 'multiselect' );
 
 ?>
 <div class="gv-search-box gv-search-field-multiselect">
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
 	<?php } ?>
 	<p>
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" multiple>
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" multiple>
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
 			<?php
-			foreach( $search_field['choices'] as $choice ) : ?>
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
 			<?php endforeach; ?>
 		</select>
 	</p>

Please login to merge, or discard this patch.

includes/widgets/poll/class-gravityview-widget-poll.php 1 patch

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

@@ -22,8 +22,8 @@  discard block
 block discarded – undo
 	function __construct() {
 
 		$this->widget_id = 'poll';
-		$this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' );
-		$this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
+		$this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' );
+		$this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
 
 		$default_values = array(
 			'header' => 1,
@@ -32,27 +32,27 @@  discard block
 block discarded – undo
 
 		$settings = array(
 			'percentages' => array(
-				'label' => __('Display Percentages', 'gravityview'),
+				'label' => __( 'Display Percentages', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'counts' => array(
-				'label' => __('Display Counts', 'gravityview'),
+				'label' => __( 'Display Counts', 'gravityview' ),
 				'type' => 'checkbox',
 				'value' => true,
 				'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
 			),
 			'style' => array(
 				'type' => 'select',
-				'label' => __('Style', 'gravityview'),
+				'label' => __( 'Style', 'gravityview' ),
 				'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ),
 				'value' => 'green',
 				'choices' => array(
-					'green' => __('Green', 'gravityview'),
-					'blue' => __('Blue', 'gravityview'),
-					'red' => __('Red', 'gravityview'),
-					'orange' => __('Orange', 'gravityview'),
+					'green' => __( 'Green', 'gravityview' ),
+					'blue' => __( 'Blue', 'gravityview' ),
+					'red' => __( 'Red', 'gravityview' ),
+					'orange' => __( 'Orange', 'gravityview' ),
 				)
 			)
 		);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 			add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
 		}
 
-		parent::__construct( __( 'Poll Results', 'gravityview' ) , null, $default_values, $settings );
+		parent::__construct( __( 'Poll Results', 'gravityview' ), null, $default_values, $settings );
 	}
 
 	/**
@@ -89,11 +89,11 @@  discard block
 block discarded – undo
 
 		$GFPolls = GFPolls::get_instance();
 
-		wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version);
+		wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version );
 
 		$GFPolls->localize_scripts();
 
-		wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version);
+		wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version );
 	}
 
 	/**
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 	 */
 	public function pre_render_frontend() {
 
-		if( !class_exists('GFPolls') ) {
+		if ( ! class_exists( 'GFPolls' ) ) {
 
 			$return = false;
 
@@ -159,14 +159,14 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.8
 	 */
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		// Make sure the class is loaded in DataTables
-		if( !class_exists( 'GFFormDisplay' ) ) {
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
 		}
 
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
 
 		$settings = $this->get_frontend_settings( $widget_args );
 
-		$percentages = empty( $settings['percentages'] ) ? 'false' : 'true';
+		$percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true';
 
-		$counts = empty( $settings['counts'] ) ? 'false' : 'true';
+		$counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true';
 
-		if( !empty( $settings['field'] ) ) {
-			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts );
+		if ( ! empty( $settings[ 'field' ] ) ) {
+			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts );
 		} else {
-			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts );
+			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts );
 		}
 
 		$gravityview_view = GravityView_View::getInstance();
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 
 		$gravityview_view->poll_settings = $settings;
 
-		$gravityview_view->render('widget', 'poll', false );
+		$gravityview_view->render( 'widget', 'poll', false );
 
 	}
 

Please login to merge, or discard this patch.

includes/admin/field-types/type_textarea.php 2 patches

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

@@ -28,13 +28,13 @@
 block discarded – undo
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class .= ' merge-tag-support mt-position-right ';
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class .= ' merge-tag-support mt-position-right ';
 
-            if( empty( $this->field['show_all_fields'] ) ) {
-            	$class .= ' mt-hide_all_fields ';
-            }
-        }
+			if( empty( $this->field['show_all_fields'] ) ) {
+				$class .= ' mt-hide_all_fields ';
+			}
+		}
 		$class .= \GV\Utils::get( $this->field, 'class' );
 		$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
 		$rows = \GV\Utils::get( $this->field, 'rows', 5 );

Please login to merge, or discard this patch.

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
 			echo $this->get_tooltip() . $this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 	}
 
 	function render_input( $override_input = null ) {
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class .= ' merge-tag-support mt-position-right ';
 
-            if( empty( $this->field['show_all_fields'] ) ) {
+            if ( empty( $this->field[ 'show_all_fields' ] ) ) {
             	$class .= ' mt-hide_all_fields ';
             }
         }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 		$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
 		$rows = \GV\Utils::get( $this->field, 'rows', 5 );
 		?>
-		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea(  $this->value ); ?></textarea>
+		<textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
        	<?php
 	}
 

Please login to merge, or discard this patch.

includes/admin/field-types/type_text.php 2 patches

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

@@ -28,11 +28,11 @@
 block discarded – undo
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
-            $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
-        }
-        $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
-        $placeholder = \GV\Utils::get( $this->field, 'placeholder' );
+		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
+		}
+		$class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
+		$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
 		?>
 		<input name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
 		<?php

Please login to merge, or discard this patch.

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

@@ -8,7 +8,7 @@  discard block
 block discarded – undo
 		?>
 		<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
 
-			echo '<span class="gv-label">'.$this->get_field_label().'</span>';
+			echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
 			echo $this->get_tooltip() . $this->get_field_desc();
 		?><div>
 				<?php $this->render_input(); ?>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
 
 	function render_input( $override_input = null ) {
 
-		if( isset( $override_input ) ) {
+		if ( isset( $override_input ) ) {
 			echo $override_input;
 			return;
 		}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 
 		$show_mt = $this->show_merge_tags();
 
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
         }
         $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );

Please login to merge, or discard this patch.

		@@ -22,8 +22,8 @@ discard block
		block discarded – undo
22	22	function __construct() {
23	23
24	24	$this->widget_id = 'poll';
25		- $this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' );
26		- $this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
	25	+ $this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' );
	26	+ $this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
27	27
28	28	$default_values = array(
29	29	'header' => 1,
		@@ -32,27 +32,27 @@ discard block
		block discarded – undo
32	32
33	33	$settings = array(
34	34	'percentages' => array(
35		- 'label' => __('Display Percentages', 'gravityview'),
	35	+ 'label' => __( 'Display Percentages', 'gravityview' ),
36	36	'type' => 'checkbox',
37	37	'value' => true,
38	38	'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
39	39	),
40	40	'counts' => array(
41		- 'label' => __('Display Counts', 'gravityview'),
	41	+ 'label' => __( 'Display Counts', 'gravityview' ),
42	42	'type' => 'checkbox',
43	43	'value' => true,
44	44	'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
45	45	),
46	46	'style' => array(
47	47	'type' => 'select',
48		- 'label' => __('Style', 'gravityview'),
	48	+ 'label' => __( 'Style', 'gravityview' ),
49	49	'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ),
50	50	'value' => 'green',
51	51	'choices' => array(
52		- 'green' => __('Green', 'gravityview'),
53		- 'blue' => __('Blue', 'gravityview'),
54		- 'red' => __('Red', 'gravityview'),
55		- 'orange' => __('Orange', 'gravityview'),
	52	+ 'green' => __( 'Green', 'gravityview' ),
	53	+ 'blue' => __( 'Blue', 'gravityview' ),
	54	+ 'red' => __( 'Red', 'gravityview' ),
	55	+ 'orange' => __( 'Orange', 'gravityview' ),
56	56	)
57	57	)
58	58	);
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
63	63	}
64	64
65		- parent::__construct( __( 'Poll Results', 'gravityview' ) , null, $default_values, $settings );
	65	+ parent::__construct( __( 'Poll Results', 'gravityview' ), null, $default_values, $settings );
66	66	}
67	67
68	68	/**
		@@ -89,11 +89,11 @@ discard block
		block discarded – undo
89	89
90	90	$GFPolls = GFPolls::get_instance();
91	91
92		- wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version);
	92	+ wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version );
93	93
94	94	$GFPolls->localize_scripts();
95	95
96		- wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version);
	96	+ wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version );
97	97	}
98	98
99	99	/**
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	*/
104	104	public function pre_render_frontend() {
105	105
106		- if( !class_exists('GFPolls') ) {
	106	+ if ( ! class_exists( 'GFPolls' ) ) {
107	107
108	108	$return = false;
109	109
		@@ -159,14 +159,14 @@ discard block
		block discarded – undo
159	159	*
160	160	* @since 1.8
161	161	*/
162		- public function render_frontend( $widget_args, $content = '', $context = '') {
	162	+ public function render_frontend( $widget_args, $content = '', $context = '' ) {
163	163
164		- if( !$this->pre_render_frontend() ) {
	164	+ if ( ! $this->pre_render_frontend() ) {
165	165	return;
166	166	}
167	167
168	168	// Make sure the class is loaded in DataTables
169		- if( !class_exists( 'GFFormDisplay' ) ) {
	169	+ if ( ! class_exists( 'GFFormDisplay' ) ) {
170	170	include_once( GFCommon::get_base_path() . '/form_display.php' );
171	171	}
172	172
		@@ -174,14 +174,14 @@ discard block
		block discarded – undo
174	174
175	175	$settings = $this->get_frontend_settings( $widget_args );
176	176
177		- $percentages = empty( $settings['percentages'] ) ? 'false' : 'true';
	177	+ $percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true';
178	178
179		- $counts = empty( $settings['counts'] ) ? 'false' : 'true';
	179	+ $counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true';
180	180
181		- if( !empty( $settings['field'] ) ) {
182		- $merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts );
	181	+ if ( ! empty( $settings[ 'field' ] ) ) {
	182	+ $merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts );
183	183	} else {
184		- $merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts );
	184	+ $merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts );
185	185	}
186	186
187	187	$gravityview_view = GravityView_View::getInstance();
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190
191	191	$gravityview_view->poll_settings = $settings;
192	192
193		- $gravityview_view->render('widget', 'poll', false );
	193	+ $gravityview_view->render( 'widget', 'poll', false );
194	194
195	195	}
196	196

		@@ -41,22 +41,22 @@
		block discarded – undo
41	41
42	42	<?php
43	43
44		- $search_value = \GV\Utils::_GET( $search_field['name'] );
	44	+ $search_value = \GV\Utils::_GET( $search_field['name'] );
45	45
46		- foreach ( $search_field['choices'] as $k => $choice ) {
	46	+ foreach ( $search_field['choices'] as $k => $choice ) {
47	47
48		- if ( 0 != $k ) {
49		- echo esc_html( $links_sep );
50		- }
	48	+ if ( 0 != $k ) {
	49	+ echo esc_html( $links_sep );
	50	+ }
51	51
52		- $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
	52	+ $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
53	53
54		- if ( $active ) {
55		- $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
56		- } else {
57		- $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
58		- }
59		- ?>
	54	+ if ( $active ) {
	55	+ $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
	56	+ } else {
	57	+ $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
	58	+ }
	59	+ ?>
60	60
61	61	<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
62	62

		@@ -13,12 +13,12 @@ discard block
		block discarded – undo
13	13	$base_url = GravityView_Widget_Search::get_search_form_action();
14	14
15	15	// Make sure that there are choices to display
16		-if ( empty( $search_field['choices'] ) ) {
	16	+if ( empty( $search_field[ 'choices' ] ) ) {
17	17	gravityview()->log->debug( 'search-field-link.php - No choices for field' );
18	18	return;
19	19	}
20	20
21		-$links_label = empty( $search_field['label'] ) ? __( 'Show only:', 'gravityview' ) : $search_field['label'];
	21	+$links_label = empty( $search_field[ 'label' ] ) ? __( 'Show only:', 'gravityview' ) : $search_field[ 'label' ];
22	22
23	23	/**
24	24	* @filter `gravityview/extension/search/links_label` Change the label for the "Link" search bar input type
		@@ -41,24 +41,24 @@ discard block
		block discarded – undo
41	41
42	42	<?php
43	43
44		- $search_value = \GV\Utils::_GET( $search_field['name'] );
	44	+ $search_value = \GV\Utils::_GET( $search_field[ 'name' ] );
45	45
46		- foreach ( $search_field['choices'] as $k => $choice ) {
	46	+ foreach ( $search_field[ 'choices' ] as $k => $choice ) {
47	47
48	48	if ( 0 != $k ) {
49	49	echo esc_html( $links_sep );
50	50	}
51	51
52		- $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
	52	+ $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
53	53
54	54	if ( $active ) {
55		- $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
	55	+ $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
56	56	} else {
57		- $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
	57	+ $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
58	58	}
59	59	?>
60	60
61		- <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
	61	+ <a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
62	62
63	63	<?php } ?>
64	64	</p>

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	$search_field = $gravityview_view->search_field;
11	11
12	12	// Make sure that there are choices to display
13		-if( empty( $search_field['choices'] ) ) {
	13	+if ( empty( $search_field[ 'choices' ] ) ) {
14	14	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
15	15	return;
16	16	}
		@@ -21,19 +21,19 @@ discard block
		block discarded – undo
21	21	* @param string $default_option Default: `—` (—)
22	22	* @param string $field_type Field type: "select" or "multiselect"
23	23	*/
24		-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
	24	+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
25	25
26	26	?>
27	27	<div class="gv-search-box gv-search-field-select">
28		- <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
29		- <label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
	28	+ <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
	29	+ <label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
30	30	<?php } ?>
31	31	<p>
32		- <select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
33		- <option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
	32	+ <select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
	33	+ <option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
34	34	<?php
35		- foreach( $search_field['choices'] as $choice ) : ?>
36		- <option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
	35	+ foreach ( $search_field[ 'choices' ] as $choice ) : ?>
	36	+ <option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
37	37	<?php endforeach; ?>
38	38	</select>
39	39	</p>

		@@ -10,22 +10,22 @@
		block discarded – undo
10	10	$search_field = $gravityview_view->search_field;
11	11
12	12	// Make sure that there are choices to display
13		-if( empty( $search_field['choices'] ) ) {
	13	+if ( empty( $search_field[ 'choices' ] ) ) {
14	14	gravityview()->log->debug( 'search-field-checkbox.php - No choices for field' );
15	15	return;
16	16	}
17	17
18	18	?>
19	19	<div class="gv-search-box gv-search-field-checkbox">
20		- <?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
21		- <label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
	20	+ <?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
	21	+ <label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
22	22	<?php } ?>
23	23	<p>
24		- <?php foreach( $search_field['choices'] as $choice ) { ?>
	24	+ <?php foreach ( $search_field[ 'choices' ] as $choice ) { ?>
25	25
26		- <label for="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" class="gv-check-radio">
27		- <input type="checkbox" name="<?php echo esc_attr( $search_field['name'] ); ?>[]" value="<?php echo esc_attr( $choice['value'] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field['name'].$choice['value'].$choice['text'] ); ?>" <?php gv_selected( $choice['value'], $search_field['value'], true, 'checked' ); ?>>
28		- <?php echo esc_html( $choice['text'] ); ?>
	26	+ <label for="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" class="gv-check-radio">
	27	+ <input type="checkbox" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>[]" value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" id="search-box-<?php echo sanitize_html_class( $search_field[ 'name' ] . $choice[ 'value' ] . $choice[ 'text' ] ); ?>" <?php gv_selected( $choice[ 'value' ], $search_field[ 'value' ], true, 'checked' ); ?>>
	28	+ <?php echo esc_html( $choice[ 'text' ] ); ?>
29	29	</label>
30	30
31	31	<?php } ?>

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	/**
32	32	* @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
33	33	* @param GravityView_Widget_Search $this GravityView Widget instance
34		- * @param array $search_field
	34	+ * @param array $search_field
35	35	*/
36	36	do_action( 'gravityview_search_widget_field_before', $this, $search_field );
37	37
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	/**
47	47	* @action `gravityview_search_widget_field_after` After each search input is rendered (other than the submit button)
48	48	* @param GravityView_Widget_Search $this GravityView Widget instance
49		- * @param array $search_field
	49	+ * @param array $search_field
50	50	*/
51	51	do_action( 'gravityview_search_widget_field_after', $this, $search_field );
52	52	}
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	do_action( 'gravityview_search_widget_fields_after', $this );
59	59
60	60	if( $has_inputs ) {
61		- $this->render( 'search-field', 'submit', false );
62		- }
	61	+ $this->render( 'search-field', 'submit', false );
	62	+ }
63	63	?>
64	64	</form>

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	*/
27	27	do_action( 'gravityview_search_widget_fields_before', $this );
28	28
29		- foreach( $this->search_fields as $search_field ) {
	29	+ foreach ( $this->search_fields as $search_field ) {
30	30
31	31	/**
32	32	* @action `gravityview_search_widget_field_before` Before each search input is rendered (other than the submit button)
		@@ -36,10 +36,10 @@ discard block
		block discarded – undo
36	36	do_action( 'gravityview_search_widget_field_before', $this, $search_field );
37	37
38	38	$gravityview_view->search_field = $search_field;
39		- $this->render( 'search-field', $search_field['input'], false );
	39	+ $this->render( 'search-field', $search_field[ 'input' ], false );
40	40
41	41	// show/hide the search button if there are input type fields
42		- if( !$has_inputs && $search_field['input'] != 'link' ) {
	42	+ if ( ! $has_inputs && $search_field[ 'input' ] != 'link' ) {
43	43	$has_inputs = true;
44	44	}
45	45
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	*/
58	58	do_action( 'gravityview_search_widget_fields_after', $this );
59	59
60		- if( $has_inputs ) {
	60	+ if ( $has_inputs ) {
61	61	$this->render( 'search-field', 'submit', false );
62	62	}
63	63	?>

		@@ -28,13 +28,13 @@
		block discarded – undo
28	28
29	29	$show_mt = $this->show_merge_tags();
30	30
31		- if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
32		- $class .= ' merge-tag-support mt-position-right ';
	31	+ if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
	32	+ $class .= ' merge-tag-support mt-position-right ';
33	33
34		- if( empty( $this->field['show_all_fields'] ) ) {
35		- $class .= ' mt-hide_all_fields ';
36		- }
37		- }
	34	+ if( empty( $this->field['show_all_fields'] ) ) {
	35	+ $class .= ' mt-hide_all_fields ';
	36	+ }
	37	+ }
38	38	$class .= \GV\Utils::get( $this->field, 'class' );
39	39	$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
40	40	$rows = \GV\Utils::get( $this->field, 'rows', 5 );

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	?>
10	10	<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
11	11
12		- echo '<span class="gv-label">'.$this->get_field_label().'</span>';
	12	+ echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
13	13	echo $this->get_tooltip() . $this->get_field_desc();
14	14	?><div>
15	15	<?php $this->render_input(); ?>
		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	}
20	20
21	21	function render_input( $override_input = null ) {
22		- if( isset( $override_input ) ) {
	22	+ if ( isset( $override_input ) ) {
23	23	echo $override_input;
24	24	return;
25	25	}
		@@ -28,10 +28,10 @@ discard block
		block discarded – undo
28	28
29	29	$show_mt = $this->show_merge_tags();
30	30
31		- if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
	31	+ if ( $show_mt && $this->field[ 'merge_tags' ] !== false \|\| $this->field[ 'merge_tags' ] === 'force' ) {
32	32	$class .= ' merge-tag-support mt-position-right ';
33	33
34		- if( empty( $this->field['show_all_fields'] ) ) {
	34	+ if ( empty( $this->field[ 'show_all_fields' ] ) ) {
35	35	$class .= ' mt-hide_all_fields ';
36	36	}
37	37	}
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	$placeholder = \GV\Utils::get( $this->field, 'placeholder' );
40	40	$rows = \GV\Utils::get( $this->field, 'rows', 5 );
41	41	?>
42		- <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
	42	+ <textarea name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo gravityview_sanitize_html_class( $class ); ?>" rows="<?php echo intval( $rows ); ?>"><?php echo esc_textarea( $this->value ); ?></textarea>
43	43	<?php
44	44	}
45	45

		@@ -28,11 +28,11 @@
		block discarded – undo
28	28
29	29	$show_mt = $this->show_merge_tags();
30	30
31		- if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
32		- $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33		- }
34		- $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
35		- $placeholder = \GV\Utils::get( $this->field, 'placeholder' );
	31	+ if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
	32	+ $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
	33	+ }
	34	+ $class .= \GV\Utils::get( $this->field, 'class', 'widefat' );
	35	+ $placeholder = \GV\Utils::get( $this->field, 'placeholder' );
36	36	?>
37	37	<input name="<?php echo esc_attr( $this->name ); ?>" placeholder="<?php echo esc_attr( $placeholder ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
38	38	<?php

		@@ -8,7 +8,7 @@ discard block
		block discarded – undo
8	8	?>
9	9	<label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php
10	10
11		- echo '<span class="gv-label">'.$this->get_field_label().'</span>';
	11	+ echo '<span class="gv-label">' . $this->get_field_label() . '</span>';
12	12	echo $this->get_tooltip() . $this->get_field_desc();
13	13	?><div>
14	14	<?php $this->render_input(); ?>
		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19
20	20	function render_input( $override_input = null ) {
21	21
22		- if( isset( $override_input ) ) {
	22	+ if ( isset( $override_input ) ) {
23	23	echo $override_input;
24	24	return;
25	25	}
		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28
29	29	$show_mt = $this->show_merge_tags();
30	30
31		- if( $show_mt && $this->field['merge_tags'] !== false \|\| $this->field['merge_tags'] === 'force' ) {
	31	+ if ( $show_mt && $this->field[ 'merge_tags' ] !== false \|\| $this->field[ 'merge_tags' ] === 'force' ) {
32	32	$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
33	33	}
34	34	$class .= \GV\Utils::get( $this->field, 'class', 'widefat' );

gravityview / GravityView

Push — develop ( 406a4f...613d21 )

Status

Category

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

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

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

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

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

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

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

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

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

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

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

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

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