Completed
Push — develop ( a61784...aed985 )
by Zack
27:19 queued 14:49
created
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 		// Only output the fields that should be displayed.
115 115
 		$allowed = array();
116 116
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible( $view )->all() as $field ) {
117
-			$allowed[] = $field;
117
+			$allowed[ ] = $field;
118 118
 		}
119 119
 
120 120
 		/**
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
 		// Tack on additional fields if needed
135 135
 		foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) {
136
-			$allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
136
+			$allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );
137 137
 		}
138 138
 
139 139
 		$r = new Request( $request );
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
211 211
 	public function get_sub_items( $request ) {
212 212
 
213 213
 		$url     = $request->get_url_params();
214
-		$view_id = intval( $url['id'] );
214
+		$view_id = intval( $url[ 'id' ] );
215 215
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
216 216
 
217
-		if( $post_id = $request->get_param('post_id') ) {
217
+		if ( $post_id = $request->get_param( 'post_id' ) ) {
218 218
 			global $post;
219 219
 
220 220
 			$post = get_post( $post_id );
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 
320 320
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
321 321
 
322
-		foreach ( $data['entries'] as &$entry ) {
322
+		foreach ( $data[ 'entries' ] as &$entry ) {
323 323
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
324 324
 		}
325 325
 
@@ -338,8 +338,8 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function get_sub_item( $request ) {
340 340
 		$url      = $request->get_url_params();
341
-		$view_id  = intval( $url['id'] );
342
-		$entry_id = intval( $url['s_id'] );
341
+		$view_id  = intval( $url[ 'id' ] );
342
+		$entry_id = intval( $url[ 's_id' ] );
343 343
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
344 344
 
345 345
 		$view  = \GV\View::by_id( $view_id );
@@ -374,32 +374,32 @@  discard block
 block discarded – undo
374 374
 		// Add all the WP_Post data
375 375
 		$view_post = $view_post->to_array();
376 376
 
377
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
377
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
378 378
 
379 379
 		$return = wp_parse_args( $item, $view_post );
380 380
 
381
-		$return['title'] = $return['post_title'];
381
+		$return[ 'title' ] = $return[ 'post_title' ];
382 382
 
383
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
384
-		unset( $return['atts'], $return['view_id'] );
383
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
384
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
385 385
 
386
-		$return['search_criteria'] = array(
386
+		$return[ 'search_criteria' ] = array(
387 387
 			'page_size' => rgars( $return, 'settings/page_size' ),
388 388
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
389 389
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
390 390
 			'offset' => rgars( $return, 'settings/offset' ),
391 391
 		);
392 392
 
393
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
393
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
394 394
 
395 395
 		// Redact for non-logged ins
396 396
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
397
-			unset( $return['settings'] );
398
-			unset( $return['search_criteria'] );
397
+			unset( $return[ 'settings' ] );
398
+			unset( $return[ 'search_criteria' ] );
399 399
 		}
400 400
 		
401 401
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
402
-			unset( $return['form'] );
402
+			unset( $return[ 'form' ] );
403 403
 		}
404 404
 
405 405
 		return $return;
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 			$view_id = func_get_arg( 1 ); // $view_id override
416 416
 		} else {
417 417
 			$url     = $request->get_url_params();
418
-			$view_id = intval( $url['id'] );
418
+			$view_id = intval( $url[ 'id' ] );
419 419
 		}
420 420
 
421 421
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -461,8 +461,8 @@  discard block
 block discarded – undo
461 461
 		}
462 462
 
463 463
 		$url     = $request->get_url_params();
464
-		$view_id = intval( $url['id'] );
465
-		$entry_id = intval( $url['s_id'] );
464
+		$view_id = intval( $url[ 'id' ] );
465
+		$entry_id = intval( $url[ 's_id' ] );
466 466
 
467 467
 		$view = \GV\View::by_id( $view_id );
468 468
 
@@ -470,11 +470,11 @@  discard block
 block discarded – undo
470 470
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
471 471
 		}
472 472
 
473
-		if ( $entry['form_id'] != $view->form->ID ) {
473
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
474 474
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
475 475
 		}
476 476
 
477
-		if ( $entry['status'] != 'active' ) {
477
+		if ( $entry[ 'status' ] != 'active' ) {
478 478
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
479 479
 		}
480 480
 
@@ -482,10 +482,10 @@  discard block
 block discarded – undo
482 482
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
483 483
 		}
484 484
 
485
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
485
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
486 486
 
487 487
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
488
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
488
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
489 489
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
490 490
 			}
491 491
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-template-legacy-override.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 		$additional = array();
99 99
 
100 100
 		// form-19-table-body.php
101
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
101
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
102 102
 
103 103
 		// view-3-table-body.php
104
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
104
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
105 105
 
106 106
 		global $post;
107 107
 		if ( $post ) {
108 108
 			// page-19-table-body.php
109
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
109
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
110 110
 		}
111 111
 
112 112
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		ob_start();
131 131
 
132 132
 		$request = new Mock_Request();
133
-		$request->returns['is_view'] = $this->view;
133
+		$request->returns[ 'is_view' ] = $this->view;
134 134
 
135 135
 		/**
136 136
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@  discard block
 block discarded – undo
144 144
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
145 145
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
146 146
 			if ( is_array( $wp_filter[ $hook ] ) ) {
147
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
148
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
147
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
148
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
149 149
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
150
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
150
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
151 151
 						}
152 152
 					}
153 153
 				}
154 154
 			} else {
155
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
155
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
156 156
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
157
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
157
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
158 158
 					}
159 159
 				}
160 160
 			}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		 */
166 166
 		if ( $this->entry ) {
167 167
 
168
-			$request->returns['is_entry'] = $this->entry;
168
+			$request->returns[ 'is_entry' ] = $this->entry;
169 169
 
170 170
 			global $post;
171 171
 
@@ -199,11 +199,11 @@  discard block
 block discarded – undo
199 199
 			 * This allows us to fake it till we make it.
200 200
 			 */
201 201
 			$parameters = $this->view->settings->as_atts();
202
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
202
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
203 203
 				$has_multisort = true;
204
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
205
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
206
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
204
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
205
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
206
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
207 207
 				}
