Completed
Pull Request — develop (#1504)
by Zack
17:49
created
future/includes/class-gv-request.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -170,10 +170,10 @@
 block discarded – undo
170 170
 	 */
171 171
 	public function is_edit_entry( $form_id = 0 ) {
172 172
 		/**
173
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
174
-		* The Edit Entry functionality overrides this value.
175
-		* @param boolean $is_edit_entry
176
-		*/
173
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
174
+		 * The Edit Entry functionality overrides this value.
175
+		 * @param boolean $is_edit_entry
176
+		 */
177 177
 		if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
178 178
 			if ( $entry->is_multi() ) {
179 179
 				return array_pop( $entry->entries );
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 */
70 70
 	public static function is_add_oembed_preview() {
71 71
 		/** The preview request is a parse-embed AJAX call without a type set. */
72
-		return ( self::is_ajax() && ! empty( $_POST['action'] ) && $_POST['action'] == 'parse-embed' && ! isset( $_POST['type'] ) );
72
+		return ( self::is_ajax() && ! empty( $_POST[ 'action' ] ) && $_POST[ 'action' ] == 'parse-embed' && ! isset( $_POST[ 'type' ] ) );
73 73
 	}
74 74
 
75 75
 	/**
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @return boolean
88 88
 	 */
89 89
 	public static function is_rest() {
90
-		return ! empty( $GLOBALS['wp']->query_vars['rest_route'] );
90
+		return ! empty( $GLOBALS[ 'wp' ]->query_vars[ 'rest_route' ] );
91 91
 	}
92 92
 
93 93
 	/**
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 					return false;
158 158
 				}
159 159
 
160
-				if ( ! in_array( $e['form_id'], $valid_forms ) ) {
160
+				if ( ! in_array( $e[ 'form_id' ], $valid_forms ) ) {
161 161
 					return false;
162 162
 				}
163 163
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 			}
174 174
 
175 175
 			$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
176
-		}  else {
176
+		} else {
177 177
 			/**
178 178
 			 * A regular one.
179 179
 			 */
@@ -231,15 +231,15 @@  discard block
 block discarded – undo
231 231
 			$get = $_GET;
232 232
 		}
233 233
 
234
-		unset( $get['mode'] );
234
+		unset( $get[ 'mode' ] );
235 235
 
236 236
 		$get = array_filter( $get, 'gravityview_is_not_empty_string' );
237 237
 
238
-		if( $has_field_key = $this->_has_field_key( $get ) ) {
238
+		if ( $has_field_key = $this->_has_field_key( $get ) ) {
239 239
 			return true;
240 240
 		}
241 241
 
242
-		return isset( $get['gv_search'] ) || isset( $get['gv_start'] ) || isset( $get['gv_end'] ) || isset( $get['gv_by'] ) || isset( $get['gv_id'] );
242
+		return isset( $get[ 'gv_search' ] ) || isset( $get[ 'gv_start' ] ) || isset( $get[ 'gv_end' ] ) || isset( $get[ 'gv_by' ] ) || isset( $get[ 'gv_id' ] );
243 243
 	}
244 244
 
245 245
 	/**
@@ -262,13 +262,13 @@  discard block
 block discarded – undo
262 262
 
263 263
 		$meta = array();
264 264
 		foreach ( $fields as $field ) {
265
-			if( empty( $field->_gf_field_class_name ) ) {
266
-				$meta[] = preg_quote( $field->name );
265
+			if ( empty( $field->_gf_field_class_name ) ) {
266
+				$meta[ ] = preg_quote( $field->name );
267 267
 			}
268 268
 		}
269 269
 
270 270
 		foreach ( $get as $key => $value ) {
271
-			if ( preg_match('/^filter_(([0-9_]+)|'. implode( '|', $meta ) .')$/sm', $key ) ) {
271
+			if ( preg_match( '/^filter_(([0-9_]+)|' . implode( '|', $meta ) . ')$/sm', $key ) ) {
272 272
 				$has_field_key = true;
273 273
 				break;
274 274
 			}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@
 block discarded – undo
173 173
 			}
174 174
 
175 175
 			$entry = Multi_Entry::from_entries( array_filter( $multientry ) );
176
-		}  else {
176
+		} else {
177 177
 			/**
178 178
 			 * A regular one.
179 179
 			 */
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -361,14 +361,14 @@  discard block
 block discarded – undo
361 361
 	/**
362 362
 	 * update_approved function.
363 363
 	 *
364
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
364
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
365 365
 	 * @see GravityView_Entry_Approval::update_approved
366
-     *
366
+	 *
367 367
 	 * @param int $entry_id (default: 0)
368 368
 	 * @param int $approved (default: 0)
369 369
 	 * @param int $form_id (default: 0)
370 370
 	 * @param int $approvedcolumn (default: 0)
371
-     *
371
+	 *
372 372
 	 * @return boolean True: It worked; False: it failed
373 373
 	 */
374 374
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -378,9 +378,9 @@  discard block
 block discarded – undo
378 378
 	/**
379 379
 	 * Calculate the approve field.input id
380 380
 	 *
381
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
382
-     * @see GravityView_Entry_Approval::get_approved_column
383
-     *
381
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
382
+	 * @see GravityView_Entry_Approval::get_approved_column
383
+	 *
384 384
 	 * @param mixed $form GF Form or Form ID
385 385
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
386 386
 	 */
@@ -505,37 +505,37 @@  discard block
 block discarded – undo
505 505
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
506 506
 			'bulk_message' => $this->bulk_update_message,
507 507
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
508
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
508
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
509 509
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
510 510
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
511 511
 			'column_link' => esc_url( $this->get_sort_link() ),
512
-            'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
512
+			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
513 513
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
514 514
 		) );
