Completed
Push — develop ( 111a2d...633ac4 )
by Zack
17:31 queued 07:57
created
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				'meta' => array(
104 104
 					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), $entry->get_slug() ),
105 105
 				),
106
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
106
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&screen_mode=edit&view=entry&id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
107 107
 			) );
108 108
 
109 109
 		}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		/** @var WP_Admin_Bar $wp_admin_bar */
120 120
 		global $wp_admin_bar;
121 121
 
122
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
122
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
123 123
 
124 124
 			$view_data = GravityView_View_Data::getInstance();
125 125
 			$views = $view_data->get_views();
@@ -131,21 +131,21 @@  discard block
 block discarded – undo
131 131
 				$added_views = array();
132 132
 
133 133
 				foreach ( $views as $view ) {
134
-					$view = \GV\View::by_id( $view['id'] );
134
+					$view = \GV\View::by_id( $view[ 'id' ] );
135 135
 					$view_id = $view->ID;
136 136
 					$form_id = $view->form ? $view->form->ID : null;
137 137
 
138 138
 					$edit_view_title = __( 'Edit View', 'gravityview' );
139 139
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
140 140
 
141
-					if( sizeof( $views ) > 1 ) {
141
+					if ( sizeof( $views ) > 1 ) {
142 142
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
143 143
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
144 144
 					}
145 145
 
146
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
146
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
147 147
 
148
-						$added_views[] = $view_id;
148
+						$added_views[ ] = $view_id;
149 149
 
150 150
 						$wp_admin_bar->add_menu( array(
151 151
 							'id'    => 'edit-view-' . $view_id,
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 						) );
156 156
 					}
157 157
 
158
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
158
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
159 159
 
160
-						$added_forms[] = $form_id;
160
+						$added_forms[ ] = $form_id;
161 161
 
162 162
 						$wp_admin_bar->add_menu( array(
163 163
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
 				$view_collection = View_Collection::from_post( $post );
128 128
 
129
-				if( 1 < $view_collection->count() ) {
130
-					$args['gvid'] = $view_id;
129
+				if ( 1 < $view_collection->count() ) {
130
+					$args[ 'gvid' ] = $view_id;
131 131
 				}
132 132
 			}
133 133
 		}
@@ -157,21 +157,21 @@  discard block
 block discarded – undo
157 157
 			 */
158 158
 			$link_parts = explode( '?', $permalink );
159 159
 
160
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
160
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
161 161
 
162
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
162
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
163 163
 		} else {
164 164
 			$args[ $entry_endpoint_name ] = $entry_slug;
165 165
 		}
166 166
 
167 167
 		if ( $track_directory ) {
168
-			if ( ! empty( $_GET['pagenum'] ) ) {
169
-				$args['pagenum'] = intval( $_GET['pagenum'] );
168
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
169
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
170 170
 			}
171 171
 
172 172
 			if ( $sort = Utils::_GET( 'sort' ) ) {
173
-				$args['sort'] = $sort;
174
-				$args['dir'] = Utils::_GET( 'dir' );
173
+				$args[ 'sort' ] = $sort;
174
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
175 175
 			}
176 176
 		}
177 177
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 		$entry_slug = \GravityView_API::get_entry_slug( $this->ID, $this->as_entry() );
211 211
 
212
-		if( ! $apply_filter ) {
212
+		if ( ! $apply_filter ) {
213 213
 			return $entry_slug;
214 214
 		}
215 215
 
Please login to merge, or discard this patch.
future/includes/class-gv-entry-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -106,14 +106,14 @@  discard block
 block discarded – undo
106 106
 	 * @return \GV\GF_Entry|null An instance of this entry or null if not found.
107 107
 	 */
108 108
 	public static function from_entry( $entry ) {
109
-		if ( empty( $entry['id'] ) ) {
109
+		if ( empty( $entry[ 'id' ] ) ) {
110 110
 			return null;
111 111
 		}
112 112
 
113 113
 		$self = new self();
114 114
 		$self->entry = $entry;
115 115
 
116
-		$self->ID = $self->entry['id'];
116
+		$self->ID = $self->entry[ 'id' ];
117 117
 		$self->slug = $self->get_slug();
118 118
 
119 119
 		return $self;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return bool Whether the offset exists or not.
129 129
 	 */
130 130
 	public function offsetExists( $offset ) {
131
-		return isset( $this->entry[$offset] );
131
+		return isset( $this->entry[ $offset ] );
132 132
 	}
133 133
 
134 134
 	/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @return mixed The value of the requested entry data.
144 144
 	 */
145 145
 	public function offsetGet( $offset ) {
146
-		return $this->entry[$offset];
146
+		return $this->entry[ $offset ];
147 147
 	}
148 148
 
149 149
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-form-gravityforms.php 3 patches
Doc Comments   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -84,6 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * Return the query class for this View.
86 86
 	 *
87
+	 * @param View $view
87 88
 	 * @return string The class name.
88 89
 	 */
89 90
 	public function get_query_class( $view ) {
@@ -575,10 +576,8 @@  discard block
 block discarded – undo
575 576
 	/**
576 577
 	 * Get a \GV\Field by Form and Field ID for this data source.
577 578
 	 *
578
-	 * @param \GV\GF_Form $form The Gravity Form form ID.
579
-	 * @param int $field_id The Gravity Form field ID for the $form_id.
580 579
 	 *
581
-	 * @return \GV\Field|null The requested field or null if not found.
580
+	 * @return null|GF_Field The requested field or null if not found.
582 581
 	 */
583 582
 	public static function get_field( /** varargs */ ) {
584 583
 		$args = func_get_args();
Please login to merge, or discard this patch.
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 		$self = new self();
56 56
 		$self->form = $form;
57 57
 
58
-		$self->ID = intval( $self->form['id'] );
58
+		$self->ID = intval( $self->form[ 'id' ] );
59 59
 
60 60
 		return $self;
61 61
 	}
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	 * @return \GV\GF_Form|null An instance of this form or null if not found.
71 71
 	 */
72 72
 	public static function from_form( $form ) {
73
-		if ( empty( $form['id'] ) ) {
73
+		if ( empty( $form[ 'id' ] ) ) {
74 74
 			return null;
75 75
 		}
76 76
 
77 77
 		$self = new self();
78 78
 		$self->form = $form;
79
-		$self->ID = $self->form['id'];
79
+		$self->ID = $self->form[ 'id' ];
80 80
 
81 81
 		return $self;
82 82
 	}
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 
139 139
 				/** The offset and limit */
140 140
 				if ( ! empty( $offset->limit ) ) {
141
-					$paging['page_size'] = $offset->limit;
141
+					$paging[ 'page_size' ] = $offset->limit;
142 142
 				}
143 143
 
144 144
 				if ( ! empty( $offset->offset ) ) {
145
-					$paging['offset'] = $offset->offset;
145
+					$paging[ 'offset' ] = $offset->offset;
146 146
 				}
147 147
 				
148 148
 				$query_class = $form->get_query_class( $view );
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
 					$view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() );
158 158
 					$view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() );
159 159
 
160
-					$has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] );
160
+					$has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] );
161 161
 
