Completed
Pull Request — develop (#1347)
by Zack
20:18 queued 06:28
created
future/includes/class-gv-shortcode-gvlogic.php 3 patches
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -248,6 +248,8 @@
 block discarded – undo
248 248
 
249 249
 	/**
250 250
 	 * Process the attributes passed to the shortcode. Make sure they're valid
251
+	 * @param string $content
252
+	 * @param string $tag
251 253
 	 * @return void
252 254
 	 */
253 255
 	private function parse_atts( $atts, $content, $tag ) {
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
 		$value    = $this->get_value( $atts );
58 58
 
59 59
 		if ( false === $operator && is_null( $value ) ) {
60
-			if ( false !== $atts['if'] ) { // Only-if test
61
-				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
60
+			if ( false !== $atts[ 'if' ] ) { // Only-if test
61
+				$match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) );
62 62
 			} else {
63 63
 				$match = $authed; // Just login test
64 64
 			}
65 65
 		} else { // Regular test
66
-			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
66
+			$match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator );
67 67
 		}
68 68
 
69 69
 		// Output and get recursive!
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 * @return bool Yes, or no.
82 82
 	 */
83 83
 	private function authorized( $atts ) {
84
-		if ( is_null( $needs_login  = \GV\Utils::get( $atts, 'logged_in', null ) ) ) {
84
+		if ( is_null( $needs_login = \GV\Utils::get( $atts, 'logged_in', null ) ) ) {
85 85
 			return true; // No auth requirements have been set
86 86
 		}
87 87
 		return ! $needs_login ^ is_user_logged_in(); // XNOR
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
 	 * @return string The output.
144 144
 	 */
145 145
 	private function get_output( $match, $atts, $content ) {
146
-		if ( ! $match && ! empty( $atts['else'] ) ) {
147
-			return $atts['else']; // Attributized else is easy :)
146
+		if ( ! $match && ! empty( $atts[ 'else' ] ) ) {
147
+			return $atts[ 'else' ]; // Attributized else is easy :)
148 148
 		}
149 149
 
150 150
 		$if = '';
@@ -267,18 +267,18 @@  discard block
 block discarded – undo
267 267
 		$atts = array_intersect_key( $supplied_atts, $atts );
268 268
 
269 269
 		// Strip whitespace if it's not default false
270
-		if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) {
271
-			$atts['if'] = trim( $atts['if'] );
270
+		if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) {
271
+			$atts[ 'if' ] = trim( $atts[ 'if' ] );
272 272
 		} else {
273
-			$atts['if'] = false;
273
+			$atts[ 'if' ] = false;
274 274
 		}
275 275
 
276
-		if ( isset( $atts['logged_in'] ) ) {
276
+		if ( isset( $atts[ 'logged_in' ] ) ) {
277 277
 			// Truthy
278
-			if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) {
279
-				$atts['logged_in'] = false;
278
+			if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) {
279
+				$atts[ 'logged_in' ] = false;
280 280
 			} else {
281
-				$atts['logged_in'] = true;
281
+				$atts[ 'logged_in' ] = true;
282 282
 			}
283 283
 		}
284 284
 
Please login to merge, or discard this patch.
Braces   +18 added lines, -9 removed lines patch added patch discarded remove patch
@@ -57,12 +57,14 @@  discard block
 block discarded – undo
57 57
 		$value    = $this->get_value( $atts );
58 58
 
59 59
 		if ( false === $operator && is_null( $value ) ) {
60
-			if ( false !== $atts['if'] ) { // Only-if test
60
+			if ( false !== $atts['if'] ) {
61
+// Only-if test
61 62
 				$match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) );
62 63
 			} else {
63 64
 				$match = $authed; // Just login test
64 65
 			}
65
-		} else { // Regular test
66
+		} else {
67
+// Regular test
66 68
 			$match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator );
67 69
 		}
68 70
 
@@ -153,11 +155,14 @@  discard block
 block discarded – undo
153 155
 		$opens = 0; // inner opens
154 156
 		$found = false; // found split position
155 157
 
156
-		while ( $content ) { // scan
158
+		while ( $content ) {
159
+// scan
157 160
 			if ( ! preg_match( '#(.*?)(\[\/?(gvlogic|else).*?])(.*)#', $content, $matches ) ) {
158
-				if ( ! $found ) { // We're still iffing.
161
+				if ( ! $found ) {
162
+// We're still iffing.
159 163
 					$if .= $content;
160
-				} else { // We are elsing
164
+				} else {
165
+// We are elsing
161 166
 					$else .= $content;
162 167
 				}
163 168
 				break; // No more shortcodes
@@ -165,9 +170,11 @@  discard block
 block discarded – undo
165 170
 
166 171
 			list( $_, $before_shortcode, $shortcode, $_, $after_shortcode ) = $matches;
167 172
 
168
-			if ( ! $found ) { // We're still iffing.
173
+			if ( ! $found ) {
174
+// We're still iffing.
169 175
 				$if .= $before_shortcode;
170
-			} else { // We are elsing
176
+			} else {
177
+// We are elsing
171 178
 				$else .= $before_shortcode;
172 179
 			}
173 180
 
@@ -191,9 +198,11 @@  discard block
 block discarded – undo
191 198
 				}
192 199
 
193 200
 				// Tack on the shortcode
194
-				if ( ! $found ) { // We're still iffing.
201
+				if ( ! $found ) {
202
+// We're still iffing.
195 203
 					$if .= $shortcode;
196
-				} else { // We are elsing
204
+				} else {
205
+// We are elsing
197 206
 					$else .= $shortcode;
198 207
 				}
199 208
 			}
Please login to merge, or discard this patch.
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		return self::$instance;
18 18
 	}
19 19
 
20
-	public function shortcode( $atts, $content = '', $tag = '') {
20
+	public function shortcode( $atts, $content = '', $tag = '' ) {
21 21
 		$shortcode = new \GV\Shortcodes\gvlogic();
22 22
 		return $shortcode->callback( $atts, $content, $tag );
23 23
 	}
Please login to merge, or discard this patch.
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.
includes/extensions/duplicate-entry/class-duplicate-entry.php 3 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @param array $file_paths List of template paths ordered
89 89
 	 *
90
-	 * @return array File paths, with duplicate field path added at index 117
90
+	 * @return string[] File paths, with duplicate field path added at index 117
91 91
 	 */
92 92
 	public function add_template_path( $file_paths ) {
93 93
 
@@ -193,7 +193,6 @@  discard block
 block discarded – undo
193 193
 	 * @since 2.5
194 194
 	 *
195 195
 	 * @param  array 	    $visibility_caps        Array of capabilities to display in field dropdown.
196
-	 * @param  string       $field_type  Type of field options to render (`field` or `widget`)
197 196
 	 * @param  string       $template_id Table slug
198 197
 	 * @param  float|string $field_id    GF Field ID - Example: `3`, `5.2`, `entry_link`, `created_by`
199 198
 	 * @param  string       $context     What context are we in? Example: `single` or `directory`
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -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 ) );
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			'action'	=> 'duplicate',
275 275
 			'entry_id'	=> $entry_slug,
276 276
 			'gvid' => $view_id,
277
-            'view_id' => $view_id,
277
+			'view_id' => $view_id,
278 278
 		), $base );
279 279
 
280 280
 		$url = wp_nonce_url( $actionurl, 'duplicate_'.$entry_slug, 'duplicate' );
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		 * @since 2.5
470 470
 		 * @param  array $duplicated_entry The duplicated entry
471 471
 		 * @param  array $entry The original entry
472
-		*/
472
+		 */
473 473
 		do_action( 'gravityview/duplicate-entry/duplicated', $duplicated_entry, $entry );
474 474
 
475 475
 		gravityview()->log->debug( 'Duplicate response: {duplicate_response}', array( 'duplicate_response' => $duplicate_response ) );
Please login to merge, or discard this patch.
Spacing   +45 added lines, -45 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
117
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
117
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
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 ) );
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 		}
269 269
 
