Completed
Branch master (3ac4b1)
by Zack
04:30
created
includes/default-widgets.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,4 +5,4 @@
 block discarded – undo
5 5
  * @deprecated 1.7.5
6 6
  */
7 7
 
8
-include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
8
+include_once(GRAVITYVIEW_DIR.'includes/widgets/class-gravityview-widget.php');
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +120 added lines, -120 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  * @copyright Copyright 2014, Katz Web Services, Inc.
13 13
  */
14 14
 
15
-if ( ! defined( 'WPINC' ) ) {
15
+if (!defined('WPINC')) {
16 16
 	die;
17 17
 }
18 18
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 	function __construct() {
32 32
 
33
-		self::$file = plugin_dir_path( __FILE__ );
33
+		self::$file = plugin_dir_path(__FILE__);
34 34
 
35 35
 		$this->add_hooks();
36 36
 	}
@@ -39,22 +39,22 @@  discard block
 block discarded – undo
39 39
 	 * @since 1.9.2
40 40
 	 */
41 41
 	private function add_hooks() {
42
-		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
42
+		add_action('wp', array($this, 'process_delete'), 10000);
43 43
 
44
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
44
+		add_filter('gravityview_entry_default_fields', array($this, 'add_default_field'), 10, 3);
45 45
 
46
-		add_action( 'gravityview_before', array( $this, 'display_message' ) );
46
+		add_action('gravityview_before', array($this, 'display_message'));
47 47
 
48 48
 		// For the Delete Entry Link, you don't want visible to all users.
49
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
49
+		add_filter('gravityview_field_visibility_caps', array($this, 'modify_visibility_caps'), 10, 5);
50 50
 
51 51
 		// Modify the field options based on the name of the field type
52
-		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
52
+		add_filter('gravityview_template_delete_link_options', array($this, 'delete_link_field_options'), 10, 5);
53 53
 
54 54
 		// add template path to check for field
55
-		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
55
+		add_filter('gravityview_template_paths', array($this, 'add_template_path'));
56 56
 
57
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 3 );
57
+		add_action('gravityview/edit-entry/publishing-action/after', array($this, 'add_delete_button'), 10, 3);
58 58
 	}
59 59
 