515 515
 
516 516
 	}
517 517
 
518 518
 	/**
519
-     * Generate a link to sort by approval status
520
-     *
521
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
522
-     * numeric, but it does group the approved entries together.
523
-     *
524
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
525
-     *
519
+	 * Generate a link to sort by approval status
520
+	 *
521
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
522
+	 * numeric, but it does group the approved entries together.
523
+	 *
524
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
525
+	 *
526 526
 	 * @param int $form_id [NO LONGER USED]
527 527
 	 *
528 528
 	 * @return string Sorting link
529 529
 	 */
530 530
 	private function get_sort_link( $form_id = 0 ) {
531 531
 
532
-	    $args = array(
533
-		    'orderby' => 'is_approved',
534
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
535
-        );
532
+		$args = array(
533
+			'orderby' => 'is_approved',
534
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
535
+		);
536 536
 
537 537
 		return add_query_arg( $args );
538
-    }
538
+	}
539 539
 
540 540
 	/**
541 541
 	 * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group
@@ -577,9 +577,9 @@  discard block
 block discarded – undo
577 577
 		// Sanitize the values, just to be sure.
578 578
 		foreach ( $bulk_actions as $key => $group ) {
579 579
 
580
-		    if( empty( $group ) ) {
581
-		        continue;
582
-		    }
580
+			if( empty( $group ) ) {
581
+				continue;
582
+			}
583 583
 
584 584
 			foreach ( $group as $i => $action ) {
585 585
 				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
Please login to merge, or discard this patch.
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -109,27 +109,27 @@  discard block
 block discarded – undo
109 109
 		$approved_count = $disapproved_count = $unapproved_count = 0;
110 110
 
111 111
 		// Only count if necessary
112
-		if( $include_counts ) {
113
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
-			$unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
112
+		if ( $include_counts ) {
113
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
+			$unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
116 116
 		}
117 117
 
118
-		$filter_links[] = array(
118
+		$filter_links[ ] = array(
119 119
 			'id'            => 'gv_approved',
120 120
 			'field_filters' => $field_filters_approved,
121 121
 			'count'         => $approved_count,
122 122
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
123 123
 		);
124 124
 
125
-		$filter_links[] = array(
125
+		$filter_links[ ] = array(
126 126
 			'id'            => 'gv_disapproved',
127 127
 			'field_filters' => $field_filters_disapproved,
128 128
 			'count'         => $disapproved_count,
129 129
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
130 130
 		);
131 131
 
132
-		$filter_links[] = array(
132
+		$filter_links[ ] = array(
133 133
 			'id'            => 'gv_unapproved',
134 134
 			'field_filters' => $field_filters_unapproved,
135 135
 			'count'         => $unapproved_count,
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 	 */
149 149
 	function tooltips( $tooltips ) {
150 150
 
151
-		$tooltips['form_gravityview_fields'] = array(
152
-			'title' => __('GravityView Fields', 'gravityview'),
153
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
151
+		$tooltips[ 'form_gravityview_fields' ] = array(
152
+			'title' => __( 'GravityView Fields', 'gravityview' ),
153
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
154 154
 		);
155 155
 
156 156
 		return $tooltips;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$gv_bulk_action = false;
263 263
 
264
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
264
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
265 265
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
266 266
 		} else {
267 267
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 		}
270 270
 
271 271
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
272
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
272
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
273 273
 			$gv_bulk_action = $bulk_action;
274 274
 		}
275 275
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
 		// gforms_entry_list is the nonce that confirms we're on the right page
296 296
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
297
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
297
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
298 298
 
299 299
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
300 300
 
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			}
313 313
 
314 314
 			// All entries are set to be updated, not just the visible ones
315
-			if ( ! empty( $_POST['all_entries'] ) ) {
315
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
316 316
 
317 317
 				// Convert the current entry search into GF-formatted search criteria
318 318
 				$search = array(
319
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
320
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
321
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
319
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
320
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
321
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
322 322
 				);
323 323
 
324 324
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 			} else {
330 330
 
331 331
 				// Changed from 'lead' to 'entry' in 2.0
332
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
332
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
333 333
 
334 334
 			}
335 335
 
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
342 342
 
343 343
 			switch ( $approved_status ) {
344
-				case $this->bulk_action_prefixes['approve']:
344
+				case $this->bulk_action_prefixes[ 'approve' ]:
345 345
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
346 346
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
347 347
 					break;
348
-				case $this->bulk_action_prefixes['unapprove']:
348
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
349 349
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
350 350
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
351 351
 					break;
352
-				case $this->bulk_action_prefixes['disapprove']:
352
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
353 353
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
354 354
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
355 355
 					break;
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
      *
372 372
 	 * @return boolean True: It worked; False: it failed
373 373
 	 */
374
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
374
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
375 375
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
376 376
 	}
377 377
 
@@ -401,20 +401,20 @@  discard block
 block discarded – undo
401 401
 	 *
402 402
 	 * @return void
403 403
 	 */
404
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
404
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
405 405
 
406
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
406
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
407 407
 			return;
408 408
 		}
409 409
 
