Completed
Push — master ( 9cf7be...029c15 )
by Zack
04:07
created
includes/class-cache.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		/**
80 80
 		 * @see RGFormsModel::update_lead_property() Trigger when any entry property changes
81 81
 		 */
82
-		foreach( $this->lead_db_columns as $column ) {
82
+		foreach ( $this->lead_db_columns as $column ) {
83 83
 			add_action( 'gform_update_' . $column, array( $this, 'entry_status_changed' ), 10, 3 );
84 84
 		}
85 85
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 			return;
113 113
 		}
114 114
 
115
-		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry['form_id'] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
115
+		do_action( 'gravityview_log_debug', __METHOD__ . ' adding form ' . $entry[ 'form_id' ] . ' to blacklist because entry #' . $lead_id . ' was deleted', array( 'value' => $property_value, 'previous' => $previous_value ) );
116 116
 		
117
-		$this->blacklist_add( $entry['form_id'] );
117
+		$this->blacklist_add( $entry[ 'form_id' ] );
118 118
 	}
119 119
 
120 120
 	/**
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function entry_updated( $form, $lead_id ) {
129 129
 
130
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form['id'] . ' to blacklist because entry #' . $lead_id . ' was updated' );
130
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_updated] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $lead_id . ' was updated' );
131 131
 
132
-		$this->blacklist_add( $form['id'] );
132
+		$this->blacklist_add( $form[ 'id' ] );
133 133
 	}
134 134
 
135 135
 	/**
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function entry_created( $entry, $form ) {
146 146
 
147
-		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form['id'] . ' to blacklist because entry #' . $entry['id'] . ' was created' );
147
+		do_action( 'gravityview_log_debug', 'GravityView_Cache[entry_created] adding form ' . $form[ 'id' ] . ' to blacklist because entry #' . $entry[ 'id' ] . ' was created' );
148 148
 
149
-		$this->blacklist_add( $form['id'] );
149
+		$this->blacklist_add( $form[ 'id' ] );
150 150
 	}
151 151
 
152 152
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		// Normally just one form, but supports multiple forms
166 166
 		//
167 167
 		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
168
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
168
+		$forms = 'f:' . implode( '&f:', (array)$form_ids );
169 169
 
170 170
 		// Prefix for transient keys
171 171
 		// Now the prefix would be: `gv-cache-f-12f-5f-14`
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
 		$blacklist = get_option( self::BLACKLIST_OPTION_NAME, array() );
244 244
 
245
-		$updated_list = array_diff( $blacklist, (array) $form_ids );
245
+		$updated_list = array_diff( $blacklist, (array)$form_ids );
246 246
 
247 247
 		do_action( 'gravityview_log_debug', 'GravityView_Cache[blacklist_remove] Removing form IDs from cache blacklist', array(
248 248
 			'$form_ids'     => $form_ids,
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 			return false;
276 276
 		}
277 277
 
278
-		foreach ( (array) $form_ids as $form_id ) {
278
+		foreach ( (array)$form_ids as $form_id ) {
279 279
 
280 280
 			if ( in_array( $form_id, $blacklist ) ) {
281 281
 
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 			 * @filter `gravityview_cache_time_{$filter_name}` Modify the cache time for a type of cache
348 348
 			 * @param int $time_in_seconds Default: `DAY_IN_SECONDS`
349 349
 			 */
350
-			$cache_time = (int) apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
350
+			$cache_time = (int)apply_filters( 'gravityview_cache_time_' . $filter_name, DAY_IN_SECONDS );
351 351
 
352 352
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[set] Setting cache with transient key ' . $this->key . ' for ' . $cache_time . ' seconds' );
353 353
 
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
 			return;
384 384
 		}
385 385
 
