Completed
Push — develop ( 859fa4...87b48c )
by Gennady
16:11
created
includes/fields/class-gravityview-field-time.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
64 64
 
65
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
65
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
66 66
 	}
67 67
 
68 68
 	/**
@@ -103,31 +103,31 @@  discard block
 block discarded – undo
103 103
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
104 104
 
105 105
 		// If the search is being sorted
106
-		if( ! empty( $criteria['sorting']['key'] ) ) {
106
+		if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
107 107
 
108
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
108
+			$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
109 109
 
110 110
 			/**
111 111
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
112 112
 			 * @see modify_sort_id()
113 113
 			 */
114
-			if( ! empty( $pieces[1] ) ) {
114
+			if ( ! empty( $pieces[ 1 ] ) ) {
115 115
 
116 116
 				// Pass these to the _modify_query_sort_by_time_hack() method
117
-				$this->_time_format = $pieces[1];
118
-				$this->_date_format = $pieces[2];
117
+				$this->_time_format = $pieces[ 1 ];
118
+				$this->_date_format = $pieces[ 2 ];
119 119
 
120 120
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
121
-				$criteria['sorting']['key'] = floor( $pieces[0] );
121
+				$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
122 122
 
123 123
 				/**
124 124
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
125 125
 				 * @see GVCommon::is_field_numeric() is_numeric should also be set here
126 126
 				 */
127
-				$criteria['sorting']['is_numeric'] = true;
127
+				$criteria[ 'sorting' ][ 'is_numeric' ] = true;
128 128
 
129 129
 				// Modify the Gravity Forms WP Query
130
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
130
+				add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
131 131
 			}
132 132
 		}
133 133
 
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
 		 * then we want to modify the query.
151 151
 		 * @see GFFormsModel::sort_by_field_query()
152 152
 		 */
153
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
153
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
154 154
 