410
-		if( empty( $entry['id'] ) ) {
410
+		if ( empty( $entry[ 'id' ] ) ) {
411 411
 			return;
412 412
 		}
413 413
 
414 414
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
415 415
 
416
-		if( $status_value ) {
417
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
416
+		if ( $status_value ) {
417
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
418 418
 		}
419 419
 	}
420 420
 
@@ -427,10 +427,10 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function get_form_id() {
429 429
 
430
-		$form_id = GFForms::get('id');
430
+		$form_id = GFForms::get( 'id' );
431 431
 
432 432
 		// If there are no forms identified, use the first form. That's how GF does it.
433
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
433
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
434 434
 			$form_id = $this->get_first_form_id();
435 435
 		}
436 436
 
@@ -450,14 +450,14 @@  discard block
 block discarded – undo
450 450
 
451 451
 		$forms = RGFormsModel::get_forms( null, 'title' );
452 452
 
453
-		if( ! isset( $forms[0] ) ) {
453
+		if ( ! isset( $forms[ 0 ] ) ) {
454 454
 			gravityview()->log->error( 'No forms were found' );
455 455
 			return 0;
456 456
 		}
457 457
 
458
-		$first_form = $forms[0];
458
+		$first_form = $forms[ 0 ];
459 459
 
460
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
460
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
461 461
 
462 462
 		return intval( $form_id );
463 463
 	}
@@ -465,37 +465,37 @@  discard block
 block discarded – undo
465 465
 
466 466
 	function add_scripts_and_styles( $hook ) {
467 467
 
468
-		if( ! class_exists( 'GFForms' ) ) {
468
+		if ( ! class_exists( 'GFForms' ) ) {
469 469
 			gravityview()->log->error( 'GFForms does not exist.' );
470 470
 			return;
471 471
 		}
472 472
 
473 473
 		// enqueue styles & scripts gf_entries
474 474
 		// But only if we're on the main Entries page, not on reports pages
475
-		if( GFForms::get_page() !== 'entry_list' ) {
475
+		if ( GFForms::get_page() !== 'entry_list' ) {
476 476
 			return;
477 477
 		}
478 478
 
479 479
 		$form_id = $this->get_form_id();
480 480
 
481 481
 		// Things are broken; no forms were found
482
-		if( empty( $form_id ) ) {
482
+		if ( empty( $form_id ) ) {
483 483
 			return;
484 484
 		}
485 485
 
486
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
486
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
487 487
 
488
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
488
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
489 489
 
490
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
490
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
491 491
 
492 492
 		wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
493 493
 		wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
494 494
 		wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
495 495
 
496 496
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
497
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
498
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
497
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
498
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
499 499
 			'form_id' => $form_id,
500 500
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
501 501
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
505 505
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
506 506
 			'bulk_message' => $this->bulk_update_message,
507
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
508
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
509
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
510
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
507
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
508
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
509
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
510
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
511 511
 			'column_link' => esc_url( $this->get_sort_link() ),
512 512
             'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
513 513
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
@@ -551,16 +551,16 @@  discard block
 block discarded – undo
551 551
 		$bulk_actions = array(
552 552
 			'GravityView' => array(
553 553
 				array(
554
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
555
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
554
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
555
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
556 556
 				),
557 557
 				array(
558
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
559
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
558
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
559
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
560 560
 				),
561 561
 				array(
562
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
563
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
562
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
563
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
564 564
 				),
565 565
 			),
566 566
 		);
@@ -577,13 +577,13 @@  discard block
 block discarded – undo
577 577
 		// Sanitize the values, just to be sure.
578 578
 		foreach ( $bulk_actions as $key => $group ) {
579 579
 
580
-		    if( empty( $group ) ) {
580
+		    if ( empty( $group ) ) {
581 581
 		        continue;
582 582
 		    }
583 583
 
584 584
 			foreach ( $group as $i => $action ) {
585
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
586
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
585
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
586
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
587 587
 			}
588 588
 		}
589 589
 
@@ -608,13 +608,13 @@  discard block
 block discarded – undo
608 608
 		 * @since 1.7.2
609 609
 		 * @param boolean $hide_if_no_connections
610 610
 		 */
611
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
611
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
612 612
 
613
-		if( $hide_if_no_connections ) {
613
+		if ( $hide_if_no_connections ) {
614 614
 
615 615
 			$connected_views = gravityview_get_connected_views( $form_id );
616 616
 
617
-			if( empty( $connected_views ) ) {
617
+			if ( empty( $connected_views ) ) {
618 618
 				$show_approve_column = false;
619 619
 			}
620 620
 		}
@@ -624,21 +624,21 @@  discard block
 block discarded – undo
624 624
 		 * @param boolean $show_approve_column Whether the column will be shown
625 625
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
626 626
 		 */
627
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
627
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
628 628
 
629 629
 		return $show_approve_column;
630 630
 	}
631 631
 
632 632
 	function register_gform_noconflict_script( $scripts ) {
633
-		$scripts[] = 'gravityview_gf_entries_scripts';
634
-		$scripts[] = 'gravityview_entries_list-popper';
635
-		$scripts[] = 'gravityview_entries_list-tippy';
633
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
634
+		$scripts[ ] = 'gravityview_entries_list-popper';
635
+		$scripts[ ] = 'gravityview_entries_list-tippy';
636 636
 		return $scripts;
637 637
 	}
638 638
 
639 639
 	function register_gform_noconflict_style( $styles ) {
640
-		$styles[] = 'gravityview_entries_list';
641
-		$styles[] = 'gravityview_entries_list-tippy';
640
+		$styles[ ] = 'gravityview_entries_list';
641
+		$styles[ ] = 'gravityview_entries_list-tippy';
642 642
 		return $styles;
643 643
 	}
644 644
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -278,7 +278,7 @@
 block discarded – undo
278 278
 	 * Capture bulk actions - gf_entries table
279 279
 	 *
280 280
 	 * @uses  GravityView_frontend::get_search_criteria() Convert the $_POST search request into a properly formatted request.
281
-	 * @return void|boolean
281
+	 * @return false|null
282 282
 	 */
283 283
 	public function process_bulk_action() {
284 284
 
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 2 patches
Indentation   +213 added lines, -213 removed lines patch added patch discarded remove patch
@@ -5,243 +5,243 @@
 block discarded – undo
5 5
  */
6 6
 class GravityView_Change_Entry_Creator {
7 7
 
8
-    function __construct() {
9
-
10
-    	/**
11
-    	 * @since  1.5.1
12
-    	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
-
15
-    	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
17
-
18
-	    /**
19
-         * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
-	     * @since 1.7.4
21
-	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
-	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
-		    return;
25
-	    }
26
-
27
-        /**
28
-         * Use `init` to fix bbPress warning
29
-         * @see https://bbpress.trac.wordpress.org/ticket/2309
30
-         */
31
-    	add_action('init', array( $this, 'load'), 100 );
32
-
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
-
35
-    }
36
-
37
-    /**
38
-     * When an user is created using the User Registration add-on, assign the entry to them
39
-     *
40
-     * @since  1.5.1
41
-     * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
-     * @param  int $user_id  WordPress User ID
43
-     * @param  array $config   User registration feed configuration
44
-     * @param  array  $entry     GF Entry array
45
-     * @param  string $password User password
46
-     * @return void
47
-     */
48
-    function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
-
50
-    	/**
51
-    	 * Disable assigning the new user to the entry by returning false.
52
-    	 * @param  int $user_id  WordPress User ID
53
-	     * @param  array $config   User registration feed configuration
54
-	     * @param  array  $entry     GF Entry array
55
-    	 */
56
-    	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
-
58
-    	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
60
-    		return;
61
-    	}
62
-
63
-    	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
65
-
66
-    	if ( false === $result ) {
67
-    		$status = __('Error', 'gravityview');
68
-    		global $wpdb;
69
-		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70
-    	} else {
71
-    		$status = __('Success', 'gravityview');
72
-    	    $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
-    	}
74
-
75
-    	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
76
-
77
-	    /**
78
-	     * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
79
-	     * @since 1.21.5
80
-	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81
-	     */
82
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
83
-		    return;
84
-	    }
85
-
86
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
87
-
88
-    }
89
-
90
-    /**
91
-     * Disable previous functionality; use this one as the canonical.
92
-     * @return void
93
-     */
94
-    function prevent_conflicts() {
95
-
96
-    	// Plugin that was provided here:
97
-    	// @link https://gravityview.co/support/documentation/201991205/
98
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100
-
101
-    }
102
-
103
-    /**
104
-     * @since  3.6.3
105
-     * @return void
106
-     */
107
-    function load() {
108
-
109
-    	// Does GF exist?
110
-        if( !class_exists('GFCommon') ) {
111
-            return;
112
-        }
113
-
114
-        // Can the user edit entries?
115
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116
-            return;
117
-        }
118
-
119
-        // If screen mode isn't set, then we're in the wrong place.
120
-        if( empty( $_REQUEST['screen_mode'] ) ) {
121
-            return;
122
-        }
123
-
124
-        // Now, no validation is required in the methods; let's hook in.
125
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
126
-
127
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
128
-
129
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
130
-
131
-    }
132
-
133
-    /**
134
-     * Allows for edit links to work with a link instead of a form (GET instead of POST)
135
-     * @return void
136
-     */
137
-    function set_screen_mode() {
138
-
139
-    	if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140
-    		return;
141
-	    }
142
-
143
-    	// If $_GET['screen_mode'] is set to edit, set $_POST value
144
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
-            $_POST["screen_mode"] = 'edit';
146
-        }
147
-
148
-    }
149
-
150
-    /**
151
-     * When the entry creator is changed, add a note to the entry
152
-     * @param  array $form   GF entry array
153
-     * @param  int $entry_id Entry ID
154
-     * @return void
155
-     */
156
-    function update_entry_creator($form, $entry_id) {
157
-            global $current_user;
8
+	function __construct() {
9
+
10
+		/**
11
+		 * @since  1.5.1
12
+		 */
13
+		add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
14
+
15
+		// ONLY ADMIN FROM HERE ON.
16
+		if( !is_admin() ) { return; }
17
+
18
+		/**
19
+		 * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20
+		 * @since 1.7.4
21
+		 * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22
+		 */
23
+		if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
24
+			return;
25
+		}
26
+
27
+		/**
28
+		 * Use `init` to fix bbPress warning
29
+		 * @see https://bbpress.trac.wordpress.org/ticket/2309
30
+		 */
31
+		add_action('init', array( $this, 'load'), 100 );
32
+
33
+		add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
34
+
35
+	}
36
+
37
+	/**
38
+	 * When an user is created using the User Registration add-on, assign the entry to them
39
+	 *
40
+	 * @since  1.5.1
41
+	 * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field
42
+	 * @param  int $user_id  WordPress User ID
43
+	 * @param  array $config   User registration feed configuration
44
+	 * @param  array  $entry     GF Entry array
45
+	 * @param  string $password User password
46
+	 * @return void
47
+	 */
48
+	function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) {
49
+
50
+		/**
51
+		 * Disable assigning the new user to the entry by returning false.
52
+		 * @param  int $user_id  WordPress User ID
53
+		 * @param  array $config   User registration feed configuration
54
+		 * @param  array  $entry     GF Entry array
55
+		 */
56
+		$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57
+
58
+		// If filter returns false, do not process
59
+		if( empty( $assign_to_lead ) ) {
60
+			return;
61
+		}
62
+
63
+		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
+		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
65
+
66
+		if ( false === $result ) {
67
+			$status = __('Error', 'gravityview');
68
+			global $wpdb;
69
+			$note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70
+		} else {
71
+			$status = __('Success', 'gravityview');
72
+			$note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
73
+		}
74
+
75
+		gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
76
+
77
+		/**
78
+		 * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator
79
+		 * @since 1.21.5
80
+		 * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81
+		 */
82
+		if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
83
+			return;
84
+		}
85
+
86
+		GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
87
+
88
+	}
89
+
90
+	/**
91
+	 * Disable previous functionality; use this one as the canonical.
92
+	 * @return void
93
+	 */
94
+	function prevent_conflicts() {
95
+
96
+		// Plugin that was provided here:
97
+		// @link https://gravityview.co/support/documentation/201991205/
98
+		remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
+		remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100
+
101
+	}
102
+
103
+	/**
104
+	 * @since  3.6.3
105
+	 * @return void
106
+	 */
107
+	function load() {
108
+
109
+		// Does GF exist?
110
+		if( !class_exists('GFCommon') ) {
111
+			return;
112
+		}
113
+
114
+		// Can the user edit entries?
115
+		if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116
+			return;
117
+		}
118
+
119
+		// If screen mode isn't set, then we're in the wrong place.
120
+		if( empty( $_REQUEST['screen_mode'] ) ) {
121
+			return;
122
+		}
123
+
124
+		// Now, no validation is required in the methods; let's hook in.
125
+		add_action('admin_init', array( &$this, 'set_screen_mode' ) );
126
+
127
+		add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
128
+
129
+		add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
130
+
131
+	}
132
+
133
+	/**
134
+	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
135
+	 * @return void
136
+	 */
137
+	function set_screen_mode() {
138
+
139
+		if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140
+			return;
141
+		}
142
+
143
+		// If $_GET['screen_mode'] is set to edit, set $_POST value
144
+		if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
+			$_POST["screen_mode"] = 'edit';
146
+		}
147
+
148
+	}
149
+
150
+	/**
151
+	 * When the entry creator is changed, add a note to the entry
152
+	 * @param  array $form   GF entry array
153
+	 * @param  int $entry_id Entry ID
154
+	 * @return void
155
+	 */
156
+	function update_entry_creator($form, $entry_id) {
157
+			global $current_user;
158 158
 
159
-        // Update the entry
160
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
159
+		// Update the entry
160
+		$created_by = absint( \GV\Utils::_POST( 'created_by') );
161 161
 
162
-        RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
162
+		RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
163 163
 
164
-        // If the creator has changed, let's add a note about who it used to be.
165
-        $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
164
+		// If the creator has changed, let's add a note about who it used to be.
165
+		$originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
166 166
 
167
-        // If there's no owner and there didn't used to be, keep going
168
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
169
-            return;
170
-        }
167
+		// If there's no owner and there didn't used to be, keep going
168
+		if( empty( $originally_created_by ) && empty( $created_by ) ) {
169
+			return;
170
+		}
171 171
 
