Inspection of "Duplicate fine-tunes" - gravityview/GravityView - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — develop ( 87b48c...882b48 )

by Gennady

created 2019-11-25 14:22 UTC

Status

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

@@ -113,16 +113,16 @@  discard block
 block discarded – undo
 		$new_value = $old_value;
 
 		// Meta value does not exist yet
-		if( false === $old_value ) {
+		if ( false === $old_value ) {
 			return self::UNAPPROVED;
 		}
 
 		// Meta value does not exist yet
-		if( true === $old_value ) {
+		if ( true === $old_value ) {
 			return self::APPROVED;
 		}
 
-		switch ( (string) $old_value ) {
+		switch ( (string)$old_value ) {
 
 			// Approved values
 			case 'Approved':
@@ -248,9 +248,9 @@  discard block
 block discarded – undo
 		foreach ( $choices as $key => $choice ) {
 
 			// Is the passed status value the same as the choice value or key?
-			if ( $status === $choice['value'] || $status === $key ) {
+			if ( $status === $choice[ 'value' ] || $status === $key ) {
 
-				if( 'key' === $attr_key ) {
+				if ( 'key' === $attr_key ) {
 					return $key;
 				} else {
 					return \GV\Utils::get( $choice, $attr_key, false );

Please login to merge, or discard this patch.

includes/widgets/class-gravityview-widget-page-links.php 1 patch

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

@@ -11,35 +11,35 @@  discard block
 block discarded – undo
 
 	function __construct() {
 
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
 
 		$default_values = array( 'header' => 1, 'footer' => 1 );
 		$settings = array( 'show_all' => array(
 			'type' => 'checkbox',
 			'label' => __( 'Show each page number', 'gravityview' ),
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
 			'value' => false
-		));
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
+		) );
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
 
 	}
 
-	public function render_frontend( $widget_args, $content = '', $context = '') {
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
 		$gravityview_view = GravityView_View::getInstance();
 
-		if( !$this->pre_render_frontend() ) {
+		if ( ! $this->pre_render_frontend() ) {
 			return;
 		}
 
 		$atts = shortcode_atts( array(
 			'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
 			'total' => $gravityview_view->total_entries,
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
-			'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
+			'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
 		), $widget_args, 'gravityview_widget_page_links' );
 		
 		$page_link_args = array(
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
 			'format' => '&pagenum=%#%',
 			'add_args' => array(), //
 			'prev_text' => '&laquo;',
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
 			'type' => 'list',
 			'end_size' => 1,
 			'mid_size' => 2,
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
-			'current' => $atts['current'],
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
+			'current' => $atts[ 'current' ],
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
 		);
 
 		/**
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
 		 * @since 1.1.4
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
 		 */
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
 
 		$page_links = paginate_links( $page_link_args );
 
-		if( !empty( $page_links )) {
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		if ( ! empty( $page_links ) ) {
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
 		} else {
 			gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
 		}

Please login to merge, or discard this patch.

includes/widgets/class-gravityview-widget-custom-content.php 1 patch

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

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 
 	function __construct() {
 
-		$this->widget_description = __('Insert custom text or HTML as a widget', 'gravityview' );
+		$this->widget_description = __( 'Insert custom text or HTML as a widget', 'gravityview' );
 
 		$default_values = array(
 			'header' => 1,
@@ -42,39 +42,39 @@  discard block
 block discarded – undo
 			),
 		);
 
-		parent::__construct( __( 'Custom Content', 'gravityview' ) , 'custom_content', $default_values, $settings );
+		parent::__construct( __( 'Custom Content', 'gravityview' ), 'custom_content', $default_values, $settings );
 	}
 
-	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;
 		}
 
-		if( !empty( $widget_args['title'] ) ) {
-			echo $widget_args['title'];
+		if ( ! empty( $widget_args[ 'title' ] ) ) {
+			echo $widget_args[ 'title' ];
 		}
 
 
 		// 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' );
 		}
 
-		$widget_args['content'] = trim( rtrim( $widget_args['content'] ) );
+		$widget_args[ 'content' ] = trim( rtrim( $widget_args[ 'content' ] ) );
 
 		// No custom content
-		if( empty( $widget_args['content'] ) ) {
+		if ( empty( $widget_args[ 'content' ] ) ) {
 			gravityview()->log->debug( 'No content.' );
 			return;
 		}
 
 		// Add paragraphs?
-		if( !empty( $widget_args['wpautop'] ) ) {
-			$widget_args['content'] = wpautop( $widget_args['content'] );
+		if ( ! empty( $widget_args[ 'wpautop' ] ) ) {
+			$widget_args[ 'content' ] = wpautop( $widget_args[ 'content' ] );
 		}
 
-		$content = $widget_args['content'];
+		$content = $widget_args[ 'content' ];
 
 		$content = GravityView_Merge_Tags::replace_variables( $content, array(), array(), false, true, false );
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
 
 
 		// Add custom class
-		$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
+		$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
 		$class = gravityview_sanitize_html_class( $class );
 
-		echo '<div class="gv-widget-custom-content '.$class.'">'. $content .'</div>';
+		echo '<div class="gv-widget-custom-content ' . $class . '">' . $content . '</div>';
 
 	}
 

Please login to merge, or discard this patch.

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

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-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( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) {
+	foreach ( array_merge( $this->search_fields, $this->permalink_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/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.

		@@ -113,16 +113,16 @@ discard block
		block discarded – undo
113	113	$new_value = $old_value;
114	114
115	115	// Meta value does not exist yet
116		- if( false === $old_value ) {
	116	+ if ( false === $old_value ) {
117	117	return self::UNAPPROVED;
118	118	}
119	119
120	120	// Meta value does not exist yet
121		- if( true === $old_value ) {
	121	+ if ( true === $old_value ) {
122	122	return self::APPROVED;
123	123	}
124	124
125		- switch ( (string) $old_value ) {
	125	+ switch ( (string)$old_value ) {
126	126
127	127	// Approved values
128	128	case 'Approved':
		@@ -248,9 +248,9 @@ discard block
		block discarded – undo
248	248	foreach ( $choices as $key => $choice ) {
249	249
250	250	// Is the passed status value the same as the choice value or key?
251		- if ( $status === $choice['value'] \|\| $status === $key ) {
	251	+ if ( $status === $choice[ 'value' ] \|\| $status === $key ) {
252	252
253		- if( 'key' === $attr_key ) {
	253	+ if ( 'key' === $attr_key ) {
254	254	return $key;
255	255	} else {
256	256	return \GV\Utils::get( $choice, $attr_key, false );

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17
18	18	function __construct() {
19	19
20		- $this->widget_description = __('Insert custom text or HTML as a widget', 'gravityview' );
	20	+ $this->widget_description = __( 'Insert custom text or HTML as a widget', 'gravityview' );
21	21
22	22	$default_values = array(
23	23	'header' => 1,
		@@ -42,39 +42,39 @@ discard block
		block discarded – undo
42	42	),
43	43	);
44	44
45		- parent::__construct( __( 'Custom Content', 'gravityview' ) , 'custom_content', $default_values, $settings );
	45	+ parent::__construct( __( 'Custom Content', 'gravityview' ), 'custom_content', $default_values, $settings );
46	46	}
47	47
48		- public function render_frontend( $widget_args, $content = '', $context = '') {
	48	+ public function render_frontend( $widget_args, $content = '', $context = '' ) {
49	49
50		- if( !$this->pre_render_frontend() ) {
	50	+ if ( ! $this->pre_render_frontend() ) {
51	51	return;
52	52	}
53	53
54		- if( !empty( $widget_args['title'] ) ) {
55		- echo $widget_args['title'];
	54	+ if ( ! empty( $widget_args[ 'title' ] ) ) {
	55	+ echo $widget_args[ 'title' ];
56	56	}
57	57
58	58
59	59	// Make sure the class is loaded in DataTables
60		- if( !class_exists( 'GFFormDisplay' ) ) {
	60	+ if ( ! class_exists( 'GFFormDisplay' ) ) {
61	61	include_once( GFCommon::get_base_path() . '/form_display.php' );
62	62	}
63	63
64		- $widget_args['content'] = trim( rtrim( $widget_args['content'] ) );
	64	+ $widget_args[ 'content' ] = trim( rtrim( $widget_args[ 'content' ] ) );
65	65
66	66	// No custom content
67		- if( empty( $widget_args['content'] ) ) {
	67	+ if ( empty( $widget_args[ 'content' ] ) ) {
68	68	gravityview()->log->debug( 'No content.' );
69	69	return;
70	70	}
71	71
72	72	// Add paragraphs?
73		- if( !empty( $widget_args['wpautop'] ) ) {
74		- $widget_args['content'] = wpautop( $widget_args['content'] );
	73	+ if ( ! empty( $widget_args[ 'wpautop' ] ) ) {
	74	+ $widget_args[ 'content' ] = wpautop( $widget_args[ 'content' ] );
75	75	}
76	76
77		- $content = $widget_args['content'];
	77	+ $content = $widget_args[ 'content' ];
78	78
79	79	$content = GravityView_Merge_Tags::replace_variables( $content, array(), array(), false, true, false );
80	80
		@@ -84,10 +84,10 @@ discard block
		block discarded – undo
84	84
85	85
86	86	// Add custom class
87		- $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
	87	+ $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
88	88	$class = gravityview_sanitize_html_class( $class );
89	89
90		- echo '<div class="gv-widget-custom-content '.$class.'">'. $content .'</div>';
	90	+ echo '<div class="gv-widget-custom-content ' . $class . '">' . $content . '</div>';
91	91
92	92	}
93	93

		@@ -11,35 +11,35 @@ discard block
		block discarded – undo
11	11
12	12	function __construct() {
13	13
14		- $this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
	14	+ $this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
15	15
16	16	$default_values = array( 'header' => 1, 'footer' => 1 );
17	17	$settings = array( 'show_all' => array(
18	18	'type' => 'checkbox',
19	19	'label' => __( 'Show each page number', 'gravityview' ),
20		- 'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
	20	+ 'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
21	21	'value' => false
22		- ));
23		- parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
	22	+ ) );
	23	+ parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
24	24
25	25	}
26	26
27		- public function render_frontend( $widget_args, $content = '', $context = '') {
	27	+ public function render_frontend( $widget_args, $content = '', $context = '' ) {
28	28	$gravityview_view = GravityView_View::getInstance();
29	29
30		- if( !$this->pre_render_frontend() ) {
	30	+ if ( ! $this->pre_render_frontend() ) {
31	31	return;
32	32	}
33	33
34	34	$atts = shortcode_atts( array(
35	35	'page_size' => \GV\Utils::get( $gravityview_view->paging, 'page_size' ),
36	36	'total' => $gravityview_view->total_entries,
37		- 'show_all' => !empty( $this->settings['show_all']['default'] ),
38		- 'current' => (int) \GV\Utils::_GET( 'pagenum', 1 ),
	37	+ 'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
	38	+ 'current' => (int)\GV\Utils::_GET( 'pagenum', 1 ),
39	39	), $widget_args, 'gravityview_widget_page_links' );
40	40
41	41	$page_link_args = array(
42		- 'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
	42	+ 'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
43	43	'format' => '&pagenum=%#%',
44	44	'add_args' => array(), //
45	45	'prev_text' => '«',
		@@ -47,9 +47,9 @@ discard block
		block discarded – undo
47	47	'type' => 'list',
48	48	'end_size' => 1,
49	49	'mid_size' => 2,
50		- 'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
51		- 'current' => $atts['current'],
52		- 'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
	50	+ 'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
	51	+ 'current' => $atts[ 'current' ],
	52	+ 'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
53	53	);
54	54
55	55	/**
		@@ -57,14 +57,14 @@ discard block
		block discarded – undo
57	57	* @since 1.1.4
58	58	* @param array $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
59	59	*/
60		- $page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
	60	+ $page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
61	61
62	62	$page_links = paginate_links( $page_link_args );
63	63
64		- if( !empty( $page_links )) {
65		- $class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
	64	+ if ( ! empty( $page_links ) ) {
	65	+ $class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
66	66	$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
67		- echo '<div class="'.$class.'">'. $page_links .'</div>';
	67	+ echo '<div class="' . $class . '">' . $page_links . '</div>';
68	68	} else {
69	69	gravityview()->log->debug( 'No page links; paginate_links() returned empty response.' );
70	70	}

		@@ -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,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( array_merge( $this->search_fields, $this->permalink_fields ) as $search_field ) {
	29	+ foreach ( array_merge( $this->search_fields, $this->permalink_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	?>

		@@ -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-multiselect.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', '—', 'multiselect' );
	24	+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'multiselect' );
25	25
26	26	?>
27	27	<div class="gv-search-box gv-search-field-multiselect">
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'] ); ?>" multiple>
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' ] ); ?>" multiple>
	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( $choice['value'], $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( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
37	37	<?php endforeach; ?>
38	38	</select>
39	39	</p>

		@@ -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

gravityview / GravityView

Push — develop ( 87b48c...882b48 )

Status

Category

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

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

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

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 +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

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