162
-					if( $has_sort_query_param ) {
163
-						$has_sort_query_param = array_filter( array_values( $_GET['sort'] ) );
162
+					if ( $has_sort_query_param ) {
163
+						$has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) );
164 164
 					}
165 165
 
166 166
 					if ( $view->settings->get( 'sort_columns' ) && $has_sort_query_param ) {
167
-						$sort_field_ids = array_keys( $_GET['sort'] );
168
-						$sort_directions = array_values( $_GET['sort'] );
167
+						$sort_field_ids = array_keys( $_GET[ 'sort' ] );
168
+						$sort_directions = array_values( $_GET[ 'sort' ] );
169 169
 					} else {
170 170
 						$sort_field_ids = $view_setting_sort_field_ids;
171 171
 						$sort_directions = $view_setting_sort_directions;
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 
174 174
 					$skip_first = false;
175 175
 
176
-					foreach ( (array) $sort_field_ids as $key => $sort_field_id ) {
176
+					foreach ( (array)$sort_field_ids as $key => $sort_field_id ) {
177 177
 
178 178
 						if ( ! $skip_first && ! $has_sort_query_param ) {
179 179
 							$skip_first = true; // Skip the first one, it's already in the query
@@ -203,15 +203,15 @@  discard block
 block discarded – undo
203 203
 
204 204
 					$merged_time = false;
205 205
 
206
-					foreach ( $q['order'] as $oid => $order ) {
207
-						if ( $order[0] instanceof \GF_Query_Column ) {
208
-							$column = $order[0];
209
-						} else if ( $order[0] instanceof \GF_Query_Call ) {
210
-							if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) {
206
+					foreach ( $q[ 'order' ] as $oid => $order ) {
207
+						if ( $order[ 0 ] instanceof \GF_Query_Column ) {
208
+							$column = $order[ 0 ];
209
+						} else if ( $order[ 0 ] instanceof \GF_Query_Call ) {
210
+							if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) {
211 211
 								$orders[ $oid ] = $order;
212 212
 								continue; // Need something that resembles a single sort
213 213
 							}
214
-							$column = $order[0]->columns[0];
214
+							$column = $order[ 0 ]->columns[ 0 ];
215 215
 						}
216 216
 
217 217
 						if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
 						$orders[ $oid ] = array(
227 227
 							new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ),
228
-							$order[1] // Mock it!
228
+							$order[ 1 ] // Mock it!
229 229
 						);
230 230
 
231 231
 						$merged_time = true;
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 						 * ORDER again.
237 237
 						 */
238 238
 						if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) {
239
-							$sql['order'] = 'ORDER BY ' . implode( ', ', $_orders );
239
+							$sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders );
240 240
 						}
241 241
 					}
242 242
 
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 
265 265
 							$query_parameters = $query->_introspect();
266 266
 
267
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
267
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
268 268
 						}
269 269
 
270 270
 						/**
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 						}
299 299
 
300 300
 						$q = $query->_introspect();
301
-						$query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );
301
+						$query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );
302 302
 
303 303
 						if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
304 304
 
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
 
324 324
 							$query_parameters = $query->_introspect();
325 325
 
326
-							$query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );
326
+							$query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );
327 327
 						}
328 328
 					}
329 329
 				/**
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 							$conditions = array();
347 347
 
348 348
 							foreach ( $condition->expressions as $_condition ) {
349
-								$conditions[] = $recurse( $_condition, $fields, $recurse );
349
+								$conditions[ ] = $recurse( $_condition, $fields, $recurse );
350 350
 							}
351 351
 
352 352
 							return call_user_func_array(
@@ -374,10 +374,10 @@  discard block
 block discarded – undo
374 374
 						$q = new $query_class( $form_id );
375 375
 
376 376
 						// Copy the WHERE clauses but substitute the field_ids to the respective ones
377
-						$q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );
377
+						$q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );
378 378
 
379 379
 						// Copy the ORDER clause and substitute the field_ids to the respective ones
380
-						foreach ( $query_parameters['order'] as $order ) {
380
+						foreach ( $query_parameters[ 'order' ] as $order ) {
381 381
 							list( $column, $_order ) = $order;
382 382
 
383 383
 							if ( $column && $column instanceof \GF_Query_Column ) {
@@ -391,15 +391,15 @@  discard block
 block discarded – undo
391 391
 
392 392
 						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) {
393 393
 							// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
394
-							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
394
+							$select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
395 395
 
396 396
 							// Record the SQL
397
-							$unions_sql[] = array(
397
+							$unions_sql[ ] = array(
398 398
 								// Remove columns, we'll rebuild them
399 399
 								'select'  => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),
400
-								'from'    => $sql['from'],
401
-								'join'    => $sql['join'],
402
-								'where'   => $sql['where'],
400
+								'from'    => $sql[ 'from' ],
401
+								'join'    => $sql[ 'join' ],
402
+								'where'   => $sql[ 'where' ],
403 403
 								// Remove order and limit
404 404
 							);
405 405
 
@@ -416,11 +416,11 @@  discard block
 block discarded – undo
416 416
 
417 417
 					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) {
418 418
 						// Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses
419
-						$sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );
419
+						$sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );
420 420
 
421 421
 						// Remove columns, we'll rebuild them
422
-						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );
423
-						$sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );
422
+						preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );
423
+						$sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );
424 424
 
425 425
 						$unions = array();
426 426
 
@@ -431,30 +431,30 @@  discard block
 block discarded – undo
431 431
 						};
432 432
 
433 433
 						// Add all the order columns into the selects, so we can order by the whole union group
434
-						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );
434
+						preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );
435 435
 						
436 436
 						$columns = array(
437
-							sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )
437
+							sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )
438 438
 						);
439 439
 
440 440
 						foreach ( array_slice( $order_matches, 1 ) as $match ) {
441
-							$columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );
441
+							$columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );
442 442
 
443 443
 							// Rewrite the order columns to the shared aliases
444
-							$sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );
444
+							$sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );
445 445
 						}
446 446
 
447 447
 						$columns = array_unique( $columns );
448 448
 
449 449
 						// Add the columns to every UNION
450 450
 						foreach ( $unions_sql as $union_sql ) {
451
-							$union_sql['select'] .= implode( ', ', $columns );
452
-							$unions []= implode( ' ', $union_sql );
451
+							$union_sql[ 'select' ] .= implode( ', ', $columns );
452
+							$unions [ ] = implode( ' ', $union_sql );
453 453
 						}
454 454
 
455 455
 						// Add the columns to the main SELECT, but only grab the entry id column
456
-						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns );
457
-						$sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];
456
+						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns );
457
+						$sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];
458 458
 
459 459
 						return $sql;
460 460
 					} );
@@ -540,11 +540,11 @@  discard block
 block discarded – undo
540 540
 
541 541
 				/** The offset and limit */
542 542
 				if ( ! empty( $offset->limit ) ) {
543
-					$paging['page_size'] = $offset->limit;
543
+					$paging[ 'page_size' ] = $offset->limit;
544 544
 				}
545 545
 
546 546
 				if ( ! empty( $offset->offset ) ) {
547
-					$paging['offset'] = $offset->offset;
547
+					$paging[ 'offset' ] = $offset->offset;
548 548
 				}
549 549
 
550 550
 				foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -602,8 +602,8 @@  discard block
 block discarded – undo
602 602
 	 */
603 603
 	public function get_fields() {
604 604
 		$fields = array();
605
-		foreach ( $this['fields'] as $field ) {
606
-			foreach ( empty( $field['inputs'] ) ? array( $field['id'] ) : wp_list_pluck( $field['inputs'], 'id' ) as $id ) {
605
+		foreach ( $this[ 'fields' ] as $field ) {
606
+			foreach ( empty( $field[ 'inputs' ] ) ? array( $field[ 'id' ] ) : wp_list_pluck( $field[ 'inputs' ], 'id' ) as $id ) {
607 607
 				if ( is_numeric( $id ) ) {
608 608
 					$fields[ $id ] = self::get_field( $this, $id );
609 609
 				} else {
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
 	 * @return bool Whether the offset exists or not.
641 641
 	 */
642 642
 	public function offsetExists( $offset ) {
643
-		return isset( $this->form[$offset] );
643
+		return isset( $this->form[ $offset ] );
644 644
 	}
645 645
 
646 646
 	/**
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 	 * @return mixed The value of the requested form data.
656 656
 	 */
657 657
 	public function offsetGet( $offset ) {
658
-		return $this->form[$offset];
658
+		return $this->form[ $offset ];
659 659
 	}
660 660
 
661 661
 	/**
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,8 @@
 block discarded – undo
111 111
 
112 112
 		$form = &$this;
113 113
 
114
-		if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) { // @todo switch to GFAPI:: once they start supporting nested and joins stuff
114
+		if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) {
115
+// @todo switch to GFAPI:: once they start supporting nested and joins stuff
115 116
 			$entries->add_fetch_callback( function( $filters, $sorts, $offset ) use ( $view, &$form ) {
116 117
 				$atts = $view->settings->as_atts();
117 118
 
Please login to merge, or discard this patch.
future/includes/class-gv-form.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -55,6 +55,7 @@
 block discarded – undo
55 55
 	 * Magic shortcuts.
56 56
 	 *
57 57
 	 * - `entries` -> `$this->get_entries()`
58
+	 * @param string $key
58 59
 	 */
59 60
 	public function __get( $key ) {
60 61
 		switch ( $key ):
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 3 patches
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,6 +64,9 @@  discard block
 block discarded – undo
64 64
     }
65 65
 
66 66
 
67
+    /**
68
+     * @param string $component
69
+     */
67 70
     private function load_components( $component ) {
68 71
 
69 72
         $dir = trailingslashit( self::$file );
@@ -183,7 +186,7 @@  discard block
 block discarded – undo
183 186
      * "You can edit this post from the post page" fields, for example.
184 187
      *
185 188
      * @param $entry array Gravity Forms entry object
186
-     * @param $view_id int GravityView view id
189
+     * @param integer $view_id int GravityView view id
187 190
      * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
188 191
      * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
189 192
      * @return string
@@ -286,7 +289,7 @@  discard block
 block discarded – undo
286 289
      * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
287 290
      *
288 291
      * @param  array $entry Gravity Forms entry array
289
-     * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
292
+     * @param integer $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
290 293
      * @return bool
291 294
      */
292 295
     public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
Please login to merge, or discard this patch.
Indentation   +157 added lines, -157 removed lines patch added patch discarded remove patch
@@ -18,83 +18,83 @@  discard block
 block discarded – undo
18 18
 
19 19
 class GravityView_Edit_Entry {
20 20
 
21
-    /**
22
-     * @var string
23
-     */
21
+	/**
22
+	 * @var string
23
+	 */
24 24
 	static $file;
25 25
 
26 26
 	static $instance;
27 27
 
28
-    /**
29
-     * Component instances.
30
-     * @var array
31
-     */
32
-    public $instances = array();
28
+	/**
29
+	 * Component instances.
30
+	 * @var array
31
+	 */
32
+	public $instances = array();
33 33
 
34 34
 
35 35
 	function __construct() {
36 36
 
37
-        self::$file = plugin_dir_path( __FILE__ );
37
+		self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
40
-            $this->load_components( 'admin' );
41
-        }
39
+		if( is_admin() ) {
40
+			$this->load_components( 'admin' );
41
+		}
42 42
 
43 43
 		$this->load_components( 'locking' );
44 44
 
45
-        $this->load_components( 'render' );
45
+		$this->load_components( 'render' );
46 46
 
47
-        // If GF User Registration Add-on exists
48
-        $this->load_components( 'user-registration' );
47
+		// If GF User Registration Add-on exists
48
+		$this->load_components( 'user-registration' );
49 49
 
50
-        $this->add_hooks();
50
+		$this->add_hooks();
51 51
 
52 52
 		// Process hooks for addons that may or may not be present
53 53
 		$this->addon_specific_hooks();
54 54
 	}
55 55
 
56 56
 
57
-    static function getInstance() {
57
+	static function getInstance() {
58 58
 
59
-        if( empty( self::$instance ) ) {
60
-            self::$instance = new GravityView_Edit_Entry;
61
-        }
59
+		if( empty( self::$instance ) ) {
60
+			self::$instance = new GravityView_Edit_Entry;
61
+		}
62 62
 
63
-        return self::$instance;
64
-    }
63
+		return self::$instance;
64
+	}
65 65
 
66 66
 
67
-    private function load_components( $component ) {
67
+	private function load_components( $component ) {
68 68
 
69
-        $dir = trailingslashit( self::$file );
69
+		$dir = trailingslashit( self::$file );
70 70
 
71
-        $filename  = $dir . 'class-edit-entry-' . $component . '.php';
72
-        $classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
71
+		$filename  = $dir . 'class-edit-entry-' . $component . '.php';
72
+		$classname = 'GravityView_Edit_Entry_' . str_replace( ' ', '_', ucwords( str_replace( '-', ' ', $component ) ) );
73 73
 
74
-        // Loads component and pass extension's instance so that component can
75
-        // talk each other.
76
-        require_once $filename;
77
-        $this->instances[ $component ] = new $classname( $this );
78
-        $this->instances[ $component ]->load();
74
+		// Loads component and pass extension's instance so that component can
75
+		// talk each other.
76
+		require_once $filename;
77
+		$this->instances[ $component ] = new $classname( $this );
78
+		$this->instances[ $component ]->load();
79 79
 
80
-    }
80
+	}
81 81
 
82
-    private function add_hooks() {
82
+	private function add_hooks() {
83 83
 
84
-        // Add front-end access to Gravity Forms delete file action
85
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+		// Add front-end access to Gravity Forms delete file action
85
+		add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
86 86
 
87
-        // Make sure this hook is run for non-admins
88
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+		// Make sure this hook is run for non-admins
88
+		add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
89 89
 
90
-        add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90
+		add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
91 91
 
92
-        // add template path to check for field
93
-        add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
92
+		// add template path to check for field
93
+		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
94 94
 
95 95
 		add_filter( 'gravityview/field/is_visible', array( $this, 'maybe_not_visible' ), 10, 3 );
96 96
 
97
-    }
97
+	}
98 98
 
99 99
 	/**
100 100
 	 * Trigger hooks that are normally run in the admin for Addons, but need to be triggered manually because we're not in the admin
@@ -149,74 +149,74 @@  discard block
 block discarded – undo
149 149
 		return false;
150 150
 	}
151 151
 
152
-    /**
153
-     * Include this extension templates path
154
-     * @param array $file_paths List of template paths ordered
155
-     */
156
-    public function add_template_path( $file_paths ) {
157
-
158
-        // Index 100 is the default GravityView template path.
159
-        $file_paths[ 110 ] = self::$file;
160
-
161
-        return $file_paths;
162
-    }
163
-
164
-    /**
165
-     *
166
-     * Return a well formatted nonce key according to GravityView Edit Entry protocol
167
-     *
168
-     * @param $view_id int GravityView view id
169
-     * @param $form_id int Gravity Forms form id
170
-     * @param $entry_id int Gravity Forms entry id
171
-     * @return string
172
-     */
173
-    public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
174
-        return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
175
-    }
176
-
177
-
178
-    /**
179
-     * The edit entry link creates a secure link with a nonce
180
-     *
181
-     * It also mimics the URL structure Gravity Forms expects to have so that
182
-     * it formats the display of the edit form like it does in the backend, like
183
-     * "You can edit this post from the post page" fields, for example.
184
-     *
185
-     * @param $entry array Gravity Forms entry object
186
-     * @param $view_id int GravityView view id
187
-     * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
188
-     * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
189
-     * @return string
190
-     */
191
-    public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
192
-
193
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
194
-
195
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
196
-
197
-        $url = add_query_arg( array(
198
-            'edit' => wp_create_nonce( $nonce_key )
199
-        ), $base );
200
-
201
-        if( $post_id ) {
202
-	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
203
-        }
204
-
205
-	    /**
206
-	     * Allow passing params to dynamically populate entry with values
207
-	     * @since 1.9.2
208
-	     */
209
-	    if( !empty( $field_values ) ) {
210
-
211
-		    if( is_array( $field_values ) ) {
212
-			    // If already an array, no parse_str() needed
213
-			    $params = $field_values;
214
-		    } else {
215
-			    parse_str( $field_values, $params );
216
-		    }
217
-
218
-		    $url = add_query_arg( $params, $url );
219
-	    }
152
+	/**
153
+	 * Include this extension templates path
154
+	 * @param array $file_paths List of template paths ordered
155
+	 */
156
+	public function add_template_path( $file_paths ) {
157
+
158
+		// Index 100 is the default GravityView template path.
159
+		$file_paths[ 110 ] = self::$file;
160
+
161
+		return $file_paths;
162
+	}
163
+
164
+	/**
165
+	 *
166
+	 * Return a well formatted nonce key according to GravityView Edit Entry protocol
167
+	 *
168
+	 * @param $view_id int GravityView view id
169
+	 * @param $form_id int Gravity Forms form id
170
+	 * @param $entry_id int Gravity Forms entry id
171
+	 * @return string
172
+	 */
173
+	public static function get_nonce_key( $view_id, $form_id, $entry_id ) {
174
+		return sprintf( 'edit_%d_%d_%d', $view_id, $form_id, $entry_id );
175
+	}
176
+
177
+
178
+	/**
179
+	 * The edit entry link creates a secure link with a nonce
180
+	 *
181
+	 * It also mimics the URL structure Gravity Forms expects to have so that
182
+	 * it formats the display of the edit form like it does in the backend, like
183
+	 * "You can edit this post from the post page" fields, for example.
184
+	 *
185
+	 * @param $entry array Gravity Forms entry object
186
+	 * @param $view_id int GravityView view id
187
+	 * @param $post_id int GravityView Post ID where View may be embedded {@since 1.9.2}
188
+	 * @param string|array $field_values Parameters to pass in to the Edit Entry form to prefill data. Uses the same format as Gravity Forms "Allow field to be populated dynamically" {@since 1.9.2} {@see https://www.gravityhelp.com/documentation/article/allow-field-to-be-populated-dynamically/ }
189
+	 * @return string
190
+	 */
191
+	public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
192
+
193
+		$nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
194
+
195
+		$base = gv_entry_link( $entry, $post_id ? : $view_id  );
196
+
197
+		$url = add_query_arg( array(
198
+			'edit' => wp_create_nonce( $nonce_key )
199
+		), $base );
200
+
201
+		if( $post_id ) {
202
+			$url = add_query_arg( array( 'gvid' => $view_id ), $url );
203
+		}
204
+
205
+		/**
206
+		 * Allow passing params to dynamically populate entry with values
207
+		 * @since 1.9.2
208
+		 */
209
+		if( !empty( $field_values ) ) {
210
+
211
+			if( is_array( $field_values ) ) {
212
+				// If already an array, no parse_str() needed
213
+				$params = $field_values;
214
+			} else {
215
+				parse_str( $field_values, $params );
216
+			}
217
+
218
+			$url = add_query_arg( $params, $url );
219
+		}
220 220
 
221 221
 		/**
222 222
 		 * @filter `gravityview/edit/link` Filter the edit URL link.
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		 * @param \GV\View $view The View.
226 226
 		 */
227 227
 		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
228
-    }
228
+	}
229 229
 
230 230
 	/**
231 231
 	 * Edit mode doesn't allow certain field types.
@@ -280,19 +280,19 @@  discard block
 block discarded – undo
280 280
 	}
281 281
 
282 282
 
283
-    /**
284
-     * checks if user has permissions to edit a specific entry
285
-     *
286
-     * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
287
-     *
288
-     * @param  array $entry Gravity Forms entry array
289
-     * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
290
-     * @return bool
291
-     */
292
-    public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
283
+	/**
284
+	 * checks if user has permissions to edit a specific entry
285
+	 *
286
+	 * Needs to be used combined with GravityView_Edit_Entry::user_can_edit_entry for maximum security!!
287
+	 *
288
+	 * @param  array $entry Gravity Forms entry array
289
+	 * @param \GV\View|int $view ID of the view you want to check visibility against {@since 1.9.2}. Required since 2.0
290
+	 * @return bool
291
+	 */
292
+	public static function check_user_cap_edit_entry( $entry, $view = 0 ) {
293 293
 
294
-        // No permission by default
295
-        $user_can_edit = false;
294
+		// No permission by default
295
+		$user_can_edit = false;
296 296
 
297 297
 		// get user_edit setting
298 298
 		if ( empty( $view ) ) {
@@ -310,60 +310,60 @@  discard block
 block discarded – undo
310 310
 			$user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
311 311
 		}
312 312
 
313
-        // If they can edit any entries (as defined in Gravity Forms)
314
-        // Or if they can edit other people's entries
315
-        // Then we're good.
316
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
313
+		// If they can edit any entries (as defined in Gravity Forms)
314
+		// Or if they can edit other people's entries
315
+		// Then we're good.
316
+		if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
317 317
 
318
-            gravityview()->log->debug( 'User has ability to edit all entries.' );
318
+			gravityview()->log->debug( 'User has ability to edit all entries.' );
319 319
 
320
-            $user_can_edit = true;
320
+			$user_can_edit = true;
321 321
 
322
-        } else if( !isset( $entry['created_by'] ) ) {
322
+		} else if( !isset( $entry['created_by'] ) ) {
323 323
 
324
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
324
+			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
325 325
 
326
-            $user_can_edit = false;
326
+			$user_can_edit = false;
327 327
 
328
-        } else {
328
+		} else {
329 329
 
330
-            $current_user = wp_get_current_user();
330
+			$current_user = wp_get_current_user();
331 331
 
332
-            // User edit is disabled
333
-            if( empty( $user_edit ) ) {
332
+			// User edit is disabled
333
+			if( empty( $user_edit ) ) {
334 334
 
335
-                gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
335
+				gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
336 336
 
337
-                $user_can_edit = false;
338
-            }
337
+				$user_can_edit = false;
338
+			}
339 339
 
340
-            // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
341
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
340
+			// User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
341
+			else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
342 342
 
343
-                gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
343
+				gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
344 344
 
345
-                $user_can_edit = true;
345
+				$user_can_edit = true;
346 346
 
347
-            } else if( ! is_user_logged_in() ) {
347
+			} else if( ! is_user_logged_in() ) {
348 348
 
349
-                gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
349
+				gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
350 350
 
351
-	            $user_can_edit = false; // Here just for clarity
352
-            }
351
+				$user_can_edit = false; // Here just for clarity
352
+			}
353 353
 
354
-        }
354
+		}
355 355
 
356
-        /**
357
-         * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
358
-         * @since 1.15 Added `$entry` and `$view_id` parameters
359
-         * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
360
-         * @param[in] array $entry Gravity Forms entry array {@since 1.15}
361
-         * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
362
-         */
363
-        $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
356
+		/**
357
+		 * @filter `gravityview/edit_entry/user_can_edit_entry` Modify whether user can edit an entry.
358
+		 * @since 1.15 Added `$entry` and `$view_id` parameters
359
+		 * @param[in,out] boolean $user_can_edit Can the current user edit the current entry? (Default: false)
360
+		 * @param[in] array $entry Gravity Forms entry array {@since 1.15}
361
+		 * @param[in] int $view_id ID of the view you want to check visibility against {@since 1.15}
362
+		 */
363
+		$user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
364 364
 
365
-        return (bool) $user_can_edit;
366
-    }
365
+		return (bool) $user_can_edit;
366
+	}
367 367
 