172
-        // If the values have changed
173
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
172
+		// If the values have changed
173
+		if( absint( $originally_created_by ) !== absint( $created_by ) ) {
174 174
 
175
-            $user_data = get_userdata($current_user->ID);
175
+			$user_data = get_userdata($current_user->ID);
176 176
 
177
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
177
+			$user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
178 178
 
179
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
179
+			$original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
180 180
 
181
-            if( !empty( $originally_created_by ) ) {
182
-                $originally_created_by_user_data = get_userdata($originally_created_by);
183
-                $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184
-            }
181
+			if( !empty( $originally_created_by ) ) {
182
+				$originally_created_by_user_data = get_userdata($originally_created_by);
183
+				$original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184
+			}
185 185
 
186
-            if( !empty( $created_by ) ) {
187
-                $created_by_user_data =  get_userdata($created_by);
188
-                $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189
-            }
186
+			if( !empty( $created_by ) ) {
187
+				$created_by_user_data =  get_userdata($created_by);
188
+				$created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189
+			}
190 190
 
191
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
192
-        }
191
+			GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
192
+		}
193 193
 
194
-    }
194
+	}
195 195
 
196
-    /**
197
-     * Output the select to change the entry creator
198
-     * @param int $form_id GF Form ID
199
-     * @param array $entry    GF entry array
200
-     * @return void
201
-     */
202
-    function add_select($form_id, $entry ) {
196
+	/**
197
+	 * Output the select to change the entry creator
198
+	 * @param int $form_id GF Form ID
199
+	 * @param array $entry    GF entry array
200
+	 * @return void
201
+	 */
202
+	function add_select($form_id, $entry ) {
203 203
 
204
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205
-            return;
206
-        }
204
+		if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205
+			return;
206
+		}
207 207
 