60 60
 	/**
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	 */
66 66
 	static function getInstance() {
67 67
 
68
-		if( empty( self::$instance ) ) {
68
+		if (empty(self::$instance)) {
69 69
 			self::$instance = new self;
70 70
 		}
71 71
 
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 	 * @since  1.5.1
79 79
 	 * @param array $file_paths List of template paths ordered
80 80
 	 */
81
-	function add_template_path( $file_paths ) {
81
+	function add_template_path($file_paths) {
82 82
 
83 83
 		// Index 100 is the default GravityView template path.
84 84
 		// Index 110 is Edit Entry link
85
-		$file_paths[ 115 ] = self::$file;
85
+		$file_paths[115] = self::$file;
86 86
 
87 87
 		return $file_paths;
88 88
 	}
@@ -98,17 +98,17 @@  discard block
 block discarded – undo
98 98
 	 * @param  [type] $input_type    [description]
99 99
 	 * @return [type]                [description]
100 100
 	 */
101
-	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
101
+	function delete_link_field_options($field_options, $template_id, $field_id, $context, $input_type) {
102 102
 
103 103
 		// Always a link, never a filter
104
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
104
+		unset($field_options['show_as_link'], $field_options['search_filter']);
105 105
 
106 106
 		// Delete Entry link should only appear to visitors capable of editing entries
107
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
107
+		unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
108 108
 
109 109
 		$add_option['delete_link'] = array(
110 110
 			'type' => 'text',
111
-			'label' => __( 'Delete Link Text', 'gravityview' ),
111
+			'label' => __('Delete Link Text', 'gravityview'),
112 112
 			'desc' => NULL,
113 113
 			'value' => __('Delete Entry', 'gravityview'),
114 114
 			'merge_tags' => true,
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
 
117 117
 		$field_options['allow_edit_cap'] = array(
118 118
 			'type' => 'select',
119
-			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
120
-			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
119
+			'label' => __('Allow the following users to delete the entry:', 'gravityview'),
120
+			'choices' => GravityView_Render_Settings::get_cap_choices($template_id, $field_id, $context, $input_type),
121 121
 			'tooltip' => 'allow_edit_cap',
122 122
 			'class' => 'widefat',
123 123
 			'value' => 'read', // Default: entry creator
124 124
 		);
125 125
 
126 126
 
127
-		return array_merge( $add_option, $field_options );
127
+		return array_merge($add_option, $field_options);
128 128
 	}
129 129
 
130 130
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	 * @param  string|array $form form_ID or form object
137 137
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
138 138
 	 */
139
-	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
139
+	function add_default_field($entry_default_fields, $form = array(), $zone = '') {
140 140
 
141 141
 		$entry_default_fields['delete_link'] = array(
142 142
 			'label' => __('Delete Entry', 'gravityview'),
@@ -152,10 +152,10 @@  discard block
 block discarded – undo
152 152
 	 * @since 1.5.1
153 153
 	 * @param array $available_fields
154 154
 	 */
155
-	function add_available_field( $available_fields = array() ) {
155
+	function add_available_field($available_fields = array()) {
156 156
 
157 157
 		$available_fields['delete_link'] = array(
158
-			'label_text' => __( 'Delete Entry', 'gravityview' ),
158
+			'label_text' => __('Delete Entry', 'gravityview'),
159 159
 			'field_id' => 'delete_link',
160 160
 			'label_type' => 'field',
161 161
 			'input_type' => 'delete_link',
@@ -177,15 +177,15 @@  discard block
 block discarded – undo
177 177
 	 * @param  string      $input_type  (textarea, list, select, etc.)
178 178
 	 * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
179 179
 	 */
180
-	public function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
180
+	public function modify_visibility_caps($visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '') {
181 181
 
182 182
 		$caps = $visibility_caps;
183 183
 
184 184
 		// If we're configuring fields in the edit context, we want a limited selection
185
-		if( $field_id === 'delete_link' ) {
185
+		if ($field_id === 'delete_link') {
186 186
 
187 187
 			// Remove other built-in caps.
188
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
188
+			unset($caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts']);
189 189
 
190 190
 			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
191 191
 		}
@@ -199,8 +199,8 @@  discard block
 block discarded – undo
199 199
 	 * @since 1.5.1
200 200
 	 * @param [type] $entry [description]
201 201
 	 */
202
-	function set_entry( $entry = null ) {
203
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
202
+	function set_entry($entry = null) {
203
+		$this->entry = empty($entry) ? GravityView_View::getInstance()->entries[0] : $entry;
204 204
 	}
205 205
 
206 206
 	/**
@@ -210,8 +210,8 @@  discard block
 block discarded – undo
210 210
 	 * @param  int $entry_id Entry ID
211 211
 	 * @return string           Key used to validate request
212 212
 	 */
213
-	public static function get_nonce_key( $entry_id ) {
214
-		return sprintf( 'delete_%s', $entry_id );
213
+	public static function get_nonce_key($entry_id) {
214
+		return sprintf('delete_%s', $entry_id);
215 215
 	}
216 216
 
217 217
 
@@ -224,30 +224,30 @@  discard block
 block discarded – undo
224 224
 	 * @param  array      $entry Gravity Forms entry array
225 225
 	 * @return string|null             If directory link is valid, the URL to process the delete request. Otherwise, `NULL`.
226 226
 	 */
227
-	public static function get_delete_link( $entry, $view_id = 0, $post_id = null ) {
227
+	public static function get_delete_link($entry, $view_id = 0, $post_id = null) {
228 228
 
229
-		self::getInstance()->set_entry( $entry );
229
+		self::getInstance()->set_entry($entry);
230 230
 
231
-        $base = GravityView_API::directory_link( $post_id, true );
231
+        $base = GravityView_API::directory_link($post_id, true);
232 232
 
233
-		if( empty( $base ) ) {
234
-			do_action( 'gravityview_log_error', __METHOD__ . ' - Post ID does not exist: '.$post_id );
233
+		if (empty($base)) {
234
+			do_action('gravityview_log_error', __METHOD__.' - Post ID does not exist: '.$post_id);
235 235
 			return NULL;
236 236
 		}
237 237
 
238 238
 		// Use the slug instead of the ID for consistent security
239
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
239
+		$entry_slug = GravityView_API::get_entry_slug($entry['id'], $entry);
240 240
 
241
-        $view_id = empty( $view_id ) ? gravityview_get_view_id() : $view_id;
241
+        $view_id = empty($view_id) ? gravityview_get_view_id() : $view_id;
242 242
 
243
-		$actionurl = add_query_arg( array(
243
+		$actionurl = add_query_arg(array(
244 244
 			'action'	=> 'delete',
245 245
 			'entry_id'		=> $entry_slug,
246 246
 			'gvid' => $view_id,
247 247
             'view_id' => $view_id,
248
-		), $base );
248
+		), $base);
249 249
 
250
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
250
+		$url = wp_nonce_url($actionurl, 'delete_'.$entry_slug, 'delete');
251 251
 
252 252
 		return $url;
253 253
 	}
@@ -261,10 +261,10 @@  discard block
 block discarded – undo
261 261
 	 * @param array $entry   Gravity Forms entry array
262 262
 	 * @param int $view_id GravityView View ID
263 263
 	 */
264
-	function add_delete_button( $form = array(), $entry = array(), $view_id = NULL ) {
264
+	function add_delete_button($form = array(), $entry = array(), $view_id = NULL) {
265 265
 
266 266
 		// Only show the link to those who are allowed to see it.
267
-		if( !self::check_user_cap_delete_entry( $entry ) ) {
267
+		if (!self::check_user_cap_delete_entry($entry)) {
268 268
 			return;
269 269
 		}
270 270
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		 * @filter `gravityview/delete-entry/show-delete-button` Should the Delete button be shown in the Edit Entry screen?
273 273
 		 * @param boolean $show_entry Default: true
274 274
 		 */
275
-		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
275
+		$show_delete_button = apply_filters('gravityview/delete-entry/show-delete-button', true);
276 276
 
277 277
 		// If the button is hidden by the filter, don't show.
278
-		if( !$show_delete_button ) {
278
+		if (!$show_delete_button) {
279 279
 			return;
280 280
 		}
281 281
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 			'onclick' => self::get_confirm_dialog(),
286 286
 		);
287 287
 
288
-		echo gravityview_get_link( self::get_delete_link( $entry, $view_id ), esc_attr__( 'Delete', 'gravityview' ), $attributes );
288
+		echo gravityview_get_link(self::get_delete_link($entry, $view_id), esc_attr__('Delete', 'gravityview'), $attributes);
289 289
 
290 290
 	}
291 291
 
@@ -305,39 +305,39 @@  discard block
 block discarded – undo
305 305
 	function process_delete() {
306 306
 
307 307
 		// If the form is submitted
308
-		if( RGForms::get("action") === "delete") {
308
+		if (RGForms::get("action") === "delete") {
309 309
 
310
-			$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
310
+			$nonce_key = self::get_nonce_key($_GET['entry_id']);
311 311
 
312 312
 			// Make sure it's a valid request
313
-			check_admin_referer( $nonce_key, 'delete' );
313
+			check_admin_referer($nonce_key, 'delete');
314 314
 
315 315
 			// Get the entry slug
316
-			$entry_slug = esc_attr( $_GET['entry_id'] );
316
+			$entry_slug = esc_attr($_GET['entry_id']);
317 317
 
318 318
 			// See if there's an entry there
319
-			$entry = gravityview_get_entry( $entry_slug );
319
+			$entry = gravityview_get_entry($entry_slug);
320 320
 
321
-			if( $entry ) {
321
+			if ($entry) {
322 322
 
323
-				$has_permission = $this->user_can_delete_entry( $entry );
323
+				$has_permission = $this->user_can_delete_entry($entry);
324 324
 
325
-				if( is_wp_error( $has_permission ) ) {
325
+				if (is_wp_error($has_permission)) {
326 326
 
327 327
 					$messages = array(
328
-						'message' => urlencode( $has_permission->get_error_message() ),
328
+						'message' => urlencode($has_permission->get_error_message()),
329 329
 						'status' => 'error',
330 330
 					);
331 331
 
332 332
 				} else {
333 333
 
334 334
 					// Delete the entry
335
-					$delete_response = $this->delete_or_trash_entry( $entry['id'] );
335
+					$delete_response = $this->delete_or_trash_entry($entry['id']);
336 336
 
337
-					if( is_wp_error( $delete_response ) ) {
337
+					if (is_wp_error($delete_response)) {
338 338
 
339 339
 						$messages = array(
340
-							'message' => urlencode( $delete_response->get_error_message() ),
340
+							'message' => urlencode($delete_response->get_error_message()),
341 341
 							'status' => 'error',
342 342
 						);
343 343
 
@@ -353,18 +353,18 @@  discard block
 block discarded – undo
353 353
 
354 354
 			} else {
355 355
 
356
-				do_action('gravityview_log_debug', __METHOD__ . ' Delete entry failed: there was no entry with the entry slug '. $entry_slug );
356
+				do_action('gravityview_log_debug', __METHOD__.' Delete entry failed: there was no entry with the entry slug '.$entry_slug);
357 357
 
358 358
 				$messages = array(
359
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
359
+					'message' => urlencode(__('The entry does not exist.', 'gravityview')),
360 360
 					'status' => 'error',
361 361
 				);
362 362
 			}
363 363
 
364
-			$redirect_to_base = esc_url_raw( remove_query_arg( array( 'action' ) ) );
365
-			$redirect_to = add_query_arg( $messages, $redirect_to_base );
364
+			$redirect_to_base = esc_url_raw(remove_query_arg(array('action')));
365
+			$redirect_to = add_query_arg($messages, $redirect_to_base);
366 366
 
367
-			wp_safe_redirect( $redirect_to );
367
+			wp_safe_redirect($redirect_to);
368 368
 
369 369
 			exit();
370 370
 
@@ -384,9 +384,9 @@  discard block
 block discarded – undo
384 384
 		 * @since 1.13.1
385 385
 		 * @param string $delete_mode Delete mode: `trash` or `delete`. Default: `delete`
386 386
 		 */
387
-		$delete_mode = apply_filters( 'gravityview/delete-entry/mode', 'delete' );
387
+		$delete_mode = apply_filters('gravityview/delete-entry/mode', 'delete');
388 388
 
389
-		return ( 'trash' === $delete_mode ) ? 'trash' : 'delete';
389
+		return ('trash' === $delete_mode) ? 'trash' : 'delete';
390 390
 	}
391 391
 
392 392
 	/**
@@ -394,37 +394,37 @@  discard block
 block discarded – undo
394 394
 	 * @see GFAPI::delete_entry()
395 395
 	 * @return WP_Error|boolean GFAPI::delete_entry() returns a WP_Error on error
396 396
 	 */
397
-	private function delete_or_trash_entry( $entry_id ) {
397
+	private function delete_or_trash_entry($entry_id) {
398 398
 
399 399
 		$mode = $this->get_delete_mode();
400 400
 
401
-		if( 'delete' === $mode ) {
401
+		if ('delete' === $mode) {
402 402
 
403
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting delete entry: ', $entry_id );
403
+			do_action('gravityview_log_debug', __METHOD__.' Starting delete entry: ', $entry_id);
404 404
 
405 405
 			// Delete the entry
406
-			$delete_response = GFAPI::delete_entry( $entry_id );
406
+			$delete_response = GFAPI::delete_entry($entry_id);
407 407
 
408
-			if( ! is_wp_error( $delete_response ) ) {
408
+			if (!is_wp_error($delete_response)) {
409 409
 				$delete_response = 'deleted';
410 410
 			}
411 411
 
412
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Delete response: ', $delete_response );
412
+			do_action('gravityview_log_debug', __METHOD__.' Delete response: ', $delete_response);
413 413
 
414 414
 		} else {
415 415
 
416
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Starting trash entry: ', $entry_id );
416
+			do_action('gravityview_log_debug', __METHOD__.' Starting trash entry: ', $entry_id);
417 417
 
418
-			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
418
+			$trashed = GFAPI::update_entry_property($entry_id, 'status', 'trash');
419 419
 			new GravityView_Cache;
420 420
 
421
-			if( ! $trashed ) {
422
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
421
+			if (!$trashed) {
422
+				$delete_response = new WP_Error('trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview'));
423 423
 			} else {
424 424
 				$delete_response = 'trashed';
425 425
 			}
426 426
 
427
-			do_action( 'gravityview_log_debug', __METHOD__ . ' Trashed? ', $delete_response );
427
+			do_action('gravityview_log_debug', __METHOD__.' Trashed? ', $delete_response);
428 428
 		}
429 429
 
430 430
 		return $delete_response;
@@ -439,13 +439,13 @@  discard block
 block discarded – undo
439 439
 	public function verify_nonce() {
440 440
 
441 441
 		// No delete entry request was made
442
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
442
+		if (empty($_GET['entry_id']) || empty($_GET['delete'])) {
443 443
 			return false;
444 444
 		}
445 445
 
446
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
446
+		$nonce_key = self::get_nonce_key($_GET['entry_id']);
447 447
 
448
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
448
+		$valid = wp_verify_nonce($_GET['delete'], $nonce_key);
449 449
 
450 450
 		/**
451 451
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 		 * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
455 455
 		 * @param string $nonce_key Name of nonce action used in wp_verify_nonce. $_GET['delete'] holds the nonce value itself. Default: `delete_{entry_id}`
456 456
 		 */
457
-		$valid = apply_filters( 'gravityview/delete-entry/verify_nonce', $valid, $nonce_key );
457
+		$valid = apply_filters('gravityview/delete-entry/verify_nonce', $valid, $nonce_key);
458 458
 
459 459
 		return $valid;
460 460
 	}
@@ -473,9 +473,9 @@  discard block
 block discarded – undo
473 473
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
474 474
 		 * @param string $confirm Default: "Are you sure you want to delete this entry? This cannot be undone."
475 475
 		 */
476
-		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
476
+		$confirm = apply_filters('gravityview/delete-entry/confirm-text', $confirm);
477 477
 
478
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
478
+		return 'return window.confirm(\''.esc_js($confirm).'\');';
479 479
 	}
480 480
 
481 481
 	/**
@@ -489,34 +489,34 @@  discard block
 block discarded – undo
489 489
 	 * @param  array $entry Gravity Forms entry array
490 490
 	 * @return boolean|WP_Error        True: can edit form. WP_Error: nope.
491 491
 	 */
492
-	function user_can_delete_entry( $entry = array() ) {
492
+	function user_can_delete_entry($entry = array()) {
493 493
 
494 494
 		$error = NULL;
495 495
 
496
-		if( ! $this->verify_nonce() ) {
497
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
496
+		if (!$this->verify_nonce()) {
497
+			$error = __('The link to delete this entry is not valid; it may have expired.', 'gravityview');
498 498
 		}
499 499
 
500
-		if( ! self::check_user_cap_delete_entry( $entry ) ) {
501
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
500
+		if (!self::check_user_cap_delete_entry($entry)) {
501
+			$error = __('You do not have permission to delete this entry.', 'gravityview');
502 502
 		}
503 503
 
504
-		if( $entry['status'] === 'trash' ) {
505
-			if( 'trash' === $this->get_delete_mode() ) {
506
-				$error = __( 'The entry is already in the trash.', 'gravityview' );
504
+		if ($entry['status'] === 'trash') {
505
+			if ('trash' === $this->get_delete_mode()) {
506
+				$error = __('The entry is already in the trash.', 'gravityview');
507 507
 			} else {
508
-				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
508
+				$error = __('You cannot delete the entry; it is already in the trash.', 'gravityview');
509 509
 			}
510 510
 		}
511 511
 
512 512
 		// No errors; everything's fine here!
513
-		if( empty( $error ) ) {
513
+		if (empty($error)) {
514 514
 			return true;
515 515
 		}
516 516
 
517
-		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]' . $error );
517
+		do_action('gravityview_log_error', 'GravityView_Delete_Entry[user_can_delete_entry]'.$error);
518 518
 
519
-		return new WP_Error( 'gravityview-delete-entry-permissions', $error );
519
+		return new WP_Error('gravityview-delete-entry-permissions', $error);
520 520
 	}
521 521
 
522 522
 
@@ -531,77 +531,77 @@  discard block
 block discarded – undo
531 531
 	 * @param int $view_id Pass a View ID to check caps against. If not set, check against current View (optional)
532 532
 	 * @return bool
533 533
 	 */
534
-	public static function check_user_cap_delete_entry( $entry, $field = array(), $view_id = 0 ) {
534
+	public static function check_user_cap_delete_entry($entry, $field = array(), $view_id = 0) {
535 535
 		$gravityview_view = GravityView_View::getInstance();
536 536
 
537 537
 		$current_user = wp_get_current_user();
538 538
 
539
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
539
+		$entry_id = isset($entry['id']) ? $entry['id'] : NULL;
540 540
 
541 541
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
542
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
542
+		if (GVCommon::has_cap(array('gravityforms_delete_entries', 'gravityview_delete_others_entries'), $entry_id)) {
543 543
 
544
-			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
544
+			do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.');
545 545
 
546 546
 			return true;
547 547
 		}
548 548
 
549 549
 
550 550
 		// If field options are passed, check if current user can view the link
551
-		if( !empty( $field ) ) {
551
+		if (!empty($field)) {
552 552
 
553 553
 			// If capability is not defined, something is not right!
554
-			if( empty( $field['allow_edit_cap'] ) ) {
554
+			if (empty($field['allow_edit_cap'])) {
555 555
 
556
-				do_action( 'gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field );
556
+				do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Cannot read delete entry field caps', $field);
557 557
 
558 558
 				return false;
559 559
 			}
560 560
 
561
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
561
+			if (GVCommon::has_cap($field['allow_edit_cap'])) {
562 562
 
563 563
 				// Do not return true if cap is read, as we need to check if the current user created the entry
564
-				if( $field['allow_edit_cap'] !== 'read' ) {
564
+				if ($field['allow_edit_cap'] !== 'read') {
565 565
 					return true;
566 566
 				}
567 567
 
568 568
 			} else {
569 569
 
570
-				do_action( 'gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID ) );
570
+				do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s is not authorized to view delete entry link ', $current_user->ID));
571 571
 
572 572
 				return false;
573 573
 			}
574 574
 
575 575
 		}
576 576
 
577
-		if( !isset( $entry['created_by'] ) ) {
577
+		if (!isset($entry['created_by'])) {
578 578
 
579 579
 			do_action('gravityview_log_error', 'GravityView_Delete_Entry[check_user_cap_delete_entry] Entry `created_by` doesn\'t exist.');
580 580
 
581 581
 			return false;
582 582
 		}
583 583
 
584
-		$view_id = empty( $view_id ) ? $gravityview_view->getViewId() : $view_id;
584
+		$view_id = empty($view_id) ? $gravityview_view->getViewId() : $view_id;
585 585
 
586 586
 		// Only checks user_delete view option if view is already set
587
-		if( $view_id ) {
587
+		if ($view_id) {
588 588
 
589
-			$current_view = gravityview_get_current_view_data( $view_id );
589
+			$current_view = gravityview_get_current_view_data($view_id);
590 590
 
591
-			$user_delete = isset( $current_view['atts']['user_delete'] ) ? $current_view['atts']['user_delete'] : false;
591
+			$user_delete = isset($current_view['atts']['user_delete']) ? $current_view['atts']['user_delete'] : false;
592 592
 
593
-			if( empty( $user_delete ) ) {
593
+			if (empty($user_delete)) {
594 594
 
595
-				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.' );
595
+				do_action('gravityview_log_debug', 'GravityView_Delete_Entry[check_user_cap_delete_entry] User Delete is disabled. Returning false.');
596 596
 
597 597
 				return false;
598 598
 			}
599 599
 		}
600 600
 
601 601
 		// If the logged-in user is the same as the user who created the entry, we're good.
602
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
602
+		if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
603 603
 
604
-			do_action('gravityview_log_debug', sprintf( 'GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID ) );
604
+			do_action('gravityview_log_debug', sprintf('GravityView_Delete_Entry[check_user_cap_delete_entry] User %s created the entry.', $current_user->ID));
605 605
 
606 606
 			return true;
607 607
 		}
@@ -622,27 +622,27 @@  discard block
 block discarded – undo
622 622
 	 * @param int $current_view_id The ID of the View being rendered
623 623
 	 * @return void
624 624
 	 */
625
-	public function display_message( $current_view_id = 0 ) {
625
+	public function display_message($current_view_id = 0) {
626 626
 
627
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
627
+		if (empty($_GET['status']) || !self::verify_nonce()) {
628 628
 			return;
629 629
 		}
630 630
 
631 631
 		// Entry wasn't deleted from current View
632
-		if( intval( $_GET['gvid'] ) !== intval( $current_view_id ) ) {
632
+		if (intval($_GET['gvid']) !== intval($current_view_id)) {
633 633
 			return;
634 634
 		}
635 635
 
636
-		$status = esc_attr( $_GET['status'] );
636
+		$status = esc_attr($_GET['status']);
637 637
 		$message_from_url = rgget('message');
638
-		$message_from_url = urldecode( stripslashes_deep( $message_from_url ) );
638
+		$message_from_url = urldecode(stripslashes_deep($message_from_url));
639 639
 		$class = '';
640 640
 
641
-		switch ( $status ) {
641
+		switch ($status) {
642 642
 			case 'error':
643 643
 				$class = ' gv-error error';
644 644
 				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
645
-				$message = sprintf( $error_message, $message_from_url );
645
+				$message = sprintf($error_message, $message_from_url);
646 646
 				break;
647 647
 			case 'trashed':
648 648
 				$message = __('The entry was successfully moved to the trash.', 'gravityview');
@@ -659,10 +659,10 @@  discard block
 block discarded – undo
659 659
 		 * @param string $status Message status (`error` or `success`)
660 660
 		 * @param string $message_from_url The original error message, if any, without the "There was an error deleting the entry:" prefix
661 661
 		 */
662
-		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
662
+		$message = apply_filters('gravityview/delete-entry/message', esc_attr($message), $status, $message_from_url);
663 663
 
664 664
 		// DISPLAY ERROR/SUCCESS MESSAGE
665
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
665
+		echo '<div class="gv-notice'.esc_attr($class).'">'.$message.'</div>';
666 666
 	}
667 667
 
668 668
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,21 +4,21 @@
 block discarded – undo
4 4
 
5 5
 $view_id = $gravityview_view->getViewId();
6 6
 
7
-extract( $gravityview_view->getCurrentField() );
7
+extract($gravityview_view->getCurrentField());
8 8
 
9 9
 // Only show the link to logged-in users with the rigth caps.
10
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
10
+if (!GravityView_Delete_Entry::check_user_cap_delete_entry($entry, $field_settings)) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
14
+$link_text = empty($field_settings['delete_link']) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
15 15
 
16
-$link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
16
+$link_text = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
17 17
 
18
-$href = GravityView_Delete_Entry::get_delete_link( $entry, $view_id );
18
+$href = GravityView_Delete_Entry::get_delete_link($entry, $view_id);
19 19
 
20 20
 $attributes = array(
21 21
 	'onclick' => GravityView_Delete_Entry::get_confirm_dialog()
22 22
 );
23 23
 
24
-echo gravityview_get_link( $href, $link_text, $attributes );
24
+echo gravityview_get_link($href, $link_text, $attributes);
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-admin.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * @copyright Copyright 2014, Katz Web Services, Inc.
10 10
  */
11 11
 
12
-if ( ! defined( 'WPINC' ) ) {
12
+if (!defined('WPINC')) {
13 13
     die;
14 14
 }
15 15
 
@@ -18,30 +18,30 @@  discard block
 block discarded – undo
18 18
 
19 19
     protected $loader;
20 20
 
21
-    function __construct( GravityView_Edit_Entry $loader ) {
21
+    function __construct(GravityView_Edit_Entry $loader) {
22 22
         $this->loader = $loader;
23 23
     }
24 24
 
25 25
     function load() {
26 26
 
27
-        if( !is_admin() ) {
27
+        if (!is_admin()) {
28 28
             return;
29 29
         }
30 30
 
31 31
         // Add Edit Link as a default field, outside those set in the Gravity Form form
32
-        add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
32
+        add_filter('gravityview_entry_default_fields', array($this, 'add_default_field'), 10, 3);
33 33
 
34 34
         // For the Edit Entry Link, you don't want visible to all users.
35
-        add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
35
+        add_filter('gravityview_field_visibility_caps', array($this, 'modify_visibility_caps'), 10, 5);
36 36
 
37 37
         // Modify the field options based on the name of the field type
38
-        add_filter( 'gravityview_template_edit_link_options', array( $this, 'edit_link_field_options' ), 10, 5 );
38
+        add_filter('gravityview_template_edit_link_options', array($this, 'edit_link_field_options'), 10, 5);
39 39
 
40 40
         // add tooltips
41
-        add_filter( 'gravityview_tooltips', array( $this, 'tooltips') );
41
+        add_filter('gravityview_tooltips', array($this, 'tooltips'));
42 42
 
43 43
         // custom fields' options for zone EDIT
44
-        add_filter( 'gravityview_template_field_options', array( $this, 'field_options' ), 10, 5 );
44
+        add_filter('gravityview_template_field_options', array($this, 'field_options'), 10, 5);
45 45
     }
46 46
 
47 47
     /**
@@ -50,9 +50,9 @@  discard block
 block discarded – undo
50 50
      * @param  string|array $form form_ID or form object
51 51
      * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
52 52
      */
53
-    function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
53
+    function add_default_field($entry_default_fields, $form = array(), $zone = '') {
54 54
 
55
-        if( $zone !== 'edit' ) {
55
+        if ($zone !== 'edit') {
56 56
 
57 57
             $entry_default_fields['edit_link'] = array(
58 58
                 'label' => __('Edit Entry', 'gravityview'),
@@ -76,17 +76,17 @@  discard block
 block discarded – undo
76 76
      * @param  string      $input_type  (textarea, list, select, etc.)
77 77
      * @return array                   Array of field options with `label`, `value`, `type`, `default` keys
78 78
      */
79
-    function modify_visibility_caps( $visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
79
+    function modify_visibility_caps($visibility_caps = array(), $template_id = '', $field_id = '', $context = '', $input_type = '') {
80 80
 
81 81
         $caps = $visibility_caps;
82 82
 
83 83
         // If we're configuring fields in the edit context, we want a limited selection
84
-        if( $context === 'edit' ) {
84
+        if ($context === 'edit') {
85 85
 
86 86
             // Remove other built-in caps.
87
-            unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
87
+            unset($caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts']);
88 88
 
89
-            $caps['read'] = _x('Entry Creator','User capability', 'gravityview');
89
+            $caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
90 90
         }
91 91
 
92 92
         return $caps;
@@ -101,23 +101,23 @@  discard block
 block discarded – undo
101 101
      * @param  [type] $input_type    [description]
102 102
      * @return [type]                [description]
103 103
      */
104
-    function edit_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
104
+    function edit_link_field_options($field_options, $template_id, $field_id, $context, $input_type) {
105 105
 
106 106
         // Always a link, never a filter
107
-        unset( $field_options['show_as_link'], $field_options['search_filter'] );
107
+        unset($field_options['show_as_link'], $field_options['search_filter']);
108 108
 
109 109
         // Edit Entry link should only appear to visitors capable of editing entries
110
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
110
+        unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
111 111
 
112 112
         $add_option['edit_link'] = array(
113 113
             'type' => 'text',
114
-            'label' => __( 'Edit Link Text', 'gravityview' ),
114
+            'label' => __('Edit Link Text', 'gravityview'),
115 115
             'desc' => NULL,
116 116
             'value' => __('Edit Entry', 'gravityview'),
117 117
             'merge_tags' => true,
118 118
         );
119 119
 
120
-        return array_merge( $add_option, $field_options );
120
+        return array_merge($add_option, $field_options);
121 121
     }
122 122
 
123 123
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
      * @param  array $tooltips Existing tooltips
126 126
      * @return array           Modified tooltips
127 127
      */
128
-    function tooltips( $tooltips ) {
128
+    function tooltips($tooltips) {
129 129
 
130 130
         $return = $tooltips;
131 131
 
@@ -146,17 +146,17 @@  discard block
 block discarded – undo
146 146
      * @param  [type] $input_type    [description]
147 147
      * @return [type]                [description]
148 148
      */
149
-    function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
149
+    function field_options($field_options, $template_id, $field_id, $context, $input_type) {
150 150
 
151 151
         // We only want to modify the settings for the edit context
152
-        if( 'edit' !== $context ) {
152
+        if ('edit' !== $context) {
153 153
 
154 154
             /**
155 155
              * @since 1.8.4
156 156
              */
157 157
             $field_options['new_window'] = array(
158 158
                 'type' => 'checkbox',
159
-                'label' => __( 'Open link in a new tab or window?', 'gravityview' ),
159
+                'label' => __('Open link in a new tab or window?', 'gravityview'),
160 160
                 'value' => false,
161 161
             );
162 162
 
@@ -164,20 +164,20 @@  discard block
 block discarded – undo
164 164
         }
165 165
 
166 166
         //  Entry field is only for logged in users
167
-        unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
167
+        unset($field_options['only_loggedin'], $field_options['only_loggedin_cap']);
168 168
 
169 169
         $add_options = array(
170 170
             'allow_edit_cap' => array(
171 171
                 'type' => 'select',
172
-                'label' => __( 'Make field editable to:', 'gravityview' ),
173
-                'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
172
+                'label' => __('Make field editable to:', 'gravityview'),
173
+                'choices' => GravityView_Render_Settings::get_cap_choices($template_id, $field_id, $context, $input_type),
174 174
                 'tooltip' => 'allow_edit_cap',
175 175
                 'class' => 'widefat',
176 176
                 'value' => 'read', // Default: entry creator
177 177
             ),
178 178
         );
179 179
 
180
-        return array_merge( $field_options, $add_options );
180
+        return array_merge($field_options, $add_options);
181 181
     }
182 182
 
183 183
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Spacing   +285 added lines, -285 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * @copyright Copyright 2014, Katz Web Services, Inc.
10 10
  */
11 11
 
12
-if ( ! defined( 'WPINC' ) ) {
12
+if (!defined('WPINC')) {
13 13
     die;
14 14
 }
15 15
 
@@ -84,30 +84,30 @@  discard block
 block discarded – undo
84 84
      */
85 85
     var $is_valid = NULL;
86 86
 
87
-    function __construct( GravityView_Edit_Entry $loader ) {
87
+    function __construct(GravityView_Edit_Entry $loader) {
88 88
         $this->loader = $loader;
89 89
     }
90 90
 
91 91
     function load() {
92 92
 
93 93
         /** @define "GRAVITYVIEW_DIR" "../../../" */
94
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
94
+        include_once(GRAVITYVIEW_DIR.'includes/class-admin-approve-entries.php');
95 95
 
96 96
         // Stop Gravity Forms processing what is ours!
97
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
97
+        add_filter('wp', array($this, 'prevent_maybe_process_form'), 8);
98 98
 
99
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
99
+        add_filter('gravityview_is_edit_entry', array($this, 'is_edit_entry'));
100 100
 
101
-        add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
101
+        add_action('gravityview_edit_entry', array($this, 'init'));
102 102
 
103 103
         // Disable conditional logic if needed (since 1.9)
104
-        add_filter( 'gform_has_conditional_logic', array( $this, 'manage_conditional_logic' ), 10, 2 );
104
+        add_filter('gform_has_conditional_logic', array($this, 'manage_conditional_logic'), 10, 2);
105 105
 
106 106
         // Make sure GF doesn't validate max files (since 1.9)
107
-        add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
107
+        add_filter('gform_plupload_settings', array($this, 'modify_fileupload_settings'), 10, 3);
108 108
 
109 109
         // Add fields expected by GFFormDisplay::validate()
110
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
110
+        add_filter('gform_pre_validation', array($this, 'gform_pre_validation'));
111 111
 
112 112
     }
113 113
 
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
      */
121 121
     function prevent_maybe_process_form() {
122 122
 
123
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
123
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
124 124
 
125
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
126
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
125
+        if ($this->is_edit_entry_submission() && $this->verify_nonce()) {
126
+            remove_action('wp', array('RGForms', 'maybe_process_form'), 9);
127 127
         }
128 128
     }
129 129
 
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
      */
134 134
     public function is_edit_entry() {
135 135
 
136
-        $gf_page = ( 'entry' === RGForms::get( 'view' ) );
136
+        $gf_page = ('entry' === RGForms::get('view'));
137 137
 
138
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
138
+        return ($gf_page && isset($_GET['edit']) || RGForms::post('action') === 'update');
139 139
     }
140 140
 
141 141
 	/**
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @return boolean
145 145
 	 */
146 146
 	public function is_edit_entry_submission() {
147
-		return !empty( $_POST[ self::$nonce_field ] );
147
+		return !empty($_POST[self::$nonce_field]);
148 148
 	}
149 149
 
150 150
     /**
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         $this->form_id = $gravityview_view->getFormId();
163 163
         $this->view_id = $gravityview_view->getViewId();
164 164
 
165
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
165
+        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key($this->view_id, $this->form_id, $this->entry['id']);
166 166
     }
167 167
 
168 168
 
@@ -174,20 +174,20 @@  discard block
 block discarded – undo
174 174
      * @param GravityView_View_Data $gv_data GravityView Data object
175 175
      * @return void
176 176
      */
177
-    function init( $gv_data ) {
177
+    function init($gv_data) {
178 178
 
179
-        require_once( GFCommon::get_base_path() . '/form_display.php' );
180
-        require_once( GFCommon::get_base_path() . '/entry_detail.php' );
179
+        require_once(GFCommon::get_base_path().'/form_display.php');
180
+        require_once(GFCommon::get_base_path().'/entry_detail.php');
181 181
 
182 182
         $this->setup_vars();
183 183
 
184 184
         // Multiple Views embedded, don't proceed if nonce fails
185
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
185
+        if ($gv_data->has_multiple_views() && !wp_verify_nonce($_GET['edit'], self::$nonce_key)) {
186 186
             return;
187 187
         }
188 188
 
189 189
         // Sorry, you're not allowed here.
190
-        if( false === $this->user_can_edit_entry( true ) ) {
190
+        if (false === $this->user_can_edit_entry(true)) {
191 191
             return;
192 192
         }
193 193
 
@@ -207,12 +207,12 @@  discard block
 block discarded – undo
207 207
     function print_scripts() {
208 208
         $gravityview_view = GravityView_View::getInstance();
209 209
 
210
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
210
+        wp_register_script('gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array('jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view'));
211 211
 
212 212
         GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
213 213
 
214 214
         // Sack is required for images
215
-        wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
215
+        wp_print_scripts(array('sack', 'gform_gravityforms'));
216 216
     }
217 217
 
218 218
 
@@ -221,32 +221,32 @@  discard block
 block discarded – undo
221 221
      */
222 222
     function process_save() {
223 223
 
224
-        if( empty( $_POST ) ) {
224
+        if (empty($_POST)) {
225 225
             return;
226 226
         }
227 227
 
228 228
         // Make sure the entry, view, and form IDs are all correct
229 229
         $valid = $this->verify_nonce();
230 230
 
231
-        if( !$valid ) {
232
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
231
+        if (!$valid) {
232
+            do_action('gravityview_log_error', __METHOD__.' Nonce validation failed.');
233 233
             return;
234 234
         }
235 235
 
236
-        if( $this->entry['id'] !== $_POST['lid'] ) {
237
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
236
+        if ($this->entry['id'] !== $_POST['lid']) {
237
+            do_action('gravityview_log_error', __METHOD__.' Entry ID did not match posted entry ID.');
238 238
             return;
239 239
         }
240 240
 
241
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
241
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
242 242
 
243
-        $this->process_save_process_files( $this->form_id );
243
+        $this->process_save_process_files($this->form_id);
244 244
 
245 245
         $this->validate();
246 246
 
247
-        if( $this->is_valid ) {
247
+        if ($this->is_valid) {
248 248
 
249
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
249
+            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.');
250 250
 
251 251
             /**
252 252
              * @hack This step is needed to unset the adminOnly from form fields
@@ -256,13 +256,13 @@  discard block
 block discarded – undo
256 256
             /**
257 257
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
258 258
              */
259
-            unset( $_GET['page'] );
259
+            unset($_GET['page']);
260 260
 
261
-            GFFormsModel::save_lead( $form, $this->entry );
261
+            GFFormsModel::save_lead($form, $this->entry);
262 262
 
263 263
             // If there's a post associated with the entry, process post fields
264
-            if( !empty( $this->entry['post_id'] ) ) {
265
-                $this->maybe_update_post_fields( $form );
264
+            if (!empty($this->entry['post_id'])) {
265
+                $this->maybe_update_post_fields($form);
266 266
             }
267 267
 
268 268
             // Perform actions normally performed after updating a lead
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
              * @param array $form Gravity Forms form array
274 274
              * @param string $entry_id Numeric ID of the entry that was updated
275 275
              */
276
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
276
+            do_action('gravityview/edit_entry/after_update', $this->form, $this->entry['id']);
277 277
         }
278 278
 
279 279
     } // process_save
@@ -286,15 +286,15 @@  discard block
 block discarded – undo
286 286
      *
287 287
      * @param int $form_id
288 288
      */
289
-    function process_save_process_files( $form_id ) {
289
+    function process_save_process_files($form_id) {
290 290
 
291 291
         //Loading files that have been uploaded to temp folder
292
-        $files = GFCommon::json_decode( stripslashes( RGForms::post( 'gform_uploaded_files' ) ) );
293
-        if ( ! is_array( $files ) ) {
292
+        $files = GFCommon::json_decode(stripslashes(RGForms::post('gform_uploaded_files')));
293
+        if (!is_array($files)) {
294 294
             $files = array();
295 295
         }
296 296
 
297
-        RGFormsModel::$uploaded_files[ $form_id ] = $files;
297
+        RGFormsModel::$uploaded_files[$form_id] = $files;
298 298
     }
299 299
 
300 300
     /**
@@ -306,8 +306,8 @@  discard block
 block discarded – undo
306 306
      * @param $instance
307 307
      * @return mixed
308 308
      */
309
-    public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
310
-        if( ! $this->is_edit_entry() ) {
309
+    public function modify_fileupload_settings($plupload_init, $form_id, $instance) {
310
+        if (!$this->is_edit_entry()) {
311 311
             return $plupload_init;
312 312
         }
313 313
 
@@ -324,13 +324,13 @@  discard block
 block discarded – undo
324 324
     private function form_prepare_for_save() {
325 325
         $form = $this->form;
326 326
 
327
-        foreach( $form['fields'] as &$field ) {
327
+        foreach ($form['fields'] as &$field) {
328 328
 
329 329
             $field->adminOnly = false;
330 330
 
331
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
332
-                foreach( $field->inputs as $key => $input ) {
333
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
331
+            if (isset($field->inputs) && is_array($field->inputs)) {
332
+                foreach ($field->inputs as $key => $input) {
333
+                    $field->inputs[$key]['id'] = (string)$input['id'];
334 334
                 }
335 335
             }
336 336
         }
@@ -346,39 +346,39 @@  discard block
 block discarded – undo
346 346
      *
347 347
      * @return void
348 348
      */
349
-    function maybe_update_post_fields( $form ) {
349
+    function maybe_update_post_fields($form) {
350 350
 
351 351
         $post_id = $this->entry['post_id'];
352 352
 
353 353
         // Security check
354
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
355
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
354
+        if (false === GVCommon::has_cap('edit_post', $post_id)) {
355
+            do_action('gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id);
356 356
             return;
357 357
         }
358 358
 
359 359
         $update_entry = false;
360 360
 
361
-        $updated_post = $original_post = get_post( $post_id );
361
+        $updated_post = $original_post = get_post($post_id);
362 362
 
363
-        foreach ( $this->entry as $field_id => $value ) {
363
+        foreach ($this->entry as $field_id => $value) {
364 364
 
365 365
             //todo: only run through the edit entry configured fields
366 366
 
367
-            $field = RGFormsModel::get_field( $form, $field_id );
367
+            $field = RGFormsModel::get_field($form, $field_id);
368 368
 
369
-            if( class_exists('GF_Fields') ) {
370
-                $field = GF_Fields::create( $field );
369
+            if (class_exists('GF_Fields')) {
370
+                $field = GF_Fields::create($field);
371 371
             }
372 372
 
373
-            if( GFCommon::is_post_field( $field ) ) {
373
+            if (GFCommon::is_post_field($field)) {
374 374
 
375 375
                 // Get the value of the field, including $_POSTed value
376
-                $value = RGFormsModel::get_field_value( $field );
376
+                $value = RGFormsModel::get_field_value($field);
377 377
 
378 378
                 // Convert the field object in 1.9 to an array for backward compatibility
379
-                $field_array = GVCommon::get_field_array( $field );
379
+                $field_array = GVCommon::get_field_array($field);
380 380
 
381
-                switch( $field_array['type'] ) {
381
+                switch ($field_array['type']) {
382 382
 
383 383
                     case 'post_title':
384 384
                     case 'post_content':
@@ -386,38 +386,38 @@  discard block
 block discarded – undo
386 386
                         $updated_post->{$field_array['type']} = $value;
387 387
                         break;
388 388
                     case 'post_tags':
389
-                        wp_set_post_tags( $post_id, $value, false );
389
+                        wp_set_post_tags($post_id, $value, false);
390 390
                         break;
391 391
                     case 'post_category':
392 392
 
393
-                        $categories = is_array( $value ) ? array_values( $value ) : (array)$value;
394
-                        $categories = array_filter( $categories );
393
+                        $categories = is_array($value) ? array_values($value) : (array)$value;
394
+                        $categories = array_filter($categories);
395 395
 
396
-                        wp_set_post_categories( $post_id, $categories, false );
396
+                        wp_set_post_categories($post_id, $categories, false);
397 397
 
398 398
                         // prepare value to be saved in the entry
399
-                        $field = GFCommon::add_categories_as_choices( $field, '' );
399
+                        $field = GFCommon::add_categories_as_choices($field, '');
400 400
 
401 401
                         // if post_category is type checkbox, then value is an array of inputs
402
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
403
-                            foreach( $value as $input_id => $val ) {
404
-                                $input_name = 'input_' . str_replace( '.', '_', $input_id );
405
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
402
+                        if (isset($value[strval($field_id)])) {
403
+                            foreach ($value as $input_id => $val) {
404
+                                $input_name = 'input_'.str_replace('.', '_', $input_id);
405
+                                $this->entry[strval($input_id)] = RGFormsModel::prepare_value($form, $field, $val, $input_name, $this->entry['id']);
406 406
                             }
407 407
                         } else {
408
-                            $input_name = 'input_' . str_replace( '.', '_', $field_id );
409
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
408
+                            $input_name = 'input_'.str_replace('.', '_', $field_id);
409
+                            $this->entry[strval($field_id)] = RGFormsModel::prepare_value($form, $field, $value, $input_name, $this->entry['id']);
410 410
                         }
411 411
 
412 412
                         break;
413 413
                     case 'post_custom_field':
414 414
 
415
-                        $input_type = RGFormsModel::get_input_type( $field );
415
+                        $input_type = RGFormsModel::get_input_type($field);
416 416
                         $custom_field_name = $field_array['postCustomFieldName'];
417 417
 
418 418
                         // Only certain custom field types are supported
419
-                        if( !in_array( $input_type, array( 'list', 'fileupload' ) ) ) {
420
-                            update_post_meta( $post_id, $custom_field_name, $value );
419
+                        if (!in_array($input_type, array('list', 'fileupload'))) {
420
+                            update_post_meta($post_id, $custom_field_name, $value);
421 421
                         }
422 422
 
423 423
                         break;
@@ -430,13 +430,13 @@  discard block
 block discarded – undo
430 430
                 }
431 431
 
432 432
                 //ignore fields that have not changed
433
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
433
+                if ($value === rgget((string)$field_id, $this->entry)) {
434 434
                     continue;
435 435
                 }
436 436
 
437 437
                 // update entry
438
-                if( 'post_category' !== $field->type ) {
439
-                    $this->entry[ strval( $field_id ) ] = $value;
438
+                if ('post_category' !== $field->type) {
439
+                    $this->entry[strval($field_id)] = $value;
440 440
                 }
441 441
 
442 442
                 $update_entry = true;
@@ -445,24 +445,24 @@  discard block
 block discarded – undo
445 445
 
446 446
         }
447 447
 
448
-        if( $update_entry ) {
448
+        if ($update_entry) {
449 449
 
450
-            $return_entry = GFAPI::update_entry( $this->entry );
450
+            $return_entry = GFAPI::update_entry($this->entry);
451 451
 
452
-            if( is_wp_error( $return_entry ) ) {
453
-                do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
452
+            if (is_wp_error($return_entry)) {
453
+                do_action('gravityview_log_error', 'Updating the entry post fields failed', $return_entry);
454 454
             } else {
455
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
455
+                do_action('gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded');
456 456
             }
457 457
 
458 458
         }
459 459
 
460
-        $return_post = wp_update_post( $updated_post, true );
460
+        $return_post = wp_update_post($updated_post, true);
461 461
 
462
-        if( is_wp_error( $return_post ) ) {
463
-            do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
462
+        if (is_wp_error($return_post)) {
463
+            do_action('gravityview_log_error', 'Updating the post content failed', $return_post);
464 464
         } else {
465
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded' );
465
+            do_action('gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded');
466 466
         }
467 467
 
468 468
     }
@@ -478,18 +478,18 @@  discard block
 block discarded – undo
478 478
      */
479 479
     function after_update() {
480 480
 
481
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
482
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
481
+        do_action('gform_after_update_entry', $this->form, $this->entry['id']);
482
+        do_action("gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id']);
483 483
 
484 484
         // Re-define the entry now that we've updated it.
485
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
485
+        $entry = RGFormsModel::get_lead($this->entry['id']);
486 486
 
487
-        $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
487
+        $entry = GFFormsModel::set_entry_meta($entry, $this->form);
488 488
 
489 489
         // We need to clear the cache because Gravity Forms caches the field values, which
490 490
         // we have just updated.
491 491
         foreach ($this->form['fields'] as $key => $field) {
492
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
492
+            GFFormsModel::refresh_lead_field_value($entry['id'], $field->id);
493 493
         }
494 494
 
495 495
         $this->entry = $entry;
@@ -503,19 +503,19 @@  discard block
 block discarded – undo
503 503
      */
504 504
     public function edit_entry_form() {
505 505
 
506
-        $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
506
+        $back_link = esc_url(remove_query_arg(array('page', 'view', 'edit')));
507 507
 
508 508
         ?>
509 509
 
510 510
         <div class="gv-edit-entry-wrapper"><?php
511 511
 
512
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
512
+            $javascript = gravityview_ob_include(GravityView_Edit_Entry::$file.'/partials/inline-javascript.php', $this);
513 513
 
514 514
             /**
515 515
              * Fixes weird wpautop() issue
516 516
              * @see https://github.com/katzwebservices/GravityView/issues/451
517 517
              */
518
-            echo gravityview_strip_whitespace( $javascript );
518
+            echo gravityview_strip_whitespace($javascript);
519 519
 
520 520
             ?><h2 class="gv-edit-entry-title">
521 521
                 <span><?php
@@ -525,27 +525,27 @@  discard block
 block discarded – undo
525 525
                      * @param string $edit_entry_title Modify the "Edit Entry" title
526 526
                      * @param GravityView_Edit_Entry_Render $this This object
527 527
                      */
528
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
528
+                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this);
529 529
 
530
-                    echo esc_attr( $edit_entry_title );
530
+                    echo esc_attr($edit_entry_title);
531 531
             ?></span>
532 532
             </h2>
533 533
 
534 534
             <?php
535 535
 
536 536
             // Display the success message
537
-            if( rgpost('action') === 'update' ) {
537
+            if (rgpost('action') === 'update') {
538 538
 
539
-                if( ! $this->is_valid ){
539
+                if (!$this->is_valid) {
540 540
 
541 541
                     // Keeping this compatible with Gravity Forms.
542
-                    $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
542
+                    $validation_message = "<div class='validation_error'>".__('There was a problem with your submission.', 'gravityview')." ".__('Errors have been highlighted below.', 'gravityview')."</div>";
543 543
                     $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
544 544
 
545
-                    echo GVCommon::generate_notice( $message , 'gv-error' );
545
+                    echo GVCommon::generate_notice($message, 'gv-error');
546 546
 
547 547
                 } else {
548
-                    $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
548
+                    $entry_updated_message = sprintf(esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'.$back_link.'">', '</a>');
549 549
 
550 550
                     /**
551 551
                      * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -555,9 +555,9 @@  discard block
 block discarded – undo
555 555
                      * @param array $entry Gravity Forms entry array
556 556
                      * @param string $back_link URL to return to the original entry. @since 1.6
557 557
                      */
558
-                    $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
558
+                    $message = apply_filters('gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link);
559 559
 
560
-                    echo GVCommon::generate_notice( $message );
560
+                    echo GVCommon::generate_notice($message);
561 561
                 }
562 562
 
563 563
             }
@@ -570,9 +570,9 @@  discard block
 block discarded – undo
570 570
 
571 571
                 <?php
572 572
 
573
-                wp_nonce_field( self::$nonce_key, self::$nonce_key );
573
+                wp_nonce_field(self::$nonce_key, self::$nonce_key);
574 574
 
575
-                wp_nonce_field( self::$nonce_field, self::$nonce_field, false );
575
+                wp_nonce_field(self::$nonce_field, self::$nonce_field, false);
576 576
 
577 577
                 // Most of this is needed for GFFormDisplay::validate(), but `gform_unique_id` is needed for file cleanup.
578 578
 
@@ -612,13 +612,13 @@  discard block
 block discarded – undo
612 612
      */
613 613
     private function render_edit_form() {
614 614
 
615
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
616
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
617
-        add_filter( 'gform_disable_view_counter', '__return_true' );
618
-        add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
615
+        add_filter('gform_pre_render', array($this, 'filter_modify_form_fields'), 5000, 3);
616
+        add_filter('gform_submit_button', array($this, 'render_form_buttons'));
617
+        add_filter('gform_disable_view_counter', '__return_true');
618
+        add_filter('gform_field_input', array($this, 'modify_edit_field_input'), 10, 5);
619 619
 
620 620
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
621
-        unset( $_GET['page'] );
621
+        unset($_GET['page']);
622 622
 
623 623
         // TODO: Make sure validation isn't handled by GF
624 624
         // TODO: Include CSS for file upload fields
@@ -626,12 +626,12 @@  discard block
 block discarded – undo
626 626
         // TODO: Product fields are not editable
627 627
         // TODO: Check Updated and Error messages
628 628
 
629
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
629
+        $html = GFFormDisplay::get_form($this->form['id'], false, false, true, $this->entry);
630 630
 
631
-	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
632
-        remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
633
-        remove_filter( 'gform_disable_view_counter', '__return_true' );
634
-        remove_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10 );
631
+	    remove_filter('gform_pre_render', array($this, 'filter_modify_form_fields'), 5000);
632
+        remove_filter('gform_submit_button', array($this, 'render_form_buttons'));
633
+        remove_filter('gform_disable_view_counter', '__return_true');
634
+        remove_filter('gform_field_input', array($this, 'modify_edit_field_input'), 10);
635 635
 
636 636
         echo $html;
637 637
     }
@@ -642,7 +642,7 @@  discard block
 block discarded – undo
642 642
      * @return string
643 643
      */
644 644
     public function render_form_buttons() {
645
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
645
+        return gravityview_ob_include(GravityView_Edit_Entry::$file.'/partials/form-buttons.php', $this);
646 646
     }
647 647
 
648 648
 
@@ -659,20 +659,20 @@  discard block
 block discarded – undo
659 659
      *
660 660
      * @return array Modified form array
661 661
      */
662
-    public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
662
+    public function filter_modify_form_fields($form, $ajax = false, $field_values = '') {
663 663
 
664 664
         // In case we have validated the form, use it to inject the validation results into the form render
665
-        if( isset( $this->form_after_validation ) ) {
665
+        if (isset($this->form_after_validation)) {
666 666
             $form = $this->form_after_validation;
667 667
         } else {
668
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
668
+            $form['fields'] = $this->get_configured_edit_fields($form, $this->view_id);
669 669
         }
670 670
 
671
-        $form = $this->filter_conditional_logic( $form );
671
+        $form = $this->filter_conditional_logic($form);
672 672
 
673 673
         // for now we don't support Save and Continue feature.
674
-        if( ! self::$supports_save_and_continue ) {
675
-	        unset( $form['save'] );
674
+        if (!self::$supports_save_and_continue) {
675
+	        unset($form['save']);
676 676
         }
677 677
 
678 678
         return $form;
@@ -691,19 +691,19 @@  discard block
 block discarded – undo
691 691
      *
692 692
      * @return mixed
693 693
      */
694
-    function modify_edit_field_input( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
694
+    function modify_edit_field_input($field_content = '', $field, $value, $lead_id = 0, $form_id) {
695 695
 
696 696
         // If the form has been submitted, then we don't need to pre-fill the values,
697 697
         // Except for fileupload type - run always!!
698
-        if(
698
+        if (
699 699
 	        $this->is_edit_entry_submission() && 'fileupload' !== $field->type
700
-        ||  GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
700
+        ||  GFCommon::is_product_field($field->type) // Prevent product fields from appearing editable
701 701
         ) {
702 702
 	        return $field_content;
703 703
         }
704 704
 
705 705
         // Turn on Admin-style display for file upload fields only
706
-        if( 'fileupload' === $field->type ) {
706
+        if ('fileupload' === $field->type) {
707 707
             $_GET['page'] = 'gf_entries';
708 708
         }
709 709
 
@@ -711,8 +711,8 @@  discard block
 block discarded – undo
711 711
         $field->adminOnly = false; /** @see GFFormDisplay::get_counter_init_script() need to prevent adminOnly */
712 712
 
713 713
         // add categories as choices for Post Category field
714
-        if ( 'post_category' === $field->type ) {
715
-            $field = GFCommon::add_categories_as_choices( $field, $value );
714
+        if ('post_category' === $field->type) {
715
+            $field = GFCommon::add_categories_as_choices($field, $value);
716 716
         }
717 717
 
718 718
         /**
@@ -721,55 +721,55 @@  discard block
 block discarded – undo
721 721
          * @param $field GF_Field object Gravity Forms field object
722 722
          * @since 1.13
723 723
          */
724
-        $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
724
+        $override_saved_value = apply_filters('gravityview/edit_entry/pre_populate/override', false, $field);
725 725
 
726 726
         // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
727
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
727
+        if (isset($field->inputs) && is_array($field->inputs) && !in_array($field->type, array('time', 'date'))) {
728 728
 
729 729
             $field_value = array();
730 730
 
731 731
             // only accept pre-populated values if the field doesn't have any choice selected.
732 732
             $allow_pre_populated = $field->allowsPrepopulate;
733 733
 
734
-	        foreach ( (array)$field->inputs as $input ) {
734
+	        foreach ((array)$field->inputs as $input) {
735 735
 
736
-	            $input_id = strval( $input['id'] );
736
+	            $input_id = strval($input['id']);
737 737
 
738
-                if ( ! empty( $this->entry[ $input_id ] ) ) {
739
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
738
+                if (!empty($this->entry[$input_id])) {
739
+                    $field_value[$input_id] = 'post_category' === $field->type ? GFCommon::format_post_category($this->entry[$input_id], true) : $this->entry[$input_id];
740 740
                     $allow_pre_populated = false;
741 741
                 }
742 742
 
743 743
             }
744 744
 
745
-            $pre_value = $field->get_value_submission( array(), false );
745
+            $pre_value = $field->get_value_submission(array(), false);
746 746
 
747
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !empty( $pre_value ) ) ? $field_value : $pre_value;
747
+            $field_value = !$allow_pre_populated && !($override_saved_value && !empty($pre_value)) ? $field_value : $pre_value;
748 748
 
749 749
         } else {
750 750
 
751
-            $id = intval( $field->id );
751
+            $id = intval($field->id);
752 752
 
753 753
             // get pre-populated value if exists
754
-            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value( $field->inputName, array(), $field ) : '';
754
+            $pre_value = $field->allowsPrepopulate ? GFFormsModel::get_parameter_value($field->inputName, array(), $field) : '';
755 755
 
756 756
             // saved field entry value (if empty, fallback to the pre-populated value, if exists)
757 757
             // or pre-populated value if not empty and set to override saved value
758
-            $field_value = !empty( $this->entry[ $id ] ) && ! ( $override_saved_value && !empty( $pre_value ) ) ? $this->entry[ $id ] : $pre_value;
758
+            $field_value = !empty($this->entry[$id]) && !($override_saved_value && !empty($pre_value)) ? $this->entry[$id] : $pre_value;
759 759
 
760 760
             // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
761
-            if ( 'post_category' === $field->type && !empty( $field_value ) ) {
761
+            if ('post_category' === $field->type && !empty($field_value)) {
762 762
                 $categories = array();
763
-                foreach ( explode( ',', $field_value ) as $cat_string ) {
764
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
763
+                foreach (explode(',', $field_value) as $cat_string) {
764
+                    $categories[] = GFCommon::format_post_category($cat_string, true);
765 765
                 }
766
-                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
766
+                $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode('', $categories);
767 767
             }
768 768
 
769 769
         }
770 770
 
771 771
         // if value is empty get the default value if defined
772
-        $field_value = $field->get_value_default_if_empty( $field_value );
772
+        $field_value = $field->get_value_default_if_empty($field_value);
773 773
 
774 774
         /**
775 775
          * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed
@@ -777,18 +777,18 @@  discard block
 block discarded – undo
777 777
          * @param mixed $field_value field value used to populate the input
778 778
          * @param object $field Gravity Forms field object ( Class GF_Field )
779 779
          */
780
-        $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field );
780
+        $field_value = apply_filters('gravityview/edit_entry/field_value', $field_value, $field);
781 781
 
782 782
 	    // Prevent any PHP warnings, like undefined index
783 783
 	    ob_start();
784 784
 
785
-	    $return = $field->get_field_input( $this->form, $field_value, $this->entry );
785
+	    $return = $field->get_field_input($this->form, $field_value, $this->entry);
786 786
 
787 787
 	    // If there was output, it's an error
788 788
 	    $warnings = ob_get_clean();
789 789
 
790
-	    if( !empty( $warnings ) ) {
791
-		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
790
+	    if (!empty($warnings)) {
791
+		    do_action('gravityview_log_error', __METHOD__.$warnings, $field_value);
792 792
 	    }
793 793
 
794 794
         /**
@@ -796,7 +796,7 @@  discard block
 block discarded – undo
796 796
          * We need the fileupload html field to render with the proper id
797 797
          *  ( <li id="field_80_16" ... > )
798 798
          */
799
-        unset( $_GET['page'] );
799
+        unset($_GET['page']);
800 800
 
801 801
         return $return;
802 802
     }
@@ -812,14 +812,14 @@  discard block
 block discarded – undo
812 812
      * @param  array $field Gravity Forms field array
813 813
      * @return string        [description]
814 814
      */
815
-    public function get_field_value( $value, $lead, $field ) {
815
+    public function get_field_value($value, $lead, $field) {
816 816
 
817 817
         // The form's not being edited; use the original value
818
-        if( ! $this->is_edit_entry_submission() ) {
818
+        if (!$this->is_edit_entry_submission()) {
819 819
             return $value;
820 820
         }
821 821
 
822
-        return GFFormsModel::get_field_value( $field, $lead, true );
822
+        return GFFormsModel::get_field_value($field, $lead, true);
823 823
     }
824 824
 
825 825
 
@@ -834,19 +834,19 @@  discard block
 block discarded – undo
834 834
      * @param  array $form GF Form
835 835
      * @return array       Modified GF Form
836 836
      */
837
-    function gform_pre_validation( $form ) {
837
+    function gform_pre_validation($form) {
838 838
 
839
-        if( ! $this->verify_nonce() ) {
839
+        if (!$this->verify_nonce()) {
840 840
             return $form;
841 841
         }
842 842
 
843 843
         // Fix PHP warning regarding undefined index.
844
-        foreach ( $form['fields'] as &$field) {
844
+        foreach ($form['fields'] as &$field) {
845 845
 
846 846
             // This is because we're doing admin form pretending to be front-end, so Gravity Forms
847 847
             // expects certain field array items to be set.
848
-            foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) {
849
-	            $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL;
848
+            foreach (array('noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions') as $key) {
849
+	            $field->{$key} = isset($field->{$key} ) ? $field->{$key} : NULL;
850 850
             }
851 851
 
852 852
             // unset emailConfirmEnabled for email type fields
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
                 $field['emailConfirmEnabled'] = '';
855 855
             }*/
856 856
 
857
-            switch( RGFormsModel::get_input_type( $field ) ) {
857
+            switch (RGFormsModel::get_input_type($field)) {
858 858
 
859 859
                 /**
860 860
                  * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -875,49 +875,49 @@  discard block
 block discarded – undo
875 875
                     $value = NULL;
876 876
 
877 877
                     // Use the previous entry value as the default.
878
-                    if( isset( $entry[ $field->id ] ) ) {
879
-                        $value = $entry[ $field->id ];
878
+                    if (isset($entry[$field->id])) {
879
+                        $value = $entry[$field->id];
880 880
                     }
881 881
 
882 882
                     // If this is a single upload file
883
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
884
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
883
+                    if (!empty($_FILES[$input_name]) && !empty($_FILES[$input_name]['name'])) {
884
+                        $file_path = GFFormsModel::get_file_upload_path($form['id'], $_FILES[$input_name]['name']);
885 885
                         $value = $file_path['url'];
886 886
 
887 887
                     } else {
888 888
 
889 889
                         // Fix PHP warning on line 1498 of form_display.php for post_image fields
890 890
                         // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
891
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
891
+                        $_FILES[$input_name] = array('name' => '', 'size' => '');
892 892
 
893 893
                     }
894 894
 
895
-                    if( rgar($field, "multipleFiles") ) {
895
+                    if (rgar($field, "multipleFiles")) {
896 896
 
897 897
                         // If there are fresh uploads, process and merge them.
898 898
                         // Otherwise, use the passed values, which should be json-encoded array of URLs
899
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
899
+                        if (isset(GFFormsModel::$uploaded_files[$form_id][$input_name])) {
900 900
 
901
-                            $value = empty( $value ) ? '[]' : $value;
902
-                            $value = stripslashes_deep( $value );
903
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
901
+                            $value = empty($value) ? '[]' : $value;
902
+                            $value = stripslashes_deep($value);
903
+                            $value = GFFormsModel::prepare_value($form, $field, $value, $input_name, $entry['id'], array());
904 904
                         }
905 905
 
906 906
                     } else {
907 907
 
908 908
                         // A file already exists when editing an entry
909 909
                         // We set this to solve issue when file upload fields are required.
910
-                        GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value;
910
+                        GFFormsModel::$uploaded_files[$form_id][$input_name] = $value;
911 911
 
912 912
                     }
913 913
 
914
-                    $_POST[ $input_name ] = $value;
914
+                    $_POST[$input_name] = $value;
915 915
 
916 916
                     break;
917 917
                 case 'number':
918 918
                     // Fix "undefined index" issue at line 1286 in form_display.php
919
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
920
-                        $_POST['input_'.$field->id ] = NULL;
919
+                    if (!isset($_POST['input_'.$field->id])) {
920
+                        $_POST['input_'.$field->id] = NULL;
921 921
                     }
922 922
                     break;
923 923
                 case 'captcha':
@@ -943,8 +943,8 @@  discard block
 block discarded – undo
943 943
     function validate() {
944 944
 
945 945
         // If using GF User Registration Add-on, remove the validation step, otherwise generates error when updating the entry
946
-        if ( class_exists( 'GFUser' ) ) {
947
-            remove_filter( 'gform_validation', array( 'GFUser', 'user_registration_validation' ) );
946
+        if (class_exists('GFUser')) {
947
+            remove_filter('gform_validation', array('GFUser', 'user_registration_validation'));
948 948
         }
949 949
 
950 950
         /**
@@ -952,22 +952,22 @@  discard block
 block discarded – undo
952 952
          * You can enter whatever you want!
953 953
          * We try validating, and customize the results using `self::custom_validation()`
954 954
          */
955
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
955
+        add_filter('gform_validation_'.$this->form_id, array($this, 'custom_validation'), 10, 4);
956 956
 
957 957
         // Needed by the validate funtion
958 958
         $failed_validation_page = NULL;
959
-        $field_values = RGForms::post( 'gform_field_values' );
959
+        $field_values = RGForms::post('gform_field_values');
960 960
 
961 961
         // Prevent entry limit from running when editing an entry, also
962 962
         // prevent form scheduling from preventing editing
963
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
963
+        unset($this->form['limitEntries'], $this->form['scheduleForm']);
964 964
 
965 965
         // Hide fields depending on Edit Entry settings
966
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
966
+        $this->form['fields'] = $this->get_configured_edit_fields($this->form, $this->view_id);
967 967
 
968
-        $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
968
+        $this->is_valid = GFFormDisplay::validate($this->form, $field_values, 1, $failed_validation_page);
969 969
 
970
-        remove_filter( 'gform_validation_'.$this->form_id, array( $this, 'custom_validation' ), 10 );
970
+        remove_filter('gform_validation_'.$this->form_id, array($this, 'custom_validation'), 10);
971 971
     }
972 972
 
973 973
 
@@ -982,55 +982,55 @@  discard block
 block discarded – undo
982 982
      * @param  [type] $validation_results [description]
983 983
      * @return [type]                     [description]
984 984
      */
985
-    function custom_validation( $validation_results ) {
985
+    function custom_validation($validation_results) {
986 986
 
987
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
987
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results);
988 988
 
989
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
989
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html(print_r($_POST, true)));
990 990
 
991 991
         $gv_valid = true;
992 992
 
993
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
993
+        foreach ($validation_results['form']['fields'] as $key => &$field) {
994 994
 
995
-            $value = RGFormsModel::get_field_value( $field );
996
-            $field_type = RGFormsModel::get_input_type( $field );
995
+            $value = RGFormsModel::get_field_value($field);
996
+            $field_type = RGFormsModel::get_input_type($field);
997 997
 
998 998
             // Validate always
999
-            switch ( $field_type ) {
999
+            switch ($field_type) {
1000 1000
 
1001 1001
 
1002 1002
                 case 'fileupload' :
1003 1003
 
1004 1004
                     // in case nothing is uploaded but there are already files saved
1005
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1005
+                    if (!empty($field->failed_validation) && !empty($field->isRequired) && !empty($value)) {
1006 1006
                         $field->failed_validation = false;
1007
-                        unset( $field->validation_message );
1007
+                        unset($field->validation_message);
1008 1008
                     }
1009 1009
 
1010 1010
                     // validate if multi file upload reached max number of files [maxFiles] => 2
1011
-                    if( rgar( $field, 'maxFiles') && rgar( $field, 'multipleFiles') ) {
1011
+                    if (rgar($field, 'maxFiles') && rgar($field, 'multipleFiles')) {
1012 1012
 
1013
-                        $input_name = 'input_' . $field->id;
1013
+                        $input_name = 'input_'.$field->id;
1014 1014
                         //uploaded
1015
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1015
+                        $file_names = isset(GFFormsModel::$uploaded_files[$validation_results['form']['id']][$input_name]) ? GFFormsModel::$uploaded_files[$validation_results['form']['id']][$input_name] : array();
1016 1016
 
1017 1017
                         //existent
1018 1018
                         $entry = $this->get_entry();
1019 1019
                         $value = NULL;
1020
-                        if( isset( $entry[ $field->id ] ) ) {
1021
-                            $value = json_decode( $entry[ $field->id ], true );
1020
+                        if (isset($entry[$field->id])) {
1021
+                            $value = json_decode($entry[$field->id], true);
1022 1022
                         }
1023 1023
 
1024 1024
                         // count uploaded files and existent entry files
1025
-                        $count_files = count( $file_names ) + count( $value );
1025
+                        $count_files = count($file_names) + count($value);
1026 1026
 
1027
-                        if( $count_files > $field->maxFiles ) {
1028
-                            $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1027
+                        if ($count_files > $field->maxFiles) {
1028
+                            $field->validation_message = __('Maximum number of files reached', 'gravityview');
1029 1029
                             $field->failed_validation = 1;
1030 1030
                             $gv_valid = false;
1031 1031
 
1032 1032
                             // in case of error make sure the newest upload files are removed from the upload input
1033
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1033
+                            GFFormsModel::$uploaded_files[$validation_results['form']['id']] = null;
1034 1034
                         }
1035 1035
 
1036 1036
                     }
@@ -1041,11 +1041,11 @@  discard block
 block discarded – undo
1041 1041
             }
1042 1042
 
1043 1043
             // This field has failed validation.
1044
-            if( !empty( $field->failed_validation ) ) {
1044
+            if (!empty($field->failed_validation)) {
1045 1045
 
1046
-                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
1046
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array('field' => $field, 'value' => $value));
1047 1047
 
1048
-                switch ( $field_type ) {
1048
+                switch ($field_type) {
1049 1049
 
1050 1050
                     // Captchas don't need to be re-entered.
1051 1051
                     case 'captcha':
@@ -1053,39 +1053,39 @@  discard block
 block discarded – undo
1053 1053
                         // Post Image fields aren't editable, so we un-fail them.
1054 1054
                     case 'post_image':
1055 1055
                         $field->failed_validation = false;
1056
-                        unset( $field->validation_message );
1056
+                        unset($field->validation_message);
1057 1057
                         break;
1058 1058
 
1059 1059
                 }
1060 1060
 
1061 1061
                 // You can't continue inside a switch, so we do it after.
1062
-                if( empty( $field->failed_validation ) ) {
1062
+                if (empty($field->failed_validation)) {
1063 1063
                     continue;
1064 1064
                 }
1065 1065
 
1066 1066
                 // checks if the No Duplicates option is not validating entry against itself, since
1067 1067
                 // we're editing a stored entry, it would also assume it's a duplicate.
1068
-                if( !empty( $field->noDuplicates ) ) {
1068
+                if (!empty($field->noDuplicates)) {
1069 1069
 
1070 1070
                     $entry = $this->get_entry();
1071 1071
 
1072 1072
                     // If the value of the entry is the same as the stored value
1073 1073
                     // Then we can assume it's not a duplicate, it's the same.
1074
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1074
+                    if (!empty($entry) && $value == $entry[$field->id]) {
1075 1075
                         //if value submitted was not changed, then don't validate
1076 1076
                         $field->failed_validation = false;
1077 1077
 
1078
-                        unset( $field->validation_message );
1078
+                        unset($field->validation_message);
1079 1079
 
1080
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1080
+                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry);
1081 1081
 
1082 1082
                         continue;
1083 1083
                     }
1084 1084
                 }
1085 1085
 
1086 1086
                 // if here then probably we are facing the validation 'At least one field must be filled out'
1087
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1088
-                    unset( $field->validation_message );
1087
+                if (GFFormDisplay::is_empty($field, $this->form_id) && empty($field->isRequired)) {
1088
+                    unset($field->validation_message);
1089 1089
 	                $field->validation_message = false;
1090 1090
                     continue;
1091 1091
                 }
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
 
1099 1099
         $validation_results['is_valid'] = $gv_valid;
1100 1100
 
1101
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1101
+        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results);
1102 1102
 
1103 1103
         // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1104 1104
         $this->form_after_validation = $validation_results['form'];
@@ -1114,9 +1114,9 @@  discard block
 block discarded – undo
1114 1114
      */
1115 1115
     private function get_entry() {
1116 1116
 
1117
-        if( empty( $this->entry ) ) {
1117
+        if (empty($this->entry)) {
1118 1118
             // Get the database value of the entry that's being edited
1119
-            $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1119
+            $this->entry = gravityview_get_entry(GravityView_frontend::is_single_entry());
1120 1120
         }
1121 1121
 
1122 1122
         return $this->entry;
@@ -1135,22 +1135,22 @@  discard block
 block discarded – undo
1135 1135
      *
1136 1136
      * @return array Array of fields that are configured in the Edit tab in the Admin
1137 1137
      */
1138
-    private function get_configured_edit_fields( $form, $view_id ) {
1138
+    private function get_configured_edit_fields($form, $view_id) {
1139 1139
 
1140 1140
         // Get all fields for form
1141
-        $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
1141
+        $properties = GravityView_View_Data::getInstance()->get_fields($view_id);
1142 1142
 
1143 1143
         // If edit tab not yet configured, show all fields
1144
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1144
+        $edit_fields = !empty($properties['edit_edit-fields']) ? $properties['edit_edit-fields'] : NULL;
1145 1145
 
1146 1146
 	    // Show hidden fields as text fields
1147
-	    $form = $this->fix_hidden_fields( $form );
1147
+	    $form = $this->fix_hidden_fields($form);
1148 1148
 
1149 1149
         // Hide fields depending on admin settings
1150
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
1150
+        $fields = $this->filter_fields($form['fields'], $edit_fields);
1151 1151
 
1152 1152
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1153
-	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
1153
+	    $fields = $this->filter_admin_only_fields($fields, $edit_fields, $form, $view_id);
1154 1154
 
1155 1155
         return $fields;
1156 1156
     }
@@ -1162,14 +1162,14 @@  discard block
 block discarded – undo
1162 1162
 	 *
1163 1163
 	 * @return mixed
1164 1164
 	 */
1165
-	private function fix_hidden_fields( $form ) {
1165
+	private function fix_hidden_fields($form) {
1166 1166
 
1167 1167
 		/** @var GF_Field $field */
1168
-		foreach( $form['fields'] as $key => $field ) {
1169
-			if( 'hidden' === $field->type ) {
1170
-				$text_field = new GF_Field_Text( $field );
1168
+		foreach ($form['fields'] as $key => $field) {
1169
+			if ('hidden' === $field->type) {
1170
+				$text_field = new GF_Field_Text($field);
1171 1171
 				$text_field->type = 'text';
1172
-				$form['fields'][ $key ] = $text_field;
1172
+				$form['fields'][$key] = $text_field;
1173 1173
 			}
1174 1174
 		}
1175 1175
 
@@ -1187,9 +1187,9 @@  discard block
 block discarded – undo
1187 1187
      * @since  1.5
1188 1188
      * @return array $fields
1189 1189
      */
1190
-    private function filter_fields( $fields, $configured_fields ) {
1190
+    private function filter_fields($fields, $configured_fields) {
1191 1191
 
1192
-        if( empty( $fields ) || !is_array( $fields ) ) {
1192
+        if (empty($fields) || !is_array($fields)) {
1193 1193
             return $fields;
1194 1194
         }
1195 1195
 
@@ -1204,9 +1204,9 @@  discard block
 block discarded – undo
1204 1204
 	     * @since 1.9.1
1205 1205
          * @param boolean $hide_product_fields Whether to hide product fields in the editor.  Default: false
1206 1206
 	     */
1207
-	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
1207
+	    $hide_product_fields = apply_filters('gravityview/edit_entry/hide-product-fields', empty(self::$supports_product_fields));
1208 1208
 
1209
-	    if( $hide_product_fields ) {
1209
+	    if ($hide_product_fields) {
1210 1210
 		    $field_type_blacklist[] = 'option';
1211 1211
 		    $field_type_blacklist[] = 'quantity';
1212 1212
             $field_type_blacklist[] = 'product';
@@ -1216,25 +1216,25 @@  discard block
 block discarded – undo
1216 1216
 	    }
1217 1217
 
1218 1218
         // First, remove blacklist
1219
-        foreach ( $fields as $key => $field ) {
1220
-            if( in_array( $field->type, $field_type_blacklist ) ) {
1221
-                unset( $fields[ $key ] );
1219
+        foreach ($fields as $key => $field) {
1220
+            if (in_array($field->type, $field_type_blacklist)) {
1221
+                unset($fields[$key]);
1222 1222
             }
1223 1223
         }
1224 1224
 
1225 1225
         // The Edit tab has not been configured, so we return all fields by default.
1226
-        if( empty( $configured_fields ) ) {
1226
+        if (empty($configured_fields)) {
1227 1227
             return $fields;
1228 1228
         }
1229 1229
 
1230 1230
         // The edit tab has been configured, so we loop through to configured settings
1231
-        foreach ( $configured_fields as $configured_field ) {
1231
+        foreach ($configured_fields as $configured_field) {
1232 1232
 
1233 1233
 	        /** @var GF_Field $field */
1234
-	        foreach ( $fields as $field ) {
1234
+	        foreach ($fields as $field) {
1235 1235
 
1236
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1237
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1236
+                if (intval($configured_field['id']) === intval($field->id) && $this->user_can_edit_field($configured_field, false)) {
1237
+                    $edit_fields[] = $this->merge_field_properties($field, $configured_field);
1238 1238
                     break;
1239 1239
                 }
1240 1240
 
@@ -1253,18 +1253,18 @@  discard block
 block discarded – undo
1253 1253
      * @since  1.5
1254 1254
      * @return array
1255 1255
      */
1256
-    private function merge_field_properties( $field, $field_setting ) {
1256
+    private function merge_field_properties($field, $field_setting) {
1257 1257
 
1258 1258
         $return_field = $field;
1259 1259
 
1260
-        if( empty( $field_setting['show_label'] ) ) {
1260
+        if (empty($field_setting['show_label'])) {
1261 1261
             $return_field->label = '';
1262
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
1262
+        } elseif (!empty($field_setting['custom_label'])) {
1263 1263
             $return_field->label = $field_setting['custom_label'];
1264 1264
         }
1265 1265
 
1266
-        if( !empty( $field_setting['custom_class'] ) ) {
1267
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1266
+        if (!empty($field_setting['custom_class'])) {
1267
+            $return_field->cssClass .= ' '.gravityview_sanitize_html_class($field_setting['custom_class']);
1268 1268
         }
1269 1269
 
1270 1270
         /**
@@ -1289,7 +1289,7 @@  discard block
 block discarded – undo
1289 1289
      *
1290 1290
      * @return array Possibly modified form array
1291 1291
      */
1292
-    function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) {
1292
+    function filter_admin_only_fields($fields = array(), $edit_fields = null, $form = array(), $view_id = 0) {
1293 1293
 
1294 1294
 	    /**
1295 1295
          * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true
@@ -1300,13 +1300,13 @@  discard block
 block discarded – undo
1300 1300
 	     * @param array $form GF Form array
1301 1301
 	     * @param int $view_id View ID
1302 1302
 	     */
1303
-	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1303
+	    $use_gf_adminonly_setting = apply_filters('gravityview/edit_entry/use_gf_admin_only_setting', empty($edit_fields), $form, $view_id);
1304 1304
 
1305
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1305
+	    if ($use_gf_adminonly_setting && false === GVCommon::has_cap('gravityforms_edit_entries', $this->entry['id'])) {
1306 1306
             return $fields;
1307 1307
         }
1308 1308
 
1309
-	    foreach( $fields as &$field ) {
1309
+	    foreach ($fields as &$field) {
1310 1310
 		    $field->adminOnly = false;
1311 1311
         }
1312 1312
 
@@ -1323,7 +1323,7 @@  discard block
 block discarded – undo
1323 1323
      * @param array $form Gravity Forms form
1324 1324
      * @return array Modified form, if not using Conditional Logic
1325 1325
      */
1326
-    function filter_conditional_logic( $form ) {
1326
+    function filter_conditional_logic($form) {
1327 1327
 
1328 1328
         /**
1329 1329
          * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields?
@@ -1331,18 +1331,18 @@  discard block
 block discarded – undo
1331 1331
          * @param bool $use_conditional_logic True: Gravity Forms will show/hide fields just like in the original form; False: conditional logic will be disabled and fields will be shown based on configuration. Default: true
1332 1332
          * @param array $form Gravity Forms form
1333 1333
          */
1334
-        $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
1334
+        $use_conditional_logic = apply_filters('gravityview/edit_entry/conditional_logic', true, $form);
1335 1335
 
1336
-        if( $use_conditional_logic ) {
1336
+        if ($use_conditional_logic) {
1337 1337
             return $form;
1338 1338
         }
1339 1339
 
1340
-        foreach( $form['fields'] as &$field ) {
1340
+        foreach ($form['fields'] as &$field) {
1341 1341
             /* @var GF_Field $field */
1342 1342
             $field->conditionalLogic = null;
1343 1343
         }
1344 1344
 
1345
-        unset( $form['button']['conditionalLogic'] );
1345
+        unset($form['button']['conditionalLogic']);
1346 1346
 
1347 1347
         return $form;
1348 1348
 
@@ -1357,13 +1357,13 @@  discard block
 block discarded – undo
1357 1357
      * @param $form
1358 1358
      * @return mixed|void
1359 1359
      */
1360
-    function manage_conditional_logic( $has_conditional_logic, $form ) {
1360
+    function manage_conditional_logic($has_conditional_logic, $form) {
1361 1361
 
1362
-        if( ! $this->is_edit_entry() ) {
1362
+        if (!$this->is_edit_entry()) {
1363 1363
             return $has_conditional_logic;
1364 1364
         }
1365 1365
 
1366
-        return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form );
1366
+        return apply_filters('gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form);
1367 1367
 
1368 1368
     }
1369 1369
 
@@ -1382,7 +1382,7 @@  discard block
 block discarded – undo
1382 1382
      * @param  boolean $echo Show error messages in the form?
1383 1383
      * @return boolean        True: can edit form. False: nope.
1384 1384
      */
1385
-    function user_can_edit_entry( $echo = false ) {
1385
+    function user_can_edit_entry($echo = false) {
1386 1386
 
1387 1387
         $error = NULL;
1388 1388
 
@@ -1391,58 +1391,58 @@  discard block
 block discarded – undo
1391 1391
          *  2. There are two entries embedded using oEmbed
1392 1392
          *  3. One of the entries has just been saved
1393 1393
          */
1394
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
1394
+        if (!empty($_POST['lid']) && !empty($_GET['entry']) && ($_POST['lid'] !== $_GET['entry'])) {
1395 1395
 
1396 1396
             $error = true;
1397 1397
 
1398 1398
         }
1399 1399
 
1400
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
1400
+        if (!empty($_GET['entry']) && (string)$this->entry['id'] !== $_GET['entry']) {
1401 1401
 
1402 1402
             $error = true;
1403 1403
 
1404
-        } elseif( ! $this->verify_nonce() ) {
1404
+        } elseif (!$this->verify_nonce()) {
1405 1405
 
1406 1406
             /**
1407 1407
              * If the Entry is embedded, there may be two entries on the same page.
1408 1408
              * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
1409 1409
              */
1410
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1410
+            if (GravityView_oEmbed::getInstance()->get_entry_id()) {
1411 1411
                 $error = true;
1412 1412
             } else {
1413
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
1413
+                $error = __('The link to edit this entry is not valid; it may have expired.', 'gravityview');
1414 1414
             }
1415 1415
 
1416 1416
         }
1417 1417
 
1418
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1419
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
1418
+        if (!GravityView_Edit_Entry::check_user_cap_edit_entry($this->entry)) {
1419
+            $error = __('You do not have permission to edit this entry.', 'gravityview');
1420 1420
         }
1421 1421
 
1422
-        if( $this->entry['status'] === 'trash' ) {
1423
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
1422
+        if ($this->entry['status'] === 'trash') {
1423
+            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview');
1424 1424
         }
1425 1425
 
1426 1426
         // No errors; everything's fine here!
1427
-        if( empty( $error ) ) {
1427
+        if (empty($error)) {
1428 1428
             return true;
1429 1429
         }
1430 1430
 
1431
-        if( $echo && $error !== true ) {
1431
+        if ($echo && $error !== true) {
1432 1432
 
1433
-	        $error = esc_html( $error );
1433
+	        $error = esc_html($error);
1434 1434
 
1435 1435
 	        /**
1436 1436
 	         * @since 1.9
1437 1437
 	         */
1438
-	        if ( ! empty( $this->entry ) ) {
1439
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
1438
+	        if (!empty($this->entry)) {
1439
+		        $error .= ' '.gravityview_get_link('#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview'), array('onclick' => "window.history.go(-1); return false;"));
1440 1440
 	        }
1441 1441
 
1442
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1442
+            echo GVCommon::generate_notice(wpautop($error), 'gv-error error');
1443 1443
         }
1444 1444
 
1445
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1445
+        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]'.$error);
1446 1446
 
1447 1447
         return false;
1448 1448
     }
@@ -1455,24 +1455,24 @@  discard block
 block discarded – undo
1455 1455
      * @param  boolean $echo  Whether to show error message telling user they aren't allowed
1456 1456
      * @return boolean         True: user can edit the current field; False: nope, they can't.
1457 1457
      */
1458
-    private function user_can_edit_field( $field, $echo = false ) {
1458
+    private function user_can_edit_field($field, $echo = false) {
1459 1459
 
1460 1460
         $error = NULL;
1461 1461
 
1462
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
1463
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
1462
+        if (!$this->check_user_cap_edit_field($field)) {
1463
+            $error = __('You do not have permission to edit this field.', 'gravityview');
1464 1464
         }
1465 1465
 
1466 1466
         // No errors; everything's fine here!
1467
-        if( empty( $error ) ) {
1467
+        if (empty($error)) {
1468 1468
             return true;
1469 1469
         }
1470 1470
 
1471
-        if( $echo ) {
1472
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
1471
+        if ($echo) {
1472
+            echo GVCommon::generate_notice(wpautop(esc_html($error)), 'gv-error error');
1473 1473
         }
1474 1474
 
1475
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1475
+        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]'.$error);
1476 1476
 
1477 1477
         return false;
1478 1478
 
@@ -1487,18 +1487,18 @@  discard block
 block discarded – undo
1487 1487
      * @param  [type] $field [description]
1488 1488
      * @return bool
1489 1489
      */
1490
-    private function check_user_cap_edit_field( $field ) {
1490
+    private function check_user_cap_edit_field($field) {
1491 1491
 
1492 1492
         // If they can edit any entries (as defined in Gravity Forms), we're good.
1493
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1493
+        if (GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_others_entries'))) {
1494 1494
             return true;
1495 1495
         }
1496 1496
 
1497
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
1497
+        $field_cap = isset($field['allow_edit_cap']) ? $field['allow_edit_cap'] : false;
1498 1498
 
1499 1499
         // If the field has custom editing capaibilities set, check those
1500
-        if( $field_cap ) {
1501
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
1500
+        if ($field_cap) {
1501
+            return GVCommon::has_cap($field['allow_edit_cap']);
1502 1502
         }
1503 1503
 
1504 1504
         return false;
@@ -1512,17 +1512,17 @@  discard block
 block discarded – undo
1512 1512
     public function verify_nonce() {
1513 1513
 
1514 1514
         // Verify form submitted for editing single
1515
-        if( $this->is_edit_entry_submission() ) {
1516
-            $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
1515
+        if ($this->is_edit_entry_submission()) {
1516
+            $valid = wp_verify_nonce($_POST[self::$nonce_field], self::$nonce_field);
1517 1517
         }
1518 1518
 
1519 1519
         // Verify
1520
-        else if( ! $this->is_edit_entry() ) {
1520
+        else if (!$this->is_edit_entry()) {
1521 1521
             $valid = false;
1522 1522
         }
1523 1523
 
1524 1524
         else {
1525
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1525
+            $valid = wp_verify_nonce($_GET['edit'], self::$nonce_key);
1526 1526
         }
1527 1527
 
1528 1528
         /**
@@ -1531,7 +1531,7 @@  discard block
 block discarded – undo
1531 1531
          * @param int|boolean $valid False if invalid; 1 or 2 when nonce was generated
1532 1532
          * @param string $nonce_field Key used when validating submissions. Default: is_gv_edit_entry
1533 1533
          */
1534
-        $valid = apply_filters( 'gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field );
1534
+        $valid = apply_filters('gravityview/edit_entry/verify_nonce', $valid, self::$nonce_field);
1535 1535
 
1536 1536
         return $valid;
1537 1537
     }
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @copyright Copyright 2015, Katz Web Services, Inc.
11 11
  */
12 12
 
13
-if ( ! defined( 'WPINC' ) ) {
13
+if (!defined('WPINC')) {
14 14
     die;
15 15
 }
16 16
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
      */
30 30
     private $_user_before_update = null;
31 31
 
32
-    function __construct( GravityView_Edit_Entry $loader ) {
32
+    function __construct(GravityView_Edit_Entry $loader) {
33 33
         $this->loader = $loader;
34 34
     }
35 35
 
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
43 43
 	     * @since 1.11
44 44
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
45 45
 	     */
46
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
47
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
46
+        if (apply_filters('gravityview/edit_entry/user_registration/trigger_update', true)) {
47
+            add_action('gravityview/edit_entry/after_update', array($this, 'update_user'), 10, 2);
48 48
 
49 49
             // last resort in case the current user display name don't match any of the defaults
50
-            add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
50
+            add_action('gform_user_updated', array($this, 'restore_display_name'), 10, 4);
51 51
         }
52 52
     }
53 53
 
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
60 60
      * @param string $entry_id Gravity Forms entry ID
61 61
      * @return void
62 62
      */
63
-    public function update_user( $form = array(), $entry_id = 0 ) {
63
+    public function update_user($form = array(), $entry_id = 0) {
64 64
 
65
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
65
+        if (!class_exists('GFAPI') || !class_exists('GFUser') || empty($entry_id)) {
66 66
             return;
67 67
         }
68 68
 
69
-        $entry = GFAPI::get_entry( $entry_id );
69
+        $entry = GFAPI::get_entry($entry_id);
70 70
 
71 71
 	    /**
72 72
 	     * @filter `gravityview/edit_entry/user_registration/entry` Modify entry details before updating the user via User Registration add-on
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
74 74
 	     * @param array $entry Gravity Forms entry
75 75
 	     * @param array $form Gravity Forms form
76 76
 	     */
77
-        $entry = apply_filters( 'gravityview/edit_entry/user_registration/entry', $entry, $form );
77
+        $entry = apply_filters('gravityview/edit_entry/user_registration/entry', $entry, $form);
78 78
 
79 79
         /**
80 80
          * @since 1.14
81 81
          */
82
-        $config = GFUser::get_active_config( $form, $entry );
82
+        $config = GFUser::get_active_config($form, $entry);
83 83
 
84 84
         /**
85 85
          * @filter `gravityview/edit_entry/user_registration/preserve_role` Keep the current user role or override with the role defined in the Create feed
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
          * @param[in] array $form Gravity Forms form array
90 90
          * @param[in] array $entry Gravity Forms entry being edited
91 91
          */
92
-        $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
92
+        $preserve_role = apply_filters('gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry);
93 93
 
94
-        if( $preserve_role ) {
94
+        if ($preserve_role) {
95 95
             $config['meta']['role'] = 'gfur_preserve_role';
96 96
         }
97 97
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
          * Make sure the current display name is not changed with the update user method.
100 100
          * @since 1.15
101 101
          */
102
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
102
+        $config['meta']['displayname'] = $this->match_current_display_name($entry['created_by']);
103 103
 
104 104
 
105 105
         /**
@@ -109,24 +109,24 @@  discard block
 block discarded – undo
109 109
          * @param[in] array $form Gravity Forms form array
110 110
          * @param[in] array $entry Gravity Forms entry being edited
111 111
          */
112
-        $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
112
+        $config = apply_filters('gravityview/edit_entry/user_registration/config', $config, $form, $entry);
113 113
 
114
-        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
114
+        $is_create_feed = ($config && rgars($config, 'meta/feed_type') === 'create');
115 115
 
116 116
         // Only update if it's a create feed
117
-        if( ! $is_create_feed ) {
117
+        if (!$is_create_feed) {
118 118
             return;
119 119
         }
120 120
 
121 121
         // The priority is set to 3 so that default priority (10) will still override it
122
-        add_filter( 'send_password_change_email', '__return_false', 3 );
123
-        add_filter( 'send_email_change_email', '__return_false', 3 );
122
+        add_filter('send_password_change_email', '__return_false', 3);
123
+        add_filter('send_email_change_email', '__return_false', 3);
124 124
 
125 125
         // Trigger the User Registration update user method
126
-        GFUser::update_user( $entry, $form, $config );
126
+        GFUser::update_user($entry, $form, $config);
127 127
 
128
-        remove_filter( 'send_password_change_email', '__return_false', 3 );
129
-        remove_filter( 'send_email_change_email', '__return_false', 3 );
128
+        remove_filter('send_password_change_email', '__return_false', 3);
129
+        remove_filter('send_email_change_email', '__return_false', 3);
130 130
 
131 131
     }
132 132
 
@@ -138,17 +138,17 @@  discard block
 block discarded – undo
138 138
      * @param int $user_id WP User ID
139 139
      * @return string Display name format as used inside Gravity Forms User Registration
140 140
      */
141
-    public function match_current_display_name( $user_id ) {
141
+    public function match_current_display_name($user_id) {
142 142
 
143
-        $user = get_userdata( $user_id );
143
+        $user = get_userdata($user_id);
144 144
 
145
-        $names = $this->generate_display_names( $user );
145
+        $names = $this->generate_display_names($user);
146 146
 
147
-        $format = array_search( $user->display_name, $names, true );
147
+        $format = array_search($user->display_name, $names, true);
148 148
 
149 149
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
150 150
         //   trigger last resort method at the 'gform_user_updated' hook
151
-        if( false === $format || 'nickname' === $format ) {
151
+        if (false === $format || 'nickname' === $format) {
152 152
             $this->_user_before_update = $user;
153 153
             $format = 'nickname';
154 154
         }
@@ -165,25 +165,25 @@  discard block
 block discarded – undo
165 165
      * @param object $profileuser WP_User object
166 166
      * @return array List all the possible display names for a certain User object
167 167
      */
168
-    public function generate_display_names( $profileuser ) {
168
+    public function generate_display_names($profileuser) {
169 169
 
170 170
         $public_display = array();
171 171
         $public_display['nickname']  = $profileuser->nickname;
172 172
         $public_display['username']  = $profileuser->user_login;
173 173
 
174
-        if ( !empty($profileuser->first_name) )
174
+        if (!empty($profileuser->first_name))
175 175
             $public_display['firstname'] = $profileuser->first_name;
176 176
 
177
-        if ( !empty($profileuser->last_name) )
177
+        if (!empty($profileuser->last_name))
178 178
             $public_display['lastname'] = $profileuser->last_name;
179 179
 
180
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
181
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
182
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
180
+        if (!empty($profileuser->first_name) && !empty($profileuser->last_name)) {
181
+            $public_display['firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
182
+            $public_display['lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
183 183
         }
184 184
 
185
-        $public_display = array_map( 'trim', $public_display );
186
-        $public_display = array_unique( $public_display );
185
+        $public_display = array_map('trim', $public_display);
186
+        $public_display = array_unique($public_display);
187 187
 
188 188
         return $public_display;
189 189
     }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      * @param string $password User password
200 200
      * @return void
201 201
      */
202
-    public function restore_display_name( $user_id = 0, $config = array(), $entry = array(), $password = '' ) {
202
+    public function restore_display_name($user_id = 0, $config = array(), $entry = array(), $password = '') {
203 203
 
204 204
         /**
205 205
          * @filter `gravityview/edit_entry/restore_display_name` Whether display names should be restored to before updating an entry.
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
          * @since 1.14.4
208 208
          * @param boolean $restore_display_name Restore Display Name? Default: true
209 209
          */
210
-        $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
210
+        $restore_display_name = apply_filters('gravityview/edit_entry/restore_display_name', true);
211 211
 
212
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
212
+        $is_update_feed = ($config && rgars($config, 'meta/feed_type') === 'update');
213 213
 
214 214
         /**
215 215
          * Don't restore display name:
@@ -218,11 +218,11 @@  discard block
 block discarded – undo
218 218
          *   - or we don't need as we found the correct format before updating user.
219 219
          * @since 1.14.4
220 220
          */
221
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
221
+        if (!$restore_display_name || $is_update_feed || is_null($this->_user_before_update)) {
222 222
             return;
223 223
         }
224 224
 
225
-        $user_after_update = get_userdata( $user_id );
225
+        $user_after_update = get_userdata($user_id);
226 226
 
227 227
         $restored_user = $user_after_update;
228 228
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
         $restored_user->display_name = $this->_user_before_update->display_name;
231 231
 
232 232
 	    // Don't have WP update the password.
233
-	    unset( $restored_user->data->user_pass, $restored_user->user_pass );
233
+	    unset($restored_user->data->user_pass, $restored_user->user_pass);
234 234
 
235 235
         /**
236 236
          * Modify the user data after updated by Gravity Forms User Registration but before restored by GravityView
@@ -240,19 +240,19 @@  discard block
 block discarded – undo
240 240
          * @param WP_User $user_after_update The user after being updated by Gravity Forms User Registration
241 241
          * @param array   $entry The Gravity Forms entry that was just updated
242 242
          */
243
-        $restored_user = apply_filters( 'gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry );
243
+        $restored_user = apply_filters('gravityview/edit_entry/user_registration/restored_user', $restored_user, $this->_user_before_update, $user_after_update, $entry);
244 244
 
245
-        $updated = wp_update_user( $restored_user );
245
+        $updated = wp_update_user($restored_user);
246 246
 
247
-        if( is_wp_error( $updated ) ) {
248
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
247
+        if (is_wp_error($updated)) {
248
+            do_action('gravityview_log_error', __METHOD__.sprintf(' - There was an error updating user #%d details', $user_id), $updated);
249 249
         } else {
250
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
250
+            do_action('gravityview_log_debug', __METHOD__.sprintf(' - User #%d details restored', $user_id));
251 251
         }
252 252
 
253 253
         $this->_user_before_update = null;
254 254
 
255
-        unset( $updated, $restored_user, $user_after_update );
255
+        unset($updated, $restored_user, $user_after_update);
256 256
     }
257 257
 
258 258
 } //end class
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @copyright Copyright 2014, Katz Web Services, Inc.
12 12
  */
13 13
 
14
-if ( ! defined( 'WPINC' ) ) {
14
+if (!defined('WPINC')) {
15 15
 	die;
16 16
 }
17 17
 
@@ -34,18 +34,18 @@  discard block
 block discarded – undo
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+        self::$file = plugin_dir_path(__FILE__);
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
39
+        if (is_admin()) {
40
+            $this->load_components('admin');
41 41
         }
42 42
 
43 43
 
44
-        $this->load_components( 'render' );
44
+        $this->load_components('render');
45 45
 
46 46
         // If GF User Registration Add-on exists
47
-        if( class_exists( 'GFUser' ) ) {
48
-            $this->load_components( 'user-registration' );
47
+        if (class_exists('GFUser')) {
48
+            $this->load_components('user-registration');
49 49
         }
50 50
 
51 51
         $this->add_hooks();
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     static function getInstance() {
59 59
 
60
-        if( empty( self::$instance ) ) {
60
+        if (empty(self::$instance)) {
61 61
             self::$instance = new GravityView_Edit_Entry;
62 62
         }
63 63
 
@@ -65,33 +65,33 @@  discard block
 block discarded – undo
65 65
     }
66 66
 
67 67
 
68
-    private function load_components( $component ) {
68
+    private function load_components($component) {
69 69
 
70
-        $dir = trailingslashit( self::$file );
70
+        $dir = trailingslashit(self::$file);
71 71
 
72
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
73
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
72
+        $filename  = $dir.'class-edit-entry-'.$component.'.php';
73
+        $classname = 'GravityView_Edit_Entry_'.str_replace(' ', '_', ucwords(str_replace('-', ' ', $component)));
74 74
 
75 75
         // Loads component and pass extension's instance so that component can
76 76
         // talk each other.
77 77
         require_once $filename;
78
-        $this->instances[ $component ] = new $classname( $this );
79
-        $this->instances[ $component ]->load();
78
+        $this->instances[$component] = new $classname($this);
79
+        $this->instances[$component]->load();
80 80
 
81 81
     }
82 82
 
83 83
     private function add_hooks() {
84 84
 
85 85
         // Add front-end access to Gravity Forms delete file action
86
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file') );
86
+        add_action('wp_ajax_nopriv_rg_delete_file', array('RGForms', 'delete_file'));
87 87
 
88 88
         // Make sure this hook is run for non-admins
89
-        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file') );
89
+        add_action('wp_ajax_rg_delete_file', array('RGForms', 'delete_file'));
90 90
 
91
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
91
+        add_filter('gravityview_blacklist_field_types', array($this, 'modify_field_blacklist'), 10, 2);
92 92
 
93 93
         // add template path to check for field
94
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
94
+        add_filter('gravityview_template_paths', array($this, 'add_template_path'));
95 95
 
96 96
     }
97 97
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function addon_specific_hooks() {
103 103
 
104
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
104
+		if (class_exists('GFSignature') && is_callable(array('GFSignature', 'get_instance'))) {
105
+			add_filter('gform_admin_pre_render', array(GFSignature::get_instance(), 'edit_lead_script'));
106 106
 		}
107 107
 
108 108
 	}
@@ -111,10 +111,10 @@  discard block
 block discarded – undo
111 111
      * Include this extension templates path
112 112
      * @param array $file_paths List of template paths ordered
113 113
      */
114
-    public function add_template_path( $file_paths ) {
114
+    public function add_template_path($file_paths) {
115 115
 
116 116
         // Index 100 is the default GravityView template path.
117
-        $file_paths[ 110 ] = self::$file;
117
+        $file_paths[110] = self::$file;
118 118
 
119 119
         return $file_paths;
120 120
     }
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
      * @param $entry_id int Gravity Forms entry id
129 129
      * @return string
130 130
      */
131
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
132
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
131
+    public static function get_nonce_key($view_id, $form_id, $entry_id) {
132
+        return sprintf('edit_%d_%d_%d', $view_id, $form_id, $entry_id);
133 133
     }
134 134
 
135 135
 
@@ -146,32 +146,32 @@  discard block
 block discarded – undo
146 146
      * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
147 147
      * @return string
148 148
      */
149
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
149
+    public static function get_edit_link($entry, $view_id, $post_id = null, $field_values = '') {
150 150
 
151
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
151
+        $nonce_key = self::get_nonce_key($view_id, $entry['form_id'], $entry['id']);
152 152
 
153
-        $base = gv_entry_link( $entry, $post_id );
153
+        $base = gv_entry_link($entry, $post_id);
154 154
 
155
-        $url = add_query_arg( array(
155
+        $url = add_query_arg(array(
156 156
             'page' => 'gf_entries', // Needed for GFForms::get_page()
157 157
             'view' => 'entry', // Needed for GFForms::get_page()
158
-            'edit' => wp_create_nonce( $nonce_key )
159
-        ), $base );
158
+            'edit' => wp_create_nonce($nonce_key)
159
+        ), $base);
160 160
 
161 161
 	    /**
162 162
 	     * Allow passing params to dynamically populate entry with values
163 163
 	     * @since 1.9.2
164 164
 	     */
165
-	    if( !empty( $field_values ) ) {
165
+	    if (!empty($field_values)) {
166 166
 
167
-		    if( is_array( $field_values ) ) {
167
+		    if (is_array($field_values)) {
168 168
 			    // If already an array, no parse_str() needed
169 169
 			    $params = $field_values;
170 170
 		    } else {
171
-			    parse_str( $field_values, $params );
171
+			    parse_str($field_values, $params);
172 172
 		    }
173 173
 
174
-		    $url = add_query_arg( $params, $url );
174
+		    $url = add_query_arg($params, $url);
175 175
 	    }
176 176
 
177 177
         return $url;
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 * @param  string|null $context Context
185 185
 	 * @return array          If not edit context, original field blacklist. Otherwise, blacklist including post fields.
186 186
 	 */
187
-	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
187
+	public function modify_field_blacklist($fields = array(), $context = NULL) {
188 188
 
189
-		if( empty( $context ) || $context !== 'edit' ) {
189
+		if (empty($context) || $context !== 'edit') {
190 190
 			return $fields;
191 191
 		}
192 192
 
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 			// 'payment_method', This is editable in the admin, so allowing it here
208 208
 		);
209 209
 
210
-		return array_merge( $fields, $add_fields );
210
+		return array_merge($fields, $add_fields);
211 211
 	}
212 212
 
213 213
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
      * @param int $view_id ID of the view you want to check visibility against {@since 1.9.2}
221 221
      * @return bool
222 222
      */
223
-    public static function check_user_cap_edit_entry( $entry, $view_id = 0 ) {
223
+    public static function check_user_cap_edit_entry($entry, $view_id = 0) {
224 224
 
225 225
         // No permission by default
226 226
         $user_can_edit = false;
@@ -228,13 +228,13 @@  discard block
 block discarded – undo
228 228
         // If they can edit any entries (as defined in Gravity Forms)
229 229
         // Or if they can edit other people's entries
230 230
         // Then we're good.
231
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
231
+        if (GVCommon::has_cap(array('gravityforms_edit_entries', 'gravityview_edit_others_entries'), $entry['id'])) {
232 232
 
233
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
233
+            do_action('gravityview_log_debug', __METHOD__.' - User has ability to edit all entries.');
234 234
 
235 235
             $user_can_edit = true;
236 236
 
237
-        } else if( !isset( $entry['created_by'] ) ) {
237
+        } else if (!isset($entry['created_by'])) {
238 238
 
239 239
             do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
240 240
 
@@ -243,34 +243,34 @@  discard block
 block discarded – undo
243 243
         } else {
244 244
 
245 245
             // get user_edit setting
246
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
246
+            if (empty($view_id) || $view_id == GravityView_View::getInstance()->getViewId()) {
247 247
                 // if View ID not specified or is the current view
248 248
                 $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
249 249
             } else {
250 250
                 // in case is specified and not the current view
251
-                $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
251
+                $user_edit = GVCommon::get_template_setting($view_id, 'user_edit');
252 252
             }
253 253
 
254 254
             $current_user = wp_get_current_user();
255 255
 
256 256
             // User edit is disabled
257
-            if( empty( $user_edit ) ) {
257
+            if (empty($user_edit)) {
258 258
 
259
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
259
+                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.');
260 260
 
261 261
                 $user_can_edit = false;
262 262
             }
263 263
 
264 264
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
265
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
265
+            else if (is_user_logged_in() && intval($current_user->ID) === intval($entry['created_by'])) {
266 266
 
267
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
267
+                do_action('gravityview_log_debug', sprintf('GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID));
268 268
 
269 269
                 $user_can_edit = true;
270 270
 
271
-            } else if( ! is_user_logged_in() ) {
271
+            } else if (!is_user_logged_in()) {
272 272
 
273
-                do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
273
+                do_action('gravityview_log_debug', __METHOD__.' No user defined; edit entry requires logged in user');
274 274
             }
275 275
 
276 276
         }
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
          * @param[in] array $entry Gravity Forms entry array {@since 1.15}
283 283
          * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
284 284
          */
285
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
285
+        $user_can_edit = apply_filters('gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id);
286 286
 
287 287
         return (bool)$user_can_edit;
288 288
     }
Please login to merge, or discard this patch.
includes/extensions/edit-entry/fields/edit_link.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,19 +4,19 @@
 block discarded – undo
4 4
 
5 5
 $view_id = $gravityview_view->getViewId();
6 6
 
7
-extract( $gravityview_view->getCurrentField() );
7
+extract($gravityview_view->getCurrentField());
8 8
 
9 9
 // Only show the link to logged-in users.
10
-if( !GravityView_Edit_Entry::check_user_cap_edit_entry( $entry ) ) {
10
+if (!GravityView_Edit_Entry::check_user_cap_edit_entry($entry)) {
11 11
 	return;
12 12
 }
13 13
 
14
-$link_text = empty( $field_settings['edit_link'] ) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
14
+$link_text = empty($field_settings['edit_link']) ? __('Edit Entry', 'gravityview') : $field_settings['edit_link'];
15 15
 
16
-$link_atts = empty( $field_settings['new_window'] ) ? '' : 'target="_blank"';
16
+$link_atts = empty($field_settings['new_window']) ? '' : 'target="_blank"';
17 17
 
18
-$output = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
18
+$output = apply_filters('gravityview_entry_link', GravityView_API::replace_variables($link_text, $form, $entry));
19 19
 
20
-$href = GravityView_Edit_Entry::get_edit_link( $entry, $view_id );
20
+$href = GravityView_Edit_Entry::get_edit_link($entry, $view_id);
21 21
 
22
-echo gravityview_get_link( $href, $output, $link_atts );
22
+echo gravityview_get_link($href, $output, $link_atts);
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
      * @param array $entry The Gravity Forms entry
16 16
      * @param int $view_id The current View ID
17 17
      */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
18
+    $back_link = apply_filters('gravityview/edit_entry/cancel_link', remove_query_arg(array('page', 'view', 'edit')), $object->form, $object->entry, $object->view_id);
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -24,12 +24,12 @@  discard block
 block discarded – undo
24 24
 	 * @param array $entry The Gravity Forms entry
25 25
 	 * @param int $view_id The current View ID
26 26
 	 */
27
-	do_action( 'gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id );
27
+	do_action('gravityview/edit-entry/publishing-action/before', $object->form, $object->entry, $object->view_id);
28 28
 
29 29
 	?>
30
-	<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e( 'Update', 'gravityview'); ?>" name="save" />
30
+	<input id="gform_submit_button_<?php echo esc_attr($object->form['id']); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" tabindex="4" value="<?php esc_attr_e('Update', 'gravityview'); ?>" name="save" />
31 31
 
32
-	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url( $back_link ); ?>"><?php esc_attr_e( 'Cancel', 'gravityview' ); ?></a>
32
+	<a class="btn btn-sm button button-small gv-button-cancel" tabindex="5" href="<?php echo esc_url($back_link); ?>"><?php esc_attr_e('Cancel', 'gravityview'); ?></a>
33 33
 	<?php
34 34
 
35 35
 	/**
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param array $entry The Gravity Forms entry
40 40
 	 * @param int $view_id The current View ID
41 41
 	 */
42
-	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id );
42
+	do_action('gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id);
43 43
 
44 44
 	?>
45 45
 	<input type="hidden" name="action" value="update" />
46
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
46
+	<input type="hidden" name="lid" value="<?php echo esc_attr($object->entry['id']); ?>" />
47 47
 </div>
Please login to merge, or discard this patch.