270 270
 		// Use the slug instead of the ID for consistent security
271
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
271
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
272 272
 
273 273
 		$actionurl = add_query_arg( array(
274 274
 			'action'	=> 'duplicate',
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
             'view_id' => $view_id,
278 278
 		), $base );
279 279
 
280
-		$url = wp_nonce_url( $actionurl, 'duplicate_'.$entry_slug, 'duplicate' );
280
+		$url = wp_nonce_url( $actionurl, 'duplicate_' . $entry_slug, 'duplicate' );
281 281
 
282 282
 		return $url;
283 283
 	}
@@ -300,12 +300,12 @@  discard block
 block discarded – undo
300 300
 	public function process_duplicate() {
301 301
 
302 302
 		// If the form is submitted
303
-		if ( ! isset( $_GET['action'] ) || 'duplicate' !== $_GET['action'] || ! isset( $_GET['entry_id'] ) ) {
303
+		if ( ! isset( $_GET[ 'action' ] ) || 'duplicate' !== $_GET[ 'action' ] || ! isset( $_GET[ 'entry_id' ] ) ) {
304 304
 			return;
305 305
 		}
306 306
 
307 307
 		// Make sure it's a GravityView request
308
-		$valid_nonce_key = wp_verify_nonce( $_GET['duplicate'], self::get_nonce_key( $_GET['entry_id'] ) );
308
+		$valid_nonce_key = wp_verify_nonce( $_GET[ 'duplicate' ], self::get_nonce_key( $_GET[ 'entry_id' ] ) );
309 309
 
310 310
 		if ( ! $valid_nonce_key ) {
311 311
 			gravityview()->log->debug( 'Duplicate entry not processed: nonce validation failed.' );
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		}
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 319
 		$entry = gravityview_get_entry( $entry_slug, true, false );
@@ -397,15 +397,15 @@  discard block
 block discarded – undo
397 397
 			return new WP_Error( 'gravityview-duplicate-entry-missing', __( 'No such entry ID', 'gravityview' ) );
398 398
 		}
399 399
 
400
-		$row['id'] = null;
401
-		$row['date_created'] = date( 'Y-m-d H:i:s', time() );
402
-		$row['date_updated'] = $row['date_created'];
403
-		$row['is_starred'] = false;
404
-		$row['is_read'] = false;
405
-		$row['ip'] = GFFormsModel::get_ip();
406
-		$row['source_url'] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
407
-		$row['user_agent'] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
408
-		$row['created_by'] = wp_get_current_user()->ID;
400
+		$row[ 'id' ] = null;
401
+		$row[ 'date_created' ] = date( 'Y-m-d H:i:s', time() );
402
+		$row[ 'date_updated' ] = $row[ 'date_created' ];
403
+		$row[ 'is_starred' ] = false;
404
+		$row[ 'is_read' ] = false;
405
+		$row[ 'ip' ] = GFFormsModel::get_ip();
406
+		$row[ 'source_url' ] = esc_url_raw( remove_query_arg( array( 'action', 'gvid' ) ) );
407
+		$row[ 'user_agent' ] = \GV\Utils::_SERVER( 'HTTP_USER_AGENT' );
408
+		$row[ 'created_by' ] = wp_get_current_user()->ID;
409 409
 
410 410
 		/**
411 411
 		 * @filter `gravityview/entry/duplicate/details` Modify the new entry details before it's created.
@@ -433,15 +433,15 @@  discard block
 block discarded – undo
433 433
 
434 434
 		$save_this_meta = array();
435 435
 		foreach ( $duplicate_meta->get_output() as $m ) {
436
-			$save_this_meta[] = array(
437
-				'meta_key' => $m['meta_key'],
438
-				'meta_value' => $m['meta_value'],
439
-				'item_index' => $m['item_index'],
436
+			$save_this_meta[ ] = array(
437
+				'meta_key' => $m[ 'meta_key' ],
438
+				'meta_value' => $m[ 'meta_value' ],
439
+				'item_index' => $m[ 'item_index' ],
440 440
 			);
441 441
 		}
442 442
 
443 443
 		// Update the row ID for later usage
444
-		$row['id'] = $duplicated_id;
444
+		$row[ 'id' ] = $duplicated_id;
445 445
 
446 446
 		/**
447 447
 		 * @filter `gravityview/entry/duplicate/meta` Modify the new entry meta details.
@@ -452,8 +452,8 @@  discard block
 block discarded – undo
452 452
 		$save_this_meta = apply_filters( 'gravityview/entry/duplicate/meta', $save_this_meta, $row, $entry );
453 453
 
454 454
 		foreach ( $save_this_meta as $data ) {
455
-			$data['form_id'] = $entry['form_id'];
456
-			$data['entry_id'] = $duplicated_id;
455
+			$data[ 'form_id' ] = $entry[ 'form_id' ];
456
+			$data[ 'entry_id' ] = $duplicated_id;
457 457
 
458 458
 			if ( ! $wpdb->insert( $entry_meta_table, $data ) ) {
459 459
 				return new WP_Error( 'gravityview-duplicate-entry-db', __( 'Database error', 'gravityview' ) );
@@ -487,13 +487,13 @@  discard block
 block discarded – undo
487 487
 	public function verify_nonce() {
488 488
 
489 489
 		// No duplicate entry request was made
490
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['duplicate'] ) ) {
490
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'duplicate' ] ) ) {
491 491
 			return false;
492 492
 		}
493 493
 
494
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
494
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
495 495
 
496
-		$valid = wp_verify_nonce( $_GET['duplicate'], $nonce_key );
496
+		$valid = wp_verify_nonce( $_GET[ 'duplicate' ], $nonce_key );
497 497
 
498 498
 		/**
499 499
 		 * @filter `gravityview/duplicate-entry/verify_nonce` Override Duplicate Entry nonce validation. Return true to declare nonce valid.
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		 */
525 525
 		$confirm = apply_filters( 'gravityview/duplicate-entry/confirm-text', $confirm );
526 526
 
527
-		return 'return window.confirm(\''. esc_js( $confirm ) .'\');';
527
+		return 'return window.confirm(\'' . esc_js( $confirm ) . '\');';
528 528
 	}