208
-        $created_by_id = \GV\Utils::get( $entry, 'created_by' );
208
+		$created_by_id = \GV\Utils::get( $entry, 'created_by' );
209 209
 
210
-        $users = GVCommon::get_users( 'change_entry_creator' );
210
+		$users = GVCommon::get_users( 'change_entry_creator' );
211 211
 
212
-        $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
212
+		$is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) );
213 213
 
214
-        // Make sure that the entry creator is included in the users list. If not, add them.
215
-        if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
214
+		// Make sure that the entry creator is included in the users list. If not, add them.
215
+		if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) {
216 216
 
217
-	        if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
218
-	            $users = array_merge( $users, $created_by_user );
219
-	        }
220
-	    }
217
+			if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) {
218
+				$users = array_merge( $users, $created_by_user );
219
+			}
220
+		}
221 221
 
222
-        $output = '<label for="change_created_by">';
223
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
224
-        $output .= '</label>';
222
+		$output = '<label for="change_created_by">';
223
+		$output .= esc_html__('Change Entry Creator:', 'gravityview');
224
+		$output .= '</label>';
225 225
 
226
-	    // If there are users who are not being shown, show a warning.
227
-	    // TODO: Use AJAX instead of <select>
228
-	    $count_users = count_users();
229
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
230
-		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
231
-	    }
226
+		// If there are users who are not being shown, show a warning.
227
+		// TODO: Use AJAX instead of <select>
228
+		$count_users = count_users();
229
+		if( sizeof( $users ) < $count_users['total_users'] ) {
230
+			$output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
231
+		}
232 232
 