155
-			if( $this->_time_format === '24' ) {
155
+			if ( $this->_time_format === '24' ) {
156 156
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
157 157
 			} else {
158 158
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -198,18 +198,18 @@  discard block
 block discarded – undo
198 198
 		// Set variables
199 199
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
200 200
 
201
-		if( 'edit' === $context ) {
201
+		if ( 'edit' === $context ) {
202 202
 			return $field_options;
203 203
 		}
204 204
 
205 205
 		/**
206 206
 		 * Set default date format based on field ID and Form ID
207 207
 		 */
208
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
208
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
209 209
 
210
-		$this->add_field_support('date_display', $field_options );
210
+		$this->add_field_support( 'date_display', $field_options );
211 211
 
212
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
212
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
213 213
 
214 214
 		return $field_options;
215 215
 	}
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 	private function _get_time_format() {
225 225
 		global $post;
226 226
 
227
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
227
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
228 228
 
229 229
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
230 230
 	}
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
 		// GF defaults to 12, so should we.
244 244
 		$time_format = '12';
245 245
 
246
-		if( $form_id ) {
246
+		if ( $form_id ) {
247 247
 			$form = GFAPI::get_form( $form_id );
248 248
 
249 249
 			if ( $form ) {
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		$default = 'h:i A';
291 291
 
292 292
 		// This doesn't take into account 24-hour
293
-		switch( $field_input_id ) {
293
+		switch ( $field_input_id ) {
294 294
 			// Hours
295 295
 			case 1:
296 296
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-radio.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Radio';
17 17
 
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 		// Set the $_field_id var
41 41
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
42 42
 		
43
-		if( $this->is_choice_value_enabled() ) {
44
-			$field_options['choice_display'] = array(
43
+		if ( $this->is_choice_value_enabled() ) {
44
+			$field_options[ 'choice_display' ] = array(
45 45
 				'type'    => 'radio',
46 46
 				'value'   => 'value',
47 47
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-select.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,8 +44,8 @@
 block discarded – undo
44 44
 		// Set the $_field_id var
45 45
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id );
46 46
 
47
-		if( $this->is_choice_value_enabled() ) {
48
-			$field_options['choice_display'] = array(
47
+		if ( $this->is_choice_value_enabled() ) {
48
+			$field_options[ 'choice_display' ] = array(
49 49
 				'type'    => 'radio',
50 50
 				'value'   => 'value',
51 51
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-fileupload.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -24,21 +24,21 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['search_filter'] );
27
+		unset( $field_options[ 'search_filter' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$add_options['link_to_file'] = array(
33
+		$add_options[ 'link_to_file' ] = array(
34 34
 			'type' => 'checkbox',
35 35
 			'label' => __( 'Display as a Link:', 'gravityview' ),
36
-			'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'),
36
+			'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ),
37 37
 			'value' => false,
38 38
 			'merge_tags' => false,
39 39
 		);
40 40
 
41
-		$add_options['image_width'] = array(
41
+		$add_options[ 'image_width' ] = array(
42 42
 			'type' => 'text',
43 43
 			'label' => __( 'Custom Width:', 'gravityview' ),
44 44
 			'desc' => __( 'Override the default image width (250).', 'gravityview' ),
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
 			$base_id = null;
128 128
 
129 129
 			$is_single = gravityview_get_context() === 'single';
130
-			$lightbox = ! empty( $gravityview_view->atts['lightbox'] );
130
+			$lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] );
131 131
 			$field_compat = $gravityview_view->getCurrentField();
132 132
 		}
133 133
 
134 134
 		$output_arr = array();
135 135
 
136 136
 		// Get an array of file paths for the field.
137
-		$file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value );
137
+		$file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value );
138 138
 
139 139
 		// The $value JSON was probably truncated; let's check lead_detail_long.
140 140
 		if ( ! is_array( $file_paths ) ) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 			$rendered = null;
154 154
 
155 155
 			// If the site is HTTPS, use HTTPS
156
-			if ( function_exists('set_url_scheme') ) {
156
+			if ( function_exists( 'set_url_scheme' ) ) {
157 157
 				$file_path = set_url_scheme( $file_path );
158 158
 			}
159 159
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 			$file_path_info = pathinfo( $file_path );
165 165
 
166 166
 			// If pathinfo() gave us the extension of the file, run the switch statement using that.
167
-			$extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] );
168
-			$basename = $file_path_info['basename'];
167
+			$extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] );
168
+			$basename = $file_path_info[ 'basename' ];
169 169
 
170 170
 			// Get the secure download URL
171 171
 			$is_secure = false;
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 					 */
203 203
 					$audio_settings = apply_filters( 'gravityview_audio_settings', array(
204 204
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
205
-						'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id']
205
+						'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ]
206 206
 					), $context );
207 207
 
208 208
 					/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 					 */
239 239
 					$video_settings = apply_filters( 'gravityview_video_settings', array(
240 240
 						'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension
241
-						'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id']
241
+						'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ]
242 242
 					), $context );
243 243
 
244 244
 					/**
@@ -271,13 +271,13 @@  discard block
 block discarded – undo
271 271
 				$width = \GV\Utils::get( $field_settings, 'image_width', 250 );
272 272
 				$image_atts = array(
273 273
 					'src'   => $file_path,
274
-					'class' => 'gv-image gv-field-id-' . $field_settings['id'],
275
-					'alt'   => $field_settings['label'],
276
-					'width' => ( $is_single ? null : ( $width ? $width: 250 ) )
274
+					'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ],
275
+					'alt'   => $field_settings[ 'label' ],
276
+					'width' => ( $is_single ? null : ( $width ? $width : 250 ) )
277 277
 				);
278 278
 				
279 279
 				if ( $is_secure ) {
280
-					$image_atts['validate_src'] = false;
280
+					$image_atts[ 'validate_src' ] = false;
281 281
 				}
282 282
 
283 283
 				/**
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 
293 293
 				$image = new GravityView_Image( $image_atts );
294 294
 
295
-				$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
295
+				$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
296 296
 
297 297
 				/**
298 298
 				 * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox.
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 				 */
304 304
 				$override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context );
305 305
 
306
-				if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) {
306
+				if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) {
307 307
 					$lightbox_link_atts = array(
308 308
 						'rel'   => sprintf( "%s-%s", $gv_class, $entry_slug ),
309 309
 						'class' => 'thickbox',
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 					$lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context );
313 313
 
314 314
 					if ( $override_security ) {
315
-						$image_atts['src'] = $insecure_file_path;
315
+						$image_atts[ 'src' ] = $insecure_file_path;
316 316
 						$image = new GravityView_Image( $image_atts );
317 317
 						$file_path = $insecure_file_path;
318 318
 						// :( a kitten died somewhere
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 				}
325 325
 
326 326
 				// Show as link should render the image regardless.
327
-				if ( ! empty( $field_settings['show_as_link'] ) ) {
327
+				if ( ! empty( $field_settings[ 'show_as_link' ] ) ) {
328 328
 					$text = $rendered;
329 329
 				}
330 330
 			}
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
 			$disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context );
342 342
 
343 343
 			// Output textualized content where 
344
-			if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) {
344
+			if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) {
345 345
 				/**
346 346
 				 * Modify the link text (defaults to the file name)
347 347
 				 *
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 				 */
355 355
 				$content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context );
356 356
 
357
-				if ( empty( $field_settings['show_as_link'] ) ) {
357
+				if ( empty( $field_settings[ 'show_as_link' ] ) ) {
358 358
 					/**
359 359
 					 * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field
360 360
 					 * @param array|string $link_atts Array or attributes string
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 				$content = empty( $rendered ) ? $text : $rendered;
371 371
 			}
372 372
 
373
-			$output_arr[] = array(
373
+			$output_arr[ ] = array(
374 374
 				'file_path' => $file_path,
375 375
 				'content' => $content
376 376
 			);
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +19 added lines, -19 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' ) ) {
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 		$this->id         = $item_id;
76 76
 		$this->form_id    = $form_id;
77 77
 		$this->settings   = $settings;
78
-		$this->label_type = $item['label_type'];
78
+		$this->label_type = $item[ 'label_type' ];
79 79
 	}
80 80
 
81 81
 	/**
@@ -119,14 +119,14 @@  discard block
 block discarded – undo
119 119
 
120 120
 			foreach ( $field_info_items as $item ) {
121 121
 
122
-				if( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
122
+				if ( \GV\Utils::get( $item, 'hide_in_picker', false ) ) {
123 123
 					continue;
124 124
 				}
125 125
 
126
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
126
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
127 127
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
128 128
 				$output .= '<span class="' . $class . '">';
129
-				$output .= esc_html( $item['value'] );
129
+				$output .= esc_html( $item[ 'value' ] );
130 130
 				$output .= '</span>';
131 131
 			}
132 132
 
@@ -154,29 +154,29 @@  discard block
 block discarded – undo
154 154
 
155 155
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
156 156
 		// TODO: Un-hack this
157
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
157
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
158 158
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
159 159
 
160 160
 		// Should we show the icon that the field is being used as a link to single entry?
161
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
161
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
162 162
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
163 163
 
164 164
 		// When a field label is empty, use the Field ID
165 165
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
166 166
 
167 167
 		// If there's a custom label, and show label is checked, use that as the field heading
168
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
169
-			$label = $this->settings['custom_label'];
170
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
171
-			$label = $this->item['customLabel'];
168
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
169
+			$label = $this->settings[ 'custom_label' ];
170
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
171
+			$label = $this->item[ 'customLabel' ];
172 172
 		}
173 173
 
174 174
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
175 175
 
176 176
 		$label = esc_attr( $label );
177 177
 
178
-		if ( ! empty( $this->item['parent'] ) ) {
179
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
178
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
179
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
180 180
 		}
181 181
 
182 182
 		// Name of field / widget
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
 
193 193
 		$output .= '</h5>';
194 194
 
195
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
196
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
195
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
196
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
197 197
 
198
-		$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>';
198
+		$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>';
199 199
 
200 200
 		return $output;
201 201
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 		 */
48 48
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
49 49
 
50
-		$view = \GV\View::by_id( $atts['view_id'] );
50
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
51 51
 
52 52
 		if ( ! $view ) {
53
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
53
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
54 54
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
55 55
 		}
56 56
 
57
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
57
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
58 58
 
59
-		switch( $entry_id ):
59
+		switch ( $entry_id ):
60 60
 			case 'last':
61 61
 				if ( class_exists( '\GF_Query' ) ) {
62 62
 					/**
@@ -65,17 +65,17 @@  discard block
 block discarded – undo
65 65
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
66 66
 					 */
67 67
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
68
-						if ( ! empty( $parameters['sorting'] ) ) {
68
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
69 69
 							/**
70 70
 							 * Reverse existing sorts.
71 71
 							 */
72
-							$sort = &$parameters['sorting'];
73
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
72
+							$sort = &$parameters[ 'sorting' ];
73
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
74 74
 						} else {
75 75
 							/**
76 76
 							 * Otherwise, sort by date_created.
77 77
 							 */
78
-							$parameters['sorting'] = array(
78
+							$parameters[ 'sorting' ] = array(
79 79
 								'key' => 'id',
80 80
 								'direction' => 'ASC',
81 81
 								'is_numeric' => true
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
 					/** If a sort already exists, reverse it. */
92 92
 					if ( $sort = end( $entries->sorts ) ) {
93
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
93
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
94 94
 					} else {
95 95
 						/** Otherwise, sort by date_created */
96 96
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 				break;
109 109
 			default:
110 110
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
111
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
111
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
112 112
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
113 113
 				}
114 114
 		endswitch;
115 115
 
116
-		if ( $view->form->ID != $entry['form_id'] ) {
116
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
117 117
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
118 118
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
119 119
 		}
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
124 124
 		}
125 125
 
126
-		if ( ! $view->form  ) {
126
+		if ( ! $view->form ) {
127 127
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
128 128
 
129 129
 			/**
@@ -146,43 +146,43 @@  discard block
 block discarded – undo
146 146
 		}
147 147
 
148 148
 		/** Unapproved entries. */
149
-		if ( $entry['status'] != 'active' ) {
149
+		if ( $entry[ 'status' ] != 'active' ) {
150 150
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
151 151
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
152 152
 		}
153 153
 
154
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
154
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
155 155
 
156 156
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
157
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
157
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
158 158
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
159 159
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
160 160
 			}
161 161
 		}
162 162
 
163
-		if ( $atts['edit'] ) {
163
+		if ( $atts[ 'edit' ] ) {
164 164
 			/**
165 165
 			 * Based on code in our unit-tests.
166 166
 			 * Mocks old context, etc.
167 167
 			 */
168 168
 			$loader = \GravityView_Edit_Entry::getInstance();
169
-			$render = $loader->instances['render'];
169
+			$render = $loader->instances[ 'render' ];
170 170
 
171 171
 			add_filter( 'gravityview/is_single_entry', '__return_true' );
172 172
 
173
-			$form = \GFAPI::get_form( $entry['form_id'] );
173
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
174 174
 
175 175
 			$data = \GravityView_View_Data::getInstance( $view );
176 176
 			$template = \GravityView_View::getInstance( array(
177 177
 				'form' => $form,
178
-				'form_id' => $form['id'],
178
+				'form_id' => $form[ 'id' ],
179 179
 				'view_id' => $view->ID,
180 180
 				'entries' => array( $entry ),
181 181
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
182 182
 			) );
183 183
 
184
-			$_GET['edit'] = wp_create_nonce(
185
-				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form['id'], $entry['id'] )
184
+			$_GET[ 'edit' ] = wp_create_nonce(
185
+				\GravityView_Edit_Entry::get_nonce_key( $view->ID, $form[ 'id' ], $entry[ 'id' ] )
186 186
 			);
187 187
 
188 188
 			add_filter( 'gravityview/edit_entry/success', $callback = function( $message ) use ( $view, $entry, $atts ) {
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 				return apply_filters( 'gravityview/shortcodes/gventry/edit/success', $message, $view, $entry, $atts );
200 200
 			} );
201 201
 
202
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
202
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
203 203
 			$output = ob_get_clean(); // Render :)
204 204
 
205 205
 			remove_filter( 'gravityview/is_single_entry', '__return_true' );
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 			$renderer = new \GV\Entry_Renderer();
212 212
 
213 213
 			$request = new \GV\Mock_Request();
214
-			$request->returns['is_entry'] = $entry;
214
+			$request->returns[ 'is_entry' ] = $entry;
215 215
 
216 216
 			$output = $renderer->render( $entry, $view, $request );
217 217
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +184 added lines, -184 removed lines patch added patch discarded remove patch
@@ -27,32 +27,32 @@  discard block
 block discarded – undo
27 27
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
28 28
 
29 29
 		// Tooltips
30
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
30
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
31 31
 
32 32
 		// adding styles and scripts
33
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
34
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
35
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
38
-
39
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
40
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
41
-		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers') );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
33
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
34
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
35
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
38
+
39
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
40
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
41
+		add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ) );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 		add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
54 54
 
55
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
55
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
56 56
 
57 57
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
58 58
 
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	function suggest_support_articles( $localization_data = array() ) {
73 73
 
74
-	    if( ! gravityview()->request->is_view() ) {
74
+	    if ( ! gravityview()->request->is_view() ) {
75 75
 	        return $localization_data;
76 76
         }
77 77
 
78
-		$localization_data['suggest'] = array(
78
+		$localization_data[ 'suggest' ] = array(
79 79
             '57ef23539033602e61d4a560',
80 80
             '54c67bb9e4b0512429885513',
81 81
             '54c67bb9e4b0512429885512',
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
97 97
 		global $pagenow;
98 98
 
99
-		if ( !is_admin() ) {
99
+		if ( ! is_admin() ) {
100 100
 			return;
101 101
 		}
102 102
 
103
-		$form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false;
103
+		$form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false;
104 104
 
105
-		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
105
+		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) {
106 106
 			return;
107 107
 		}
108 108
 
@@ -119,18 +119,18 @@  discard block
 block discarded – undo
119 119
 	function add_view_dropdown() {
120 120
 		$current_screen = get_current_screen();
121 121
 
122
-		if( 'gravityview' !== $current_screen->post_type ) {
122
+		if ( 'gravityview' !== $current_screen->post_type ) {
123 123
 			return;
124 124
 		}
125 125
 
126 126
 		$forms = gravityview_get_forms();
127 127
 		$current_form = \GV\Utils::_GET( 'gravityview_form_id' );
128 128
 		// If there are no forms to select, show no forms.
129
-		if( !empty( $forms ) ) { ?>
129
+		if ( ! empty( $forms ) ) { ?>
130 130
 			<select name="gravityview_form_id" id="gravityview_form_id">
131 131
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
132
-				<?php foreach( $forms as $form ) { ?>
133
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
132
+				<?php foreach ( $forms as $form ) { ?>
133
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
134 134
 				<?php } ?>
135 135
 			</select>
136 136
 		<?php }
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 */
144 144
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
145 145
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
146
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
146
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
147 147
 	}
148 148
 
149 149
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) {
166 166
 
167 167
 		// Don't show on Trashed forms
168
-		if( 'trash' === rgget( 'filter') ) {
168
+		if ( 'trash' === rgget( 'filter' ) ) {
169 169
 			return $menu_items;
170 170
 		}
171 171
 
@@ -173,13 +173,13 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$priority = 0;
175 175
 
176
-		if( 'form_list' === GFForms::get_page() ) {
176
+		if ( 'form_list' === GFForms::get_page() ) {
177 177
 			$priority = 790;
178 178
         }
179 179
 
180
-		if( empty( $connected_views ) ) {
180
+		if ( empty( $connected_views ) ) {
181 181
 
182
-		    $menu_items['gravityview'] = array(
182
+		    $menu_items[ 'gravityview' ] = array(
183 183
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
184 184
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
185 185
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -195,22 +195,22 @@  discard block
 block discarded – undo
195 195
 		$sub_menu_items = array();
196 196
 		foreach ( (array)$connected_views as $view ) {
197 197
 
198
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
198
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
199 199
 				continue;
200 200
 			}
201 201
 
202
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
202
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
203 203
 
204
-			$sub_menu_items[] = array(
204
+			$sub_menu_items[ ] = array(
205 205
 				'label' => esc_attr( $label ),
206
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
206
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
207 207
 			);
208 208
 		}
209 209
 
210 210
 		// If there were no items added, then let's create the parent menu
211
-		if( $sub_menu_items ) {
211
+		if ( $sub_menu_items ) {
212 212
 
213
-		    $sub_menu_items[] = array(
213
+		    $sub_menu_items[ ] = array(
214 214
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
215 215
                 'link_class' => 'gv-create-view',
216 216
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -219,14 +219,14 @@  discard block
 block discarded – undo
219 219
             );
220 220
 
221 221
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
222
-			$sub_menu_items[] = array(
222
+			$sub_menu_items[ ] = array(
223 223
 				'url' => '#',
224 224
 				'label' => '',
225 225
 				'menu_class' => 'hidden',
226 226
 				'capabilities' => '',
227 227
 			);
228 228
 
229
-			$menu_items['gravityview'] = array(
229
+			$menu_items[ 'gravityview' ] = array(
230 230
 				'label'          => __( 'Connected Views', 'gravityview' ),
231 231
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
232 232
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -255,8 +255,8 @@  discard block
 block discarded – undo
255 255
 		$add = array( 'captcha', 'page' );
256 256
 
257 257
 		// Don't allowing editing the following values:
258
-		if( $context === 'edit' ) {
259
-			$add[] = 'post_id';
258
+		if ( $context === 'edit' ) {
259
+			$add[ ] = 'post_id';
260 260
 		}
261 261
 
262 262
 		$return = array_merge( $array, $add );
@@ -279,32 +279,32 @@  discard block
 block discarded – undo
279 279
 		foreach ( $default_args as $key => $arg ) {
280 280
 
281 281
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
282
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
282
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
283 283
 
284 284
 			// By default, use `tooltip` if defined.
285
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
285
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
286 286
 
287 287
 			// Otherwise, use the description as a tooltip.
288
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
289
-				$tooltip = $arg['desc'];
288
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
289
+				$tooltip = $arg[ 'desc' ];
290 290
 			}
291 291
 
292 292
 			// If there's no tooltip set, continue
293
-			if( empty( $tooltip ) ) {
293
+			if ( empty( $tooltip ) ) {
294 294
 				continue;
295 295
 			}
296 296
 
297 297
 			// Add the tooltip
298
-			$gv_tooltips[ 'gv_'.$key ] = array(
299
-				'title'	=> $arg['label'],
298
+			$gv_tooltips[ 'gv_' . $key ] = array(
299
+				'title'	=> $arg[ 'label' ],
300 300
 				'value'	=> $tooltip,
301 301
 			);
302 302
 
303 303
 		}
304 304
 
305
-		$gv_tooltips['gv_css_merge_tags'] = array(
306
-			'title' => __('CSS Merge Tags', 'gravityview'),
307
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
305
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
306
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
307
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
308 308
 		);
309 309
 
310 310
 		/**
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
322 322
 
323 323
 		foreach ( $gv_tooltips as $key => $tooltip ) {
324 324
 
325
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
325
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
326 326
 
327
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
327
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
328 328
 		}
329 329
 
330 330
 		return $tooltips;
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
 	 *
339 339
 	 * @return void
340 340
 	 */
341
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
341
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
342 342
 
343 343
 		$output = '';
344 344
 
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
361 361
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
362 362
 
363
-				$output = $template ? $template['label'] : $template_id_pretty;
363
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
364 364
 
365 365
 				break;
366 366
 
@@ -401,44 +401,44 @@  discard block
 block discarded – undo
401 401
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
402 402
 
403 403
 		// Either the form is empty or the form ID is 0, not yet set.
404
-		if( empty( $form ) ) {
404
+		if ( empty( $form ) ) {
405 405
 			return '';
406 406
 		}
407 407
 
408 408
 		// The $form is passed as the form ID
409
-		if( !is_array( $form ) ) {
409
+		if ( ! is_array( $form ) ) {
410 410
 			$form = gravityview_get_form( $form );
411 411
 		}
412 412
 
413
-		$form_id = $form['id'];
413
+		$form_id = $form[ 'id' ];
414 414
 		$links = array();
415 415
 
416
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
416
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
417 417
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
418
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
419
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
418
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
419
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
420 420
 		} else {
421
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
421
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
422 422
 		}
423 423
 
424
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
424
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
425 425
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
426
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
426
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
427 427
 		}
428 428
 
429
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
429
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
430 430
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
431
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
431
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
432 432
 		}
433 433
 
434
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
434
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
435 435
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
436
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
436
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
437 437
 		}
438 438
 
439 439
 		$output = '';
440 440
 
441
-		if( !empty( $include_form_link ) ) {
441
+		if ( ! empty( $include_form_link ) ) {
442 442
 			$output .= $form_link;
443 443
 		}
444 444
 
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 		 */
451 451
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
452 452
 
453
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
453
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
454 454
 
455 455
 		return $output;
456 456
 	}
@@ -464,8 +464,8 @@  discard block
 block discarded – undo
464 464
 		// Get the date column and save it for later to add back in.
465 465
 		// This adds it after the Data Source column.
466 466
 		// This way, we don't need to do array_slice, array_merge, etc.
467
-		$date = $columns['date'];
468
-		unset( $columns['date'] );
467
+		$date = $columns[ 'date' ];
468
+		unset( $columns[ 'date' ] );
469 469
 
470 470
 		$data_source_required_caps = array(
471 471
 			'gravityforms_edit_forms',
@@ -476,14 +476,14 @@  discard block
 block discarded – undo
476 476
 			'gravityforms_preview_forms',
477 477
 		);
478 478
 
479
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
480
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
479
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
480
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
481 481
 		}
482 482
 
483
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
483
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
484 484
 
485 485
 		// Add the date back in.
486
-		$columns['date'] = $date;
486
+		$columns[ 'date' ] = $date;
487 487
 
488 488
 		return $columns;
489 489
 	}
@@ -497,12 +497,12 @@  discard block
 block discarded – undo
497 497
 	 */
498 498
 	function save_postdata( $post_id ) {
499 499
 
500
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
500
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
501 501
 			return;
502 502
 		}
503 503
 
504 504
 		// validate post_type
505
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
505
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
506 506
 			return;
507 507
 		}
508 508
 
@@ -517,63 +517,63 @@  discard block
 block discarded – undo
517 517
 		$statii = array();
518 518
 
519 519
 		// check if this is a start fresh View
520
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
520
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
521 521
 
522
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
522
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
523 523
 			// save form id
524
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
524
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
525 525
 
526 526
 		}
527 527
 
528
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
528
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
529 529
 			gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) );
530 530
 			return;
531 531
 		}
532 532
 
533 533
 		// Was this a start fresh?
534
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
535
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
534
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
535
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
536 536
 		} else {
537
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
537
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
538 538
 		}
539 539
 
540 540
 		// Check if we have a template id
541
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
541
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
542 542
 
543
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
543
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
544 544
 
545 545
 			// now save template id
546
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
546
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
547 547
 		}
548 548
 
549 549
 
550 550
 		// save View Configuration metabox
551
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
551
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
552 552
 
553 553
 			// template settings
554
-			if( empty( $_POST['template_settings'] ) ) {
555
-				$_POST['template_settings'] = array();
554
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
555
+				$_POST[ 'template_settings' ] = array();
556 556
 			}
557
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
557
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
558 558
 
559 559
 			// guard against unloaded View configuration page
560
-			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) {
560
+			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) {
561 561
 				$fields = array();
562 562
 
563
-				if ( ! empty( $_POST['gv_fields'] ) ) {
563
+				if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
564 564
 					$fields = _gravityview_process_posted_fields();
565 565
 				}
566 566
 
567 567
 				$fields = wp_slash( $fields );
568 568
 
569
-				$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
569
+				$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
570 570
 			}
571 571
 
572 572
 			// Directory Visible Widgets
573
-			if( empty( $_POST['widgets'] ) ) {
574
-				$_POST['widgets'] = array();
573
+			if ( empty( $_POST[ 'widgets' ] ) ) {
574
+				$_POST[ 'widgets' ] = array();
575 575
 			}
576
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
576
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
577 577
 
578 578
 		} // end save view configuration
579 579
 
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
584 584
 		 * @since 1.17.2
585 585
 		 */
586
-		do_action('gravityview_view_saved', $post_id, $statii );
586
+		do_action( 'gravityview_view_saved', $post_id, $statii );
587 587
 
588 588
 		gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) );
589 589
 	}
@@ -627,20 +627,20 @@  discard block
 block discarded – undo
627 627
 
628 628
 		$output = '';
629 629
 
630
-		if( !empty( $fields ) ) {
630
+		if ( ! empty( $fields ) ) {
631 631
 
632
-			foreach( $fields as $id => $details ) {
632
+			foreach ( $fields as $id => $details ) {
633 633
 
634
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
634
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
635 635
 					continue;
636 636
 				}
637 637
 
638 638
 				// Edit mode only allows editing the parent fields, not single inputs.
639
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
639
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
640 640
 					continue;
641 641
 				}
642 642
 
643
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, $settings = array(), $form );
643
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, $settings = array(), $form );
644 644
 
645 645
 			} // End foreach
646 646
 		}
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 		echo $output;
649 649
 
650 650
 		// For the EDIT view we only want to allow the form fields.
651
-		if( $context === 'edit' ) {
651
+		if ( $context === 'edit' ) {
652 652
 			return;
653 653
 		}
654 654
 
@@ -672,16 +672,16 @@  discard block
 block discarded – undo
672 672
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
673 673
 			array(
674 674
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
675
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
675
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
676 676
 				'field_id' => 'all-fields',
677 677
 				'label_type' => 'field',
678 678
 				'input_type' => NULL,
679 679
 				'field_options' => NULL,
680 680
 				'settings_html'	=> NULL,
681 681
 			)
682
-		));
682
+		) );
683 683
 
684
-		if( !empty( $additional_fields )) {
684
+		if ( ! empty( $additional_fields ) ) {
685 685
 			foreach ( (array)$additional_fields as $item ) {
686 686
 
687 687
 				// Prevent items from not having index set
@@ -692,16 +692,16 @@  discard block
 block discarded – undo
692 692
 					'input_type' => NULL,
693 693
 					'field_options' => NULL,
694 694
 					'settings_html'	=> NULL,
695
-				));
695
+				) );
696 696
 
697 697
 				// Backward compat.
698
-				if( !empty( $item['field_options'] ) ) {
698
+				if ( ! empty( $item[ 'field_options' ] ) ) {
699 699
 					// Use settings_html from now on.
700
-					$item['settings_html'] = $item['field_options'];
700
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
701 701
 				}
702 702
 
703 703
 				// Render a label for each of them
704
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form );
704
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form );
705 705
 
706 706
 			}
707 707
 		}
@@ -714,54 +714,54 @@  discard block
 block discarded – undo
714 714
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
715 715
 	 * @return array
716 716
 	 */
717
-	function get_entry_default_fields($form, $zone) {
717
+	function get_entry_default_fields( $form, $zone ) {
718 718
 
719 719
 		$entry_default_fields = array();
720 720
 
721
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
721
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
722 722
 
723 723
 			$entry_default_fields = array(
724 724
 				'id' => array(
725
-					'label' => __('Entry ID', 'gravityview'),
725
+					'label' => __( 'Entry ID', 'gravityview' ),
726 726
 					'type' => 'id',
727
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
727
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
728 728
 				),
729 729
 				'date_created' => array(
730
-					'label' => __('Entry Date', 'gravityview'),
731
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
730
+					'label' => __( 'Entry Date', 'gravityview' ),
731
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
732 732
 					'type' => 'date_created',
733 733
 				),
734 734
 				'source_url' => array(
735
-					'label' => __('Source URL', 'gravityview'),
735
+					'label' => __( 'Source URL', 'gravityview' ),
736 736
 					'type' => 'source_url',
737
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
737
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
738 738
 				),
739 739
 				'ip' => array(
740
-					'label' => __('User IP', 'gravityview'),
740
+					'label' => __( 'User IP', 'gravityview' ),
741 741
 					'type' => 'ip',
742
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
742
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
743 743
 				),
744 744
 				'created_by' => array(
745
-					'label' => __('User', 'gravityview'),
745
+					'label' => __( 'User', 'gravityview' ),
746 746
 					'type' => 'created_by',
747
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
747
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
748 748
 				),
749 749
 
750 750
 				/**
751 751
 				 * @since 1.7.2
752 752
 				 */
753 753
 			    'other_entries' => array(
754
-				    'label'	=> __('Other Entries', 'gravityview'),
754
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
755 755
 				    'type'	=> 'other_entries',
756
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
756
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
757 757
 			    ),
758 758
 	        );
759 759
 
760
-			if( 'single' !== $zone) {
760
+			if ( 'single' !== $zone ) {
761 761
 
762
-				$entry_default_fields['entry_link'] = array(
763
-					'label' => __('Link to Entry', 'gravityview'),
764
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
762
+				$entry_default_fields[ 'entry_link' ] = array(
763
+					'label' => __( 'Link to Entry', 'gravityview' ),
764
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
765 765
 					'type' => 'entry_link',
766 766
 				);
767 767
 			}
@@ -771,19 +771,19 @@  discard block
 block discarded – undo
771 771
 		/**
772 772
 		 * @since  1.2
773 773
 		 */
774
-		$entry_default_fields['custom']	= array(
775
-			'label'	=> __('Custom Content', 'gravityview'),
774
+		$entry_default_fields[ 'custom' ] = array(
775
+			'label'	=> __( 'Custom Content', 'gravityview' ),
776 776
 			'type'	=> 'custom',
777
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
777
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
778 778
 		);
779 779
 
780 780
 		/**
781 781
 		 * @since develop
782 782
 		 */
783
-		$entry_default_fields['sequence'] = array(
784
-			'label'	=> __('Result Number', 'gravityview'),
783
+		$entry_default_fields[ 'sequence' ] = array(
784
+			'label'	=> __( 'Result Number', 'gravityview' ),
785 785
 			'type'	=> 'sequence',
786
-			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'),
786
+			'desc'	=> __( 'Display a sequential result number for each entry.', 'gravityview' ),
787 787
 		);
788 788
 
789 789
 		/**
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 		 * @param  string|array $form form_ID or form object
793 793
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
794 794
 		 */
795
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
795
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
796 796
 	}
797 797
 
798 798
 	/**
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 	 */
804 804
 	function get_available_fields( $form = '', $zone = NULL ) {
805 805
 
806
-		if( empty( $form ) ) {
806
+		if ( empty( $form ) ) {
807 807
 			gravityview()->log->error( '$form is empty' );
808 808
 			return array();
809 809
 		}
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
 		$fields = gravityview_get_form_fields( $form, true );
813 813
 
814 814
 		// get meta fields ( only if form was already created )
815
-		if( !is_array( $form ) ) {
815
+		if ( ! is_array( $form ) ) {
816 816
 			$meta_fields = gravityview_get_entry_meta( $form );
817 817
 		} else {
818 818
 			$meta_fields = array();
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 		$fields = $fields + $meta_fields + $default_fields;
826 826
 
827 827
 		// Move Custom Content to top
828
-		$fields = array( 'custom' => $fields['custom'] ) + $fields;
828
+		$fields = array( 'custom' => $fields[ 'custom' ] ) + $fields;
829 829
 
830 830
 		/**
831 831
 		 * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View.
@@ -845,11 +845,11 @@  discard block
 block discarded – undo
845 845
 
846 846
 		$widgets = $this->get_registered_widgets();
847 847
 
848
-		if( !empty( $widgets ) ) {
848
+		if ( ! empty( $widgets ) ) {
849 849
 
850
-			foreach( $widgets as $id => $details ) {
850
+			foreach ( $widgets as $id => $details ) {
851 851
 
852
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
852
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
853 853
 
854 854
 			}
855 855
 		}
@@ -878,7 +878,7 @@  discard block
 block discarded – undo
878 878
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
879 879
 		global $post;
880 880
 
881
-		if( $type === 'widget' ) {
881
+		if ( $type === 'widget' ) {
882 882
 			$button_label = __( 'Add Widget', 'gravityview' );
883 883
 		} else {
884 884
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -890,10 +890,10 @@  discard block
 block discarded – undo
890 890
 		$form_id = null;
891 891
 
892 892
 		// if saved values, get available fields to label everyone
893
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
893
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
894 894
 
895
-			if( !empty( $_POST['template_id'] ) ) {
896
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
895
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
896
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
897 897
 			} else {
898 898
 				$form_id = $form = gravityview_get_form_id( $post->ID );
899 899
 			}
@@ -911,44 +911,44 @@  discard block
 block discarded – undo
911 911
 			}
912 912
 		}
913 913
 
914
-		foreach( $rows as $row ) :
915
-			foreach( $row as $col => $areas ) :
916
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
914
+		foreach ( $rows as $row ) :
915
+			foreach ( $row as $col => $areas ) :
916
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
917 917
 
918 918
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
919 919
 
920
-					<?php foreach( $areas as $area ) : 	?>
920
+					<?php foreach ( $areas as $area ) : 	?>
921 921
 
922
-						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
923
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
922
+						<div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>">
923
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
924 924
 
925 925
 								<?php // render saved fields
926 926
 
927
-								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
927
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
928 928
 
929
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
929
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
930 930
 
931 931
 										// Maybe has a form ID
932
-										$form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id'];
932
+										$form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ];
933 933
 
934 934
 										$input_type = NULL;
935 935
 
936 936
 										if ( $form_id ) {
937
-											$original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ;
937
+											$original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false;
938 938
                                         } else {
939
-											$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
939
+											$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
940 940
                                         }
941 941
 
942
-										if ( !$original_item ) {
943
-											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) );
942
+										if ( ! $original_item ) {
943
+											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) );
944 944
 
945 945
 											$original_item = $field;
946 946
 										} else {
947
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
947
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
948 948
 										}
949 949
 
950 950
 										// Field options dialog box
951
-										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
951
+										$field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
952 952
 
953 953
 										$item = array(
954 954
 											'input_type' => $input_type,
@@ -961,23 +961,23 @@  discard block
 block discarded – undo
961 961
 											$item = wp_parse_args( $item, $original_item );
962 962
 										}
963 963
 
964
-										switch( $type ) {
964
+										switch ( $type ) {
965 965
 											case 'widget':
966
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
966
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
967 967
 												break;
968 968
 											default:
969
-												echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id );
969
+												echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id );
970 970
 										}
971 971
 									}
972 972
 
973 973
 								} // End if zone is not empty ?>
974 974
 
975
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
975
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
976 976
 							</div>
977 977
 							<div class="gv-droppable-area-action">
978
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
978
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
979 979
 
980
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
980
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
981 981
 							</div>
982 982
 						</div>
983 983
 
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 				// This is a new View, prefill the widgets
1006 1006
 				$widgets = array(
1007 1007
 					'header_top' => array(
1008
-						substr( md5( microtime( true ) ), 0, 13 ) => array (
1008
+						substr( md5( microtime( true ) ), 0, 13 ) => array(
1009 1009
 							'id' => 'search_bar',
1010 1010
 							'label' => __( 'Search Bar', 'gravityview' ),
1011 1011
 							'search_layout' => 'horizontal',
@@ -1077,7 +1077,7 @@  discard block
 block discarded – undo
1077 1077
 		// list of available fields to be shown in the popup
1078 1078
 		$forms = gravityview_get_forms( 'any' );
1079 1079
 
1080
-		$form_ids = array_map( function ($form) { return $form['id']; }, $forms);
1080
+		$form_ids = array_map( function( $form ) { return $form[ 'id' ]; }, $forms );
1081 1081
 
1082 1082
 		foreach ( $form_ids as $form_id ) {
1083 1083
 			$filter_field_id = sprintf( 'gv-field-filter-%s-%d', $context, $form_id );
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
1090 1090
                 </div>
1091 1091
 
1092 1092
                 <div id="available-fields-<?php echo $filter_field_id; ?>" aria-live="polite" role="listbox">
1093
-                <?php do_action('gravityview_render_available_fields', $form_id, $context ); ?>
1093
+                <?php do_action( 'gravityview_render_available_fields', $form_id, $context ); ?>
1094 1094
                 </div>
1095 1095
 
1096 1096
                 <div class="gv-no-results hidden description"><?php esc_html_e( 'No fields were found matching the search.', 'gravityview' ); ?></div>
@@ -1109,7 +1109,7 @@  discard block
 block discarded – undo
1109 1109
 	 * @return string HTML of the active areas
1110 1110
 	 */
1111 1111
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
1112
-		if( empty( $template_id ) ) {
1112
+		if ( empty( $template_id ) ) {
1113 1113
 			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) );
1114 1114
 			return '';
1115 1115
 		}
@@ -1123,12 +1123,12 @@  discard block
 block discarded – undo
1123 1123
 		 */
1124 1124
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
1125 1125
 
1126
-		if( empty( $template_areas ) ) {
1126
+		if ( empty( $template_areas ) ) {
1127 1127
 
1128 1128
 			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) );
1129 1129
 			$output = '<div>';
1130
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
1131
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
1130
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
1131
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
1132 1132
 			$output .= '</div>';
1133 1133
 		} else {
1134 1134
 
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
 
1144 1144
 		}
1145 1145
 
1146
-		if( $echo ) {
1146
+		if ( $echo ) {
1147 1147
 			echo $output;
1148 1148
 		}
1149 1149
 
@@ -1163,32 +1163,32 @@  discard block
 block discarded – undo
1163 1163
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1164 1164
 
1165 1165
 		// Add the GV font (with the Astronaut)
1166
-        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version );
1166
+        wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version );
1167 1167
 		wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version );
1168 1168
 
1169
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true );
1169
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true );
1170 1170
 
1171
-		if( GFForms::get_page() === 'form_list' ) {
1171
+		if ( GFForms::get_page() === 'form_list' ) {
1172 1172
 			wp_enqueue_style( 'gravityview_views_styles' );
1173 1173
 			return;
1174 1174
         }
1175 1175
 
1176 1176
 		// Don't process any scripts below here if it's not a GravityView page.
1177
-		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1177
+		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) {
1178 1178
 		    return;
1179 1179
 		}
1180 1180
 
1181 1181
         wp_enqueue_script( 'jquery-ui-datepicker' );
1182
-        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version );
1182
+        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version );
1183 1183
 
1184
-        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1184
+        $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1185 1185
 
1186 1186
         //enqueue scripts
1187 1187
         wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version );
1188 1188
 
1189
-        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1189
+        wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1190 1190
             'cookiepath' => COOKIEPATH,
1191
-            'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ),
1191
+            'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ),
1192 1192
             'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1193 1193
             'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1194 1194
             'label_close' => __( 'Close', 'gravityview' ),
@@ -1200,7 +1200,7 @@  discard block
 block discarded – undo
1200 1200
             'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1201 1201
             'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1202 1202
             'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1203
-        ));
1203
+        ) );
1204 1204
 
1205 1205
 		wp_enqueue_style( 'gravityview_views_styles' );
1206 1206
 
@@ -1227,7 +1227,7 @@  discard block
 block discarded – undo
1227 1227
 		);
1228 1228
 
1229 1229
 		if ( wp_is_mobile() ) {
1230
-		    $scripts[] = 'jquery-touch-punch';
1230
+		    $scripts[ ] = 'jquery-touch-punch';
1231 1231
 		}
1232 1232
 
1233 1233
 		wp_enqueue_script( $scripts );
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-pageviews.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
 		parent::add_hooks();
44 44
 
45
-		add_shortcode( 'gv_pageviews', array( $this, 'pageviews') );
45
+		add_shortcode( 'gv_pageviews', array( $this, 'pageviews' ) );
46 46
 
47 47
 		add_filter( 'gravityview/fields/custom/decode_shortcodes', array( $this, 'inject_entry_id' ), 10, 3 );
48 48
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * Used as sort of an action via the gravityview/fields/custom/decode_shortcodes filter.
69 69
 	 */
70 70
 	public function inject_entry_id( $r, $content, $context ) {
71
-		if ( ! empty( $context->entry['id'] ) ) {
72
-			$this->next_id = $context->entry['id'];
71
+		if ( ! empty( $context->entry[ 'id' ] ) ) {
72
+			$this->next_id = $context->entry[ 'id' ];
73 73
 		} else {
74 74
 			$this->next_id = false; // Nothing to look at, move along
75 75
 		}
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
 			'id'        => $this->next_id,
98 98
 		), $atts );
99 99
 
100
-		if ( ! $this->atts['id'] ) {
100
+		if ( ! $this->atts[ 'id' ] ) {
101 101
 			return; // The ID was not set
102 102
 		}
103 103
 
104 104
 		add_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
105 105
 
106
-		$output = Pageviews::placeholder( 'GV' . $this->atts['id'] ); // Prefix the ID to avoid collissions with default post IDs
106
+		$output = Pageviews::placeholder( 'GV' . $this->atts[ 'id' ] ); // Prefix the ID to avoid collissions with default post IDs
107 107
 
108 108
 		remove_filter( 'pageviews_placeholder_preload', array( $this, 'preload_callback' ) );
109 109
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * Set the preload text.
115 115
 	 */
116 116
 	public function preload_callback( $preload ) {
117
-		return $this->atts['preload'];
117
+		return $this->atts[ 'preload' ];
118 118
 	}
119 119
 
120 120
 	/**
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	 */
123 123
 	public function increment_callback() {
124 124
 		if ( $entry = gravityview()->request->is_entry() ) {
125
-			$increment = 'GV' . $entry['id'];
125
+			$increment = 'GV' . $entry[ 'id' ];
126 126
 			?>
127 127
 				_pv_config.incr = <?php echo json_encode( $increment ); ?>;
128 128
 			<?php
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -60,28 +60,28 @@  discard block
 block discarded – undo
60 60
 	if ( $object->show_previous_button ) {
61 61
 		$previous_tabindex = GFCommon::get_tabindex();
62 62
 		?>
63
-		<input id="gform_previous_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels['previous'] ); ?>" name="save" />
63
+		<input id="gform_previous_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-previous" type="submit" <?php echo $previous_tabindex; ?> value="<?php echo esc_attr( $labels[ 'previous' ] ); ?>" name="save" />
64 64
 		<?php
65 65
 	}
66 66
 
67 67
 	if ( $object->show_next_button ) {
68
-		$next_tabindex    = GFCommon::get_tabindex();
68
+		$next_tabindex = GFCommon::get_tabindex();
69 69
 		?>
70
-		<input id="gform_next_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels['next'] ); ?>" name="save" />
70
+		<input id="gform_next_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-next" type="submit" <?php echo $next_tabindex; ?> value="<?php echo esc_attr( $labels[ 'next' ] ); ?>" name="save" />
71 71
 		<?php
72 72
 	}
73 73
 
74 74
 	if ( $object->show_update_button ) {
75
-		$update_tabindex  = GFCommon::get_tabindex();
75
+		$update_tabindex = GFCommon::get_tabindex();
76 76
 		?>
77
-		<input id="gform_submit_button_<?php echo esc_attr( $object->form['id'] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels['submit'] ); ?>" name="save" />
77
+		<input id="gform_submit_button_<?php echo esc_attr( $object->form[ 'id' ] ); ?>" class="btn btn-lg button button-large gform_button button-primary gv-button-update" type="submit" <?php echo $update_tabindex; ?> value="<?php echo esc_attr( $labels[ 'submit' ] ); ?>" name="save" />
78 78
 		<?php
79 79
 	}
80 80
 
81
-	$cancel_tabindex   = GFCommon::get_tabindex();
81
+	$cancel_tabindex = GFCommon::get_tabindex();
82 82
 
83 83
 	?>
84
-	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels['cancel'] ); ?></a>
84
+	<a class="btn btn-sm button button-small gv-button-cancel" <?php echo $cancel_tabindex; ?> href="<?php echo esc_url( $back_link ); ?>"><?php echo esc_attr( $labels[ 'cancel' ] ); ?></a>
85 85
 	<?php
86 86
 
87 87
 	/**
@@ -97,5 +97,5 @@  discard block
 block discarded – undo
97 97
 
98 98
 	?>
99 99
 	<input type="hidden" name="action" value="update" />
100
-	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry['id'] ); ?>" />
100
+	<input type="hidden" name="lid" value="<?php echo esc_attr( $object->entry[ 'id' ] ); ?>" />
101 101
 </div>
Please login to merge, or discard this patch.