Completed
Pull Request — master (#654)
by Zack
59:38 queued 55:37
created
includes/extensions/edit-entry/partials/inline-javascript.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @file inline-javascript.php
4
- * @global GravityView_Edit_Entry_Render $object
5
- */
3
+	 * @file inline-javascript.php
4
+	 * @global GravityView_Edit_Entry_Render $object
5
+	 */
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
 ?><script type="text/javascript">
7 7
 
8 8
 	function DeleteFile(leadId, fieldId, deleteButton){
9
-		if(confirm('<?php echo esc_js( __("Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview') ); ?>')){
9
+		if(confirm('<?php echo esc_js( __( "Would you like to permanently delete this file? 'Cancel' to stop. 'OK' to delete", 'gravityview' ) ); ?>')){
10 10
 			var fileIndex = jQuery(deleteButton).parent().index();
11
-			var mysack = new sack("<?php echo admin_url("admin-ajax.php")?>");
11
+			var mysack = new sack("<?php echo admin_url( "admin-ajax.php" )?>");
12 12
 			mysack.execute = 1;
13 13
 			mysack.method = 'POST';
14 14
 			mysack.setVar( "action", "rg_delete_file" );
15
-			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce("rg_delete_file") ?>" );
15
+			mysack.setVar( "rg_delete_file", "<?php echo wp_create_nonce( "rg_delete_file" ) ?>" );
16 16
 			mysack.setVar( "lead_id", leadId );
17 17
 			mysack.setVar( "field_id", fieldId );
18 18
 			mysack.setVar( "file_index", fileIndex );
19
-			mysack.onError = function() { alert('<?php echo esc_js(__('Ajax error while deleting field.', 'gravityview')) ?>' )};
19
+			mysack.onError = function() { alert('<?php echo esc_js( __( 'Ajax error while deleting field.', 'gravityview' ) ) ?>' )};
20 20
 			mysack.runAJAX();
21 21
 
22 22
 			return true;
Please login to merge, or discard this patch.
includes/helper-functions.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@
 block discarded – undo
307 307
 		! isset( $value ) // If it's not set, it's empty!
308 308
 		|| false === $value
309 309
 		|| null === $value
310
-	    || '' === $value // Empty string
310
+		|| '' === $value // Empty string
311 311
 		|| array() === $value // Empty array
312 312
 		|| ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object
313 313
 	) {
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
  *
29 29
  * We could do this in a cleaner fashion, but this prevents a lot of code duplication, checking for URL structure, etc.
30 30
  *
31
- * @param int|WP_Post $id        Optional. Post ID or post object. Default current post.
31
+ * @param integer $id        Optional. Post ID or post object. Default current post.
32 32
  *
33 33
  * @return array URL args, if exists. Empty array if not.
34 34
  */
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
  * @since 1.15 Added $object param
136 136
  *
137 137
  * @param string $file_path Full path to a file
138
- * @param mixed $object Pass pseudo-global to the included file
138
+ * @param GravityView_Edit_Entry_Render $object Pass pseudo-global to the included file
139 139
  * @return string Included file contents
140 140
  */
141 141
 function gravityview_ob_include( $file_path, $object = NULL ) {
@@ -310,7 +310,6 @@  discard block
 block discarded – undo
310 310
  * Do a _very_ basic match for second-level TLD domains, like `.co.uk`
311 311
  *
312 312
  * Ideally, we'd use https://github.com/jeremykendall/php-domain-parser to check for this, but it's too much work for such a basic functionality. Maybe if it's needed more in the future. So instead, we use [Basic matching regex](http://stackoverflow.com/a/12372310).
313
- * @param  string $domain Domain to check if it's a TLD or subdomain
314 313
  * @return string         Extracted domain if it has a subdomain
315 314
  */
316 315
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
Please login to merge, or discard this patch.
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 
37 37
 	$parsed_permalink = parse_url( get_permalink( $id ) );
38 38
 
39
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
39
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
40 40
 
41
-	if( empty( $permalink_args ) ) {
41
+	if ( empty( $permalink_args ) ) {
42 42
 		return array();
43 43
 	}
44 44
 
@@ -63,15 +63,15 @@  discard block
 block discarded – undo
63 63
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
64 64
 
65 65
 	$output = '';
66
-	if( is_array( $current ) ) {
67
-		if( in_array( $value, $current ) ) {
66
+	if ( is_array( $current ) ) {
67
+		if ( in_array( $value, $current ) ) {
68 68
 			$output = __checked_selected_helper( true, true, false, $type );
69 69
 		}
70 70
 	} else {
71 71
 		$output = __checked_selected_helper( $value, $current, false, $type );
72 72
 	}
73 73
 
74
-	if( $echo ) {
74
+	if ( $echo ) {
75 75
 		echo $output;
76 76
 	}
77 77
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 }
80 80
 
81 81
 
82
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
82
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
83 83
 
84 84
 	/**
85 85
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
  */
126 126
 function gravityview_strip_whitespace( $string ) {
127 127
 	$string = normalize_whitespace( $string );
128
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
128
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
129 129
 }
130 130
 
131 131
 /**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
  * @return string Included file contents
140 140
  */
141 141
 function gravityview_ob_include( $file_path, $object = NULL ) {
142
-	if( ! file_exists( $file_path ) ) {
142
+	if ( ! file_exists( $file_path ) ) {
143 143
 		do_action( 'gravityview_log_error', __FUNCTION__ . ': File path does not exist. ', $file_path );
144 144
 		return '';
145 145
 	}
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
  */
156 156
 function gravityview_get_floaty() {
157 157
 
158
-	if( function_exists('is_rtl') && is_rtl() ) {
158
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
159 159
 		$style = 'margin:10px 10px 10px 0;';
160 160
 		$class = 'alignright';
161 161
 	} else {
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		$class = 'alignleft';
164 164
 	}
165 165
 
166
-	return '<img src="'.plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="'.$class.'" height="87" width="66" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
166
+	return '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="' . $class . '" height="87" width="66" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
167 167
 }
168 168
 
169 169
 /**
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 function gravityview_number_format( $number, $decimals = '' ) {
187 187
 	global $wp_locale;
188 188
 
189
-	if( '' === $decimals ) {
189
+	if ( '' === $decimals ) {
190 190
 
191
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
191
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
192 192
 
193 193
 		/**
194 194
 		 * Calculate the position of the decimal point in the number
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 	$parts = parse_url( $value );
218 218
 
219 219
 	// No domain? Strange...show the original text.
220
-	if( empty( $parts['host'] ) ) {
220
+	if ( empty( $parts[ 'host' ] ) ) {
221 221
 		return $value;
222 222
 	}
223 223
 
@@ -230,16 +230,16 @@  discard block
 block discarded – undo
230 230
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
231 231
 	 * If true: `http://example.com => example.com`
232 232
 	 */
233
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
233
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
234 234
 
235
-		if( isset( $parts['scheme'] ) ) {
236
-			$return .= $parts['scheme'];
235
+		if ( isset( $parts[ 'scheme' ] ) ) {
236
+			$return .= $parts[ 'scheme' ];
237 237
 		}
238 238
 
239 239
 	}
240 240
 
241 241
 	// The domain, which may contain a subdomain
242
-	$domain = $parts['host'];
242
+	$domain = $parts[ 'host' ];
243 243
 
244 244
 	/**
245 245
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -247,10 +247,10 @@  discard block
 block discarded – undo
247 247
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
248 248
 	 * If true: `www.example.com => example.com`
249 249
 	 */
250
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
250
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
251 251
 
252
-	if( $strip_www ) {
253
-		$domain = str_replace('www.', '', $domain );
252
+	if ( $strip_www ) {
253
+		$domain = str_replace( 'www.', '', $domain );
254 254
 	}
255 255
 
256 256
 	/**
@@ -260,11 +260,11 @@  discard block
 block discarded – undo
260 260
 	 * If true: `http://demo.example.com => example.com` \n
261 261
 	 * If false: `http://demo.example.com => demo.example.com`
262 262
 	 */
263
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
263
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
264 264
 
265
-	if( $strip_subdomains ) {
265
+	if ( $strip_subdomains ) {
266 266
 
267
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
267
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
268 268
 
269 269
 	}
270 270
 
@@ -278,12 +278,12 @@  discard block
 block discarded – undo
278 278
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
279 279
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
280 280
 	 */
281
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
281
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
282 282
 
283
-	if( empty( $root_only ) ) {
283
+	if ( empty( $root_only ) ) {
284 284
 
285
-		if( isset( $parts['path'] ) ) {
286
-			$return .= $parts['path'];
285
+		if ( isset( $parts[ 'path' ] ) ) {
286
+			$return .= $parts[ 'path' ];
287 287
 		}
288 288
 	}
289 289
 
@@ -293,12 +293,12 @@  discard block
 block discarded – undo
293 293
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
294 294
 	 * If true: `http://example.com/?query=example => example.com`
295 295
 	 */
296
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
296
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
297 297
 
298
-	if( empty( $strip_query_string ) ) {
298
+	if ( empty( $strip_query_string ) ) {
299 299
 
300
-		if( isset( $parts['query'] ) ) {
301
-			$return .= '?'.$parts['query'];
300
+		if ( isset( $parts[ 'query' ] ) ) {
301
+			$return .= '?' . $parts[ 'query' ];
302 302
 		}
303 303
 
304 304
 	}
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
  */
316 316
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
317 317
 
318
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
319
-		return $matches['domain'];
318
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
319
+		return $matches[ 'domain' ];
320 320
 	} else {
321 321
 		return $string_maybe_has_subdomain;
322 322
 	}
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
  */
338 338
 function gv_empty( $value, $zero_is_empty = true, $allow_string_booleans = true ) {
339 339
 
340
-	if(
340
+	if (
341 341
 		! isset( $value ) // If it's not set, it's empty!
342 342
 		|| false === $value
343 343
 		|| null === $value
@@ -348,20 +348,20 @@  discard block
 block discarded – undo
348 348
 		return true;
349 349
 	}
350 350
 
351
-	if( is_string( $value ) && $allow_string_booleans ) {
351
+	if ( is_string( $value ) && $allow_string_booleans ) {
352 352
 
353 353
 		$value = trim( $value );
354 354
 		$value = strtolower( $value );
355 355
 
356 356
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
357 357
 			$value = true;
358
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
358
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
359 359
 			$value = false;
360 360
 		}
361 361
 	}
362 362
 
363 363
 	// If zero isn't empty, then if $value is a number and it's empty, it's zero. Thus, return false.
364
-	if( ! $zero_is_empty && is_numeric( $value ) && empty( $value ) ) {
364
+	if ( ! $zero_is_empty && is_numeric( $value ) && empty( $value ) ) {
365 365
 		return false;
366 366
 	}
367 367
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 function gv_map_deep( $value, $callback ) {
384 384
 
385 385
 	// Use the original function, if exists.
386
-	if( function_exists( 'map_deep') ) {
386
+	if ( function_exists( 'map_deep' ) ) {
387 387
 		return map_deep( $value, $callback );
388 388
 	}
389 389
 
@@ -465,13 +465,13 @@  discard block
 block discarded – undo
465 465
 	 */
466 466
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
467 467
 
468
-	$terms = get_terms( $args['taxonomy'], $args );
468
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
469 469
 
470 470
 	$choices = array();
471 471
 
472 472
 	if ( is_array( $terms ) ) {
473 473
 		foreach ( $terms as $term_id => $term_name ) {
474
-			$choices[] = array(
474
+			$choices[ ] = array(
475 475
 				'text'  => $term_name,
476 476
 				'value' => $term_id
477 477
 			);
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
@@ -39,22 +39,22 @@
 block discarded – undo
39 39
 
40 40
         <?php
41 41
 
42
-        $search_value = rgget( $search_field['name'] );
42
+		$search_value = rgget( $search_field['name'] );
43 43
 
44
-        foreach ( $search_field['choices'] as $k => $choice ) {
44
+		foreach ( $search_field['choices'] as $k => $choice ) {
45 45
 
46
-            if ( 0 != $k ) {
47
-                echo esc_html( $links_sep );
48
-            }
46
+			if ( 0 != $k ) {
47
+				echo esc_html( $links_sep );
48
+			}
49 49
 
50
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
50
+			$active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
51 51
 
52
-            if ( $active ) {
53
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
54
-            } else {
55
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
56
-            }
57
-            ?>
52
+			if ( $active ) {
53
+				$link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
54
+			} else {
55
+				$link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
56
+			}
57
+			?>
58 58
 
59 59
 			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
60 60
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  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
 	do_action( 'gravityview_log_debug', 'search-field-link.php - No choices for field' );
18 18
 	return;
19 19
 }
@@ -39,24 +39,24 @@  discard block
 block discarded – undo
39 39
 
40 40
         <?php
41 41
 
42
-        $search_value = rgget( $search_field['name'] );
42
+        $search_value = rgget( $search_field[ 'name' ] );
43 43
 
44
-        foreach ( $search_field['choices'] as $k => $choice ) {
44
+        foreach ( $search_field[ 'choices' ] as $k => $choice ) {
45 45
 
46 46
             if ( 0 != $k ) {
47 47
                 echo esc_html( $links_sep );
48 48
             }
49 49
 
50
-            $active = ( '' !== $search_value && in_array( $search_value, array( $choice['text'], $choice['value'] ) ) ) ? ' class="active"' : false;
50
+            $active = ( '' !== $search_value && in_array( $search_value, array( $choice[ 'text' ], $choice[ 'value' ] ) ) ) ? ' class="active"' : false;
51 51
 
52 52
             if ( $active ) {
53
-                $link = remove_query_arg( array( 'pagenum', $search_field['name'] ), $base_url );
53
+                $link = remove_query_arg( array( 'pagenum', $search_field[ 'name' ] ), $base_url );
54 54
             } else {
55
-                $link = add_query_arg( array( $search_field['name'] => urlencode( $choice['value'] ) ), remove_query_arg( array('pagenum'), $base_url ) );
55
+                $link = add_query_arg( array( $search_field[ 'name' ] => urlencode( $choice[ 'value' ] ) ), remove_query_arg( array( 'pagenum' ), $base_url ) );
56 56
             }
57 57
             ?>
58 58
 
59
-			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice['text'] ); ?></a>
59
+			<a href="<?php echo esc_url_raw( $link ); ?>" <?php echo $active; ?>><?php echo esc_html( $choice[ 'text' ] ); ?></a>
60 60
 
61 61
 		<?php } ?>
62 62
 	</p>
Please login to merge, or discard this patch.
includes/admin/field-types/type_number.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 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 .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
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 .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
35 35
 
36 36
 		?>
37 37
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,13 +3,13 @@  discard block
 block discarded – undo
3 3
  * number input type
4 4
  */
5 5
 
6
-if( !class_exists('GravityView_FieldType_text') ) {
6
+if ( ! class_exists( 'GravityView_FieldType_text' ) ) {
7 7
 	include_once( GRAVITYVIEW_DIR . 'includes/admin/field-types/type_text.php' );
8 8
 }
9 9
 class GravityView_FieldType_number extends GravityView_FieldType_text {
10 10
 
11 11
 	function render_input( $override_input = null ) {
12
-		if( isset( $override_input ) ) {
12
+		if ( isset( $override_input ) ) {
13 13
 			echo $override_input;
14 14
 			return;
15 15
 		}
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$show_mt = $this->show_merge_tags();
20 20
 
21
-        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) {
21
+        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) {
22 22
             $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
23 23
         }
24
-        $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat';
24
+        $class .= ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat';
25 25
 
26 26
 		?>
27 27
 		<input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="number" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>">
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,9 @@
 block discarded – undo
4 4
 //set_site_transient( 'update_plugins', null );
5 5
 
6 6
 // Exit if accessed directly
7
-if ( ! defined( 'ABSPATH' ) ) exit;
7
+if ( ! defined( 'ABSPATH' ) ) {
8
+	exit;
9
+}
8 10
 
9 11
 /**
10 12
  * Allows plugins to use their own update API.
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 	 * @since 1.0
35 35
 	 */
36 36
 	public function __construct() {
37
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
37
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
38 38
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
39
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
40
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
39
+		add_action( 'admin_init', array( $this, 'welcome' ) );
40
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
41 41
 	}
42 42
 
43 43
 	/**
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 		// Add help page to GravityView menu
54 54
 		add_submenu_page(
55 55
 			'edit.php?post_type=gravityview',
56
-			__('GravityView: Getting Started', 'gravityview'),
57
-			__('Getting Started', 'gravityview'),
56
+			__( 'GravityView: Getting Started', 'gravityview' ),
57
+			__( 'Getting Started', 'gravityview' ),
58 58
 			$this->minimum_capability,
59 59
 			'gv-getting-started',
60 60
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return boolean  $is_page   True: yep; false: nope
89 89
 	 */
90
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
90
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
91 91
 		global $plugin_page;
92 92
 
93
-		if($is_page) { return $is_page; }
93
+		if ( $is_page ) { return $is_page; }
94 94
 
95 95
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
96 96
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
109 109
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
110 110
 
111
-		if( !$this->is_dashboard_page() ) { return; }
111
+		if ( ! $this->is_dashboard_page() ) { return; }
112 112
 
113 113
 		?>
114 114
 		<style type="text/css" media="screen">
@@ -141,20 +141,20 @@  discard block
 block discarded – undo
141 141
 		// Don't fetch -beta, etc.
142 142
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
143 143
 
144
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
144
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
145 145
 		?>
146 146
 
147 147
 		<h1><img class="alignleft" src="<?php echo plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ); ?>" width="100" height="132" /><?php printf( esc_html__( 'Welcome to GravityView %s', 'gravityview' ), $display_version ); ?></h1>
148 148
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
149 149
 
150 150
 		<h2 class="nav-tab-wrapper clear">
151
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
151
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
152 152
 				<?php _e( "Getting Started", 'gravityview' ); ?>
153 153
 			</a>
154
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
154
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
155 155
 				<?php _e( "List of Changes", 'gravityview' ); ?>
156 156
 			</a>
157
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
157
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
158 158
 				<?php _e( 'Credits', 'gravityview' ); ?>
159 159
 			</a>
160 160
 		</h2>
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 					<h2>Create a View</h2>
191 191
 
192 192
 					<ol class="ol-decimal">
193
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
193
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
194 194
 						<li>If you want to <strong>create a new form</strong>, click the "Start Fresh" button</li>
195 195
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
196 196
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 					</ul>
526 526
 
527 527
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
528
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
528
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
529 529
 				</div>
530 530
 			</div>
531 531
 
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
 		global $plugin_page;
566 566
 
567 567
 		// Bail if we're just editing the plugin
568
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
568
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
569 569
 
570 570
 		// Bail if no activation redirect
571 571
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -576,7 +576,7 @@  discard block
 block discarded – undo
576 576
 		$upgrade = get_option( 'gv_version_upgraded_from' );
577 577
 
578 578
 		// Don't do anything if they've already seen the new version info
579
-		if( $upgrade === GravityView_Plugin::version ) {
579
+		if ( $upgrade === GravityView_Plugin::version ) {
580 580
 			return;
581 581
 		}
582 582
 
@@ -584,10 +584,10 @@  discard block
 block discarded – undo
584 584
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
585 585
 
586 586
 		// Bail if activating from network, or bulk
587
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
587
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
588 588
 
589 589
 		// First time install
590
-		if( ! $upgrade ) {
590
+		if ( ! $upgrade ) {
591 591
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
592 592
 		}
593 593
 		// Update
Please login to merge, or discard this patch.
includes/class-gravityview-migrate.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * GravityView Migrate Class - where awesome features become even better, seamlessly!
4
- *
5
- * @package   GravityView
6
- * @author    Zack Katz <[email protected]>
7
- * @license   ToBeDefined
8
- * @link      http://www.katzwebservices.com
9
- * @copyright Copyright 2014, Katz Web Services, Inc.
10
- *
11
- * @since 1.2
12
- */
3
+	 * GravityView Migrate Class - where awesome features become even better, seamlessly!
4
+	 *
5
+	 * @package   GravityView
6
+	 * @author    Zack Katz <[email protected]>
7
+	 * @license   ToBeDefined
8
+	 * @link      http://www.katzwebservices.com
9
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
10
+	 *
11
+	 * @since 1.2
12
+	 */
13 13
 
14 14
 
15 15
 class GravityView_Migrate {
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
 
181 181
 					// check widget settings:
182 182
 					//  [search_free] => 1
183
-			        //  [search_date] => 1
184
-			        $search_generic = array();
183
+					//  [search_date] => 1
184
+					$search_generic = array();
185 185
 					if( !empty( $widget['search_free'] ) ) {
186 186
 						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
Please login to merge, or discard this patch.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -51,11 +51,11 @@  discard block
 block discarded – undo
51 51
 		$redux_settings = $this->get_redux_settings();
52 52
 
53 53
 		// No need to process
54
-		if( false === $redux_settings ) {
54
+		if ( false === $redux_settings ) {
55 55
 			return;
56 56
 		}
57 57
 
58
-		if( empty(  $redux_settings['license_key_status'] ) ) {
58
+		if ( empty( $redux_settings[ 'license_key_status' ] ) ) {
59 59
 			$redux_settings = $this->get_redux_license_status( $redux_settings );
60 60
 		}
61 61
 
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 		GravityView_Settings::get_instance()->update_app_settings( $updated_settings );
70 70
 
71 71
 		// And now remove the previous option, so this is a one-time thing.
72
-		delete_option('gravityview_settings');
73
-		delete_option('gravityview_settings-transients');
72
+		delete_option( 'gravityview_settings' );
73
+		delete_option( 'gravityview_settings-transients' );
74 74
 	}
75 75
 
76 76
 	/**
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 
87 87
 		$data = array(
88 88
 			'edd_action' => 'check_license',
89
-			'license' => rgget('license_key', $redux_settings ),
89
+			'license' => rgget( 'license_key', $redux_settings ),
90 90
 			'update' => false,
91 91
 			'format' => 'object',
92 92
 		);
93 93
 
94 94
 		$license_call = GravityView_Settings::get_instance()->get_license_handler()->license_call( $data );
95 95
 
96
-		if( is_object( $license_call ) && isset( $license_call->license ) ) {
97
-			$redux_settings['license_key_status'] = $license_call->license;
98
-			$redux_settings['license_key_response'] = json_encode( $license_call );
96
+		if ( is_object( $license_call ) && isset( $license_call->license ) ) {
97
+			$redux_settings[ 'license_key_status' ] = $license_call->license;
98
+			$redux_settings[ 'license_key_response' ] = json_encode( $license_call );
99 99
 		}
100 100
 
101 101
 		return $redux_settings;
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
 	function get_redux_settings() {
110 110
 
111 111
 		// Previous settings set by Redux
112
-		$redux_option = get_option('gravityview_settings');
112
+		$redux_option = get_option( 'gravityview_settings' );
113 113
 
114 114
 		// No Redux settings? Don't proceed.
115
-		if( false === $redux_option ) {
115
+		if ( false === $redux_option ) {
116 116
 			return false;
117 117
 		}
118 118
 
@@ -122,21 +122,21 @@  discard block
 block discarded – undo
122 122
 			'no-conflict-mode' => ( rgget( 'no-conflict-mode', $redux_option ) ? '1' : '0' ),
123 123
 		);
124 124
 
125
-		if( $license_array = rgget( 'license', $redux_option ) ) {
125
+		if ( $license_array = rgget( 'license', $redux_option ) ) {
126 126
 
127
-			$redux_settings['license_key'] = $license_key = rgget( 'license', $license_array );
127
+			$redux_settings[ 'license_key' ] = $license_key = rgget( 'license', $license_array );
128 128
 
129
-			$redux_last_changed_values = get_option('gravityview_settings-transients');
129
+			$redux_last_changed_values = get_option( 'gravityview_settings-transients' );
130 130
 
131 131
 			// This contains the last response for license validation
132
-			if( !empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
132
+			if ( ! empty( $redux_last_changed_values ) && $saved_values = rgget( 'changed_values', $redux_last_changed_values ) ) {
133 133
 
134
-				$saved_license = rgget('license', $saved_values );
134
+				$saved_license = rgget( 'license', $saved_values );
135 135
 
136 136
 				// Only use the last-saved values if they are for the same license
137
-				if( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
-					$redux_settings['license_key_status'] = rgget( 'status', $saved_license );
139
-					$redux_settings['license_key_response'] = rgget( 'response', $saved_license );
137
+				if ( $saved_license && rgget( 'license', $saved_license ) === $license_key ) {
138
+					$redux_settings[ 'license_key_status' ] = rgget( 'status', $saved_license );
139
+					$redux_settings[ 'license_key_response' ] = rgget( 'response', $saved_license );
140 140
 				}
141 141
 			}
142 142
 		}
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	/** ----  Migrate from old search widget to new search widget  ---- */
149 149
 	function update_search_on_views() {
150 150
 
151
-		if( !class_exists('GravityView_Widget_Search') ) {
152
-			include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' );
151
+		if ( ! class_exists( 'GravityView_Widget_Search' ) ) {
152
+			include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' );
153 153
 		}
154 154
 
155 155
 		// Loop through all the views
@@ -161,20 +161,20 @@  discard block
 block discarded – undo
161 161
 
162 162
 		$views = get_posts( $query_args );
163 163
 
164
-		foreach( $views as $view ) {
164
+		foreach ( $views as $view ) {
165 165
 
166 166
 			$widgets = get_post_meta( $view->ID, '_gravityview_directory_widgets', true );
167 167
 			$search_fields = null;
168 168
 
169
-			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; }
169
+			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; }
170 170
 
171 171
 			do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Loading View ID: ', $view->ID );
172 172
 
173
-			foreach( $widgets as $area => $ws ) {
174
-				foreach( $ws as $k => $widget ) {
175
-					if( $widget['id'] !== 'search_bar' ) { continue; }
173
+			foreach ( $widgets as $area => $ws ) {
174
+				foreach ( $ws as $k => $widget ) {
175
+					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; }
176 176
 
177
-					if( is_null( $search_fields ) ) {
177
+					if ( is_null( $search_fields ) ) {
178 178
 						$search_fields = $this->get_search_fields( $view->ID );
179 179
 					}
180 180
 
@@ -182,24 +182,24 @@  discard block
 block discarded – undo
182 182
 					//  [search_free] => 1
183 183
 			        //  [search_date] => 1
184 184
 			        $search_generic = array();
185
-					if( !empty( $widget['search_free'] ) ) {
186
-						$search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' );
185
+					if ( ! empty( $widget[ 'search_free' ] ) ) {
186
+						$search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' );
187 187
 					}
188
-					if( !empty( $widget['search_date'] ) ) {
189
-						$search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' );
188
+					if ( ! empty( $widget[ 'search_date' ] ) ) {
189
+						$search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' );
190 190
 					}
191 191
 
192 192
 					$search_config = array_merge( $search_generic, $search_fields );
193 193
 
194 194
 					// don't throw '[]' when json_encode an empty array
195
-					if( empty( $search_config ) ) {
195
+					if ( empty( $search_config ) ) {
196 196
 						$search_config = '';
197 197
 					} else {
198 198
 						$search_config = json_encode( $search_config );
199 199
 					}
200 200
 
201
-					$widgets[ $area ][ $k ]['search_fields'] = $search_config;
202
-					$widgets[ $area ][ $k ]['search_layout'] = 'horizontal';
201
+					$widgets[ $area ][ $k ][ 'search_fields' ] = $search_config;
202
+					$widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal';
203 203
 
204 204
 					do_action( 'gravityview_log_debug', '[GravityView_Migrate/update_search_on_views] Updated Widget: ', $widgets[ $area ][ $k ] );
205 205
 				}
@@ -227,26 +227,26 @@  discard block
 block discarded – undo
227 227
 		// check view fields' settings
228 228
 		$fields = get_post_meta( $view_id, '_gravityview_directory_fields', true );
229 229
 
230
-		if( !empty( $fields ) && is_array( $fields ) ) {
230
+		if ( ! empty( $fields ) && is_array( $fields ) ) {
231 231
 
232
-			foreach( $fields as $t => $fs ) {
232
+			foreach ( $fields as $t => $fs ) {
233 233
 
234
-				foreach( $fs as $k => $field ) {
234
+				foreach ( $fs as $k => $field ) {
235 235
 					// is field a search_filter ?
236
-					if( empty( $field['search_filter'] ) ) { continue; }
236
+					if ( empty( $field[ 'search_filter' ] ) ) { continue; }
237 237
 
238 238
 					// get field type & calculate the input type (by default)
239
-					$form_field = gravityview_get_field( $form, $field['id'] );
239
+					$form_field = gravityview_get_field( $form, $field[ 'id' ] );
240 240
 
241
-					if( empty( $form_field['type'] ) ) {
241
+					if ( empty( $form_field[ 'type' ] ) ) {
242 242
 						continue;
243 243
 					}
244 244
 
245 245
 					// depending on the field type assign a group of possible search field types
246
-					$type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] );
246
+					$type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] );
247 247
 
248 248
 					// add field to config
249
-					$search_fields[] = array( 'field' => $field['id'], 'input' => $type );
249
+					$search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type );
250 250
 
251 251
 				}
252 252
 			}
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/view-settings.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * @package GravityView
4
- * @subpackage Gravityview/admin/metaboxes/views
5
- * @global $post
6
- */
3
+	 * @package GravityView
4
+	 * @subpackage Gravityview/admin/metaboxes/views
5
+	 * @global $post
6
+	 */
7 7
 global $post;
8 8
 
9 9
 $curr_form = gravityview_get_form_id( $post->ID );
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-select.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Display the search SELECT input field
4
- *
5
- * @see class-search-widget.php
6
- */
3
+			 * Display the search SELECT input field
4
+			 *
5
+			 * @see class-search-widget.php
6
+			 */
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -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'] ) ) {
14
-	do_action('gravityview_log_debug', 'search-field-select.php - No choices for field' );
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14
+	do_action( 'gravityview_log_debug', 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18 18
 ?>
19 19
 <div class="gv-search-box">
20
-	<?php if( ! gv_empty( $search_field['label'], 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 ) ) { ?>
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
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
25
-			<option value="" <?php selected( '', $search_field['value'], true ); ?>>&mdash;</option>
24
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
25
+			<option value="" <?php selected( '', $search_field[ 'value' ], true ); ?>>&mdash;</option>
26 26
 			<?php
27
-			foreach( $search_field['choices'] as $choice ) : ?>
28
-				<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php selected( $choice['value'], $search_field['value'], true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
27
+			foreach ( $search_field[ 'choices' ] as $choice ) : ?>
28
+				<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php selected( $choice[ 'value' ], $search_field[ 'value' ], true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
29 29
 			<?php endforeach; ?>
30 30
 		</select>
31 31
 	</p>
Please login to merge, or discard this patch.
includes/admin/class.field.type.php 3 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -158,6 +158,7 @@
 block discarded – undo
158 158
     /**
159 159
      * important! Override this class if needed
160 160
      * outputs the field setting html
161
+     * @param string $override_input
161 162
      */
162 163
     function render_setting( $override_input = NULL ) {
163 164
 
Please login to merge, or discard this patch.
Indentation   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -10,159 +10,159 @@  discard block
 block discarded – undo
10 10
 	 *
11 11
 	 * @var string
12 12
 	 */
13
-    protected $name;
13
+	protected $name;
14 14
 
15 15
 	/**
16 16
 	 * Field settings
17 17
 	 *
18 18
 	 * @var array
19 19
 	 */
20
-    protected $field;
20
+	protected $field;
21 21
 
22 22
 	/**
23 23
 	 * Field current value
24 24
 	 *
25 25
 	 * @var mixed
26 26
 	 */
27
-    protected $value;
28
-
29
-    function __construct( $name = '', $field = array(), $curr_value = NULL ) {
30
-
31
-        $this->name = $name;
32
-
33
-        $defaults = self::get_field_defaults();
34
-
35
-        // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
39
-        }
40
-
41
-        $this->field =  wp_parse_args( $field, $defaults );
42
-
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
44
-
45
-    }
46
-
47
-    /**
48
-     * Returns the default details for a field option
49
-     *
50
-     * - default    // default option value, in case nothing is defined (@deprecated)
51
-     * - desc       // option description
52
-     * - value      // the option default value
53
-     * - label      // the option label
54
-     * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
55
-     * - id         // the field id
56
-     * - type       // the option type ( text, checkbox, select, ... )
57
-     * - options    // when type is select, define the select options ('choices' is @deprecated)
58
-     * - merge_tags // if the option supports merge tags feature
59
-     * - class      // (new) define extra classes for the field
60
-     * - tooltip    //
61
-     *
62
-     * @return array
63
-     */
64
-    public static function get_field_defaults() {
65
-        return array(
66
-            'desc' => '',
67
-            'value' => NULL,
68
-            'label' => '',
69
-            'left_label' => NULL,
70
-            'id' => NULL,
71
-            'type'  => 'text',
72
-            'options' => NULL,
73
-            'merge_tags' => true,
74
-            'class' => '',
75
-            'tooltip' => NULL
76
-        );
77
-    }
78
-
79
-
80
-    function get_tooltip() {
81
-        if( !function_exists('gform_tooltip') ) {
82
-            return NULL;
83
-        }
84
-
85
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
86
-    }
87
-
88
-    /**
89
-     * Build input id based on the name
90
-     * @return string
91
-     */
92
-    function get_field_id() {
93
-        if( isset( $this->field['id'] ) ) {
94
-            return esc_attr( $this->field['id'] );
95
-        }
96
-        return esc_attr( sanitize_html_class( $this->name ) );
97
-    }
98
-
99
-    /**
100
-     * Retrieve field label
101
-     * @return string
102
-     */
103
-    function get_field_label() {
104
-        return esc_html( trim( $this->field['label'] ) );
105
-    }
27
+	protected $value;
28
+
29
+	function __construct( $name = '', $field = array(), $curr_value = NULL ) {
30
+
31
+		$this->name = $name;
32
+
33
+		$defaults = self::get_field_defaults();
34
+
35
+		// Backward compatibility
36
+		if( !empty( $field['choices'] ) ) {
37
+			$field['options'] = $field['choices'];
38
+			unset( $field['choices'] );
39
+		}
40
+
41
+		$this->field =  wp_parse_args( $field, $defaults );
42
+
43
+		$this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
44
+
45
+	}
46
+
47
+	/**
48
+	 * Returns the default details for a field option
49
+	 *
50
+	 * - default    // default option value, in case nothing is defined (@deprecated)
51
+	 * - desc       // option description
52
+	 * - value      // the option default value
53
+	 * - label      // the option label
54
+	 * - left_label // In case of checkboxes, left label will appear on the left of the checkbox
55
+	 * - id         // the field id
56
+	 * - type       // the option type ( text, checkbox, select, ... )
57
+	 * - options    // when type is select, define the select options ('choices' is @deprecated)
58
+	 * - merge_tags // if the option supports merge tags feature
59
+	 * - class      // (new) define extra classes for the field
60
+	 * - tooltip    //
61
+	 *
62
+	 * @return array
63
+	 */
64
+	public static function get_field_defaults() {
65
+		return array(
66
+			'desc' => '',
67
+			'value' => NULL,
68
+			'label' => '',
69
+			'left_label' => NULL,
70
+			'id' => NULL,
71
+			'type'  => 'text',
72
+			'options' => NULL,
73
+			'merge_tags' => true,
74
+			'class' => '',
75
+			'tooltip' => NULL
76
+		);
77
+	}
78
+
79
+
80
+	function get_tooltip() {
81
+		if( !function_exists('gform_tooltip') ) {
82
+			return NULL;
83
+		}
84
+
85
+		return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
86
+	}
87
+
88
+	/**
89
+	 * Build input id based on the name
90
+	 * @return string
91
+	 */
92
+	function get_field_id() {
93
+		if( isset( $this->field['id'] ) ) {
94
+			return esc_attr( $this->field['id'] );
95
+		}
96
+		return esc_attr( sanitize_html_class( $this->name ) );
97
+	}
98
+
99
+	/**
100
+	 * Retrieve field label
101
+	 * @return string
102
+	 */
103
+	function get_field_label() {
104
+		return esc_html( trim( $this->field['label'] ) );
105
+	}
106 106
 
107 107
 	/**
108 108
 	 * Retrieve field left label
109
-     *
110
-     * @since 1.7
111
-     *
109
+	 *
110
+	 * @since 1.7
111
+	 *
112 112
 	 * @return string
113 113
 	 */
114 114
 	function get_field_left_label() {
115 115
 		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
116 116
 	}
117 117
 
118
-    /**
119
-     * Retrieve field label class
120
-     * @return string
121
-     */
122
-    function get_label_class() {
123
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
124
-    }
125
-
126
-
127
-    /**
128
-     * Retrieve field description
129
-     * @return string
130
-     */
131
-    function get_field_desc() {
132
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
133
-    }
134
-
135
-
136
-    /**
137
-     * Verify if field should have merge tags
138
-     * @return boolean
139
-     */
140
-    function show_merge_tags() {
141
-        // Show the merge tags if the field is a list view
142
-        $is_list = preg_match( '/_list-/ism', $this->name );
143
-        // Or is a single entry view
144
-        $is_single = preg_match( '/single_/ism', $this->name );
145
-
146
-        return ( $is_single || $is_list );
147
-    }
148
-
149
-
150
-
151
-    /**
152
-     * important! Override this class
153
-     * outputs the field option html
154
-     */
155
-    function render_option() {
156
-        // to replace on each field
157
-    }
158
-
159
-    /**
160
-     * important! Override this class if needed
161
-     * outputs the field setting html
162
-     */
163
-    function render_setting( $override_input = NULL ) {
164
-
165
-        if( !empty( $this->field['full_width'] ) ) { ?>
118
+	/**
119
+	 * Retrieve field label class
120
+	 * @return string
121
+	 */
122
+	function get_label_class() {
123
+		return 'gv-label-'. sanitize_html_class( $this->field['type'] );
124
+	}
125
+
126
+
127
+	/**
128
+	 * Retrieve field description
129
+	 * @return string
130
+	 */
131
+	function get_field_desc() {
132
+		return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
133
+	}
134
+
135
+
136
+	/**
137
+	 * Verify if field should have merge tags
138
+	 * @return boolean
139
+	 */
140
+	function show_merge_tags() {
141
+		// Show the merge tags if the field is a list view
142
+		$is_list = preg_match( '/_list-/ism', $this->name );
143
+		// Or is a single entry view
144
+		$is_single = preg_match( '/single_/ism', $this->name );
145
+
146
+		return ( $is_single || $is_list );
147
+	}
148
+
149
+
150
+
151
+	/**
152
+	 * important! Override this class
153
+	 * outputs the field option html
154
+	 */
155
+	function render_option() {
156
+		// to replace on each field
157
+	}
158
+
159
+	/**
160
+	 * important! Override this class if needed
161
+	 * outputs the field setting html
162
+	 */
163
+	function render_setting( $override_input = NULL ) {
164
+
165
+		if( !empty( $this->field['full_width'] ) ) { ?>
166 166
             <th scope="row" colspan="2">
167 167
                 <div>
168 168
                     <label for="<?php echo $this->get_field_id(); ?>">
@@ -182,14 +182,14 @@  discard block
 block discarded – undo
182 182
             </td>
183 183
         <?php }
184 184
 
185
-    }
185
+	}
186 186
 
187
-    /**
188
-     * important! Override this class
189
-     * outputs the input html part
190
-     */
191
-    function render_input( $override_input ) {
192
-        echo '';
193
-    }
187
+	/**
188
+	 * important! Override this class
189
+	 * outputs the input html part
190
+	 */
191
+	function render_input( $override_input ) {
192
+		echo '';
193
+	}
194 194
 
195 195
 }
Please login to merge, or discard this patch.
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -33,14 +33,14 @@  discard block
 block discarded – undo
33 33
         $defaults = self::get_field_defaults();
34 34
 
35 35
         // Backward compatibility
36
-        if( !empty( $field['choices'] ) ) {
37
-        	$field['options'] = $field['choices'];
38
-        	unset( $field['choices'] );
36
+        if ( ! empty( $field[ 'choices' ] ) ) {
37
+        	$field[ 'options' ] = $field[ 'choices' ];
38
+        	unset( $field[ 'choices' ] );
39 39
         }
40 40
 
41
-        $this->field =  wp_parse_args( $field, $defaults );
41
+        $this->field = wp_parse_args( $field, $defaults );
42 42
 
43
-        $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value;
43
+        $this->value = is_null( $curr_value ) ? $this->field[ 'value' ] : $curr_value;
44 44
 
45 45
     }
46 46
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 
79 79
 
80 80
     function get_tooltip() {
81
-        if( !function_exists('gform_tooltip') ) {
81
+        if ( ! function_exists( 'gform_tooltip' ) ) {
82 82
             return NULL;
83 83
         }
84 84
 
85
-        return !empty( $this->field['tooltip'] ) ? ' '.gform_tooltip( $this->field['tooltip'] , false, true ) : NULL;
85
+        return ! empty( $this->field[ 'tooltip' ] ) ? ' ' . gform_tooltip( $this->field[ 'tooltip' ], false, true ) : NULL;
86 86
     }
87 87
 
88 88
     /**
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
      * @return string
91 91
      */
92 92
     function get_field_id() {
93
-        if( isset( $this->field['id'] ) ) {
94
-            return esc_attr( $this->field['id'] );
93
+        if ( isset( $this->field[ 'id' ] ) ) {
94
+            return esc_attr( $this->field[ 'id' ] );
95 95
         }
96 96
         return esc_attr( sanitize_html_class( $this->name ) );
97 97
     }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
      * @return string
102 102
      */
103 103
     function get_field_label() {
104
-        return esc_html( trim( $this->field['label'] ) );
104
+        return esc_html( trim( $this->field[ 'label' ] ) );
105 105
     }
106 106
 
107 107
 	/**
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 * @return string
113 113
 	 */
114 114
 	function get_field_left_label() {
115
-		return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL;
115
+		return ! empty( $this->field[ 'left_label' ] ) ? esc_html( trim( $this->field[ 'left_label' ] ) ) : NULL;
116 116
 	}
117 117
 
118 118
     /**
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      * @return string
121 121
      */
122 122
     function get_label_class() {
123
-        return 'gv-label-'. sanitize_html_class( $this->field['type'] );
123
+        return 'gv-label-' . sanitize_html_class( $this->field[ 'type' ] );
124 124
     }
125 125
 
126 126
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
      * @return string
130 130
      */
131 131
     function get_field_desc() {
132
-        return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : '';
132
+        return ! empty( $this->field[ 'desc' ] ) ? '<span class="howto">' . $this->field[ 'desc' ] . '</span>' : '';
133 133
     }
134 134
 
135 135
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
      */
163 163
     function render_setting( $override_input = NULL ) {
164 164
 
165
-        if( !empty( $this->field['full_width'] ) ) { ?>
165
+        if ( ! empty( $this->field[ 'full_width' ] ) ) { ?>
166 166
             <th scope="row" colspan="2">
167 167
                 <div>
168 168
                     <label for="<?php echo $this->get_field_id(); ?>">
Please login to merge, or discard this patch.