233
-	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
-        foreach($users as $user) {
236
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
237
-        }
238
-        $output .= '</select>';
239
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
233
+		$output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
+		$output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
+		foreach($users as $user) {
236
+			$output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
237
+		}
238
+		$output .= '</select>';
239
+		$output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
240 240
 
241
-	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
241
+		unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
242 242
 
243
-        echo $output;
244
-    }
243
+		echo $output;
244
+	}
245 245
 
246 246
 }
247 247
 
Please login to merge, or discard this patch.
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     	/**
11 11
     	 * @since  1.5.1
12 12
     	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
13
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
14 14
 
15 15
     	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
16
+    	if ( ! is_admin() ) { return; }
17 17
 
18 18
 	    /**
19 19
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20 20
 	     * @since 1.7.4
21 21
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22 22
 	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
23
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
24 24
 		    return;
25 25
 	    }
26 26
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
          * Use `init` to fix bbPress warning
29 29
          * @see https://bbpress.trac.wordpress.org/ticket/2309
30 30
          */
31
-    	add_action('init', array( $this, 'load'), 100 );
31
+    	add_action( 'init', array( $this, 'load' ), 100 );
32 32
 
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
33
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
34 34
 
35 35
     }
36 36
 
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57 57
 
58 58
     	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
59
+    	if ( empty( $assign_to_lead ) ) {
60 60
     		return;
61 61
     	}
62 62
 
63 63
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
64
+    	$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
65 65
 
66 66
     	if ( false === $result ) {
67
-    		$status = __('Error', 'gravityview');
67
+    		$status = __( 'Error', 'gravityview' );
68 68
     		global $wpdb;
69 69
 		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70 70
     	} else {
71
-    		$status = __('Success', 'gravityview');
72
-    	    $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
71
+    		$status = __( 'Success', 'gravityview' );
72
+    	    $note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
73 73
     	}
74 74
 
75 75
     	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 	     * @since 1.21.5
80 80
 	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81 81
 	     */
82
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) {
83 83
 		    return;
84 84
 	    }
85 85
 
86
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
86
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
87 87
 
88 88
     }
89 89
 
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 
96 96
     	// Plugin that was provided here:
97 97
     	// @link https://gravityview.co/support/documentation/201991205/
98
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
98
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100 100
 
101 101
     }
102 102
 
@@ -107,26 +107,26 @@  discard block
 block discarded – undo
107 107
     function load() {
108 108
 
109 109
     	// Does GF exist?
110
-        if( !class_exists('GFCommon') ) {
110
+        if ( ! class_exists( 'GFCommon' ) ) {
111 111
             return;
112 112
         }
113 113
 
114 114
         // Can the user edit entries?
115
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
115
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116 116
             return;
117 117
         }
118 118
 
119 119
         // If screen mode isn't set, then we're in the wrong place.
120
-        if( empty( $_REQUEST['screen_mode'] ) ) {
120
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
121 121
             return;
122 122
         }
123 123
 
124 124
         // Now, no validation is required in the methods; let's hook in.
125
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
125
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
126 126
 
127
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
127
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
128 128
 
129
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
129
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
130 130
 
131 131
     }
132 132
 
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
      */
137 137
     function set_screen_mode() {
138 138
 
139
-    	if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
139
+    	if ( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140 140
     		return;
141 141
 	    }
142 142
 
143 143
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
144
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
-            $_POST["screen_mode"] = 'edit';
144
+        if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
+            $_POST[ "screen_mode" ] = 'edit';
146 146
         }
147 147
 
148 148
     }
@@ -153,11 +153,11 @@  discard block
 block discarded – undo
153 153
      * @param  int $entry_id Entry ID
154 154
      * @return void
155 155
      */
