Completed
Pull Request — develop (#1523)
by Zack
19:02
created
includes/fields/class-gravityview-field-hidden.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	function edit_entry_fix_hidden_fields( $fields ) {
50 50
 
51 51
 		/** @type GF_Field $field */
52
-		foreach( $fields as &$field ) {
52
+		foreach ( $fields as &$field ) {
53 53
 
54 54
 			if ( 'hidden' === $field->type ) {
55 55
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 				 */
63 63
 				$reveal_hidden_field = apply_filters( 'gravityview/edit_entry/reveal_hidden_field', false, $field );
64 64
 
65
-				if( ! $reveal_hidden_field ) {
65
+				if ( ! $reveal_hidden_field ) {
66 66
 					continue;
67 67
 				}
68 68
 
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-perks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	public function edit_entry_fix_uid_fields( $fields ) {
51 51
 
52 52
 		/** @type \GF_Field $field */
53
-		foreach( $fields as &$field ) {
53
+		foreach ( $fields as &$field ) {
54 54
 			if ( 'uid' === $field->type ) {
55 55
 
56 56
 				// Replace GF_Field with GF_Field_Text, copying all the data from $field
Please login to merge, or discard this patch.
future/includes/class-gv-field.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
167 167
 	 */
168 168
 	public static function from_configuration( $configuration ) {
169
-		if ( empty( $configuration['id'] ) ) {
169
+		if ( empty( $configuration[ 'id' ] ) ) {
170 170
 			$field = new self();
171 171
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
172 172
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 		} else {
180 180
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
181 181
 		}
182
-		$trace = $trace[1];
183
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
182
+		$trace = $trace[ 1 ];
183
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
184 184
 			$field = new self();
185 185
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
186 186
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		}
189 189
 
190 190
 		/** @type \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
191
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
191
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
192 192
 
193 193
 		/**
194 194
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@  discard block
 block discarded – undo
227 227
 	public function update_configuration( $configuration ) {
228 228
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
229 229
 
230
-		if ( $this->ID != $configuration['id'] ) {
230
+		if ( $this->ID != $configuration[ 'id' ] ) {
231 231
 			/** Smelling trouble here... */
232 232
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
233 233
 		}
234 234
 
235
-		$this->ID = $configuration['id'];
236
-		$this->label = $configuration['label'];
237
-		$this->show_label = $configuration['show_label'] == '1';
238
-		$this->custom_label = $configuration['custom_label'];
239
-		$this->custom_class = $configuration['custom_class'];
240
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
241
-		$this->search_filter = $configuration['search_filter'] == '1';
242
-		$this->show_as_link = $configuration['show_as_link'] == '1';
235
+		$this->ID = $configuration[ 'id' ];
236
+		$this->label = $configuration[ 'label' ];
237
+		$this->show_label = $configuration[ 'show_label' ] == '1';
238
+		$this->custom_label = $configuration[ 'custom_label' ];
239
+		$this->custom_class = $configuration[ 'custom_class' ];
240
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
241
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
242
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
243 243
 
244 244
 		/** Shared among all field types (sort of). */
245 245
 		$shared_configuration_keys = array(
246 246
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
247
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
247
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
248 248
 		);
249 249
 
250 250
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 
274 274
 		/** A custom label is available. */
275 275
 		if ( ! empty( $this->custom_label ) ) {
276
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
276
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
277 277
 		}
278 278
 
279 279
 		return '';
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
360 360
 	 */
361 361
 	public function __get( $key ) {
362
-		switch( $key ) {
362
+		switch ( $key ) {
363 363
 			default:
364 364
 				if ( isset( $this->configuration[ $key ] ) ) {
365 365
 					return $this->configuration[ $key ];
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 * @return boolean Whether this $key is set or not.
378 378
 	 */
379 379
 	public function __isset( $key ) {
380
-		switch( $key ) {
380
+		switch ( $key ) {
381 381
 			default:
382 382
 				return isset( $this->configuration[ $key ] );
383 383
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-website.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
30 30
 
31 31
 		// It makes no sense to use this as the link.
32
-		unset( $field_options['show_as_link'] );
32
+		unset( $field_options[ 'show_as_link' ] );
33 33
 
34
-		if( 'edit' === $context ) {
34
+		if ( 'edit' === $context ) {
35 35
 			return $field_options;
36 36
 		}
37 37
 
@@ -39,12 +39,12 @@  discard block
 block discarded – undo
39 39
 		 * Set default to opening in new links for back-compatibility with Version 1.5.1
40 40
 		 * @link https://github.com/gravityview/GravityView/commit/e12e76e2d032754227728d41e65103042d4f75ec
41 41
 		 */
42
-		$field_options['new_window']['value'] = true;
42
+		$field_options[ 'new_window' ][ 'value' ] = true;
43 43
 
44 44
 		/**
45 45
 		 * @since 1.8
46 46
 		 */
47
-		$field_options['anchor_text'] = array(
47
+		$field_options[ 'anchor_text' ] = array(
48 48
 			'type' => 'text',
49 49
 			'label' => __( 'Link Text:', 'gravityview' ),
50 50
 			'desc' => __( 'Define custom link text. Leave blank to display the URL', 'gravityview' ),
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 			'merge_tags' => 'force',
53 53
 		);
54 54
 
55
-		$field_options['truncatelink'] = array(
55
+		$field_options[ 'truncatelink' ] = array(
56 56
 			'type' => 'checkbox',
57 57
 			'value' => true,
58 58
 			'label' => __( 'Shorten Link Display', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-other-entries.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
 	public function __construct() {
27 27
 		$this->label = esc_html__( 'Other Entries', 'gravityview' );
28
-		$this->description = esc_html__('Display other entries created by the entry creator.', 'gravityview');
28
+		$this->description = esc_html__( 'Display other entries created by the entry creator.', 'gravityview' );
29 29
 		parent::__construct();
30 30
 	}
31 31
 
@@ -35,32 +35,32 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
37 37
 
38
-		if( 'edit' === $context ) {
38
+		if ( 'edit' === $context ) {
39 39
 			return $field_options;
40 40
 		}
41 41
 
42 42
 		// No "Link to single entry"; all the items will be links to entries!
43
-		unset( $field_options['show_as_link'] );
43
+		unset( $field_options[ 'show_as_link' ] );
44 44
 
45 45
 		$new_options = array();
46 46
 
47
-		$new_options['link_format'] = array(
47
+		$new_options[ 'link_format' ] = array(
48 48
 			'type'  => 'text',
49 49
 			'label' => __( 'Entry link text (required)', 'gravityview' ),
50
-			'value' => __('Entry #{entry_id}', 'gravityview'),
50
+			'value' => __( 'Entry #{entry_id}', 'gravityview' ),
51 51
 			'merge_tags' => 'force',
52 52
 		);
53 53
 
54
-		$new_options['after_link'] = array(
54
+		$new_options[ 'after_link' ] = array(
55 55
 			'type'  => 'textarea',
56 56
 			'label' => __( 'Text or HTML to display after the link (optional)', 'gravityview' ),
57
-			'desc'  => __('This content will be displayed below each entry link.', 'gravityview'),
57
+			'desc'  => __( 'This content will be displayed below each entry link.', 'gravityview' ),
58 58
 			'value' => '',
59 59
 			'merge_tags' => 'force',
60 60
 			'class' => 'widefat code',
61 61
 		);
62 62
 
63
-		$new_options['page_size'] = array(
63
+		$new_options[ 'page_size' ] = array(
64 64
 			'type'  => 'number',
65 65
 			'label' => __( 'Entries to Display', 'gravityview' ),
66 66
 			'desc'  => __( 'What is the maximum number of entries that should be shown?', 'gravityview' ) . ' ' . sprintf( _x( 'Set to %s for no maximum.', '%s replaced with a formatted 0', 'gravityview' ), '<code>0</code>' ),
@@ -69,14 +69,14 @@  discard block
 block discarded – undo
69 69
 			'min'   => 0,
70 70
 		);
71 71
 
72
-		$new_options['no_entries_hide'] = array(
72
+		$new_options[ 'no_entries_hide' ] = array(
73 73
 			'type'  => 'checkbox',
74 74
 			'label' => __( 'Hide if no entries', 'gravityview' ),
75 75
 			'desc'  => __( 'Don\'t display this field if the entry creator has no other entries', 'gravityview' ),
76 76
 			'value' => false,
77 77
 		);
78 78
 
79
-		$new_options['no_entries_text'] = array(
79
+		$new_options[ 'no_entries_text' ] = array(
80 80
 			'type'  => 'text',
81 81
 			'label' => __( 'No Entries Text', 'gravityview' ),
82 82
 			'desc'  => __( 'The text that is shown if the entry creator has no other entries (and "Hide if no entries" is disabled).', 'gravityview' ),
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
 		foreach ( $filters as $filter ) {
111 111
 			foreach ( $wp_filter[ $filter ] as $priority => $callbacks ) {
112 112
 				foreach ( $callbacks as $id => $callback ) {
113
-					if ( ! is_array( $callback['function'] ) ) {
113
+					if ( ! is_array( $callback[ 'function' ] ) ) {
114 114
 						continue;
115 115
 					}
116
-					if ( $callback['function'][0] instanceof \GV\Widget ) {
117
-						$remove[] = array( $filter, $priority, $id );
116
+					if ( $callback[ 'function' ][ 0 ] instanceof \GV\Widget ) {
117
+						$remove[ ] = array( $filter, $priority, $id );
118 118
 					}
119 119
 				}
120 120
 			}
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 		foreach ( $remove as $r ) {
124 124
 			list( $filter, $priority, $id ) = $r;
125
-			$removed[] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] );
125
+			$removed[ ] = array( $filter, $priority, $id, $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] );
126 126
 			unset( $wp_filter[ $filter ]->callbacks[ $priority ][ $id ] );
127 127
 		}
128 128
 
@@ -146,10 +146,10 @@  discard block
 block discarded – undo
146 146
 	public function filter_entries( $search_criteria, $form_id = null, $args = array(), $force_search_criteria = false ) {
147 147
 		$context = $this->context;
148 148
 
149
-		$created_by = $context->entry['created_by'];
149
+		$created_by = $context->entry[ 'created_by' ];
150 150
 
151 151
 		/** Filter entries by approved and created_by. */
152
-		$search_criteria['field_filters'][] = array(
152
+		$search_criteria[ 'field_filters' ][ ] = array(
153 153
 			'key' => 'created_by',
154 154
 			'value' => $created_by,
155 155
 			'operator' => 'is'
@@ -169,14 +169,14 @@  discard block
 block discarded – undo
169 169
 		$criteria = apply_filters( 'gravityview/field/other_entries/criteria', $search_criteria, $context->view->settings->as_atts(), $context->view->form->ID, $context );
170 170
 
171 171
 		/** Force mode all and filter out our own entry. */
172
-		$search_criteria['field_filters']['mode'] = 'all';
173
-		$search_criteria['field_filters'][] = array(
172
+		$search_criteria[ 'field_filters' ][ 'mode' ] = 'all';
173
+		$search_criteria[ 'field_filters' ][ ] = array(
174 174
 			'key' => 'id',
175 175
 			'value' => $context->entry->ID,
176 176
 			'operator' => 'isnot'
177 177
 		);
178 178
 
179
-		$search_criteria['paging']['page_size'] = $context->field->page_size ? : 10;
179
+		$search_criteria[ 'paging' ][ 'page_size' ] = $context->field->page_size ?: 10;
180 180
 
181 181
 		return $search_criteria;
182 182
 	}
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	function update_priority() {
53 53
 		global $wp_meta_boxes;
54 54
 
55
-		if ( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
56 56
 			foreach ( array( 'high', 'core', 'low' ) as $position ) {
57
-				if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
58
-					foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
57
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
58
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
59 59
 						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
60
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
61
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
60
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
61
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
62 62
 						}
63 63
 					}
64 64
 				}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 		foreach ( $metaboxes as $m ) {
193 193
 
194
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
194
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
195 195
 
196 196
 			GravityView_Metabox_Tabs::add( $tab );
197 197
 
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$form = gravityview_get_form( $curr_form );
263 263
 
264
-		$get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null;
264
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null;
265 265
 
266
-		if ( isset( $form['id'] ) ) {
266
+		if ( isset( $form[ 'id' ] ) ) {
267 267
 			$form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
268 268
 
269 269
 			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
270
-			$_GET['id'] = $form['id'];
270
+			$_GET[ 'id' ] = $form[ 'id' ];
271 271
 
272 272
 		} else {
273 273
 			$form_script = 'var form = new Form();';
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
277 277
 
278 278
 		// Restore previous $_GET setting
279
-		$_GET['id'] = $get_id_backup;
279
+		$_GET[ 'id' ] = $get_id_backup;
280 280
 
281 281
 		return $output;
282 282
 	}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@
 block discarded – undo
532 532
 				 * @since 1.16.4
533 533
 				 * @param  int $entry_id ID of the Gravity Forms entry
534 534
 				 * @param  array $entry Deleted entry array
535
-				*/
535
+				 */
536 536
 				do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry );
537 537
 			}
538 538
 
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @since 2.9.2
65 65
 	 *
66
-	 * @param $component
66
+	 * @param string $component
67 67
 	 */
68 68
 	private function load_components( $component ) {
69 69
 
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 	 * @uses GFAPI::delete_entry()
424 424
 	 * @uses GFAPI::update_entry_property()
425 425
 	 *
426
-	 * @return WP_Error|string "deleted" or "trashed" if successful, WP_Error if GFAPI::delete_entry() or updating entry failed.
426
+	 * @return string "deleted" or "trashed" if successful, WP_Error if GFAPI::delete_entry() or updating entry failed.
427 427
 	 */
428 428
 	private function delete_or_trash_entry( $entry ) {
429 429
 
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 	 *
591 591
 	 * @since 1.5.1
592 592
 	 * @param  array $entry Gravity Forms entry array
593
-	 * @return boolean|WP_Error        True: can edit form. WP_Error: nope.
593
+	 * @return string        True: can edit form. WP_Error: nope.
594 594
 	 */
595 595
 	function user_can_delete_entry( $entry = array(), $view_id = null ) {
596 596
 
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 	 *
632 632
 	 * @param  array $entry Gravity Forms entry array
633 633
 	 * @param array $field Field settings (optional)
634
-	 * @param int|\GV\View $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
634
+	 * @param integer $view Pass a View ID to check caps against. If not set, check against current View (@deprecated no longer optional)
635 635
 	 * @return bool
636 636
 	 */
637 637
 	public static function check_user_cap_delete_entry( $entry, $field = array(), $view = 0 ) {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
 		// Index 100 is the default GravityView template path.
167 167
 		// Index 110 is Edit Entry link
168
-		$file_paths[115] = self::$file;
168
+		$file_paths[ 115 ] = self::$file;
169 169
 
170 170
 		return $file_paths;
171 171
 	}
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
 		$attributes = array(
271 271
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
272
-			'tabindex' => ( GFCommon::$tab_index ++ ),
272
+			'tabindex' => ( GFCommon::$tab_index++ ),
273 273
 			'onclick' => self::get_confirm_dialog(),
274 274
 		);
275 275
 
@@ -305,12 +305,12 @@  discard block
 block discarded – undo
305 305
 		);
306 306
 
307 307
 		// If the form is not submitted, return early
308
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
308
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
309 309
 			return;
310 310
 		}
311 311
 
312 312
 		// Make sure it's a GravityView request
313
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
313
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
314 314
 
315 315
 		if ( ! $valid_nonce_key ) {
316 316
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -319,10 +319,10 @@  discard block
 block discarded – undo
319 319
 		}
320 320
 
321 321
 		// Get the entry slug
322
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
322
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
323 323
 
324 324
 		// Redirect after deleting the entry.
325
-		$view = \GV\View::by_id( $get_fields['view_id'] );
325
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
326 326
 
327 327
 		// See if there's an entry there
328 328
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
350 350
 		}
351 351
 
352
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
352
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
353 353
 
354
-			$form                 = GFAPI::get_form( $entry['form_id'] );
354
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
355 355
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
356 356
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
357 357
 
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function delete_or_trash_entry( $entry ) {
429 429
 
430
-		$entry_id = $entry['id'];
430
+		$entry_id = $entry[ 'id' ];
431 431
 
432 432
 		$mode = $this->get_delete_mode();
433 433
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
492 492
 
493 493
 		// The entry had no connected post
494
-		if ( empty( $entry['post_id'] ) ) {
494
+		if ( empty( $entry[ 'post_id' ] ) ) {
495 495
 			return;
496 496
 		}
497 497
 
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
 		$action = current_action();
510 510
 
511 511
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
512
-			$result = wp_delete_post( $entry['post_id'], true );
512
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
513 513
 		} else {
514
-			$result = wp_trash_post( $entry['post_id'] );
514
+			$result = wp_trash_post( $entry[ 'post_id' ] );
515 515
 		}
516 516
 
517 517
 		if ( false === $result ) {
@@ -542,13 +542,13 @@  discard block
 block discarded – undo
542 542
 	public function verify_nonce() {
543 543
 
544 544
 		// No delete entry request was made
545
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
545
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
546 546
 			return false;
547 547
 		}
548 548
 
549
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
549
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
550 550
 
551
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
551
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
552 552
 
553 553
 		/**
554 554
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
605 605
 		}
606 606
 
607
-		if ( $entry['status'] === 'trash' ) {
607
+		if ( $entry[ 'status' ] === 'trash' ) {
608 608
 			if ( 'trash' === $this->get_delete_mode() ) {
609 609
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
610 610
 			} else {
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 
649 649
 		$current_user = wp_get_current_user();
650 650
 
651
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
651
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
652 652
 
653 653
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
654 654
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -662,17 +662,17 @@  discard block
 block discarded – undo
662 662
 		if ( ! empty( $field ) ) {
663 663
 
664 664
 			// If capability is not defined, something is not right!
665
-			if ( empty( $field['allow_edit_cap'] ) ) {
665
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
666 666
 
667 667
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
668 668
 
669 669
 				return false;
670 670
 			}
671 671
 
672
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
672
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
673 673
 
674 674
 				// Do not return true if cap is read, as we need to check if the current user created the entry
675
-				if ( $field['allow_edit_cap'] !== 'read' ) {
675
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
676 676
 					return true;
677 677
 				}
678 678
 			} else {
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 			}
684 684
 		}
685 685
 
686
-		if ( ! isset( $entry['created_by'] ) ) {
686
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
687 687
 
688 688
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
689 689
 
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 		}
700 700
 
701 701
 		// If the logged-in user is the same as the user who created the entry, we're good.
702
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
702
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
703 703
 
704 704
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
705 705
 
@@ -724,12 +724,12 @@  discard block
 block discarded – undo
724 724
 	 */
725 725
 	public function maybe_display_message( $current_view_id = 0 ) {
726 726
 
727
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
727
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
728 728
 			return;
729 729
 		}
730 730
 
731 731
 		// Entry wasn't deleted from current View
732
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
732
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
733 733
 			return;
734 734
 		}
735 735
 
@@ -738,11 +738,11 @@  discard block
 block discarded – undo
738 738
 
739 739
 	public function display_message() {
740 740
 
741
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
741
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
742 742
 			return;
743 743
 		}
744 744
 
745
-		$status = esc_attr( $_GET['status'] );
745
+		$status = esc_attr( $_GET[ 'status' ] );
746 746
 		$message_from_url = \GV\Utils::_GET( 'message' );
747 747
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
748 748
 		$class = '';
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 		);
532 532
 
533 533
 		if ( version_compare( \GFCommon::$version, '2.3-beta-4', '>=' ) ) {
534
-			$default_settings['sort_direction']['options']['RAND'] = __( 'Random', 'gravityview' );
534
+			$default_settings[ 'sort_direction' ][ 'options' ][ 'RAND' ] = __( 'Random', 'gravityview' );
535 535
 		}
536 536
 
537 537
 		/**
@@ -552,7 +552,7 @@  discard block
 block discarded – undo
552 552
 		if ( ! $detailed ) {
553 553
 			$defaults = array();
554 554
 			foreach ( $default_settings as $key => $value ) {
555
-				$defaults[ $key ] = $value['value'];
555
+				$defaults[ $key ] = $value[ 'value' ];
556 556
 			}
557 557
 			return $defaults;
558 558
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 				// If the $group argument is set for the method,
564 564
 				// ignore any settings that aren't in that group.
565 565
 				if ( ! empty( $group ) && is_string( $group ) ) {
566
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
566
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
567 567
 						unset( $default_settings[ $key ] );
568 568
 					}
569 569
 				}
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@
 block discarded – undo
183 183
 
184 184
 		$parent_label = '';
185 185
 
186
-    if ( ! empty( $this->item['parent'] ) ) {
186
+	if ( ! empty( $this->item['parent'] ) ) {
187 187
 			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
188 188
 		}
189 189
 
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id = '', $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		if ( $admin_label = \GV\Utils::get( $settings, 'admin_label' ) ) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		$this->id         = $item_id;
77 77
 		$this->form_id    = $form_id;
78 78
 		$this->settings   = $settings;
79
-		$this->label_type = $item['label_type'];
79
+		$this->label_type = $item[ 'label_type' ];
80 80
 	}
81 81
 
82 82
 	/**
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
 
121 121
 			foreach ( $field_info_items as $item ) {
122 122
 
123
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
124 124
 					continue;
125 125
 				}
126 126
 
127
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
127
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
128 128
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
129 129
 				$output .= '<span class="' . $class . '">';
130
-				$output .= esc_html( $item['value'] );
130
+				$output .= esc_html( $item[ 'value' ] );
131 131
 				$output .= '</span>';
132 132
 			}
133 133
 
@@ -155,26 +155,26 @@  discard block
 block discarded – undo
155 155
 
156 156
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
157 157
 		// TODO: Un-hack this
158
-		$hide_settings_link_class = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
159
-		$settings_link      = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
158
+		$hide_settings_link_class = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
159
+		$settings_link = sprintf( '<button class="gv-field-settings" title="%1$s" aria-label="%1$s"><span class="dashicons-admin-generic dashicons %2$s"></span></button>', esc_attr( $settings_title ), $hide_settings_link_class );
160 160
 
161 161
 		// Should we show the icon that the field is being used as a link to single entry?
162
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
162
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
163 163
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
164 164
 
165 165
 		// When a field label is empty, use the Field ID
166 166
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
167 167
 
168 168
 		// If there's a custom label, and show label is checked, use that as the field heading
169
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
170
-			$label = $this->settings['custom_label'];
171
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
172
-			$label = $this->item['customLabel'];
169
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
170
+			$label = $this->settings[ 'custom_label' ];
171
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
172
+			$label = $this->item[ 'customLabel' ];
173 173
 		}
174 174
 		$label = esc_attr( $label );
175 175
 
176
-		if ( $this->item['icon'] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
177
-			$label = '<i class="dashicons ' . esc_attr( $this->item['icon'] ) . '"></i> ' . $label;
176
+		if ( $this->item[ 'icon' ] && ! \GV\Utils::get( $this->item, 'parent' ) ) {
177
+			$label = '<i class="dashicons ' . esc_attr( $this->item[ 'icon' ] ) . '"></i> ' . $label;
178 178
 		}
179 179
 
180 180
 		$output = '<button class="gv-add-field screen-reader-text">' . sprintf( esc_html__( 'Add "%s"', 'gravityview' ), $label ) . '</button>';
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
183 183
 
184 184
 		$parent_label = '';
185 185
 
186
-    if ( ! empty( $this->item['parent'] ) ) {
187
-			$parent_label = ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
186
+    if ( ! empty( $this->item[ 'parent' ] ) ) {
187
+			$parent_label = ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
188 188
 		}
189 189
 
190 190
 		// Name of field / widget
@@ -199,10 +199,10 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$output .= '</h5>';
201 201
 
202
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
203
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
202
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
203
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
204 204
 
205
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
205
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
206 206
 
207 207
 		return $output;
208 208
 	}
Please login to merge, or discard this patch.