386
-		foreach ( (array) $form_ids as $form_id ) {
386
+		foreach ( (array)$form_ids as $form_id ) {
387 387
 
388 388
 			$key = $this->get_cache_key_prefix( $form_id );
389 389
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
 
498 498
 		if ( GVCommon::has_cap( 'edit_gravityviews' ) ) {
499 499
 
500
-			if ( isset( $_GET['cache'] ) || isset( $_GET['nocache'] ) ) {
500
+			if ( isset( $_GET[ 'cache' ] ) || isset( $_GET[ 'nocache' ] ) ) {
501 501
 
502 502
 				do_action( 'gravityview_log_debug', 'GravityView_Cache[use_cache] Not using cache: ?cache or ?nocache is in the URL' );
503 503
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		 */
527 527
 		$use_cache = apply_filters( 'gravityview_use_cache', $use_cache, $this );
528 528
 
529
-		return (boolean) $use_cache;
529
+		return (boolean)$use_cache;
530 530
 	}
531 531
 
532 532
 }
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
 	 */
18 18
 	private function __construct( $passed_post = NULL ) {
19 19
 
20
-		if( !empty( $passed_post ) ) {
20
+		if ( ! empty( $passed_post ) ) {
21 21
 
22 22
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
23 23
 
24
-			if( !empty( $id_or_id_array ) ) {
24
+			if ( ! empty( $id_or_id_array ) ) {
25 25
 				$this->add_view( $id_or_id_array );
26 26
 			}
27 27
 		}
@@ -56,33 +56,33 @@  discard block
 block discarded – undo
56 56
 
57 57
 		$ids = array();
58 58
 
59
-		if( ! empty( $passed_post ) ) {
59
+		if ( ! empty( $passed_post ) ) {
60 60
 
61
-			if( is_numeric( $passed_post ) ) {
61
+			if ( is_numeric( $passed_post ) ) {
62 62
 				$passed_post = get_post( $passed_post );
63 63
 			}
64 64
 
65 65
 			// Convert WP_Posts into WP_Posts[] array
66
-			if( $passed_post instanceof WP_Post ) {
66
+			if ( $passed_post instanceof WP_Post ) {
67 67
 				$passed_post = array( $passed_post );
68 68
 			}
69 69
 
70
-			if( is_array( $passed_post ) ) {
70
+			if ( is_array( $passed_post ) ) {
71 71
 
72
-				foreach ( $passed_post as &$post) {
73
-					if( ( get_post_type( $post ) === 'gravityview' ) ) {
74
-						$ids[] = $post->ID;
75
-					} else{
72
+				foreach ( $passed_post as &$post ) {
73
+					if ( ( get_post_type( $post ) === 'gravityview' ) ) {
74
+						$ids[ ] = $post->ID;
75
+					} else {
76 76
 						// Parse the Post Content
77 77
 						$id = $this->parse_post_content( $post->post_content );
78
-						if( $id ) {
79
-							$ids = array_merge( $ids, (array) $id );
78
+						if ( $id ) {
79
+							$ids = array_merge( $ids, (array)$id );
80 80
 						}
81 81
 
82 82
 						// Parse the Post Meta
83 83
 						$id = $this->parse_post_meta( $post->ID );
84
-						if( $id ) {
85
-							$ids = array_merge( $ids, (array) $id );
84
+						if ( $id ) {
85
+							$ids = array_merge( $ids, (array)$id );
86 86
 						}
87 87
 					}
88 88
 
@@ -93,24 +93,24 @@  discard block
 block discarded – undo
93 93
 				if ( is_string( $passed_post ) ) {
94 94
 
95 95
 					$id = $this->parse_post_content( $passed_post );
96
-					if( $id ) {
97
-						$ids = array_merge( $ids, (array) $id );
96
+					if ( $id ) {
97
+						$ids = array_merge( $ids, (array)$id );
98 98
 					}
99 99
 
100 100
 				} else {
101 101
 					$id = $this->get_id_from_atts( $passed_post );
102
-					$ids[] = intval( $id );
102
+					$ids[ ] = intval( $id );
103 103
 				}
104 104
 			}
105 105
 		}
106 106
 
107
-		if( empty($ids) ) {
107
+		if ( empty( $ids ) ) {
108 108
 			return NULL;
109 109
 		}
110 110
 
111 111
 		// If it's just one ID, return that.
112 112
 		// Otherwise, return array of IDs
113
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
113
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
114 114
 	}
115 115
 
116 116
 	/**
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	public static function getInstance( $passed_post = NULL ) {
120 120
 
121
-		if( empty( self::$instance ) ) {
121
+		if ( empty( self::$instance ) ) {
122 122
 			self::$instance = new GravityView_View_Data( $passed_post );
123 123
 		}
124 124
 
@@ -131,19 +131,19 @@  discard block
 block discarded – undo
131 131
 
132 132
 	function get_view( $view_id, $atts = NULL ) {
133 133
 
134
-		if( ! is_numeric( $view_id) ) {
135
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
134
+		if ( ! is_numeric( $view_id ) ) {
135
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) );
136 136
 			return false;
137 137
 		}
138 138
 
139 139
 		// Backup: the view hasn't been fetched yet. Doing it now.
140 140
 		if ( ! isset( $this->views[ $view_id ] ) ) {
141
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
141
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) );
142 142
 			return $this->add_view( $view_id, $atts );
143 143
 		}
144 144
 
145 145
 		if ( empty( $this->views[ $view_id ] ) ) {
146
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
146
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) );
147 147
 			return false;
148 148
 		}
149 149
 
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
174 174
 	function add_view( $view_id, $atts = NULL ) {
175 175
 
176 176
 		// Handle array of IDs
177
-		if( is_array( $view_id ) ) {
178
-			foreach( $view_id as $id ) {
177
+		if ( is_array( $view_id ) ) {
178
+			foreach ( $view_id as $id ) {
179 179
 
180 180
 				$this->add_view( $id, $atts );
181 181
 			}
@@ -184,21 +184,21 @@  discard block
 block discarded – undo
184 184
 		}
185 185
 
186 186
 		// The view has been set already; returning stored view.
187
-		if ( !empty( $this->views[ $view_id ] ) ) {
188
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
187
+		if ( ! empty( $this->views[ $view_id ] ) ) {
188
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) );
189 189
 			return $this->views[ $view_id ];
190 190
 		}
191 191
 
192
-		if( ! $this->view_exists( $view_id ) ) {
193
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
192
+		if ( ! $this->view_exists( $view_id ) ) {
193
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) );
194 194
 			return false;
195 195
 		}
196 196
 
197 197
 		$form_id = gravityview_get_form_id( $view_id );
198 198
 
199
-		if( empty( $form_id ) ) {
199
+		if ( empty( $form_id ) ) {
200 200
 
201
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
201
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) );
202 202
 
203 203
 			return false;
204 204
 		}
@@ -206,21 +206,21 @@  discard block
 block discarded – undo
206 206
 		// Get the settings for the View ID
207 207
 		$view_settings = gravityview_get_template_settings( $view_id );
208 208
 
209
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
209
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings );
210 210
 
211 211
 		// Merge the view settings with the defaults
212 212
 		$view_defaults = wp_parse_args( $view_settings, self::get_default_args() );
213 213
 
214
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
214
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
215 215
 
216
-		if( ! empty( $atts ) && is_array( $atts ) ) {
216
+		if ( ! empty( $atts ) && is_array( $atts ) ) {
217 217
 
218
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
218
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
219 219
 
220 220
 			// Get the settings from the shortcode and merge them with defaults.
221 221
 			$atts = shortcode_atts( $view_defaults, $atts );
222 222
 
223
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
223
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
224 224
 
225 225
 		} else {
226 226
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 
230 230
 		}
231 231
 
232
-		unset( $atts['id'], $view_defaults, $view_settings );
232
+		unset( $atts[ 'id' ], $view_defaults, $view_settings );
233 233
 
234 234
 		$data = array(
235 235
 			'id' => $view_id,
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 			'form' => gravityview_get_form( $form_id ),
243 243
 		);
244 244
 
245
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
245
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data );
246 246
 
247 247
 		$this->views[ $view_id ] = $data;
248 248
 
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
 	 */
278 278
 	private function filter_fields( $dir_fields ) {
279 279
 
280
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
280
+		if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) {
281 281
 			return $dir_fields;
282 282
 		}
283 283
 
284
-		foreach( $dir_fields as $area => $fields ) {
284
+		foreach ( $dir_fields as $area => $fields ) {
285 285
 
286
-			foreach( (array)$fields as $uniqid => $properties ) {
286
+			foreach ( (array)$fields as $uniqid => $properties ) {
287 287
 
288
-				if( $this->hide_field_check_conditions( $properties ) ) {
288
+				if ( $this->hide_field_check_conditions( $properties ) ) {
289 289
 					unset( $dir_fields[ $area ][ $uniqid ] );
290 290
 				}
291 291
 
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	private function hide_field_check_conditions( $properties ) {
308 308
 
309 309
 		// logged-in visibility
310
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
310
+		if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) {
311 311
 			return true;
312 312
 		}
313 313
 
@@ -321,14 +321,14 @@  discard block
 block discarded – undo
321 321
 		// Get the settings from the shortcode and merge them with defaults.
322 322
 		$atts = wp_parse_args( $atts, self::get_default_args() );
323 323
 
324
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
324
+		$view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL;
325 325
 
326
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
327
-			$view_id = (int)$atts['id'];
326
+		if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) {
327
+			$view_id = (int)$atts[ 'id' ];
328 328
 		}
329 329
 
330
-		if( empty( $view_id ) ) {
331
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
330
+		if ( empty( $view_id ) ) {
331
+			do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
332 332
 			return;
333 333
 		}
334 334
 
@@ -350,44 +350,44 @@  discard block
 block discarded – undo
350 350
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
351 351
 		 * @since 1.6
352 352
 		 */
353
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
353
+		if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) {
354 354
 			new GravityView_Shortcode;
355 355
 		}
356 356
 
357 357
 		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
358 358
 
359
-		if( empty( $shortcodes ) ) {
359
+		if ( empty( $shortcodes ) ) {
360 360
 			return NULL;
361 361
 		}
362 362
 
363
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
363
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
364 364
 
365 365
 		$ids = array();
366 366
 
367
-		foreach ($shortcodes as $key => $shortcode) {
367
+		foreach ( $shortcodes as $key => $shortcode ) {
368 368
 
369
-			$args = shortcode_parse_atts( $shortcode[3] );
369
+			$args = shortcode_parse_atts( $shortcode[ 3 ] );
370 370
 
371
-			if( empty( $args['id'] ) ) {
372
-				do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
371
+			if ( empty( $args[ 'id' ] ) ) {
372
+				do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts for Post #%s (Atts)', $post->ID ), $shortcode );
373 373
 				continue;
374 374
 			}
375 375
 
376
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
376
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args );
377 377
 
378 378
 			// Store the View to the object for later fetching.
379
-			$this->add_view( $args['id'], $args );
379
+			$this->add_view( $args[ 'id' ], $args );
380 380
 
381
-			$ids[] = $args['id'];
381
+			$ids[ ] = $args[ 'id' ];
382 382
 		}
383 383
 
384
-		if( empty($ids) ) {
384
+		if ( empty( $ids ) ) {
385 385
 			return NULL;
386 386
 		}
387 387
 
388 388
 		// If it's just one ID, return that.
389 389
 		// Otherwise, return array of IDs
390
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
390
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
391 391
 
392 392
 	}
393 393
 
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 		 */
409 409
 		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
410 410
 
411
-		if( empty( $meta_keys ) ) {
411
+		if ( empty( $meta_keys ) ) {
412 412
 			return NULL;
413 413
 		}
414 414
 
@@ -416,16 +416,16 @@  discard block
 block discarded – undo
416 416
 
417 417
 		$meta_content = '';
418 418
 
419
-		foreach( $meta_keys as $key ) {
420
-			$meta = get_post_meta( $post_id, $key , true );
421
-			if( ! is_string( $meta ) ) {
419
+		foreach ( $meta_keys as $key ) {
420
+			$meta = get_post_meta( $post_id, $key, true );
421
+			if ( ! is_string( $meta ) ) {
422 422
 				continue;
423 423
 			}
424 424
 			$meta_content .= $meta . ' ';
425 425
 		}
426 426
 
427
-		if( empty( $meta_content ) ) {
428
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
427
+		if ( empty( $meta_content ) ) {
428
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
429 429
 			return NULL;
430 430
 		}
431 431
 
@@ -452,16 +452,16 @@  discard block
 block discarded – undo
452 452
 		$message = NULL;
453 453
 
454 454
 		// Not invalid if not set!
455
-		if( empty( $post_id ) || empty( $view_id ) ) {
455
+		if ( empty( $post_id ) || empty( $view_id ) ) {
456 456
 
457
-			if( $empty_is_valid ) {
457
+			if ( $empty_is_valid ) {
458 458
 				return true;
459 459
 			}
460 460
 
461 461
 			$message = esc_html__( 'The ID is required.', 'gravityview' );
462 462
 		}
463 463
 
464
-		if( ! $message ) {
464
+		if ( ! $message ) {
465 465
 			$status = get_post_status( $post_id );
466 466
 
467 467
 			// Nothing exists with that post ID.
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
 			}
474 474
 		}
475 475
 
476
-		if( ! $message ) {
476
+		if ( ! $message ) {
477 477
 
478 478
 			// Nothing exists with that post ID.
479 479
 			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
@@ -482,25 +482,25 @@  discard block
 block discarded – undo
482 482
 
483 483
 		}
484 484
 
485
-		if( ! $message ) {
485
+		if ( ! $message ) {
486 486
 			$view_ids_in_post = GravityView_View_Data::getInstance()->maybe_get_view_id( $post_id );
487 487
 
488 488
 			// The post or page specified does not contain the shortcode.
489
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
489
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
490 490
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
491 491
 			}
492 492
 		}
493 493
 
494
-		if( ! $message ) {
494
+		if ( ! $message ) {
495 495
 
496 496
 			// It's a View
497
-			if( 'gravityview' === get_post_type( $post_id ) ) {
498
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
497
+			if ( 'gravityview' === get_post_type( $post_id ) ) {
498
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
499 499
 			}
500 500
 
501 501
 		}
502 502
 
503
-		if( $message ) {
503
+		if ( $message ) {
504 504
 			return new WP_Error( 'invalid_embed_id', $message );
505 505
 		}
506 506
 
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
 
518 518
 		$args = self::get_default_args( $with_details );
519 519
 
520
-		if( !isset( $args[ $key ] ) ) { return NULL; }
520
+		if ( ! isset( $args[ $key ] ) ) { return NULL; }
521 521
 
522 522
 		return $args[ $key ];
523 523
 	}
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		 */
547 547
 		$default_settings = apply_filters( 'gravityview_default_args', array(
548 548
 			'id' => array(
549
-				'label' => __('View ID', 'gravityview'),
549
+				'label' => __( 'View ID', 'gravityview' ),
550 550
 				'type' => 'number',
551 551
 				'group'	=> 'default',
552 552
 				'value' => NULL,
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 				'show_in_shortcode' => false,
555 555
 			),
556 556
 			'page_size' => array(
557
-				'label' 	=> __('Number of entries per page', 'gravityview'),
557
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
558 558
 				'type' => 'number',
559 559
 				'class'	=> 'small-text',
560 560
 				'group'	=> 'default',
@@ -594,40 +594,40 @@  discard block
 block discarded – undo
594 594
 			'user_edit' => array(
595 595
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
596 596
 				'group'	=> 'default',
597
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
597
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
598 598
 				'value'	=> 0,
599
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
599
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
600 600
 				'type'	=> 'checkbox',
601 601
 				'show_in_shortcode' => true,
602 602
 			),
603 603
 			'user_delete' => array(
604 604
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
605 605
 				'group'	=> 'default',
606
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
606
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
607 607
 				'value'	=> 0,
608
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
608
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
609 609
 				'type'	=> 'checkbox',
610 610
 				'show_in_shortcode' => true,
611 611
 			),
612 612
 			'sort_field' => array(
613
-				'label'	=> __('Sort by field', 'gravityview'),
613
+				'label'	=> __( 'Sort by field', 'gravityview' ),
614 614
 				'type' => 'select',
615 615
 				'value' => '',
616 616
 				'group'	=> 'sort',
617 617
 				'options' => array(
618
-					'' => __( 'Default', 'gravityview'),
619
-					'date_created' => __( 'Date Created', 'gravityview'),
618
+					'' => __( 'Default', 'gravityview' ),
619
+					'date_created' => __( 'Date Created', 'gravityview' ),
620 620
 				),
621 621
 				'show_in_shortcode' => true,
622 622
 			),
623 623
 			'sort_direction' => array(
624
-				'label' 	=> __('Sort direction', 'gravityview'),
624
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
625 625
 				'type' => 'select',
626 626
 				'value' => 'ASC',
627 627
 				'group'	=> 'sort',
628 628
 				'options' => array(
629
-					'ASC' => __('ASC', 'gravityview'),
630
-					'DESC' => __('DESC', 'gravityview'),
629
+					'ASC' => __( 'ASC', 'gravityview' ),
630
+					'DESC' => __( 'DESC', 'gravityview' ),
631 631
 					//'RAND' => __('Random', 'gravityview'),
632 632
 				),
633 633
 				'show_in_shortcode' => true,
@@ -643,83 +643,83 @@  discard block
 block discarded – undo
643 643
 				'show_in_template' => array( 'default_table' ),
644 644
 			),
645 645
 			'start_date' => array(
646
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
646
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
647 647
 				'class'	=> 'gv-datepicker',
648
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
648
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
649 649
 				'type' => 'text',
650 650
 				'value' => '',
651 651
 				'group'	=> 'filter',
652 652
 				'show_in_shortcode' => true,
653 653
 			),
654 654
 			'end_date' => array(
655
-				'label' 	=> __('Filter by End Date', 'gravityview'),
655
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
656 656
 				'class'	=> 'gv-datepicker',
657
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
657
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
658 658
 				'type' => 'text',
659 659
 				'value' => '',
660 660
 				'group'	=> 'filter',
661 661
 				'show_in_shortcode' => true,
662 662
 			),
663 663
 			'class' => array(
664
-				'label' 	=> __('CSS Class', 'gravityview'),
665
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
664
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
665
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
666 666
 				'group'	=> 'default',
667 667
 				'type' => 'text',
668 668
 				'value' => '',
669 669
 				'show_in_shortcode' => false,
670 670
 			),
671 671
 			'search_value' => array(
672
-				'label' 	=> __('Search Value', 'gravityview'),
673
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
672
+				'label' 	=> __( 'Search Value', 'gravityview' ),
673
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
674 674
 				'type' => 'text',
675 675
 				'value' => '',
676 676
 				'group'	=> 'filter',
677 677
 				'show_in_shortcode' => false,
678 678
 			),
679 679
 			'search_field' => array(
680
-				'label' 	=> __('Search Field', 'gravityview'),
681
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
680
+				'label' 	=> __( 'Search Field', 'gravityview' ),
681
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
682 682
 				'type' => 'number',
683 683
 				'value' => '',
684 684
 				'group'	=> 'filter',
685 685
 				'show_in_shortcode' => false,
686 686
 			),
687 687
 			'single_title' => array(
688
-				'label'	=> __('Single Entry Title', 'gravityview'),
688
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
689 689
 				'type'	=> 'text',
690
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
690
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
691 691
 				'group'	=> 'default',
692 692
 				'value'	=> '',
693 693
 				'show_in_shortcode' => false,
694 694
 				'full_width' => true,
695 695
 			),
696 696
 			'back_link_label' => array(
697
-				'label'	=> __('Back Link Label', 'gravityview'),
697
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
698 698
 				'group'	=> 'default',
699
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
699
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
700 700
 				'type'	=> 'text',
701 701
 				'value'	=> '',
702 702
 				'show_in_shortcode' => false,
703 703
 				'full_width' => true,
704 704
 			),
705 705
 			'embed_only' => array(
706
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
706
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
707 707
 				'group'	=> 'default',
708
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
708
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
709 709
 				'type'	=> 'checkbox',
710 710
 				'value'	=> '',
711 711
 				'show_in_shortcode' => false,
712 712
 				'full_width' => true,
713 713
 			),
714
-		));
714
+		) );
715 715
 
716 716
 		// By default, we only want the key => value pairing, not the whole array.
717
-		if( empty( $with_details ) ) {
717
+		if ( empty( $with_details ) ) {
718 718
 
719 719
 			$defaults = array();
720 720
 
721
-			foreach( $default_settings as $key => $value ) {
722
-				$defaults[ $key ] = $value['value'];
721
+			foreach ( $default_settings as $key => $value ) {
722
+				$defaults[ $key ] = $value[ 'value' ];
723 723
 			}
724 724
 
725 725
 			return $defaults;
@@ -728,12 +728,12 @@  discard block
 block discarded – undo
728 728
 		// But sometimes, we want all the details.
729 729
 		else {
730 730
 
731
-			foreach ($default_settings as $key => $value) {
731
+			foreach ( $default_settings as $key => $value ) {
732 732
 
733 733
 				// If the $group argument is set for the method,
734 734
 				// ignore any settings that aren't in that group.
735
-				if( !empty( $group ) && is_string( $group ) ) {
736
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
735
+				if ( ! empty( $group ) && is_string( $group ) ) {
736
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
737 737
 						unset( $default_settings[ $key ] );
738 738
 					}
739 739
 				}
Please login to merge, or discard this patch.
includes/class-gravityview-entry-notes.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		// Make sure the keys are all set
53 53
 		$note = wp_parse_args( $note, $default_note );
54 54
 
55
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
55
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
56 56
 	}
57 57
 
58 58
 	/**
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	public static function delete_notes( $note_ids = array() ) {
74 74
 
75
-		if( !is_array( $note_ids ) ) {
75
+		if ( ! is_array( $note_ids ) ) {
76 76
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array', $note_ids );
77 77
 		}
78 78
 
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	public static function filter_avatar( $avatar = '', $note ) {
113 113
 
114
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
115
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
114
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
115
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
116 116
 		}
117 117
 
118 118
 		return $avatar;
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +39 added lines, -39 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
 
@@ -429,13 +429,13 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
431 431
 
432
-	$terms = get_terms( $args['taxonomy'], $args );
432
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
433 433
 
434 434
 	$choices = array();
435 435
 
436 436
 	if ( is_array( $terms ) ) {
437 437
 		foreach ( $terms as $term_id => $term_name ) {
438
-			$choices[] = array(
438
+			$choices[ ] = array(
439 439
 				'text'  => $term_name,
440 440
 				'value' => $term_id
441 441
 			);
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
 	// hold widget View options
52 52
 	private $widget_options;
53 53
 
54
-	function __construct( $widget_label , $widget_id , $defaults = array(), $settings = array() ) {
54
+	function __construct( $widget_label, $widget_id, $defaults = array(), $settings = array() ) {
55 55
 
56 56
 
57 57
 		/**
58 58
 		 * The shortcode name is set to the lowercase name of the widget class, unless overridden by the class specifying a different value for $shortcode_name
59 59
 		 * @var string
60 60
 		 */
61
-		$this->shortcode_name = !isset( $this->shortcode_name ) ? strtolower( get_class($this) ) : $this->shortcode_name;
61
+		$this->shortcode_name = ! isset( $this->shortcode_name ) ? strtolower( get_class( $this ) ) : $this->shortcode_name;
62 62
 
63 63
 		$this->widget_label = $widget_label;
64 64
 		$this->widget_id = $widget_id;
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		$this->settings = wp_parse_args( $settings, $this->settings );
70 70
 
71 71
 		// register widgets to be listed in the View Configuration
72
-		add_filter( 'gravityview_register_directory_widgets', array( $this, 'register_widget') );
72
+		add_filter( 'gravityview_register_directory_widgets', array( $this, 'register_widget' ) );
73 73
 
74 74
 		// widget options
75 75
 		add_filter( 'gravityview_template_widget_options', array( $this, 'assign_widget_options' ), 10, 3 );
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 		add_action( "gravityview_render_widget_{$widget_id}", array( $this, 'render_frontend' ), 10, 1 );
79 79
 
80 80
 		// register shortcodes
81
-		add_action( 'wp', array( $this, 'add_shortcode') );
81
+		add_action( 'wp', array( $this, 'add_shortcode' ) );
82 82
 
83 83
 		// Use shortcodes in text widgets.
84
-		add_filter('widget_text', array( $this, 'maybe_do_shortcode' ) );
84
+		add_filter( 'widget_text', array( $this, 'maybe_do_shortcode' ) );
85 85
 	}
86 86
 
87 87
 
@@ -99,14 +99,14 @@  discard block
 block discarded – undo
99 99
 		 * @param boolean $enable_custom_class False by default. Return true if you want to enable.
100 100
 		 * @param GravityView_Widget $this Current instance of GravityView_Widget
101 101
 		 */
102
-		$enable_custom_class = apply_filters('gravityview/widget/enable_custom_class', false, $this );
102
+		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
103 103
 
104
-		if( $enable_custom_class ) {
104
+		if ( $enable_custom_class ) {
105 105
 
106
-			$settings['custom_class'] = array(
106
+			$settings[ 'custom_class' ] = array(
107 107
 				'type' => 'text',
108 108
 				'label' => __( 'Custom CSS Class:', 'gravityview' ),
109
-				'desc' => __( 'This class will be added to the widget container', 'gravityview'),
109
+				'desc' => __( 'This class will be added to the widget container', 'gravityview' ),
110 110
 				'value' => '',
111 111
 				'merge_tags' => true,
112 112
 			);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return array|null   Settings array; NULL if not set
129 129
 	 */
130 130
 	public function get_settings() {
131
-		return !empty( $this->settings ) ? $this->settings : NULL;
131
+		return ! empty( $this->settings ) ? $this->settings : NULL;
132 132
 	}
133 133
 
134 134
 	/**
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	public function get_setting( $key ) {
140 140
 		$setting = NULL;
141 141
 
142
-		if( isset( $this->settings ) && is_array( $this->settings ) ) {
142
+		if ( isset( $this->settings ) && is_array( $this->settings ) ) {
143 143
 			$setting = isset( $this->settings[ $key ] ) ? $this->settings[ $key ] : NULL;
144 144
 		}
145 145
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 */
155 155
 	function maybe_do_shortcode( $text, $widget = NULL ) {
156 156
 
157
-		if( !empty( $this->shortcode_name ) && has_shortcode( $text, $this->shortcode_name ) ) {
157
+		if ( ! empty( $this->shortcode_name ) && has_shortcode( $text, $this->shortcode_name ) ) {
158 158
 			return do_shortcode( $text );
159 159
 		}
160 160
 
@@ -176,28 +176,28 @@  discard block
 block discarded – undo
176 176
 	function add_shortcode( $run_on_singular = true ) {
177 177
 		global $post;
178 178
 
179
-		if( GravityView_Plugin::is_admin() ) { return; }
179
+		if ( GravityView_Plugin::is_admin() ) { return; }
180 180
 
181
-		if( empty( $this->shortcode_name ) ) { return; }
181
+		if ( empty( $this->shortcode_name ) ) { return; }
182 182
 
183 183
 		// If the widget shouldn't output on single entries, don't show it
184
-		if( empty( $this->show_on_single ) && class_exists('GravityView_frontend') && GravityView_frontend::is_single_entry() ) {
185
-			do_action('gravityview_log_debug', sprintf( '%s[add_shortcode]: Skipping; set to not run on single entry.', get_class($this)) );
184
+		if ( empty( $this->show_on_single ) && class_exists( 'GravityView_frontend' ) && GravityView_frontend::is_single_entry() ) {
185
+			do_action( 'gravityview_log_debug', sprintf( '%s[add_shortcode]: Skipping; set to not run on single entry.', get_class( $this ) ) );
186 186
 
187 187
 			add_shortcode( $this->shortcode_name, '__return_null' );
188 188
 			return;
189 189
 		}
190 190
 
191 191
 
192
-		if( !has_gravityview_shortcode( $post ) ) {
192
+		if ( ! has_gravityview_shortcode( $post ) ) {
193 193
 
194
-			do_action('gravityview_log_debug', sprintf( '%s[add_shortcode]: No shortcode present; not adding render_frontend shortcode.', get_class($this)) );
194
+			do_action( 'gravityview_log_debug', sprintf( '%s[add_shortcode]: No shortcode present; not adding render_frontend shortcode.', get_class( $this ) ) );
195 195
 
196 196
 			add_shortcode( $this->shortcode_name, '__return_null' );
197 197
 			return;
198 198
 		}
199 199
 
200
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
200
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
201 201
 	}
202 202
 
203 203
 	/**
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 */
208 208
 	function register_widget( $widgets ) {
209 209
 		$widgets[ $this->widget_id ] = array(
210
-			'label' => $this->widget_label ,
210
+			'label' => $this->widget_label,
211 211
 			'description' => $this->widget_description,
212 212
 			'subtitle' => $this->widget_subtitle,
213 213
 		);
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	 */
225 225
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
226 226
 
227
-		if( $this->widget_id === $widget ) {
227
+		if ( $this->widget_id === $widget ) {
228 228
 			$options = array_merge( $options, $this->settings );
229 229
 		}
230 230
 
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
 	 *
238 238
 	 * @return void
239 239
 	 */
240
-	public function render_frontend( $widget_args, $content = '', $context = '') {
240
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
241 241
 		// to be defined by child class
242
-		if( !$this->pre_render_frontend() ) {
242
+		if ( ! $this->pre_render_frontend() ) {
243 243
 			return;
244 244
 		}
245 245
 	}
@@ -251,8 +251,8 @@  discard block
 block discarded – undo
251 251
 	public function pre_render_frontend() {
252 252
 		$gravityview_view = GravityView_View::getInstance();
253 253
 
254
-		if( empty( $gravityview_view ) ) {
255
-			do_action('gravityview_log_debug', sprintf( '%s[render_frontend]: $gravityview_view not instantiated yet.', get_class($this)) );
254
+		if ( empty( $gravityview_view ) ) {
255
+			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend]: $gravityview_view not instantiated yet.', get_class( $this ) ) );
256 256
 			return false;
257 257
 		}
258 258
 
@@ -263,8 +263,8 @@  discard block
 block discarded – undo
263 263
 		 */
264 264
 		$hide_until_search = apply_filters( 'gravityview/widget/hide_until_searched', $gravityview_view->hide_until_searched, $this );
265 265
 
266
-		if( $hide_until_search ) {
267
-			do_action('gravityview_log_debug', sprintf( '%s[render_frontend]: Hide View data until search is performed', get_class($this)) );
266
+		if ( $hide_until_search ) {
267
+			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend]: Hide View data until search is performed', get_class( $this ) ) );
268 268
 			return false;
269 269
 		}
270 270
 
Please login to merge, or discard this patch.
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -20,15 +20,15 @@
 block discarded – undo
20 20
  */
21 21
 function gravityview_register_gravityview_widgets() {
22 22
 
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
24 24
 
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
27
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
28
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
27
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
28
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
29 29
 
30
-	if( class_exists('GFPolls') ) {
31
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
30
+	if ( class_exists( 'GFPolls' ) ) {
31
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
32 32
 	}
33 33
 
34 34
 }
Please login to merge, or discard this patch.
includes/widgets/poll/class-gravityview-widget-poll.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	function __construct() {
23 23
 
24
-		$this->widget_description = __('Displays the results of Poll Fields that exist in the form.', 'gravityview' );
24
+		$this->widget_description = __( 'Displays the results of Poll Fields that exist in the form.', 'gravityview' );
25 25
 
26
-		$this->widget_subtitle = sprintf( _x('Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
26
+		$this->widget_subtitle = sprintf( _x( 'Note: this will display poll results for %sall form entries%s, not only the entries displayed in the View.', 'The string placeholders are for emphasis HTML', 'gravityview' ), '<em>', '</em>' );
27 27
 
28 28
 		$default_values = array(
29 29
 			'header' => 1,
@@ -32,32 +32,32 @@  discard block
 block discarded – undo
32 32
 
33 33
 		$settings = array(
34 34
 			'percentages' => array(
35
-				'label' => __('Display Percentages', 'gravityview'),
35
+				'label' => __( 'Display Percentages', 'gravityview' ),
36 36
 				'type' => 'checkbox',
37 37
 				'value' => true,
38 38
 				'tooltip' => __( 'Display results percentages as part of results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
39 39
 			),
40 40
 			'counts' => array(
41
-				'label' => __('Display Counts', 'gravityview'),
41
+				'label' => __( 'Display Counts', 'gravityview' ),
42 42
 				'type' => 'checkbox',
43 43
 				'value' => true,
44 44
 				'tooltip' => __( 'Display number of times each choice has been selected when displaying results? Supported values are: true, false. Defaults to "true".', 'gravityview' ),
45 45
 			),
46 46
 			'style' => array(
47 47
 				'type' => 'select',
48
-				'label' => __('Style', 'gravityview'),
48
+				'label' => __( 'Style', 'gravityview' ),
49 49
 				'tooltip' => __( 'The Polls Add-On currently supports 4 built in styles: red, green, orange, blue. Defaults to "green".', 'gravityview' ),
50 50
 				'value' => 'green',
51 51
 				'choices' => array(
52
-					'green' => __('Green', 'gravityview'),
53
-					'blue' => __('Blue', 'gravityview'),
54
-					'red' => __('Red', 'gravityview'),
55
-					'orange' => __('Orange', 'gravityview'),
52
+					'green' => __( 'Green', 'gravityview' ),
53
+					'blue' => __( 'Blue', 'gravityview' ),
54
+					'red' => __( 'Red', 'gravityview' ),
55
+					'orange' => __( 'Orange', 'gravityview' ),
56 56
 				)
57 57
 			)
58 58
 		);
59 59
 
60
-		parent::__construct( __( 'Poll Results', 'gravityview' ) , 'poll', $default_values, $settings );
60
+		parent::__construct( __( 'Poll Results', 'gravityview' ), 'poll', $default_values, $settings );
61 61
 
62 62
 		// frontend - add template path
63 63
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
@@ -88,11 +88,11 @@  discard block
 block discarded – undo
88 88
 
89 89
 		$GFPolls = GFPolls::get_instance();
90 90
 
91
-		wp_enqueue_script('gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array('jquery'), $GFPolls->_version);
91
+		wp_enqueue_script( 'gpoll_js', $GFPolls->get_base_url() . '/js/gpoll.js', array( 'jquery' ), $GFPolls->_version );
92 92
 
93 93
 		$GFPolls->localize_scripts();
94 94
 
95
-		wp_enqueue_style('gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version);
95
+		wp_enqueue_style( 'gpoll_css', $GFPolls->get_base_url() . '/css/gpoll.css', null, $GFPolls->_version );
96 96
 	}
97 97
 
98 98
 	/**
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	public function pre_render_frontend() {
104 104
 
105
-		if( !class_exists('GFPolls') ) {
105
+		if ( ! class_exists( 'GFPolls' ) ) {
106 106
 
107 107
 			$return = false;
108 108
 
@@ -158,14 +158,14 @@  discard block
 block discarded – undo
158 158
 	 *
159 159
 	 * @since 1.8
160 160
 	 */
161
-	public function render_frontend( $widget_args, $content = '', $context = '') {
161
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
162 162
 
163
-		if( !$this->pre_render_frontend() ) {
163
+		if ( ! $this->pre_render_frontend() ) {
164 164
 			return;
165 165
 		}
166 166
 
167 167
 		// Make sure the class is loaded in DataTables
168
-		if( !class_exists( 'GFFormDisplay' ) ) {
168
+		if ( ! class_exists( 'GFFormDisplay' ) ) {
169 169
 			include_once( GFCommon::get_base_path() . '/form_display.php' );
170 170
 		}
171 171
 
@@ -173,14 +173,14 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$settings = $this->get_frontend_settings( $widget_args );
175 175
 
176
-		$percentages = empty( $settings['percentages'] ) ? 'false' : 'true';
176
+		$percentages = empty( $settings[ 'percentages' ] ) ? 'false' : 'true';
177 177
 
178
-		$counts = empty( $settings['counts'] ) ? 'false' : 'true';
178
+		$counts = empty( $settings[ 'counts' ] ) ? 'false' : 'true';
179 179
 
180
-		if( !empty( $settings['field'] ) ) {
181
-			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings['field'], $settings['style'], $percentages, $counts );
180
+		if ( ! empty( $settings[ 'field' ] ) ) {
181
+			$merge_tag = sprintf( '{gpoll: field="%d" style="%s" percentages="%s" counts="%s"}', $settings[ 'field' ], $settings[ 'style' ], $percentages, $counts );
182 182
 		} else {
183
-			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings['style'], $percentages, $counts );
183
+			$merge_tag = sprintf( '{all_poll_results: style="%s" percentages="%s" counts="%s"}', $settings[ 'style' ], $percentages, $counts );
184 184
 		}
185 185
 
186 186
 		$gravityview_view = GravityView_View::getInstance();
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 		$gravityview_view->poll_settings = $settings;
191 191
 
192
-		$gravityview_view->render('widget', 'poll', false );
192
+		$gravityview_view->render( 'widget', 'poll', false );
193 193
 
194 194
 	}
195 195
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-date.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@
 block discarded – undo
11 11
 ?>
12 12
 
13 13
 <div class="gv-search-box">
14
-	<?php if( ! gv_empty( $search_field['label'], false ) ) { ?>
15
-	<label for=search-box-<?php echo esc_attr( $search_field['name'] ); ?>><?php echo esc_html( $search_field['label'] ); ?></label>
14
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false ) ) { ?>
15
+	<label for=search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
16 16
 	<?php } ?>
17 17
 	<p>
18
-		<input type="text" name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
18
+		<input type="text" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" >
19 19
 	</p>
20 20
 </div>
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-hidden.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,4 +7,4 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $search_field = $gravityview_view->search_field;
10
-?><div><input type="hidden" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"></div>
11 10
\ No newline at end of file
11
+?><div><input type="hidden" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"></div>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.