208 208
 			}
209 209
 
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
 					'fields' => $this->view->fields->by_visible( $this->view ),
223 223
 					'in_the_loop' => true,
224 224
 				), empty( $parameters ) ? array() : array(
225
-					'paging' => $parameters['paging'],
226
-					'sorting' => $parameters['sorting'],
225
+					'paging' => $parameters[ 'paging' ],
226
+					'sorting' => $parameters[ 'sorting' ],
227 227
 				), $post ? array(
228 228
 					'post' => $post,
229 229
 				) : array() ) );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-unsubscribe.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function __construct() {
20 20
 		$this->label = esc_html__( 'Unsubscribe', 'gravityview' );
21
-		$this->description =  esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
21
+		$this->description = esc_attr__( 'Unsubscribe from a Payment-based entry.', 'gravityview' );
22 22
 
23 23
 		$this->add_hooks();
24 24
 
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 	 */
58 58
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
59 59
 
60
-		unset( $field_options['only_loggedin'] );
60
+		unset( $field_options[ 'only_loggedin' ] );
61 61
 
62
-		unset( $field_options['new_window'] );
62
+		unset( $field_options[ 'new_window' ] );
63 63
 
64
-		unset( $field_options['show_as_link'] );
64
+		unset( $field_options[ 'show_as_link' ] );
65 65
 
66
-		$add_options['unsub_all'] = array(
66
+		$add_options[ 'unsub_all' ] = array(
67 67
 			'type'       => 'checkbox',
68 68
 			'label'      => __( 'Allow admins to unsubscribe', 'gravityview' ),
69 69
 			'desc'       => __( 'Allow users with `gravityforms_edit_entries` to cancel subscriptions', 'gravityview' ),
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
130 130
 		}
131 131
 
132 132
 		foreach ( $feeds as $feed ) {
133
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
135
-					$entry_default_fields["{$this->name}"] = array(
133
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && 'subscription' === \GV\Utils::get( $feed, 'meta/transactionType' ) ) {
134
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
135
+					$entry_default_fields[ "{$this->name}" ] = array(
136 136
 						'label' => $this->label,
137 137
 						'desc'  => $this->description,
138 138
 						'type'  => $this->name,
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
163 163
 			return $output;
164 164
 		}
165 165
 
166
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
166
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
167 167
 
168 168
 		if ( ! $can_current_user_edit ) {
169
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
169
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
170 170
 				return $output;
171 171
 			}
172 172
 		}
@@ -179,21 +179,21 @@  discard block
 block discarded – undo
179 179
 		// @todo Also make sure we check caps if moved from here
180 180
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
181 181
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
182
-			if ( $entry['payment_status'] !== $status ) {
182
+			if ( $entry[ 'payment_status' ] !== $status ) {
183 183
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
184
-				return $entry['payment_status'];
184
+				return $entry[ 'payment_status' ];
185 185
 			}
186 186
 		}
187 187
 
188
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
188
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
189 189
 			return $output;
190 190
 		}
191 191
 
192 192
 		global $wp;
193 193
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
194 194
 
195
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
196
-		$link = add_query_arg( 'uid', $entry['id'], $link );
195
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
196
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
197 197
 
198 198
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
199 199
 	}
@@ -213,11 +213,11 @@  discard block
 block discarded – undo
213 213
 	 */
214 214
 	private function maybe_unsubscribe( $entry ) {
215 215
 
216
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
216
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
217 217
 			return $entry;
218 218
 		}
219 219
 
220
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
220
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
221 221
 			return $entry;
222 222
 		}
223 223
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
261 261
 
262
-						return \GFAPI::get_entry( $entry['id'] );
262
+						return \GFAPI::get_entry( $entry[ 'id' ] );
263 263
 					}
264 264
 				}
265 265
 			}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 
43 43
 		add_action( 'wp', array( $this, 'process_delete' ), 10000 );
44 44
 
45
-		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field'), 10, 3 );
45
+		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_default_field' ), 10, 3 );
46 46
 
47 47
 		add_action( 'gravityview_before', array( $this, 'display_message' ) );
48 48
 
49 49
 		// For the Delete Entry Link, you don't want visible to all users.
50
-		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps'), 10, 5 );
50
+		add_filter( 'gravityview_field_visibility_caps', array( $this, 'modify_visibility_caps' ), 10, 5 );
51 51
 
52 52
 		// Modify the field options based on the name of the field type
53 53
 		add_filter( 'gravityview_template_delete_link_options', array( $this, 'delete_link_field_options' ), 10, 5 );
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 		// add template path to check for field
56 56
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
57 57
 
58
-		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button'), 10, 4 );
58
+		add_action( 'gravityview/edit-entry/publishing-action/after', array( $this, 'add_delete_button' ), 10, 4 );
59 59
 