156
-    function update_entry_creator($form, $entry_id) {
156
+    function update_entry_creator( $form, $entry_id ) {
157 157
             global $current_user;
158 158
 
159 159
         // Update the entry
160
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
160
+        $created_by = absint( \GV\Utils::_POST( 'created_by' ) );
161 161
 
162 162
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
163 163
 
@@ -165,30 +165,30 @@  discard block
 block discarded – undo
165 165
         $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
166 166
 
167 167
         // If there's no owner and there didn't used to be, keep going
168
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
168
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
169 169
             return;
170 170
         }
171 171
 
172 172
         // If the values have changed
173
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
173
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
174 174
 
175
-            $user_data = get_userdata($current_user->ID);
175
+            $user_data = get_userdata( $current_user->ID );
176 176
 
177
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
177
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
178 178
 
179
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
179
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
180 180
 
181
-            if( !empty( $originally_created_by ) ) {
182
-                $originally_created_by_user_data = get_userdata($originally_created_by);
181
+            if ( ! empty( $originally_created_by ) ) {
182
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
183 183
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184 184
             }
185 185
 
186
-            if( !empty( $created_by ) ) {
187
-                $created_by_user_data =  get_userdata($created_by);
186
+            if ( ! empty( $created_by ) ) {
187
+                $created_by_user_data = get_userdata( $created_by );
188 188
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189 189
             }
190 190
 
191
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
191
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
192 192
         }
193 193
 
194 194
     }
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
      * @param array $entry    GF entry array
200 200
      * @return void
201 201
      */
202
-    function add_select($form_id, $entry ) {
202
+    function add_select( $form_id, $entry ) {
203 203
 
204
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
204
+        if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205 205
             return;
206 206
         }
207 207
 
@@ -220,23 +220,23 @@  discard block
 block discarded – undo
220 220
 	    }
221 221
 
222 222
         $output = '<label for="change_created_by">';
223
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
223
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
224 224
         $output .= '</label>';
225 225
 
226 226
 	    // If there are users who are not being shown, show a warning.
227 227
 	    // TODO: Use AJAX instead of <select>
228 228
 	    $count_users = count_users();
229
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
229
+	    if ( sizeof( $users ) < $count_users[ 'total_users' ] ) {
230 230
 		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
231 231
 	    }
232 232
 
233 233
 	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
-        foreach($users as $user) {
236
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
234
+        $output .= '<option value="' . selected( $entry[ 'created_by' ], '0', false ) . '"> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
235
+        foreach ( $users as $user ) {
236
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
237 237
         }
238 238
         $output .= '</select>';
239
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
239
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
240 240
 
241 241
 	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
242 242
 
Please login to merge, or discard this patch.
future/includes/class-gv-renderer.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 	 * @param \GV\View $view The view we're looking at.
77 77
 	 * @param string $path The path of the offending template.
78 78
 	 *
79
-	 * @return \Callable A closure used in the filter.
79
+	 * @return \Closure A closure used in the filter.
80 80
 	 */
81 81
 	public function legacy_template_warning( $view, $path ) {
82 82
 		return function() use ( $view, $path ) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,11 +49,11 @@  discard block
 block discarded – undo
49 49
 
50 50
 		$post_types = get_post_types();
51 51
 
52
-		foreach( $post_types as $post_type ) {
52
+		foreach ( $post_types as $post_type ) {
53 53
 			$post_type_rewrite = get_post_type_object( $post_type )->rewrite;
54 54
 
55 55
 			if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) {
56
-				$reserved_slugs[] = $slug;
56
+				$reserved_slugs[ ] = $slug;
57 57
 			}
58 58
 		}
59 59
 
@@ -89,8 +89,7 @@  discard block
 block discarded – undo
89 89
 				$tab = __( 'Edit Entry', 'gravityview' );
90 90
 				$context = 'edit';
91 91
 				break;
92
-			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ):
93
-				$tab = __( 'Single Entry', 'gravityview' );
92
+			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ) : $tab = __( 'Single Entry', 'gravityview' );
94 93
 				$context = 'single';
95 94
 				break;
96 95
 			default:
@@ -110,7 +109,7 @@  discard block
 block discarded – undo
110 109
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
111 110
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
112 111
 
113
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
112
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
114 113
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
115 114
 
116 115
 		echo \GVCommon::generate_notice( $output . $image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID );
Please login to merge, or discard this patch.
future/includes/class-gv-template-field.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
 	 * Why? See https://github.com/gravityview/GravityView/issues/1024
102 102
 	 *
103 103
 	 * @param \GV\Field_Template $template The template instance.
104
-	 * @return callable The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
104
+	 * @return \Closure The callback bound to `get_template_part`. See `\GV\Field_Template::__construct`
105 105
 	 */
106 106
 	public static function add_id_specific_templates( $template ) {
107 107
 
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	public function __destruct() {
95
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
95
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
96 96
 	}
97 97
 
98 98
 	/**
@@ -175,59 +175,59 @@  discard block
 block discarded – undo
175 175
 
176 176
 			if ( $is_view && $post ) {
177 177
 				if ( $field_type ) {
178
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
178
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
186 186
 				}
187 187
 
188
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
188
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
192 192
 			}
193 193
 			
194 194
 			/** Field-specific */
195 195
 			if ( $field_id && $form_id ) {
196 196
 
197 197
 				if ( $field_id ) {
198
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
198
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
200 200
 
201 201
 					if ( $view_id ) {
202
-						$specifics []= sprintf( '%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id );
202
+						$specifics [ ] = sprintf( '%sview-%d-field-%d.php', $slug_dir, $view_id, $field_id );
203 203
 					}
204 204
 				}
205 205
 
206 206
 				if ( $field_type ) {
207
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
208
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
209
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
210
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
211
-
212
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
213
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
214
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
215
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
216
-
217
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
218
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
219
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
220
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
207
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
208
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
209
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
210
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
211
+
212
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
213
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
214
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
215
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
216
+
217
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
218
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
219
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
220
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
221 221
 				}
222 222
 			}
223 223
 
224 224
 			if ( $form_id ) {
225 225
 				/** Generic field templates */
226
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
227
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
226
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
227
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
228 228
 
229
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
230
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
229
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
230
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
231 231
 			}
232 232
 
233 233
 			/**
@@ -235,12 +235,12 @@  discard block
 block discarded – undo
235 235
 			 * Ignore some types that conflict.
236 236
 			 */
237 237
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
238
-				$specifics []= sprintf( '%s.php', $field_type );
239
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
238
+				$specifics [ ] = sprintf( '%s.php', $field_type );
239
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
240 240
 			}
241 241
 
242
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
243
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
242
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
243
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
244 244
 
245 245
 			return array_merge( $specifics, $templates );
246 246
 		};
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			/** Prevent any PHP warnings that may be generated. */
275 275
 			ob_start();
276 276
 
277
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry['currency'], false, 'html' );
277
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $entry[ 'currency' ], false, 'html' );
278 278
 