368 368
 
369 369
 
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 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
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
     static function getInstance() {
58 58
 
59
-        if( empty( self::$instance ) ) {
59
+        if ( empty( self::$instance ) ) {
60 60
             self::$instance = new GravityView_Edit_Entry;
61 61
         }
62 62
 
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
     private function add_hooks() {
83 83
 
84 84
         // Add front-end access to Gravity Forms delete file action
85
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
85
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
86 86
 
87 87
         // Make sure this hook is run for non-admins
88
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
88
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
89 89
 
90 90
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
91 91
 
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 	 */
103 103
 	private function addon_specific_hooks() {
104 104
 
105
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
106
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
105
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
106
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
107 107
 		}
108 108
 
109 109
 	}
@@ -190,15 +190,15 @@  discard block
 block discarded – undo
190 190
      */
191 191
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
192 192
 
193
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
193
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
194 194
 
195
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
195
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
196 196
 
197 197
         $url = add_query_arg( array(
198 198
             'edit' => wp_create_nonce( $nonce_key )
199 199
         ), $base );
200 200
 
201
-        if( $post_id ) {
201
+        if ( $post_id ) {
202 202
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
203 203
         }
204 204
 
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
 	     * Allow passing params to dynamically populate entry with values
207 207
 	     * @since 1.9.2
208 208
 	     */
209
-	    if( !empty( $field_values ) ) {
209
+	    if ( ! empty( $field_values ) ) {
210 210
 
211
-		    if( is_array( $field_values ) ) {
211
+		    if ( is_array( $field_values ) ) {
212 212
 			    // If already an array, no parse_str() needed
213 213
 			    $params = $field_values;
214 214
 		    } else {
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		 * @param array $entry The entry.
225 225
 		 * @param \GV\View $view The View.
226 226
 		 */
227
-		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id  ) );
227
+		return apply_filters( 'gravityview/edit/link', $url, $entry, \GV\View::by_id( $view_id ) );
228 228
     }
229 229
 
230 230
 	/**
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 	 */
236 236
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
237 237
 
238
-		if( empty( $context ) || $context !== 'edit' ) {
238
+		if ( empty( $context ) || $context !== 'edit' ) {
239 239
 			return $fields;
240 240
 		}
241 241
 
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
313 313
         // If they can edit any entries (as defined in Gravity Forms)
314 314
         // Or if they can edit other people's entries
315 315
         // Then we're good.
316
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
316
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
317 317
 
318 318
             gravityview()->log->debug( 'User has ability to edit all entries.' );
319 319
 
320 320
             $user_can_edit = true;
321 321
 
322
-        } else if( !isset( $entry['created_by'] ) ) {
322
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
323 323
 
324
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
324
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
325 325
 
326 326
             $user_can_edit = false;
327 327
 
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
             $current_user = wp_get_current_user();
331 331
 
332 332
             // User edit is disabled
333
-            if( empty( $user_edit ) ) {
333
+            if ( empty( $user_edit ) ) {
334 334
 
335 335
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
336 336
 
@@ -338,13 +338,13 @@  discard block
 block discarded – undo
338 338
             }
339 339
 
340 340
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
341
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
341
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
342 342
 
343 343
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
344 344
 
345 345
                 $user_can_edit = true;
346 346
 
347
-            } else if( ! is_user_logged_in() ) {
347
+            } else if ( ! is_user_logged_in() ) {
348 348
 
349 349
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
350 350
 
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
          */
363 363
         $user_can_edit = apply_filters( 'gravityview/edit_entry/user_can_edit_entry', $user_can_edit, $entry, $view_id );
364 364
 
365
-        return (bool) $user_can_edit;
365
+        return (bool)$user_can_edit;
366 366
     }
367 367
 
368 368
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/data-source.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
11 11
 
12 12
 //current value
13
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
13
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
14 14
 
15 15
 // If form is in trash or not existing, show error
16 16
 GravityView_Admin::connected_form_warning( $current_form );
17 17
 
18 18
 // check for available gravity forms
19
-$forms = gravityview_get_forms('any', false, 'title' );
19
+$forms = gravityview_get_forms( 'any', false, 'title' );
20 20
 
21 21
 /**
22 22
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
 		?>
36 36
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
37 37
 
38
-		<?php if( !empty( $forms ) ) { ?>
38
+		<?php if ( ! empty( $forms ) ) { ?>
39 39
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
40 40
 		<?php }
41 41
 	}
42 42
 
43 43
 	// If there are no forms to select, show no forms.
44
-	if( !empty( $forms ) ) { ?>
44
+	if ( ! empty( $forms ) ) { ?>
45 45
 		<select name="gravityview_form_id" id="gravityview_form_id">
46 46
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
47
-			<?php foreach( $forms as $form ) { ?>
48
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
47
+			<?php foreach ( $forms as $form ) { ?>
48
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
49 49
 			<?php } ?>
50 50
 		</select>
51 51
 	<?php } else { ?>
52 52
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
53 53
 	<?php } ?>
54 54
 
55
-	&nbsp;<button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
55
+	&nbsp;<button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
56 56
 </p>
57 57
 
58 58
 <?php // confirm dialog box ?>
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gravatar.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	static public function get_email( $field_settings, $entry ) {
72 72
 
73 73
 		// There was no logged in user.
74
-		switch ( $field_settings['email_field'] ) {
74
+		switch ( $field_settings[ 'email_field' ] ) {
75 75
 			case 'created_by_email':
76 76
 
77 77
 				$created_by = \GV\Utils::get( $entry, 'created_by', null );
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 			return $field_options;
103 103
 		}
104 104
 
105
-		$field_options['email_field'] = array(
105
+		$field_options[ 'email_field' ] = array(
106 106
 			'type'    => 'select',
107 107
 			'label'   => __( 'Email to Use', 'gravityview' ),
108 108
 			'value'   => 'created_by_email',
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'choices' => $this->_get_email_field_choices( $form_id ),
111 111
 		);
112 112
 
113
-		$field_options['default'] = array(
113
+		$field_options[ 'default' ] = array(
114 114
 			'type'    => 'select',
115 115
 			'label'   => __( 'Default Image', 'gravityview' ),
116 116
 			'desc'    => __( 'Choose the default image to be shown when an email has no Gravatar.', 'gravityview' ) . ' <a href="https://en.gravatar.com/site/implement/images/">' . esc_html( sprintf( __( 'Read more about %s', 'gravityview' ), __( 'Default Image', 'gravityview' ) ) ) . '</a>',
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 			),
127 127
 		);
128 128
 
129
-		$field_options['size'] = array(
129
+		$field_options[ 'size' ] = array(
130 130
 			'type'  => 'number',
131 131
 			'label' => __( 'Size in Pixels', 'gravityview' ),
132 132
 			'value' => 80,
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$email_fields = GFAPI::get_fields_by_type( $form, array( 'email' ) );
160 160
 
161 161
 		foreach ( $email_fields as $email_field ) {
162
-			$email_field_id                   = $email_field['id'];
162
+			$email_field_id                   = $email_field[ 'id' ];
163 163
 			$email_field_label                = GVCommon::get_field_label( $form, $email_field_id );
164 164
 			$email_field_label                = sprintf( __( 'Field: %s', 'gravityview' ), $email_field_label );
165 165
 			$field_choices[ $email_field_id ] = esc_html( $email_field_label );
Please login to merge, or discard this patch.
includes/class-gravityview-entry-list.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,13 +87,13 @@
 block discarded – undo
87 87
 	 * @since 2.0 Added $template_context parameter
88 88
 	 * @since 2.7.2 Added $view_id parameter
89 89
 	 *
90
-	 * @param array|GV\Entry[] $entries
90
+	 * @param GV\Entry[] $entries
91 91
 	 * @param int $post_id
92 92
 	 * @param array $form
93 93
 	 * @param string $link_format
94 94
 	 * @param string $after_link
95 95
 	 * @param \GV\Template_Context $template_context The context
96
-	 * @param int|null $view_id View to link to when displaying on a page with multiple Views
96
+	 * @param integer $view_id View to link to when displaying on a page with multiple Views
97 97
 	 */
98 98
 	function __construct( $entries = array(), $post_id = 0, $form = array(), $link_format = '', $after_link = '', $context = '', $template_context = null, $view_id = 0 ) {
99 99
 		$this->entries = $entries;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
 	public function get_output() {
191 191
 
192 192
 		// No Entries
193
-		if( empty( $this->entries ) ) {
194
-			return '<div class="gv-no-results">'.$this->empty_message.'</div>';
193
+		if ( empty( $this->entries ) ) {
194
+			return '<div class="gv-no-results">' . $this->empty_message . '</div>';
195 195
 		}
196 196
 
197 197
 		$output = '';
@@ -202,22 +202,22 @@  discard block
 block discarded – undo
202 202
 			$current_entry = GravityView_View::getInstance()->getCurrentEntry();
203 203
 		}
204 204
 
205
-		$output .= '<'. $this->wrapper_tag .'>';
205
+		$output .= '<' . $this->wrapper_tag . '>';
206 206
 
207
-		foreach( $this->entries as $entry ) {
207
+		foreach ( $this->entries as $entry ) {
208 208
 
209 209
 			if ( $entry instanceof \GV\Entry ) {
210 210
 				$entry = $entry->as_entry();
211 211
 			}
212 212
 
213
-			if( $this->skip_entry( $entry, $current_entry ) ) {
213
+			if ( $this->skip_entry( $entry, $current_entry ) ) {
214 214
 				continue;
215 215
 			}
216 216
 
217 217
 			$output .= $this->get_item_output( $entry );
218 218
 		}
219 219
 
220
-		$output .= '</'. $this->wrapper_tag .'>';
220
+		$output .= '</' . $this->wrapper_tag . '>';
221 221
 
222 222
 		/**
223 223
 		 * @filter `gravityview/widget/recent-entries/output` Modify the HTML of the Recent Entries widget output
@@ -240,15 +240,15 @@  discard block
 block discarded – undo
240 240
 	private function skip_entry( $entry, $current_entry ) {
241 241
 
242 242
 		// If skip entry is off, or there's no current entry, return false
243
-		if( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
243
+		if ( empty( $this->skip_current_entry ) || empty( $current_entry ) ) {
244 244
 			return false;
245 245
 		}
246 246
 
247 247
 		// If in Single or Edit mode, $current_entry will be an array.
248
-		$current_entry_id = is_array( $current_entry ) ? $current_entry['id'] : $current_entry;
248
+		$current_entry_id = is_array( $current_entry ) ? $current_entry[ 'id' ] : $current_entry;
249 249
 
250 250
 		// If the entry ID matches the current entry, yes: skip
251
-		if( $entry['id'] === $current_entry_id ) {
251
+		if ( $entry[ 'id' ] === $current_entry_id ) {
252 252
 			return true;
253 253
 		}
254 254
 
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 		$item_output = gravityview_get_link( $link, $this->link_format );
285 285
 
286
-		if( !empty( $this->after_link ) ) {
286
+		if ( ! empty( $this->after_link ) ) {
287 287
 
288 288
 			/**
289 289
 			 * @filter `gravityview/entry-list/after-link` Modify the content displayed after the entry link in an entry list
@@ -292,14 +292,14 @@  discard block
 block discarded – undo
292 292
 			 * @param array $entry Gravity Forms entry array
293 293
 			 * @param GravityView_Entry_List $this The current class instance
294 294
 			 */
295
-			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>'.$this->after_link.'</div>', $entry, $this );
295
+			$after_link = apply_filters( 'gravityview/entry-list/after-link', '<div>' . $this->after_link . '</div>', $entry, $this );
296 296
 
297 297
 			$item_output .= $after_link;
298 298
 		}
299 299
 
300 300
 		$item_output = GravityView_API::replace_variables( $item_output, $this->form, $entry );
301 301
 
302
-		$item_output = '<'. $this->item_tag .'>'. $item_output .'</'. $this->item_tag .'>';
302
+		$item_output = '<' . $this->item_tag . '>' . $item_output . '</' . $this->item_tag . '>';
303 303
 
304 304
 		/**
305 305
 		 * @filter `gravityview/entry-list/item` Modify each item's output in an entry list
Please login to merge, or discard this patch.