529 529
 
530 530
 	/**
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 	public static function check_user_cap_duplicate_entry( $entry, $field, $view_id ) {
579 579
 		$current_user = wp_get_current_user();
580 580
 
581
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : NULL;
581
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : NULL;
582 582
 
583 583
 		// Or if they can duplicate any entries (as defined in Gravity Forms), we're good.
584 584
 		if ( GVCommon::has_cap( array( 'gravityforms_edit_entries' ), $entry_id ) ) {
@@ -593,17 +593,17 @@  discard block
 block discarded – undo
593 593
 		if ( ! empty( $field ) ) {
594 594
 
595 595
 			// If capability is not defined, something is not right!
596
-			if ( empty( $field['allow_duplicate_cap'] ) ) {
596
+			if ( empty( $field[ 'allow_duplicate_cap' ] ) ) {
597 597
 
598 598
 				gravityview()->log->error( 'Cannot read duplicate entry field caps', array( 'data' => $field ) );
599 599
 
600 600
 				return false;
601 601
 			}
602 602
 
603
-			if ( GVCommon::has_cap( $field['allow_duplicate_cap'] ) ) {
603
+			if ( GVCommon::has_cap( $field[ 'allow_duplicate_cap' ] ) ) {
604 604
 
605 605
 				// Do not return true if cap is read, as we need to check if the current user created the entry
606
-				if ( 'read' !== $field['allow_duplicate_cap'] ) {
606
+				if ( 'read' !== $field[ 'allow_duplicate_cap' ] ) {
607 607
 					return true;
608 608
 				}
609 609
 
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
 
617 617
 		}
618 618
 
619
-		if ( ! isset( $entry['created_by'] ) ) {
619
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
620 620
 
621 621
 			gravityview()->log->error( 'Cannot duplicate entry; entry `created_by` doesn\'t exist.' );
622 622
 
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 
629 629
 			$current_view = gravityview_get_current_view_data( $view_id );
630 630
 
631
-			$user_duplicate = isset( $current_view['atts']['user_duplicate'] ) ? $current_view['atts']['user_duplicate'] : false;
631
+			$user_duplicate = isset( $current_view[ 'atts' ][ 'user_duplicate' ] ) ? $current_view[ 'atts' ][ 'user_duplicate' ] : false;
632 632
 
633 633
 			if ( empty( $user_duplicate ) ) {
634 634
 
@@ -639,7 +639,7 @@  discard block
 block discarded – undo
639 639
 		}
640 640
 
641 641
 		// If the logged-in user is the same as the user who created the entry, we're good.
642
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
642
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
643 643
 
644 644
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
645 645
 
@@ -664,16 +664,16 @@  discard block
 block discarded – undo
664 664
 	 */