279 279
 			if ( $errors = ob_get_clean() ) {
280 280
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
 	/**
78 78
 	 * Render the page size widget
79
-     *
79
+	 *
80 80
 	 * @param array $widget_args The Widget shortcode args.
81 81
 	 * @param string $content The content.
82 82
 	 * @param string|\GV\Template_Context $context The context, if available.
@@ -117,10 +117,10 @@  discard block
 block discarded – undo
117 117
 						<?php } ?>
118 118
                     </select>
119 119
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
120
-                    if( ! empty( $_GET ) ) {
121
-                        $get = $_GET;
122
-                        unset( $get['page_size'] );
123
-	                    foreach ( $get as $key => $value ) {
120
+					if( ! empty( $_GET ) ) {
121
+						$get = $_GET;
122
+						unset( $get['page_size'] );
123
+						foreach ( $get as $key => $value ) {
124 124
 							if ( is_array( $value ) ) {
125 125
 								foreach ( $value as $_key => $_value ) {
126 126
 									printf( '<input type="hidden" name="%s[%s]" value="%s" />', esc_attr( $key ), esc_attr( $_key ), esc_attr( $_value ) );
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 							} else {
129 129
 								printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
130 130
 							}
131
-	                    }
132
-                    }
133
-                    ?>
131
+						}
132
+					}
133
+					?>
134 134
                 </div>
135 135
             </form>
136 136
         </div>
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$default_size = 25;
48 48
 
49 49
 		if ( $context instanceof \GV\Template_Context ) {
50
-			$default_size = (int) $context->view->settings->get( 'page_size' );
50
+			$default_size = (int)$context->view->settings->get( 'page_size' );
51 51
 		}
52 52
 
53 53
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$page_sizes = array();
60 60
 		foreach ( $sizes as $size ) {
61
-			$page_sizes [] = array(
61
+			$page_sizes [ ] = array(
62 62
 				'value' => $size,
63 63
 				'text'  => $size
64 64
 			);
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 	 */
84 84
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
85 85
 
86
-		if( ! $this->pre_render_frontend() ) {
86
+		if ( ! $this->pre_render_frontend() ) {
87 87
 			return;
88 88
 		}
89 89
 
90
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
90
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
91 91
 
92 92
 		$settings = shortcode_atts( array(
93 93
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -106,20 +106,20 @@  discard block
 block discarded – undo
106 106
         <div class="gv-widget-page-size">
107 107
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
108 108
                 <div>
109
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
110
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
109
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
110
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
111 111
                     <?php } ?>
112 112
                     <select name="page_size" id="gv-page_size">
113
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
113
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
114 114
 						<?php
115
-						foreach ( $settings['choices'] as $choice ) { ?>
116
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
115
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
116
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
117 117
 						<?php } ?>
118 118
                     </select>
119 119
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
120
-                    if( ! empty( $_GET ) ) {
120
+                    if ( ! empty( $_GET ) ) {
121 121
                         $get = $_GET;
122
-                        unset( $get['page_size'] );
122
+                        unset( $get[ 'page_size' ] );
123 123
 	                    foreach ( $get as $key => $value ) {
124 124
 							if ( is_array( $value ) ) {
125 125
 								foreach ( $value as $_key => $_value ) {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		}
159 159
 
160 160
 		// Already overridden
161
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
161
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
162 162
 			return;
163 163
 		}
164 164
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 			'view' => $view,
167 167
 		) );
168 168
 
169
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
169
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
170 170
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
171 171
 			return;
172 172
 		}
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-submit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@
 block discarded – undo
12 12
 	// Output the Clear button, if enabled
13 13
 	GravityView_Widget_Search::the_clear_search_button();
14 14
 
15
-	if ( isset( $_GET['page_size'] ) ) {
15
+	if ( isset( $_GET[ 'page_size' ] ) ) {
16 16
 		?>
17
-		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET['page_size'] ); ?>" />
17
+		<input type="hidden" name="page_size" value="<?php echo esc_attr( $_GET[ 'page_size' ] ); ?>" />
18 18
 		<?php
19 19
 	}
20 20
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-entry-link.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,25 +30,25 @@
 block discarded – undo
30 30
 
31 31
 	public function __construct() {
32 32
 		$this->label = esc_html__( 'Link to Entry', 'gravityview' );
33
-		$this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
33
+		$this->description = esc_html__( 'A dedicated link to the single entry with customizable text.', 'gravityview' );
34 34
 		parent::__construct();
35 35
 	}
36 36
 
37 37
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
38 38
 
39 39
 		// Always a link!
40
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
40
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
41 41
 
42
-		if( 'edit' === $context ) {
42
+		if ( 'edit' === $context ) {
43 43
 			return $field_options;
44 44
 		}
45 45
 
46 46
 		$add_options = array();
47
-		$add_options['entry_link_text'] = array(
47
+		$add_options[ 'entry_link_text' ] = array(
48 48
 			'type' => 'text',
49 49
 			'label' => __( 'Link Text:', 'gravityview' ),
50 50
 			'desc' => NULL,
51
-			'value' => __('View Details', 'gravityview'),
51
+			'value' => __( 'View Details', 'gravityview' ),
52 52
 			'merge_tags' => true,
53 53
 		);
54 54
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-content.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['show_as_link'] );
27
+		unset( $field_options[ 'show_as_link' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$this->add_field_support('dynamic_data', $field_options );
33
+		$this->add_field_support( 'dynamic_data', $field_options );
34 34
 
35 35
 		return $field_options;
36 36
 	}
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) {
48 48
 
49
-		$id    = (int) $field->id;
49
+		$id    = (int)$field->id;
50 50
 		$input_name = "input_{$id}";
51 51
 		$class = esc_attr( $field->size );
52 52
 		$tabindex = $field->get_tabindex();
Please login to merge, or discard this patch.