60
-		add_action ( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
-		add_action ( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
60
+		add_action( 'gravityview/delete-entry/deleted', array( $this, 'process_connected_posts' ), 10, 2 );
61
+		add_action( 'gravityview/delete-entry/trashed', array( $this, 'process_connected_posts' ), 10, 2 );
62 62
 
63 63
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
64 64
 	}
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	static function getInstance() {
73 73
 
74
-		if( empty( self::$instance ) ) {
74
+		if ( empty( self::$instance ) ) {
75 75
 			self::$instance = new self;
76 76
 		}
77 77
 
@@ -151,20 +151,20 @@  discard block
 block discarded – undo
151 151
 	function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
152 152
 
153 153
 		// Always a link, never a filter
154
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
154
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
155 155
 
156 156
 		// Delete Entry link should only appear to visitors capable of editing entries
157
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
157
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
158 158
 
159
-		$add_option['delete_link'] = array(
159
+		$add_option[ 'delete_link' ] = array(
160 160
 			'type' => 'text',
161 161
 			'label' => __( 'Delete Link Text', 'gravityview' ),
162 162
 			'desc' => NULL,
163
-			'value' => __('Delete Entry', 'gravityview'),
163
+			'value' => __( 'Delete Entry', 'gravityview' ),
164 164
 			'merge_tags' => true,
165 165
 		);
166 166
 
167
-		$field_options['allow_edit_cap'] = array(
167
+		$field_options[ 'allow_edit_cap' ] = array(
168 168
 			'type' => 'select',
169 169
 			'label' => __( 'Allow the following users to delete the entry:', 'gravityview' ),
170 170
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -188,8 +188,8 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
190 190
 
191
-		if( 'edit' !== $zone ) {
192
-			$entry_default_fields['delete_link'] = array(
191
+		if ( 'edit' !== $zone ) {
192
+			$entry_default_fields[ 'delete_link' ] = array(
193 193
 				'label' => __( 'Delete Entry', 'gravityview' ),
194 194
 				'type'  => 'delete_link',
195 195
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	function add_available_field( $available_fields = array() ) {
208 208
 
209
-		$available_fields['delete_link'] = array(
209
+		$available_fields[ 'delete_link' ] = array(
210 210
 			'label_text' => __( 'Delete Entry', 'gravityview' ),
211 211
 			'field_id' => 'delete_link',
212 212
 			'label_type' => 'field',
@@ -234,12 +234,12 @@  discard block
 block discarded – undo
234 234
 		$caps = $visibility_caps;
235 235
 
236 236
 		// If we're configuring fields in the edit context, we want a limited selection
237
-		if( $field_id === 'delete_link' ) {
237
+		if ( $field_id === 'delete_link' ) {
238 238
 
239 239
 			// Remove other built-in caps.
240
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
240
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
241 241
 
242
-			$caps['read'] = _x('Entry Creator', 'User capability', 'gravityview');
242
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
243 243
 		}
244 244
 
245 245
 		return $caps;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @param [type] $entry [description]
253 253
 	 */
254 254
 	function set_entry( $entry = null ) {
255
-		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[0] : $entry;
255
+		$this->entry = empty( $entry ) ? GravityView_View::getInstance()->entries[ 0 ] : $entry;
256 256
 	}
257 257
 
258 258
 	/**
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 
286 286
 		self::getInstance()->set_entry( $entry );
287 287
 
288
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
288
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
289 289
 
290 290
 		if ( empty( $base ) ) {
291 291
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 		}
294 294
 
295 295
 		// Use the slug instead of the ID for consistent security
296
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
296
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
297 297
 
298 298
 		$actionurl = add_query_arg( array(
299 299
 			'action'	=> 'delete',
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
             'view_id' => $view_id,
303 303
 		), $base );
304 304
 
305
-		$url = wp_nonce_url( $actionurl, 'delete_'.$entry_slug, 'delete' );
305
+		$url = wp_nonce_url( $actionurl, 'delete_' . $entry_slug, 'delete' );
306 306
 
307 307
 		return $url;
308 308
 	}
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	public function add_delete_button( $form = array(), $entry = array(), $view_id = null, $post_id = null ) {
325 325
 
326 326
 		// Only show the link to those who are allowed to see it.
327
-		if( !self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
327
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
328 328
 			return;
329 329
 		}
330 330
 
@@ -335,13 +335,13 @@  discard block
 block discarded – undo
335 335
 		$show_delete_button = apply_filters( 'gravityview/delete-entry/show-delete-button', true );
336 336
 
337 337
 		// If the button is hidden by the filter, don't show.
338
-		if( !$show_delete_button ) {
338
+		if ( ! $show_delete_button ) {
339 339
 			return;
340 340
 		}
341 341
 
342 342
 		$attributes = array(
343 343
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
344
-			'tabindex' => ( GFCommon::$tab_index ++ ),
344
+			'tabindex' => ( GFCommon::$tab_index++ ),
345 345
 			'onclick' => self::get_confirm_dialog(),
346 346
 		);
347 347
 
@@ -365,27 +365,27 @@  discard block
 block discarded – undo
365 365
 	function process_delete() {
366 366
 
367 367
 		// If the form is submitted
368
-		if( isset( $_GET['action'] ) && 'delete' === $_GET['action'] && isset( $_GET['entry_id'] ) ) {
368
+		if ( isset( $_GET[ 'action' ] ) && 'delete' === $_GET[ 'action' ] && isset( $_GET[ 'entry_id' ] ) ) {
369 369
 
370 370
 			// Make sure it's a GravityView request
371
-			$valid_nonce_key = wp_verify_nonce( $_GET['delete'], self::get_nonce_key( $_GET['entry_id'] ) );
371
+			$valid_nonce_key = wp_verify_nonce( $_GET[ 'delete' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
372 372
 
373
-			if( ! $valid_nonce_key ) {
373
+			if ( ! $valid_nonce_key ) {
374 374
 				gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
375 375
 				return;
376 376
 			}
377 377
 
378 378
 			// Get the entry slug
379
-			$entry_slug = esc_attr( $_GET['entry_id'] );
379
+			$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
380 380
 
381 381
 			// See if there's an entry there
382 382
 			$entry = gravityview_get_entry( $entry_slug, true, false );
383 383
 
384
-			if( $entry ) {
384
+			if ( $entry ) {
385 385
 
386 386
 				$has_permission = $this->user_can_delete_entry( $entry );
387 387
 
388
-				if( is_wp_error( $has_permission ) ) {
388
+				if ( is_wp_error( $has_permission ) ) {
389 389
 
390 390
 					$messages = array(
391 391
 						'message' => urlencode( $has_permission->get_error_message() ),
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 					// Delete the entry
398 398
 					$delete_response = $this->delete_or_trash_entry( $entry );
399 399
 
400
-					if( is_wp_error( $delete_response ) ) {
400
+					if ( is_wp_error( $delete_response ) ) {
401 401
 
402 402
 						$messages = array(
403 403
 							'message' => urlencode( $delete_response->get_error_message() ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 				gravityview()->log->debug( 'Delete entry failed: there was no entry with the entry slug {entry_slug}', array( 'entry_slug' => $entry_slug ) );
420 420
 
421 421
 				$messages = array(
422
-					'message' => urlencode( __('The entry does not exist.', 'gravityview') ),
422
+					'message' => urlencode( __( 'The entry does not exist.', 'gravityview' ) ),
423 423
 					'status' => 'error',
424 424
 				);
425 425
 			}
@@ -459,18 +459,18 @@  discard block
 block discarded – undo
459 459
 	 */
460 460
 	private function delete_or_trash_entry( $entry ) {
461 461
 
462
-		$entry_id = $entry['id'];
462
+		$entry_id = $entry[ 'id' ];
463 463
 		
464 464
 		$mode = $this->get_delete_mode();
465 465
 
466
-		if( 'delete' === $mode ) {
466
+		if ( 'delete' === $mode ) {
467 467
 
468 468
 			gravityview()->log->debug( 'Starting delete entry: {entry_id}', array( 'entry_id' => $entry_id ) );
469 469
 
470 470
 			// Delete the entry
471 471
 			$delete_response = GFAPI::delete_entry( $entry_id );
472 472
 
473
-			if( ! is_wp_error( $delete_response ) ) {
473
+			if ( ! is_wp_error( $delete_response ) ) {
474 474
 				$delete_response = 'deleted';
475 475
 
476 476
 				/**
@@ -491,8 +491,8 @@  discard block
 block discarded – undo
491 491
 			$trashed = GFAPI::update_entry_property( $entry_id, 'status', 'trash' );
492 492
 			new GravityView_Cache;
493 493
 
494
-			if( ! $trashed ) {
495
-				$delete_response = new WP_Error( 'trash_entry_failed', __('Moving the entry to the trash failed.', 'gravityview' ) );
494
+			if ( ! $trashed ) {
495
+				$delete_response = new WP_Error( 'trash_entry_failed', __( 'Moving the entry to the trash failed.', 'gravityview' ) );
496 496
 			} else {
497 497
 
498 498
 				/**
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
524 524
 
525 525
 		// The entry had no connected post
526
-		if( empty( $entry['post_id'] ) ) {
526
+		if ( empty( $entry[ 'post_id' ] ) ) {
527 527
 			return;
528 528
 		}
529 529
 
@@ -534,19 +534,19 @@  discard block
 block discarded – undo
534 534
 		 */
535 535
 		$delete_post = apply_filters( 'gravityview/delete-entry/delete-connected-post', true );
536 536
 		
537
-		if( false === $delete_post ) {
537
+		if ( false === $delete_post ) {
538 538
 			return;
539 539
 		}
540 540
 
541 541
 		$action = current_action();
542 542
 
543
-		if( 'gravityview/delete-entry/deleted' === $action ) {
544
-			$result = wp_delete_post( $entry['post_id'], true );
543
+		if ( 'gravityview/delete-entry/deleted' === $action ) {
544
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
545 545
 		} else {
546
-			$result = wp_trash_post( $entry['post_id'] );
546
+			$result = wp_trash_post( $entry[ 'post_id' ] );
547 547
 		}
548 548
 
549
-		if( false === $result ) {
549
+		if ( false === $result ) {
550 550
 			gravityview()->log->error( '(called by {action}): Error processing the Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
551 551
 		} else {
552 552
 			gravityview()->log->debug( '(called by {action}): Successfully processed Post connected to the entry.', array( 'action' => $action, 'data' => $entry ) );
@@ -562,13 +562,13 @@  discard block
 block discarded – undo
562 562
 	public function verify_nonce() {
563 563
 
564 564
 		// No delete entry request was made
565
-		if( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
565
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
566 566
 			return false;
567 567
 		}
568 568
 
569
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
569
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
570 570
 
571
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
571
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
572 572
 
573 573
 		/**
574 574
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 */
591 591
 	public static function get_confirm_dialog() {
592 592
 
593
-		$confirm = __('Are you sure you want to delete this entry? This cannot be undone.', 'gravityview');
593
+		$confirm = __( 'Are you sure you want to delete this entry? This cannot be undone.', 'gravityview' );
594 594
 
595 595
 		/**
596 596
 		 * @filter `gravityview/delete-entry/confirm-text` Modify the Delete Entry Javascript confirmation text
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		 */
599 599
 		$confirm = apply_filters( 'gravityview/delete-entry/confirm-text', $confirm );
600 600
 
601
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
601
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
602 602
 	}
603 603
 
604 604
 	/**
@@ -616,16 +616,16 @@  discard block
 block discarded – undo
616 616
 
617 617
 		$error = NULL;
618 618
 
619
-		if( ! $this->verify_nonce() ) {
620
-			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview');
619
+		if ( ! $this->verify_nonce() ) {
620
+			$error = __( 'The link to delete this entry is not valid; it may have expired.', 'gravityview' );
621 621
 		}
622 622
 
623
-		if( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
-			$error = __( 'You do not have permission to delete this entry.', 'gravityview');
623
+		if ( ! self::check_user_cap_delete_entry( $entry, array(), $view_id ) ) {
624
+			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
625 625
 		}
626 626
 
627
-		if( $entry['status'] === 'trash' ) {
628
-			if( 'trash' === $this->get_delete_mode() ) {
627
+		if ( $entry[ 'status' ] === 'trash' ) {
628
+			if ( 'trash' === $this->get_delete_mode() ) {
629 629
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
630 630
 			} else {
631 631
 				$error = __( 'You cannot delete the entry; it is already in the trash.', 'gravityview' );
@@ -633,7 +633,7 @@  discard block
 block discarded – undo
633 633
 		}
634 634
 
635 635
 		// No errors; everything's fine here!
636
-		if( empty( $error ) ) {
636
+		if ( empty( $error ) ) {
637 637
 			return true;
638 638
 		}
639 639
 
@@ -661,17 +661,17 @@  discard block
 block discarded – undo
661 661
 			$view = \GV\View::by_id( $view_id );
662 662
 		} else {
663 663
 			if ( ! $view instanceof \GV\View ) {
664
-				$view = \GV\View::by_id ( $view );
664
+				$view = \GV\View::by_id( $view );
665 665
 			}
666 666
 			$view_id = $view->ID;
667 667
 		}
668 668
 
669 669
 		$current_user = wp_get_current_user();
670 670
 
671
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
671
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
672 672
 
673 673
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
674
-		if( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
674
+		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
675 675
 
676 676
 			gravityview()->log->debug( 'Current user has `gravityforms_delete_entries` or `gravityview_delete_others_entries` capability.' );
677 677
 
@@ -680,20 +680,20 @@  discard block
 block discarded – undo
680 680
 
681 681
 
682 682
 		// If field options are passed, check if current user can view the link
683
-		if( !empty( $field ) ) {
683
+		if ( ! empty( $field ) ) {
684 684
 
685 685
 			// If capability is not defined, something is not right!
686
-			if( empty( $field['allow_edit_cap'] ) ) {
686
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
687 687
 
688 688
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
689 689
 
690 690
 				return false;
691 691
 			}
692 692
 
693
-			if( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
693
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
694 694
 
695 695
 				// Do not return true if cap is read, as we need to check if the current user created the entry
696
-				if( $field['allow_edit_cap'] !== 'read' ) {
696
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
697 697
 					return true;
698 698
 				}
699 699
 
@@ -706,9 +706,9 @@  discard block
 block discarded – undo
706 706
 
707 707
 		}
708 708
 
709
-		if( !isset( $entry['created_by'] ) ) {
709
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
710 710
 
711
-			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
711
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
712 712
 
713 713
 			return false;
714 714
 		}
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 		}
726 726
 
727 727
 		// If the logged-in user is the same as the user who created the entry, we're good.
728
-		if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
728
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
729 729
 
730 730
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
731 731
 
@@ -750,16 +750,16 @@  discard block
 block discarded – undo
750 750
 	 */
751 751
 	public function display_message( $current_view_id = 0 ) {
752 752
 
753
-		if( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
753
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
754 754
 			return;
755 755
 		}
756 756
 
757 757
 		// Entry wasn't deleted from current View
758
-		if( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
758
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
759 759
 			return;
760 760
 		}
761 761
 
762
-		$status = esc_attr( $_GET['status'] );
762
+		$status = esc_attr( $_GET[ 'status' ] );
763 763
 		$message_from_url = \GV\Utils::_GET( 'message' );
764 764
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
765 765
 		$class = '';
@@ -767,14 +767,14 @@  discard block
 block discarded – undo
767 767
 		switch ( $status ) {
768 768
 			case 'error':
769 769
 				$class = ' gv-error error';
770
-				$error_message = __('There was an error deleting the entry: %s', 'gravityview');
770
+				$error_message = __( 'There was an error deleting the entry: %s', 'gravityview' );
771 771
 				$message = sprintf( $error_message, $message_from_url );
772 772
 				break;
773 773
 			case 'trashed':
774
-				$message = __('The entry was successfully moved to the trash.', 'gravityview');
774
+				$message = __( 'The entry was successfully moved to the trash.', 'gravityview' );
775 775
 				break;
776 776
 			default:
777
-				$message = __('The entry was successfully deleted.', 'gravityview');
777
+				$message = __( 'The entry was successfully deleted.', 'gravityview' );
778 778
 				break;
779 779
 		}
780 780
 
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
 		$message = apply_filters( 'gravityview/delete-entry/message', esc_attr( $message ), $status, $message_from_url );
789 789
 
790 790
 		// DISPLAY ERROR/SUCCESS MESSAGE
791
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
791
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
792 792
 	}
793 793
 
794 794
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -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
 
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
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( 'GFForms', 'delete_file') );
86
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
87 87
 
88 88
         // Make sure this hook is run for non-admins
89
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
89
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
90 90
 
91 91
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
92 92
 
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	private function addon_specific_hooks() {
105 105
 
106
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
107
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
106
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
107
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
108 108
 		}
109 109
 
110 110
 	}
@@ -194,15 +194,15 @@  discard block
 block discarded – undo
194 194
      */
195 195
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
196 196
 
197
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
197
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
198 198
 
199
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
199
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
200 200
 
201 201
         $url = add_query_arg( array(
202 202
             'edit' => wp_create_nonce( $nonce_key )
203 203
         ), $base );
204 204
 
205
-        if( $post_id ) {
205
+        if ( $post_id ) {
206 206
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
207 207
         }
208 208
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	     * Allow passing params to dynamically populate entry with values
211 211
 	     * @since 1.9.2
212 212
 	     */
213
-	    if( !empty( $field_values ) ) {
213
+	    if ( ! empty( $field_values ) ) {
214 214
 
215
-		    if( is_array( $field_values ) ) {
215
+		    if ( is_array( $field_values ) ) {
216 216
 			    // If already an array, no parse_str() needed
217 217
 			    $params = $field_values;
218 218
 		    } else {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
235 235
 
236
-		if( empty( $context ) || $context !== 'edit' ) {
236
+		if ( empty( $context ) || $context !== 'edit' ) {
237 237
 			return $fields;
238 238
 		}
239 239
 
@@ -311,15 +311,15 @@  discard block
 block discarded – undo
311 311
         // If they can edit any entries (as defined in Gravity Forms)
312 312
         // Or if they can edit other people's entries
313 313
         // Then we're good.
314
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
314
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
315 315
 
316 316
             gravityview()->log->debug( 'User has ability to edit all entries.' );
317 317
 
318 318
             $user_can_edit = true;
319 319
 
320
-        } else if( !isset( $entry['created_by'] ) ) {
320
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
321 321
 
322
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
322
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
323 323
 
324 324
             $user_can_edit = false;
325 325
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
             $current_user = wp_get_current_user();
330 330
 
331 331
             // User edit is disabled
332
-            if( empty( $user_edit ) ) {
332
+            if ( empty( $user_edit ) ) {
333 333
 
334 334
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
335 335
 
@@ -337,13 +337,13 @@  discard block
 block discarded – undo
337 337
             }
338 338
 
339 339
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
340
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
340
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
341 341
 
342 342
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
343 343
 
344 344
                 $user_can_edit = true;
345 345
 
346
-            } else if( ! is_user_logged_in() ) {
346
+            } else if ( ! is_user_logged_in() ) {
347 347
 
348 348
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
349 349
             }
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gvlogic.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
 		$value    = $this->get_value( $atts );
59 59
 
60 60
 		if ( false === $operator && is_null( $value ) ) {
61
-			if ( false !== $atts['if'] ) { // Only-if test
62
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
61
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
62
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
63 63
 			} else {
64 64
 				$match = $authed; // Just login test
65 65
 			}
66 66
 		} else { // Regular test
67
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
67
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
68 68
 		}
69 69
 
70 70
 		$output = $this->get_output( $match, $atts, $content );
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @return string The output.
151 151
 	 */
152 152
 	private function get_output( $match, $atts, $content ) {
153
-		if ( ! $match && ! empty( $atts['else'] ) ) {
154
-			return $atts['else']; // Attributized else is easy :)
153
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
154
+			return $atts[ 'else' ]; // Attributized else is easy :)
155 155
 		}
156 156
 
157 157
 		$if = '';
@@ -278,18 +278,18 @@  discard block
 block discarded – undo
278 278
 		$atts = array_intersect_key( $supplied_atts, $atts );
279 279
 
280 280
 		// Strip whitespace if it's not default false
281
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
282
-			$atts['if'] = trim( $atts['if'] );
281
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
282
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
283 283
 		} else {
284
-			$atts['if'] = false;
284
+			$atts[ 'if' ] = false;
285 285
 		}
286 286
 
287
-		if ( isset( $atts['logged_in'] ) ) {
287
+		if ( isset( $atts[ 'logged_in' ] ) ) {
288 288
 			// Truthy
289
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
290
-				$atts['logged_in'] = false;
289
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
290
+				$atts[ 'logged_in' ] = false;
291 291
 			} else {
292
-				$atts['logged_in'] = true;
292
+				$atts[ 'logged_in' ] = true;
293 293
 			}
294 294
 		}
295 295
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $form ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		}
273 273
 
274 274
 		// Set default
275
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
275
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
276 276
 
277 277
 		// Then check for if there is an approval column, and use that value instead
278
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
278
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
279 279
 	}
280 280
 
281 281
 	/**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
291 291
 
292
-		$approved_column = self::get_approved_column( $form['id'] );
292
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
293 293
 
294 294
 		/**
295 295
 		 * If the form doesn't contain the approve field, don't assume anything.
296 296
 		 */
297
-		if( empty( $approved_column ) ) {
297
+		if ( empty( $approved_column ) ) {
298 298
 			return;
299 299
 		}
300 300
 
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		 */
317 317
 		$value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry );
318 318
 
319
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
319
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
320 320
 	}
321 321
 
322 322
 	/**
@@ -334,12 +334,12 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public static function update_bulk( $entries = array(), $approved = 0, $form_id = 0 ) {
336 336
 
337
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
337
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
338 338
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
339 339
 			return NULL;
340 340
 		}
341 341
 
342
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
342
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
343 343
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
344 344
 			return NULL;
345 345
 		}
@@ -354,10 +354,10 @@  discard block
 block discarded – undo
354 354
 		$approved_column_id = self::get_approved_column( $form_id );
355 355
 
356 356
 		$success = true;
357
-		foreach( $entries as $entry_id ) {
357
+		foreach ( $entries as $entry_id ) {
358 358
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
359 359
 
360
-			if( ! $update_success ) {
360
+			if ( ! $update_success ) {
361 361
 				$success = false;
362 362
 			}
363 363
 		}
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
 	 */
382 382
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
383 383
 
384
-		if( !class_exists( 'GFAPI' ) ) {
384
+		if ( ! class_exists( 'GFAPI' ) ) {
385 385
 			gravityview()->log->error( 'GFAPI does not exist' );
386 386
 			return false;
387 387
 		}
388 388
 
389
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
389
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
390 390
 			gravityview()->log->error( 'Not a valid approval value.' );
391 391
 			return false;
392 392
 		}
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		// If the form has an Approve/Reject field, update that value
404 404
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
405 405
 
406
-		if( is_wp_error( $result ) ) {
406
+		if ( is_wp_error( $result ) ) {
407 407
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
408 408
 			return false;
409 409
 		}
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
 		// add note to entry if approval field updating worked or there was no approved field
417 417
 		// There's no validation for the meta
418
-		if( true === $result ) {
418
+		if ( true === $result ) {
419 419
 
420 420
 			// Add an entry note
421 421
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 
469 469
 		$note_id = false;
470 470
 
471
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
471
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
472 472
 
473 473
 			$current_user = wp_get_current_user();
474 474
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 	 */
491 491
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
492 492
 
493
-		if( empty( $approvedcolumn ) ) {
493
+		if ( empty( $approvedcolumn ) ) {
494 494
 			$approvedcolumn = self::get_approved_column( $form_id );
495 495
 		}
496 496
 
@@ -513,12 +513,12 @@  discard block
 block discarded – undo
513 513
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
514 514
 
515 515
 		$new_value = '';
516
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
516
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
517 517
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
518 518
 		}
519 519
 
520 520
 		//update entry
521
-		$entry["{$approvedcolumn}"] = $new_value;
521
+		$entry[ "{$approvedcolumn}" ] = $new_value;
522 522
 
523 523
 		/**
524 524
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -549,12 +549,12 @@  discard block
 block discarded – undo
549 549
 		// If the user has enabled a different value than the label (for some reason), use it.
550 550
 		// This is highly unlikely
551 551
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
552
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
552
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
553 553
 		}
554 554
 
555 555
 		// Otherwise, fall back on the inputs array
556 556
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
557
-			return $field->inputs[0]['label'];
557
+			return $field->inputs[ 0 ][ 'label' ];
558 558
 		}
559 559
 
560 560
 		return null;
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 		 * @since 1.18 Added "unapproved"
607 607
 		 * @param  int $entry_id ID of the Gravity Forms entry
608 608
 		 */
609
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
609
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
610 610
 	}
611 611
 
612 612
 	/**
@@ -619,11 +619,11 @@  discard block
 block discarded – undo
619 619
 	 */
620 620
 	static public function get_approved_column( $form ) {
621 621
 
622
-		if( empty( $form ) ) {
622
+		if ( empty( $form ) ) {
623 623
 			return null;
624 624
 		}
625 625
 
626
-		if( !is_array( $form ) ) {
626
+		if ( ! is_array( $form ) ) {
627 627
 			$form = GVCommon::get_form( $form );
628 628
 		}
629 629
 
@@ -633,22 +633,22 @@  discard block
 block discarded – undo
633 633
 		 * @var string $key
634 634
 		 * @var GF_Field $field
635 635
 		 */
636
-		foreach( $form['fields'] as $key => $field ) {
636
+		foreach ( $form[ 'fields' ] as $key => $field ) {
637 637
 
638 638
 			$inputs = $field->get_entry_inputs();
639 639
 
640
-			if( !empty( $field->gravityview_approved ) ) {
641
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
642
-					$approved_column_id = $inputs[0]['id'];
640
+			if ( ! empty( $field->gravityview_approved ) ) {
641
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
642
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
643 643
 					break;
644 644
 				}
645 645
 			}
646 646
 
647 647
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
648
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
648
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
649 649
 				foreach ( $inputs as $input ) {
650
-					if ( 'approved' === strtolower( $input['label'] ) ) {
651
-						$approved_column_id = $input['id'];
650
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
651
+						$approved_column_id = $input[ 'id' ];
652 652
 						break;
653 653
 					}
654 654
 				}
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 
675 675
 		$view_keys = array_keys( $gv_data->get_views() );
676 676
 
677
-		$view = \GV\View::by_id( $view_keys[0] );
677
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
678 678
 
679 679
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
680 680
 			return;
@@ -699,11 +699,11 @@  discard block
 block discarded – undo
699 699
 			return;
700 700
 		}
701 701
 
702
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
702
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
703 703
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
704 704
 		}
705 705
 
706
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
706
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
707 707
 	}
708 708
 
709 709
 	/**
@@ -741,9 +741,9 @@  discard block
 block discarded – undo
741 741
 		$choices = GravityView_Entry_Approval_Status::get_all();
742 742
 
743 743
 		return <<<TEMPLATE
744
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
745
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
746
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
744
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
745
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
746
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
747 747
 TEMPLATE;
748 748
 	}
749 749
 }
Please login to merge, or discard this patch.
includes/extensions/duplicate-entry/class-duplicate-entry.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -114,13 +114,13 @@  discard block
 block discarded – undo
114 114
 	public function duplicate_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
115 115
 
116 116
 		// Always a link, never a filter, always same window
117
-		unset( $field_options['show_as_link'], $field_options['search_filter'], $field_options['new_window'] );
117
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ], $field_options[ 'new_window' ] );
118 118
 
119 119
 
120 120
 		// Duplicate Entry link should only appear to visitors capable of editing entries
121
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
121
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
122 122
 
123
-		$add_option['duplicate_link'] = array(
123
+		$add_option[ 'duplicate_link' ] = array(
124 124
 			'type' => 'text',
125 125
 			'label' => __( 'Duplicate Link Text', 'gravityview' ),
126 126
 			'desc' => NULL,
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			'merge_tags' => true,
129 129
 		);
130 130
 
131
-		$field_options['allow_duplicate_cap'] = array(
131
+		$field_options[ 'allow_duplicate_cap' ] = array(
132 132
 			'type' => 'select',
133 133
 			'label' => __( 'Allow the following users to duplicate the entry:', 'gravityview' ),
134 134
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
156 156
 
157 157
 		if ( 'edit' !== $zone ) {
158
-			$entry_default_fields['duplicate_link'] = array(
158
+			$entry_default_fields[ 'duplicate_link' ] = array(
159 159
 				'label' => __( 'Duplicate Entry', 'gravityview' ),
160 160
 				'type'  => 'duplicate_link',
161 161
 				'desc'  => __( 'A link to duplicate the entry. Respects the Duplicate Entry permissions.', 'gravityview' ),
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public function add_available_field( $available_fields = array() ) {
178 178
 
179
-		$available_fields['duplicate_link'] = array(
179
+		$available_fields[ 'duplicate_link' ] = array(
180 180
 			'label_text' => __( 'Duplicate Entry', 'gravityview' ),
181 181
 			'field_id' => 'duplicate_link',
182 182
 			'label_type' => 'field',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
 		if ( 'duplicate_link' === $field_id ) {
210 210
 
211 211
 			// Remove other built-in caps.
212
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['duplicate_others_posts'] );
212
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'duplicate_others_posts' ] );
213 213
 
214
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
214
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
215 215
 		}
216 216
 
217 217
 		return $caps;
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	public static function get_duplicate_link( $entry, $view_id, $post_id = null ) {
261 261
 		self::getInstance()->set_entry( $entry );
262 262
 
263
-        $base = GravityView_API::directory_link( $post_id ? : $view_id, true );
263
+        $base = GravityView_API::directory_link( $post_id ?: $view_id, true );
264 264
 
265 265
 		if ( empty( $base ) ) {
266 266
 			gravityview()->log->error( 'Post ID does not exist: {post_id}', array( 'post_id' => $post_id ) );
@@ -269,12 +269,12 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$actionurl = add_query_arg( array(
271 271
 			'action'	=> 'duplicate',
272
-			'entry_id'	=> $entry['id'],
272
+			'entry_id'	=> $entry[ 'id' ],
273 273
 			'gvid' => $view_id,
274 274
             'view_id' => $view_id,
275 275
 		), $base );
276 276
 
277
-		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry['id'] ) ), $actionurl );
277
+		return add_query_arg( 'duplicate', wp_create_nonce( self::get_nonce_key( $entry[ 'id' ] ) ), $actionurl );
278 278
 	}
279 279
 
280 280
 	/**
@@ -295,12 +295,12 @@  discard block
 block discarded – undo
295 295
 	public function process_duplicate() {
296 296
 
297 297
 		// If the form is submitted
298
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
298
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
299 299
 			return;
300 300
 		}
301 301
 
302 302
 		// Make sure it's a GravityView request
303
-		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET['entry_id'] ) );
303
+		$valid_nonce_key = wp_verify_nonce( \GV\Utils::_GET( 'duplicate' ), self::get_nonce_key( $_GET[ 'entry_id' ] ) );
304 304
 
305 305
 		if ( ! $valid_nonce_key ) {
306 306
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 		}
309 309
 
310 310
 		// Get the entry slug
311
-		$entry_slug = esc_attr( $_GET['entry_id'] );
311
+		$entry_slug = esc_attr( $_GET[ 'entry_id' ] );
312 312
 
313 313
 		// See if there's an entry there
314 314
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -402,15 +402,15 @@  discard block
 block discarded – undo
402 402
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'The entry does not exist.', 'gravityview' ) );
403 403
 		}
404 404
 
405
-		$row['id'] = null;
406
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
407
-		$row['date_updated'] = $row['date_created'];
408
-		$row['is_starred'] = false;
409
-		$row['is_read'] = false;
410
-		$row['ip'] = GFFormsModel::get_ip();
411
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
-		$row['created_by'] = wp_get_current_user()->ID;
405
+		$row[ 'id' ] = null;
406
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
407
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
408
+		$row[ 'is_starred' ] = false;
409
+		$row[ 'is_read' ] = false;
410
+		$row[ 'ip' ] = GFFormsModel::get_ip();
411
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
412
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
413
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
414 414
 
415 415
 		/**
416 416
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -438,15 +438,15 @@  discard block
 block discarded – undo
438 438
 
439 439
 		$save_this_meta = array();
440 440
 		foreach ( $duplicate_meta->get_output() as $m ) {
441
-			$save_this_meta[] = array(
442
-				'meta_key' => $m['meta_key'],
443
-				'meta_value' => $m['meta_value'],
444
-				'item_index' => $m['item_index'],
441
+			$save_this_meta[ ] = array(
442
+				'meta_key' => $m[ 'meta_key' ],
443
+				'meta_value' => $m[ 'meta_value' ],
444
+				'item_index' => $m[ 'item_index' ],
445 445
 			);
446 446
 		}
447 447
 
448 448
 		// Update the row ID for later usage
449
-		$row['id'] = $duplicated_id;
449
+		$row[ 'id' ] = $duplicated_id;
450 450
 
451 451
 		/**
452 452
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
458 458
 
459 459
 		foreach ( $save_this_meta as $data ) {
460
-			$data['form_id'] = $entry['form_id'];
461
-			$data['entry_id'] = $duplicated_id;
460
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
461
+			$data[ 'entry_id' ] = $duplicated_id;
462 462
 
463 463
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
464 464
 				return new WP_Error( 'gravityview-duplicate-entry-db-meta', __( 'There was an error duplicating the entry.', 'gravityview' ) );
@@ -492,13 +492,13 @@  discard block
 block discarded – undo
492 492
 	public function verify_nonce() {
493 493
 
494 494
 		// No duplicate entry request was made
495
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
495
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
496 496
 			return false;
497 497
 		}
498 498
 
499
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
499
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
500 500
 
501
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
501
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
502 502
 
503 503
 		/**
504 504
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 			return '';
535 535
 		}
536 536
 
537
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
537
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
538 538
 	}
539 539
 
540 540
 	/**
@@ -588,7 +588,7 @@  discard block
 block discarded – undo
588 588
 	public static function check_user_cap_duplicate_entry( $entry, $field = array(), $view_id = 0 ) {
589 589
 		$current_user = wp_get_current_user();
590 590
 
591
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
591
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
592 592
 
593 593
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
594 594
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gform_full_access', 'gravityview_full_access' ), $entry_id ) ) {
@@ -603,17 +603,17 @@  discard block
 block discarded – undo
603 603
 		if ( ! empty( $field ) ) {
604 604
 
605 605
 			// If capability is not defined, something is not right!
606
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
606
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
607 607
 
608 608
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
609 609
 
610 610
 				return false;
611 611
 			}
612 612
 
613
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
613
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
614 614
 
615 615
 				// Do not return true if cap is read, as we need to check if the current user created the entry
616
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
616
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
617 617
 					return true;
618 618
 				}
619 619
 
@@ -626,7 +626,7 @@  discard block
 block discarded – undo
626 626
 
627 627
 		}
628 628
 
629
-		if ( ! isset( $entry['created_by'] ) ) {
629
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
630 630
 
631 631
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
632 632
 
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
 		}
652 652
 
653 653
 		// If the logged-in user is the same as the user who created the entry, we're good.
654
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
654
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
655 655
 
656 656
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
657 657
 
@@ -676,16 +676,16 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	public function display_message( $current_view_id = 0 ) {
678 678
 
679
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
679
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
680 680
 			return;
681 681
 		}
682 682
 
683 683
 		// Entry wasn't duplicated from current View
684
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
684
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
685 685
 			return;
686 686
 		}
687 687
 
688
-		$status = esc_attr( $_GET['status'] );
688
+		$status = esc_attr( $_GET[ 'status' ] );
689 689
 		$message_from_url = \GV\Utils::_GET( 'message' );
690 690
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
691 691
 		$class = '';
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
712 712
 
713 713
 		// DISPLAY ERROR/SUCCESS MESSAGE
714
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
714
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
715 715
 	}
716 716
 
717 717
 
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry      = $gravityview_view->getCurrentEntry();
28
-$notes      = (array) GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes      = (array)GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings    = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.