665 665
 	public function display_message( $current_view_id = 0 ) {
666 666
 
667
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
667
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
668 668
 			return;
669 669
 		}
670 670
 
671 671
 		// Entry wasn't duplicateded from current View
672
-		if ( isset( $_GET['view_id'] ) && ( intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) ) {
672
+		if ( isset( $_GET[ 'view_id' ] ) && ( intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) ) {
673 673
 			return;
674 674
 		}
675 675
 
676
-		$status = esc_attr( $_GET['status'] );
676
+		$status = esc_attr( $_GET[ 'status' ] );
677 677
 		$message_from_url = \GV\Utils::_GET( 'message' );
678 678
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
679 679
 		$class = '';
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		$message = apply_filters( 'gravityview/duplicate-entry/message', esc_attr( $message ), $status, $message_from_url );
700 700
 
701 701
 		// DISPLAY ERROR/SUCCESS MESSAGE
702
-		echo '<div class="gv-notice' . esc_attr( $class ) .'">'. $message .'</div>';
702
+		echo '<div class="gv-notice' . esc_attr( $class ) . '">' . $message . '</div>';
703 703
 	}
704 704
 
705 705
 
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' ),
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 		}
121 121
 
122 122
 		foreach ( $feeds as $feed ) {
123
-			if ( isset( $subscription_addons[ $feed['addon_slug'] ] ) && \GV\Utils::get( $feed, 'meta/transactionType' ) == 'subscription' ) {
124
-				if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
125
-					$entry_default_fields["{$this->name}"] = array(
123
+			if ( isset( $subscription_addons[ $feed[ 'addon_slug' ] ] ) && \GV\Utils::get( $feed, 'meta/transactionType' ) == 'subscription' ) {
124
+				if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
125
+					$entry_default_fields[ "{$this->name}" ] = array(
126 126
 						'label' => $this->label,
127 127
 						'desc'  => $this->description,
128 128
 						'type'  => $this->name,
@@ -153,10 +153,10 @@  discard block
 block discarded – undo
153 153
 			return $output;
154 154
 		}
155 155
 
156
-		$can_current_user_edit = is_numeric( $entry['created_by'] ) && ( wp_get_current_user()->ID === intval( $entry['created_by'] ) );
156
+		$can_current_user_edit = is_numeric( $entry[ 'created_by' ] ) && ( wp_get_current_user()->ID === intval( $entry[ 'created_by' ] ) );
157 157
 
158 158
 		if ( ! $can_current_user_edit ) {
159
-			if ( empty( $field_settings['unsub_all'] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry['id'] ) ) {
159
+			if ( empty( $field_settings[ 'unsub_all' ] ) || ! \GVCommon::has_cap( 'gravityforms_edit_entries', $entry[ 'id' ] ) ) {
160 160
 				return $output;
161 161
 			}
162 162
 		}
@@ -169,21 +169,21 @@  discard block
 block discarded – undo
169 169
 		// @todo Also make sure we check caps if moved from here
170 170
 		// @todo Also make sure test_GravityView_Field_Unsubscribe_unsubscribe_permissions is rewritten
171 171
 		if ( $entry = $this->maybe_unsubscribe( $entry ) ) {
172
-			if ( $entry['payment_status'] !== $status ) {
172
+			if ( $entry[ 'payment_status' ] !== $status ) {
173 173
 				// @todo Probably __( 'Unsubscribed', 'gravityview' );
174
-				return $entry['payment_status'];
174
+				return $entry[ 'payment_status' ];
175 175
 			}
176 176
 		}
177 177
 
178
-		if ( 'active' !== mb_strtolower( $entry['payment_status'] ) ) {
178
+		if ( 'active' !== mb_strtolower( $entry[ 'payment_status' ] ) ) {
179 179
 			return $output;
180 180
 		}
181 181
 
182 182
 		global $wp;
183 183
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
184 184
 
185
-		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry['id'] ), $current_url );
186
-		$link = add_query_arg( 'uid', $entry['id'], $link );
185
+		$link = add_query_arg( 'unsubscribe', wp_create_nonce( 'unsubscribe_' . $entry[ 'id' ] ), $current_url );
186
+		$link = add_query_arg( 'uid', $entry[ 'id' ], $link );
187 187
 
188 188
 		return sprintf( '<a href="%s">%s</a>', esc_url( $link ), esc_html__( 'Unsubscribe', 'gravityview' ) );
189 189
 	}
@@ -202,11 +202,11 @@  discard block
 block discarded – undo
202 202
 	 * @return \GV\Entry $entry The entry
203 203
 	 */
204 204
 	private function maybe_unsubscribe( $entry ) {
205
-		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry['id'] ) ) {
205
+		if ( ! wp_verify_nonce( \GV\Utils::_REQUEST( 'unsubscribe' ), 'unsubscribe_' . $entry[ 'id' ] ) ) {
206 206
 			return $entry;
207 207
 		}
208 208
 
209
-		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry['id'] ) ) ) {
209
+		if ( ( ! $uid = \GV\Utils::_REQUEST( 'uid' ) ) || ! is_numeric( $uid ) || ( intval( $uid ) !== intval( $entry[ 'id' ] ) ) ) {
210 210
 			return $entry;
211 211
 		}
212 212
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 				if ( ( $feed = $subscription_addons[ $slug ]->get_feed( $feed_id ) ) && \GV\Utils::get( $feed, 'meta/transactionType' ) === 'subscription' ) {
235 235
 					if ( $subscription_addons[ $slug ]->cancel( $entry, $feed ) ) {
236 236
 						$subscription_addons[ $slug ]->cancel_subscription( $entry, $feed );
237
-						return \GFAPI::get_entry( $entry['id'] );
237
+						return \GFAPI::get_entry( $entry[ 'id' ] );
238 238
 					}
239 239
 				}
240 240
 			}
Please login to merge, or discard this patch.