Completed
Push — develop ( cb5b74...de6e74 )
by Zack
11:01
created
includes/fields/class-gravityview-field-is-approved.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 */
93 93
 	function add_default_field( $entry_default_fields, $form, $zone ) {
94 94
 
95
-		if( 'edit' !== $zone ) {
95
+		if ( 'edit' !== $zone ) {
96 96
 			$entry_default_fields[ $this->name ] = array(
97 97
 				'label' => $this->label,
98 98
 				'desc'  => $this->description,
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 
118 118
 		$merge_tags = array(
119 119
 			array(
120
-				'label' => __('Approval Status', 'gravityview'),
120
+				'label' => __( 'Approval Status', 'gravityview' ),
121 121
 				'tag' => '{approval_status}'
122 122
 			),
123 123
 		);
@@ -157,10 +157,10 @@  discard block
 block discarded – undo
157 157
 				do_action( 'gravityview_log_error', __METHOD__ . ': No entry data available. Returning empty string.' );
158 158
 				$replacement = '';
159 159
 			} else {
160
-				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[1] );
160
+				$replacement = GravityView_Entry_Approval::get_entry_status( $entry, $match[ 1 ] );
161 161
 			}
162 162
 
163
-			$return = str_replace( $match[0], $replacement, $return );
163
+			$return = str_replace( $match[ 0 ], $replacement, $return );
164 164
 		}
165 165
 
166 166
 		return $return;
@@ -168,25 +168,25 @@  discard block
 block discarded – undo
168 168
 
169 169
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
170 170
 
171
-		$field_options['approved_label'] = array(
171
+		$field_options[ 'approved_label' ] = array(
172 172
 			'type' => 'text',
173 173
 			'label' => __( 'Approved Label', 'gravityview' ),
174 174
 			'desc' => __( 'If the entry is approved, display this value', 'gravityview' ),
175
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('approved'),
175
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'approved' ),
176 176
 		);
177 177
 
178
-		$field_options['disapproved_label'] = array(
178
+		$field_options[ 'disapproved_label' ] = array(
179 179
 			'type' => 'text',
180 180
 			'label' => __( 'Disapproved Label', 'gravityview' ),
181 181
 			'desc' => __( 'If the entry is not approved, display this value', 'gravityview' ),
182
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('disapproved'),
182
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'disapproved' ),
183 183
 		);
184 184
 
185
-		$field_options['unapproved_label'] = array(
185
+		$field_options[ 'unapproved_label' ] = array(
186 186
 			'type' => 'text',
187 187
 			'label' => __( 'Unapproved Label', 'gravityview' ),
188 188
 			'desc' => __( 'If the entry has not yet been approved or disapproved, display this value', 'gravityview' ),
189
-			'placeholder' => GravityView_Entry_Approval_Status::get_label('unapproved'),
189
+			'placeholder' => GravityView_Entry_Approval_Status::get_label( 'unapproved' ),
190 190
 		);
191 191
 
192 192
 		return $field_options;
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 		$field_options = array();
29 29
 
30
-		if( 'field' === $field_type ) {
30
+		if ( 'field' === $field_type ) {
31 31
 
32 32
 			// Default options - fields
33 33
 			$field_options = array(
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 				'custom_class' => array(
46 46
 					'type' => 'text',
47 47
 					'label' => __( 'Custom CSS Class:', 'gravityview' ),
48
-					'desc' => __( 'This class will be added to the field container', 'gravityview'),
48
+					'desc' => __( 'This class will be added to the field container', 'gravityview' ),
49 49
 					'value' => '',
50 50
 					'merge_tags' => true,
51 51
 					'tooltip' => 'gv_css_merge_tags',
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 			);
66 66
 
67 67
 			// Match Table as well as DataTables
68
-			if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
-				$field_options['width'] = array(
68
+			if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) {
69
+				$field_options[ 'width' ] = array(
70 70
 					'type' => 'number',
71
-					'label' => __('Percent Width', 'gravityview'),
72
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
71
+					'label' => __( 'Percent Width', 'gravityview' ),
72
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
73 73
 					'class' => 'code widefat',
74 74
 					'value' => '',
75 75
 				);
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 			'manage_options' => __( 'Administrator', 'gravityview' ),
123 123
 		);
124 124
 
125
-		if( is_multisite() ) {
126
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
125
+		if ( is_multisite() ) {
126
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
127 127
 		}
128 128
 
129 129
 		/**
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
137 137
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
138 138
 		 */
139
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
139
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
140 140
 
141 141
 		return $select_cap_choices;
142 142
 	}
@@ -163,24 +163,24 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public static function render_field_options( $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
165 165
 
166
-		if( empty( $uniqid ) ) {
166
+		if ( empty( $uniqid ) ) {
167 167
 			//generate a unique field id
168
-			$uniqid = uniqid('', false);
168
+			$uniqid = uniqid( '', false );
169 169
 		}
170 170
 
171 171
 		// get field/widget options
172 172
 		$options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type );
173 173
 
174 174
 		// two different post arrays, depending of the field type
175
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
175
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
176 176
 
177 177
 		// build output
178 178
 		$output = '';
179
-		$output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
180
-		$output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
179
+		$output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
180
+		$output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
181 181
 
182 182
 		// If there are no options, return what we got.
183
-		if(empty($options)) {
183
+		if ( empty( $options ) ) {
184 184
 
185 185
 			// This is here for checking if the output is empty in render_label()
186 186
 			$output .= '<!-- No Options -->';
@@ -188,33 +188,33 @@  discard block
 block discarded – undo
188 188
 			return $output;
189 189
 		}
190 190
 
191
-		$output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';
191
+		$output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';
192 192
 
193 193
 		/**
194 194
 		 * @since 1.8
195 195
 		 */
196
-		if( !empty( $item['subtitle'] ) ) {
197
-			$output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';
196
+		if ( ! empty( $item[ 'subtitle' ] ) ) {
197
+			$output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';
198 198
 		}
199 199
 
200
-		foreach( $options as $key => $option ) {
200
+		foreach ( $options as $key => $option ) {
201 201
 
202 202
 			$value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;
203 203
 
204
-			$field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);
204
+			$field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );
205 205
 
206 206
 			// The setting is empty
207
-			if( empty( $field_output ) ) {
207
+			if ( empty( $field_output ) ) {
208 208
 				continue;
209 209
 			}
210 210
 
211
-			switch( $option['type'] ) {
211
+			switch ( $option[ 'type' ] ) {
212 212
 				// Hide hidden fields
213 213
 				case 'hidden':
214
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';
214
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
215 215
 					break;
216 216
 				default:
217
-					$output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';
217
+					$output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';
218 218
 			}
219 219
 		}
220 220
 
@@ -243,17 +243,17 @@  discard block
 block discarded – undo
243 243
 		 * @deprecated setting index 'default' was replaced by 'value'
244 244
 		 * @see GravityView_FieldType::get_field_defaults
245 245
 		 */
246
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
247
-			$option['value'] = $option['default'];
248
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
246
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
247
+			$option[ 'value' ] = $option[ 'default' ];
248
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
249 249
 		}
250 250
 
251 251
 		// prepare to render option field type
252
-		if( isset( $option['type'] ) ) {
252
+		if ( isset( $option[ 'type' ] ) ) {
253 253
 
254 254
 			$type_class = self::load_type_class( $option );
255 255
 
256
-			if( class_exists( $type_class ) ) {
256
+			if ( class_exists( $type_class ) ) {
257 257
 
258 258
 				/** @var GravityView_FieldType $render_type */
259 259
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 				 * @param[in,out] string $output field class name
271 271
 				 * @param[in] array $option  option field data
272 272
 				 */
273
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
273
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
274 274
 			}
275 275
 
276 276
 		} // isset option[type]
@@ -297,33 +297,33 @@  discard block
 block discarded – undo
297 297
 		$setting = GravityView_View_Data::get_default_arg( $key, true );
298 298
 
299 299
 		// If the key doesn't exist, there's something wrong.
300
-		if( empty( $setting ) ) { return; }
300
+		if ( empty( $setting ) ) { return; }
301 301
 
302 302
 		/**
303 303
 		 * @deprecated setting index 'name' was replaced by 'label'
304 304
 		 * @see GravityView_FieldType::get_field_defaults
305 305
 		 */
306
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
307
-			$setting['label'] = $setting['name'];
308
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
306
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
307
+			$setting[ 'label' ] = $setting[ 'name' ];
308
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
309 309
 		}
310 310
 
311 311
 		$name = esc_attr( sprintf( $name, $key ) );
312
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
313
-		$setting['tooltip'] = 'gv_' . $key;
312
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
313
+		$setting[ 'tooltip' ] = 'gv_' . $key;
314 314
 
315 315
 		// Use default if current setting isn't set.
316
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
316
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
317 317
 
318 318
 		// default setting type = text
319
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
319
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
320 320
 
321 321
 		// merge tags
322
-		if( !isset( $setting['merge_tags'] ) ) {
323
-			if( $setting['type'] === 'text' ) {
324
-				$setting['merge_tags'] = true;
322
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
323
+			if ( $setting[ 'type' ] === 'text' ) {
324
+				$setting[ 'merge_tags' ] = true;
325 325
 			} else {
326
-				$setting['merge_tags'] = false;
326
+				$setting[ 'merge_tags' ] = false;
327 327
 			}
328 328
 		}
329 329
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
 		// render the setting
333 333
 		$type_class = self::load_type_class( $setting );
334
-		if( class_exists( $type_class ) ) {
334
+		if ( class_exists( $type_class ) ) {
335 335
 			/** @var GravityView_FieldType $render_type */
336 336
 			$render_type = new $type_class( $name, $setting, $curr_value );
337 337
 			ob_start();
@@ -340,21 +340,21 @@  discard block
 block discarded – undo
340 340
 		}
341 341
 
342 342
 		// Check if setting is specific for a template
343
-		if( !empty( $setting['show_in_template'] ) ) {
344
-			if( !is_array( $setting['show_in_template'] ) ) {
345
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
343
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
344
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
345
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
346 346
 			}
347
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
347
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
348 348
 		} else {
349 349
 			$show_if = '';
350 350
 		}
351 351
 
352
-		if( ! empty( $setting['requires'] ) ) {
353
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
352
+		if ( ! empty( $setting[ 'requires' ] ) ) {
353
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
354 354
 		}
355 355
 
356 356
 		// output
357
-		echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';
357
+		echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';
358 358
 
359 359
 	}
360 360
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 	 */
367 367
 	public static function load_type_class( $field = NULL ) {
368 368
 
369
-		if( empty( $field['type'] ) ) {
369
+		if ( empty( $field[ 'type' ] ) ) {
370 370
 			return NULL;
371 371
 		}
372 372
 
@@ -375,19 +375,19 @@  discard block
 block discarded – undo
375 375
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
376 376
 		 * @param array $field   field data
377 377
 		 */
378
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
378
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
379 379
 
380
-		if( !class_exists( $type_class ) ) {
380
+		if ( ! class_exists( $type_class ) ) {
381 381
 
382 382
 			/**
383 383
 			 * @filter `gravityview/setting/class_file/{field_type}`
384 384
 			 * @param string  $field_type_include_path field class file path
385 385
 			 * @param array $field  field data
386 386
 			 */
387
-			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
387
+			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
388 388
 
389
-			if( $class_file ) {
390
-				if( file_exists( $class_file ) ) {
389
+			if ( $class_file ) {
390
+				if ( file_exists( $class_file ) ) {
391 391
 					require_once( $class_file );
392 392
 				}
393 393
 			}
@@ -412,8 +412,8 @@  discard block
 block discarded – undo
412 412
 
413 413
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
414 414
 
415
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
416
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
415
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
416
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
417 417
 
418 418
 		return $output;
419 419
 	}
@@ -433,22 +433,22 @@  discard block
 block discarded – undo
433 433
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
434 434
 
435 435
 		// Show the merge tags if the field is a list view
436
-		$is_list = ( preg_match( '/_list-/ism', $name ));
436
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
437 437
 
438 438
 		// Or is a single entry view
439
-		$is_single = ( preg_match( '/single_/ism', $name ));
439
+		$is_single = ( preg_match( '/single_/ism', $name ) );
440 440
 		$show = ( $is_single || $is_list );
441 441
 
442 442
 		$class = '';
443 443
 		// and $add_merge_tags is not false
444
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
444
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
445 445
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
446 446
 		}
447 447
 
448
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
449
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
448
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
449
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
450 450
 
451
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
451
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
452 452
 	}
453 453
 
454 454
 	/**
@@ -465,21 +465,21 @@  discard block
 block discarded – undo
465 465
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
466 466
 
467 467
 		// Show the merge tags if the field is a list view
468
-		$is_list = ( preg_match( '/_list-/ism', $name ));
468
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
469 469
 
470 470
 		// Or is a single entry view
471
-		$is_single = ( preg_match( '/single_/ism', $name ));
471
+		$is_single = ( preg_match( '/single_/ism', $name ) );
472 472
 		$show = ( $is_single || $is_list );
473 473
 
474 474
 		$class = '';
475 475
 		// and $add_merge_tags is not false
476
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
476
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
477 477
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
478 478
 		}
479 479
 
480
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
480
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
481 481
 
482
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
482
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
483 483
 	}
484 484
 
485 485
 	/**
@@ -495,9 +495,9 @@  discard block
 block discarded – undo
495 495
 
496 496
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
497 497
 
498
-		$output = '<select name="'. $name .'" id="'. $id .'">';
499
-		foreach( $choices as $value => $label ) {
500
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
498
+		$output = '<select name="' . $name . '" id="' . $id . '">';
499
+		foreach ( $choices as $value => $label ) {
500
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
501 501
 		}
502 502
 		$output .= '</select>';
503 503
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 	}
51 51
 
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
64 64
 
65
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
65
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
66 66
 
67 67
 		$status = gform_get_meta( $entry_id, self::meta_key );
68 68
 
69 69
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
70 70
 
71
-		if( 'value' === $value_or_label ) {
71
+		if ( 'value' === $value_or_label ) {
72 72
 			return $status;
73 73
 		}
74 74
 
@@ -93,20 +93,20 @@  discard block
 block discarded – undo
93 93
 	 */
94 94
 	public function ajax_update_approved() {
95 95
 		
96
-		$form_id = intval( rgpost('form_id') );
96
+		$form_id = intval( rgpost( 'form_id' ) );
97 97
 
98 98
 		// We always want requests from the admin to allow entry IDs, but not from the frontend
99 99
 		// There's another nonce sent when approving entries in the admin that we check
100 100
 		$force_entry_ids = rgpost( 'admin_nonce' ) && wp_verify_nonce( rgpost( 'admin_nonce' ), 'gravityview_admin_entry_approval' );
101 101
 		
102
-		$entry_id = GVCommon::get_entry_id( rgpost('entry_slug'), $force_entry_ids );
102
+		$entry_id = GVCommon::get_entry_id( rgpost( 'entry_slug' ), $force_entry_ids );
103 103
 
104
-		$approval_status = rgpost('approved');
104
+		$approval_status = rgpost( 'approved' );
105 105
 
106
-		$nonce = rgpost('nonce');
106
+		$nonce = rgpost( 'nonce' );
107 107
 
108 108
 		// Valid status
109
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
109
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
110 110
 
111 111
 			do_action( 'gravityview_log_error', __METHOD__ . ': Invalid approval status', $_POST );
112 112
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
139 139
 
140
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
140
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
141 141
 
142 142
 		}
143 143
 
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 	 * @param $form array Gravity Forms form object
171 171
 	 */
172 172
 	public function after_submission( $entry, $form ) {
173
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
173
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
174 174
 	}
175 175
 
176 176
 	/**
@@ -184,12 +184,12 @@  discard block
 block discarded – undo
184 184
 	 */
185 185
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
186 186
 
187
-		$approved_column = self::get_approved_column( $form['id'] );
187
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
188 188
 
189 189
 		/**
190 190
 		 * If the form doesn't contain the approve field, don't assume anything.
191 191
 		 */
192
-		if( empty( $approved_column ) ) {
192
+		if ( empty( $approved_column ) ) {
193 193
 			return;
194 194
 		}
195 195
 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 			$value = GravityView_Entry_Approval_Status::APPROVED;
204 204
 		}
205 205
 
206
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
206
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
207 207
 	}
208 208
 
209 209
 	/**
@@ -221,12 +221,12 @@  discard block
 block discarded – undo
221 221
 	 */
222 222
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
223 223
 
224
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
224
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
225 225
 			do_action( 'gravityview_log_error', __METHOD__ . ' Entries were empty or malformed.', $entries );
226 226
 			return NULL;
227 227
 		}
228 228
 
229
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
229
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
230 230
 			do_action( 'gravityview_log_error', __METHOD__ . ' User does not have the `gravityview_moderate_entries` capability.' );
231 231
 			return NULL;
232 232
 		}
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
 		$approved_column_id = self::get_approved_column( $form_id );
242 242
 
243 243
 		$success = true;
244
-		foreach( $entries as $entry_id ) {
244
+		foreach ( $entries as $entry_id ) {
245 245
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
246 246
 
247
-			if( ! $update_success ) {
247
+			if ( ! $update_success ) {
248 248
 				$success = false;
249 249
 			}
250 250
 		}
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
270 270
 
271
-		if( !class_exists( 'GFAPI' ) ) {
271
+		if ( ! class_exists( 'GFAPI' ) ) {
272 272
 			do_action( 'gravityview_log_error', __METHOD__ . 'GFAPI does not exist' );
273 273
 			return false;
274 274
 		}
275 275
 
276
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
276
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
277 277
 			do_action( 'gravityview_log_error', __METHOD__ . ': Not a valid approval value.' );
278 278
 			return false;
279 279
 		}
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		// If the form has an Approve/Reject field, update that value
291 291
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
292 292
 
293
-		if( is_wp_error( $result ) ) {
293
+		if ( is_wp_error( $result ) ) {
294 294
 			do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - Entry approval not updated: %s', $result->get_error_message() ) );
295 295
 			return false;
296 296
 		}
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 		// add note to entry if approval field updating worked or there was no approved field
304 304
 		// There's no validation for the meta
305
-		if( true === $result ) {
305
+		if ( true === $result ) {
306 306
 
307 307
 			// Add an entry note
308 308
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 
356 356
 		$note_id = false;
357 357
 
358
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
358
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
359 359
 
360 360
 			$current_user = wp_get_current_user();
361 361
 
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 */
378 378
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
379 379
 
380
-		if( empty( $approvedcolumn ) ) {
380
+		if ( empty( $approvedcolumn ) ) {
381 381
 			$approvedcolumn = self::get_approved_column( $form_id );
382 382
 		}
383 383
 
@@ -400,12 +400,12 @@  discard block
 block discarded – undo
400 400
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
401 401
 
402 402
 		$new_value = '';
403
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
403
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
404 404
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
405 405
 		}
406 406
 
407 407
 		//update entry
408
-		$entry["{$approvedcolumn}"] = $new_value;
408
+		$entry[ "{$approvedcolumn}" ] = $new_value;
409 409
 
410 410
 		/**
411 411
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -434,12 +434,12 @@  discard block
 block discarded – undo
434 434
 		// If the user has enabled a different value than the label (for some reason), use it.
435 435
 		// This is highly unlikely
436 436
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
437
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
437
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
438 438
 		}
439 439
 
440 440
 		// Otherwise, fall back on the inputs array
441 441
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
442
-			return $field->inputs[0]['label'];
442
+			return $field->inputs[ 0 ][ 'label' ];
443 443
 		}
444 444
 
445 445
 		return null;
@@ -460,16 +460,16 @@  discard block
 block discarded – undo
460 460
 	private static function update_approved_meta( $entry_id, $status, $form_id = 0 ) {
461 461
 
462 462
 		if ( ! GravityView_Entry_Approval_Status::is_valid( $status ) ) {
463
-			do_action('gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
463
+			do_action( 'gravityview_log_error', __METHOD__ . ': $is_approved not valid value', $status );
464 464
 			return;
465 465
 		}
466 466
 
467 467
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
468 468
 
469 469
 		// update entry meta
470
-		if( function_exists('gform_update_meta') ) {
470
+		if ( function_exists( 'gform_update_meta' ) ) {
471 471
 
472
-			if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
472
+			if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
473 473
 				gform_delete_meta( $entry_id, self::meta_key );
474 474
 			} else {
475 475
 				gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -492,11 +492,11 @@  discard block
 block discarded – undo
492 492
 			 * @since 1.18 Added "unapproved"
493 493
 			 * @param  int $entry_id ID of the Gravity Forms entry
494 494
 			 */
495
-			do_action( 'gravityview/approve_entries/' . $action , $entry_id );
495
+			do_action( 'gravityview/approve_entries/' . $action, $entry_id );
496 496
 
497 497
 		} else {
498 498
 
499
-			do_action('gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
499
+			do_action( 'gravityview_log_error', __METHOD__ . ' - `gform_update_meta` does not exist.' );
500 500
 
501 501
 		}
502 502
 	}
@@ -511,11 +511,11 @@  discard block
 block discarded – undo
511 511
 	 */
512 512
 	static public function get_approved_column( $form ) {
513 513
 
514
-		if( empty( $form ) ) {
514
+		if ( empty( $form ) ) {
515 515
 			return null;
516 516
 		}
517 517
 
518
-		if( !is_array( $form ) ) {
518
+		if ( ! is_array( $form ) ) {
519 519
 			$form = GVCommon::get_form( $form );
520 520
 		}
521 521
 
@@ -525,22 +525,22 @@  discard block
 block discarded – undo
525 525
 		 * @var string $key
526 526
 		 * @var GF_Field $field
527 527
 		 */
528
-		foreach( $form['fields'] as $key => $field ) {
528
+		foreach ( $form[ 'fields' ] as $key => $field ) {
529 529
 
530 530
 			$inputs = $field->get_entry_inputs();
531 531
 
532
-			if( !empty( $field->gravityview_approved ) ) {
533
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
534
-					$approved_column_id = $inputs[0]['id'];
532
+			if ( ! empty( $field->gravityview_approved ) ) {
533
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
534
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
535 535
 					break;
536 536
 				}
537 537
 			}
538 538
 
539 539
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
540
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
540
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
541 541
 				foreach ( $inputs as $input ) {
542
-					if ( 'approved' === strtolower( $input['label'] ) ) {
543
-						$approved_column_id = $input['id'];
542
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
543
+						$approved_column_id = $input[ 'id' ];
544 544
 						break;
545 545
 					}
546 546
 				}
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-links.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -11,35 +11,35 @@  discard block
 block discarded – undo
11 11
 
12 12
 	function __construct() {
13 13
 
14
-		$this->widget_description = __('Links to multiple pages of results.', 'gravityview' );
14
+		$this->widget_description = __( 'Links to multiple pages of results.', 'gravityview' );
15 15
 
16 16
 		$default_values = array( 'header' => 1, 'footer' => 1 );
17 17
 		$settings = array( 'show_all' => array(
18 18
 			'type' => 'checkbox',
19 19
 			'label' => __( 'Show each page number', 'gravityview' ),
20
-			'desc' => __('Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview'),
20
+			'desc' => __( 'Show every page number instead of summary (eg: 1 2 3 ... 8 »)', 'gravityview' ),
21 21
 			'value' => false
22
-		));
23
-		parent::__construct( __( 'Page Links', 'gravityview' ) , 'page_links', $default_values, $settings );
22
+		) );
23
+		parent::__construct( __( 'Page Links', 'gravityview' ), 'page_links', $default_values, $settings );
24 24
 
25 25
 	}
26 26
 
27
-	public function render_frontend( $widget_args, $content = '', $context = '') {
27
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
28 28
 		$gravityview_view = GravityView_View::getInstance();
29 29
 
30
-		if( !$this->pre_render_frontend() ) {
30
+		if ( ! $this->pre_render_frontend() ) {
31 31
 			return;
32 32
 		}
33 33
 
34 34
 		$atts = shortcode_atts( array(
35 35
 			'page_size' => rgar( $gravityview_view->paging, 'page_size' ),
36 36
 			'total' => $gravityview_view->total_entries,
37
-			'show_all' => !empty( $this->settings['show_all']['default'] ),
38
-			'current' => (int) rgar( $_GET, 'pagenum', 1 ),
37
+			'show_all' => ! empty( $this->settings[ 'show_all' ][ 'default' ] ),
38
+			'current' => (int)rgar( $_GET, 'pagenum', 1 ),
39 39
 		), $widget_args, 'gravityview_widget_page_links' );
40 40
 		
41 41
 		$page_link_args = array(
42
-			'base' => add_query_arg('pagenum','%#%', gv_directory_link() ),
42
+			'base' => add_query_arg( 'pagenum', '%#%', gv_directory_link() ),
43 43
 			'format' => '&pagenum=%#%',
44 44
 			'add_args' => array(), //
45 45
 			'prev_text' => '&laquo;',
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 			'type' => 'list',
48 48
 			'end_size' => 1,
49 49
 			'mid_size' => 2,
50
-			'total' => empty( $atts['page_size'] ) ? 0 : ceil( $atts['total'] / $atts['page_size'] ),
51
-			'current' => $atts['current'],
52
-			'show_all' => !empty( $atts['show_all'] ), // to be available at backoffice
50
+			'total' => empty( $atts[ 'page_size' ] ) ? 0 : ceil( $atts[ 'total' ] / $atts[ 'page_size' ] ),
51
+			'current' => $atts[ 'current' ],
52
+			'show_all' => ! empty( $atts[ 'show_all' ] ), // to be available at backoffice
53 53
 		);
54 54
 
55 55
 		/**
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
57 57
 		 * @since 1.1.4
58 58
 		 * @param array  $page_link_args Array of arguments for the `paginate_links()` function. [Read more about `paginate_links()`](http://developer.wordpress.org/reference/functions/paginate_links/)
59 59
 		 */
60
-		$page_link_args = apply_filters('gravityview_page_links_args', $page_link_args );
60
+		$page_link_args = apply_filters( 'gravityview_page_links_args', $page_link_args );
61 61
 
62 62
 		$page_links = paginate_links( $page_link_args );
63 63
 
64
-		if( !empty( $page_links )) {
65
-			$class = !empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
64
+		if ( ! empty( $page_links ) ) {
65
+			$class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
66 66
 			$class = gravityview_sanitize_html_class( 'gv-widget-page-links ' . $class );
67
-			echo '<div class="'.$class.'">'. $page_links .'</div>';
67
+			echo '<div class="' . $class . '">' . $page_links . '</div>';
68 68
 		} else {
69 69
 			do_action( 'gravityview_log_debug', 'GravityView_Widget_Page_Links[render_frontend] No page links; paginate_links() returned empty response.' );
70 70
 		}
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
21 21
 }
22 22
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 			'atts'	  => NULL,
158 158
 		) );
159 159
 
160
-		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
160
+		foreach ( $atts as $key => $value ) {
161
+			if ( is_null( $value ) ) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 */
190 190
 	static function getInstance( $passed_post = NULL ) {
191 191
 
192
-		if( empty( self::$instance ) ) {
192
+		if ( empty( self::$instance ) ) {
193 193
 			self::$instance = new self( $passed_post );
194 194
 		}
195 195
 
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public function getCurrentField( $key = NULL ) {
204 204
 
205
-		if( !empty( $key ) ) {
206
-			if( isset( $this->_current_field[ $key ] ) ) {
205
+		if ( ! empty( $key ) ) {
206
+			if ( isset( $this->_current_field[ $key ] ) ) {
207 207
 				return $this->_current_field[ $key ];
208 208
 			}
209 209
 			return NULL;
@@ -214,16 +214,16 @@  discard block
 block discarded – undo
214 214
 
215 215
 	public function setCurrentFieldSetting( $key, $value ) {
216 216
 
217
-		if( !empty( $this->_current_field ) ) {
218
-			$this->_current_field['field_settings'][ $key ] = $value;
217
+		if ( ! empty( $this->_current_field ) ) {
218
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
219 219
 		}
220 220
 
221 221
 	}
222 222
 
223 223
 	public function getCurrentFieldSetting( $key ) {
224
-		$settings = $this->getCurrentField('field_settings');
224
+		$settings = $this->getCurrentField( 'field_settings' );
225 225
 
226
-		if( $settings && !empty( $settings[ $key ] ) ) {
226
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
227 227
 			return $settings[ $key ];
228 228
 		}
229 229
 
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 	 */
255 255
 	public function getAtts( $key = NULL ) {
256 256
 
257
-		if( !empty( $key ) ) {
258
-			if( isset( $this->atts[ $key ] ) ) {
257
+		if ( ! empty( $key ) ) {
258
+			if ( isset( $this->atts[ $key ] ) ) {
259 259
 				return $this->atts[ $key ];
260 260
 			}
261 261
 			return NULL;
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
323 323
 
324
-		if( $fields && !empty( $key ) ) {
324
+		if ( $fields && ! empty( $key ) ) {
325 325
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
326 326
 		}
327 327
 
@@ -339,18 +339,18 @@  discard block
 block discarded – undo
339 339
 	 */
340 340
 	public function getContextFields( $context = '' ) {
341 341
 
342
-	    if( '' === $context ) {
342
+	    if ( '' === $context ) {
343 343
 	        $context = $this->getContext();
344 344
         }
345 345
 
346 346
 		$fields = $this->getFields();
347 347
 
348
-        foreach ( (array) $fields as $key => $context_fields ) {
348
+        foreach ( (array)$fields as $key => $context_fields ) {
349 349
 
350 350
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
351 351
             $matches = explode( '_', $key );
352 352
 
353
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
353
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
354 354
                 return $context_fields;
355 355
             }
356 356
         }
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
 	 */
372 372
 	public function getField( $key ) {
373 373
 
374
-		if( !empty( $key ) ) {
375
-			if( isset( $this->fields[ $key ] ) ) {
374
+		if ( ! empty( $key ) ) {
375
+			if ( isset( $this->fields[ $key ] ) ) {
376 376
 				return $this->fields[ $key ];
377 377
 			}
378 378
 		}
@@ -478,8 +478,8 @@  discard block
 block discarded – undo
478 478
 	public function getPaginationCounts() {
479 479
 
480 480
 		$paging = $this->getPaging();
481
-		$offset = $paging['offset'];
482
-		$page_size = $paging['page_size'];
481
+		$offset = $paging[ 'offset' ];
482
+		$page_size = $paging[ 'page_size' ];
483 483
 		$total = $this->getTotalEntries();
484 484
 
485 485
 		if ( empty( $total ) ) {
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 		 */
501 501
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
502 502
 
503
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
503
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
504 504
 	}
505 505
 
506 506
 	/**
@@ -591,16 +591,16 @@  discard block
 block discarded – undo
591 591
 	 */
592 592
 	public function getCurrentEntry() {
593 593
 
594
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
594
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
595 595
 			$entries = $this->getEntries();
596
-			$entry = $entries[0];
596
+			$entry = $entries[ 0 ];
597 597
 		} else {
598 598
 			$entry = $this->_current_entry;
599 599
 		}
600 600
 
601 601
 		/** @since 1.16 Fixes DataTables empty entry issue */
602
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
603
-			$entry = $this->_current_field['entry'];
602
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
603
+			$entry = $this->_current_field[ 'entry' ];
604 604
 		}
605 605
 
606 606
 		return $entry;
@@ -637,8 +637,8 @@  discard block
 block discarded – undo
637 637
 	 */
638 638
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
639 639
 
640
-		if( empty( $zone ) ) {
641
-			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
640
+		if ( empty( $zone ) ) {
641
+			do_action( 'gravityview_log_error', 'GravityView_View[renderZone] No zone defined.' );
642 642
 			return NULL;
643 643
 		}
644 644
 
@@ -647,37 +647,37 @@  discard block
 block discarded – undo
647 647
 			'context' => $this->getContext(),
648 648
 			'entry' => $this->getCurrentEntry(),
649 649
 			'form' => $this->getForm(),
650
-			'hide_empty' => $this->getAtts('hide_empty'),
650
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
651 651
 		);
652 652
 
653 653
 		$final_atts = wp_parse_args( $atts, $defaults );
654 654
 
655 655
 		$output = '';
656 656
 
657
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
657
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
658 658
 
659
-		$fields = $this->getField( $final_atts['zone_id'] );
659
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
660 660
 
661 661
 		// Backward compatibility
662
-		if( 'table' === $this->getTemplatePartSlug() ) {
662
+		if ( 'table' === $this->getTemplatePartSlug() ) {
663 663
 			/**
664 664
 			 * @filter `gravityview_table_cells` Modify the fields displayed in a table
665 665
 			 * @param array $fields
666 666
 			 * @param GravityView_View $this
667 667
 			 */
668
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
668
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
669 669
 		}
670 670
 
671
-		if( empty( $fields ) ) {
671
+		if ( empty( $fields ) ) {
672 672
 
673
-			do_action('gravityview_log_error', 'GravityView_View[renderZone] Empty View configuration for this context.', $fields );
673
+			do_action( 'gravityview_log_error', 'GravityView_View[renderZone] Empty View configuration for this context.', $fields );
674 674
 
675 675
 			return NULL;
676 676
 		}
677 677
 
678 678
 		$field_output = '';
679 679
 		foreach ( $fields as $field ) {
680
-			$final_atts['field'] = $field;
680
+			$final_atts[ 'field' ] = $field;
681 681
 
682 682
 			$field_output .= gravityview_field_output( $final_atts );
683 683
 		}
@@ -688,21 +688,21 @@  discard block
 block discarded – undo
688 688
 		 * @since 1.7.6
689 689
 		 * @param boolean $hide_empty_zone Default: false
690 690
 		 */
691
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
691
+		if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
692 692
 			return NULL;
693 693
 		}
694 694
 
695
-		if( !empty( $final_atts['wrapper_class'] ) ) {
696
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
695
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
696
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
697 697
 		}
698 698
 
699 699
 		$output .= $field_output;
700 700
 
701
-		if( !empty( $final_atts['wrapper_class'] ) ) {
701
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
702 702
 			$output .= '</div>';
703 703
 		}
704 704
 
705
-		if( $echo ) {
705
+		if ( $echo ) {
706 706
 			echo $output;
707 707
 		}
708 708
 
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 	 */
721 721
 	function locate_template( $template_names, $load = false, $require_once = true ) {
722 722
 
723
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
723
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
724 724
 
725 725
 			$located = $this->located_templates[ $template_names ];
726 726
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 			// Set $load to always false so we handle it here.
730 730
 			$located = parent::locate_template( $template_names, false, $require_once );
731 731
 
732
-			if( is_string( $template_names ) ) {
732
+			if ( is_string( $template_names ) ) {
733 733
 				$this->located_templates[ $template_names ] = $located;
734 734
 			}
735 735
 		}
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
 	 * @return mixed|null    The stored data.
748 748
 	 */
749 749
 	public function __get( $name ) {
750
-		if( isset( $this->{$name} ) ) {
750
+		if ( isset( $this->{$name} ) ) {
751 751
 			return $this->{$name};
752 752
 		} else {
753 753
 			return NULL;
@@ -776,15 +776,15 @@  discard block
 block discarded – undo
776 776
 		$additional = array();
777 777
 
778 778
 		// form-19-table-body.php
779
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
779
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
780 780
 
781 781
 		// view-3-table-body.php
782
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
782
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
783 783
 
784
-		if( $this->getPostId() ) {
784
+		if ( $this->getPostId() ) {
785 785
 
786 786
 			// page-19-table-body.php
787
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
787
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
788 788
 		}
789 789
 
790 790
 		// Combine with existing table-body.php and table.php
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
 
807 807
 		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
808 808
 
809
-		if( !empty( $template_file) ) {
809
+		if ( ! empty( $template_file ) ) {
810 810
 
811 811
 			if ( $require_once ) {
812 812
 				require_once( $template_file );
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 	 */
824 824
 	public function render_widget_hooks( $view_id ) {
825 825
 
826
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
826
+		if ( empty( $view_id ) || 'single' == gravityview_get_context() ) {
827 827
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
828 828
 			return;
829 829
 		}
@@ -831,9 +831,9 @@  discard block
 block discarded – undo
831 831
 		$view_data = gravityview_get_current_view_data( $view_id );
832 832
 
833 833
 		// get View widget configuration
834
-		$widgets = (array)$view_data['widgets'];
834
+		$widgets = (array)$view_data[ 'widgets' ];
835 835
 
836
-		switch( current_filter() ) {
836
+		switch ( current_filter() ) {
837 837
 			default:
838 838
 			case 'gravityview_before':
839 839
 				$zone = 'header';
@@ -847,9 +847,9 @@  discard block
 block discarded – undo
847 847
 		 * Filter widgets not in the current zone
848 848
 		 * @since 1.16
849 849
 		 */
850
-		foreach( $widgets as $key => $widget ) {
850
+		foreach ( $widgets as $key => $widget ) {
851 851
 			// The widget isn't in the current zone
852
-			if( false === strpos( $key, $zone ) ) {
852
+			if ( false === strpos( $key, $zone ) ) {
853 853
 				unset( $widgets[ $key ] );
854 854
 			}
855 855
 		}
@@ -864,8 +864,8 @@  discard block
 block discarded – undo
864 864
 		}
865 865
 
866 866
 		// Prevent being called twice
867
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
868
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
867
+		if ( did_action( $zone . '_' . $view_id . '_widgets' ) ) {
868
+			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__, $zone . '_' . $view_id . '_widgets' ) );
869 869
 			return;
870 870
 		}
871 871
 
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 
877 877
 		$default_css_class = 'gv-grid gv-widgets-' . $zone;
878 878
 
879
-		if( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
879
+		if ( 0 === GravityView_View::getInstance()->getTotalEntries() ) {
880 880
 			$default_css_class .= ' gv-widgets-no-results';
881 881
 		}
882 882
 
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
 		 * @param string $zone Current widget zone, either `header` or `footer`
888 888
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
889 889
 		 */
890
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets );
890
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets );
891 891
 
892 892
 		$css_class = gravityview_sanitize_html_class( $css_class );
893 893
 
@@ -895,17 +895,17 @@  discard block
 block discarded – undo
895 895
 		?>
896 896
 		<div class="<?php echo $css_class; ?>">
897 897
 			<?php
898
-			foreach( $rows as $row ) {
899
-				foreach( $row as $col => $areas ) {
900
-					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
898
+			foreach ( $rows as $row ) {
899
+				foreach ( $row as $col => $areas ) {
900
+					$column = ( $col == '2-2' ) ? '1-2 gv-right' : $col . ' gv-left';
901 901
 				?>
902 902
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
903 903
 						<?php
904
-						if( !empty( $areas ) ) {
905
-							foreach( $areas as $area ) {
906
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
907
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
908
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
904
+						if ( ! empty( $areas ) ) {
905
+							foreach ( $areas as $area ) {
906
+								if ( ! empty( $widgets[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
907
+									foreach ( $widgets[ $zone . '_' . $area[ 'areaid' ] ] as $widget ) {
908
+										do_action( "gravityview_render_widget_{$widget[ 'id' ]}", $widget );
909 909
 									}
910 910
 								}
911 911
 							}
@@ -921,8 +921,8 @@  discard block
 block discarded – undo
921 921
 		 * Prevent widgets from being called twice.
922 922
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
923 923
 		 */
924
-		if( did_action( 'wp_head' ) ) {
925
-			do_action( $zone.'_'.$view_id.'_widgets' );
924
+		if ( did_action( 'wp_head' ) ) {
925
+			do_action( $zone . '_' . $view_id . '_widgets' );
926 926
 		}
927 927
 	}
928 928
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-approval.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 		$this->label = esc_attr__( 'Approve Entries', 'gravityview' );
24 24
 
25
-		$this->description =  esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
25
+		$this->description = esc_attr__( 'Approve and reject entries from the View.', 'gravityview' );
26 26
 
27 27
 		$this->add_hooks();
28 28
 
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
46 46
 
47
-		unset( $field_options['only_loggedin'] );
47
+		unset( $field_options[ 'only_loggedin' ] );
48 48
 
49
-		unset( $field_options['new_window'] );
49
+		unset( $field_options[ 'new_window' ] );
50 50
 
51
-		unset( $field_options['show_as_link'] );
51
+		unset( $field_options[ 'show_as_link' ] );
52 52
 
53 53
 		return $field_options;
54 54
 	}
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
 		add_action( 'gravityview/field/approval/load_scripts', array( $this, 'enqueue_and_localize_script' ) );
70 70
 
71
-		add_action( 'gravityview_datatables_scripts_styles',  array( $this, 'enqueue_and_localize_script' ) );
71
+		add_action( 'gravityview_datatables_scripts_styles', array( $this, 'enqueue_and_localize_script' ) );
72 72
 
73 73
 		add_filter( 'gravityview_get_entries', array( $this, 'modify_search_parameters' ), 1000 );
74 74
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	public function maybe_prevent_field_render( $html, $args ) {
89 89
 
90 90
 		// If the field is `entry_approval` type but the user doesn't have the moderate entries cap, don't render.
91
-		if( $this->name === rgar( $args['field'], 'id' ) && ! GVCommon::has_cap('gravityview_moderate_entries') ) {
91
+		if ( $this->name === rgar( $args[ 'field' ], 'id' ) && ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
92 92
 			return '';
93 93
 		}
94 94
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 */
105 105
 	public function modify_search_parameters( $parameters ) {
106 106
 
107
-		if( $this->name === rgars( $parameters, 'sorting/key' ) ) {
108
-			$parameters['sorting']['key'] = 'is_approved';
107
+		if ( $this->name === rgars( $parameters, 'sorting/key' ) ) {
108
+			$parameters[ 'sorting' ][ 'key' ] = 'is_approved';
109 109
 		}
110 110
 
111 111
 		return $parameters;
@@ -121,18 +121,18 @@  discard block
 block discarded – undo
121 121
 	function register_scripts_and_styles() {
122 122
 		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
123 123
 
124
-		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval'.$script_debug.'.js', array( 'jquery' ), GravityView_Plugin::version, true );
124
+		wp_register_script( 'gravityview-field-approval', GRAVITYVIEW_URL . 'assets/js/field-approval' . $script_debug . '.js', array( 'jquery' ), GravityView_Plugin::version, true );
125 125
 
126 126
 		$style_path = GRAVITYVIEW_DIR . 'templates/css/field-approval.css';
127 127
 
128
-		if( class_exists( 'GravityView_View' ) ) {
128
+		if ( class_exists( 'GravityView_View' ) ) {
129 129
 			/**
130 130
 			 * Override CSS file by placing in your theme's /gravityview/css/ sub-directory.
131 131
 			 */
132 132
 			$style_path = GravityView_View::getInstance()->locate_template( 'css/field-approval.css', false );
133 133
 		}
134 134
 
135
-		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) )  );
135
+		$style_url = plugins_url( 'css/field-approval.css', trailingslashit( dirname( $style_path ) ) );
136 136
 
137 137
 		/**
138 138
 		 * @filter `gravityview/field/approval/css_url` URL to the Approval field CSS file.
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		 */
142 142
 		$style_url = apply_filters( 'gravityview/field/approval/css_url', $style_url );
143 143
 
144
-		if( ! empty( $style_url ) ) {
144
+		if ( ! empty( $style_url ) ) {
145 145
 			wp_register_style( 'gravityview-field-approval', $style_url, array( 'dashicons' ), GravityView_Plugin::version, 'screen' );
146 146
 		}
147 147
 
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	public function enqueue_and_localize_script() {
157 157
 
158 158
 		// The script is already registered and enqueued
159
-		if( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
159
+		if ( wp_script_is( 'gravityview-field-approval', 'enqueued' ) ) {
160 160
 			return;
161 161
 		}
162 162
 
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 
167 167
 		wp_localize_script( 'gravityview-field-approval', 'gvApproval', array(
168 168
 			'ajaxurl' => admin_url( 'admin-ajax.php' ),
169
-			'nonce' => wp_create_nonce('gravityview_entry_approval'),
169
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
170 170
 			'status' => GravityView_Entry_Approval_Status::get_all(),
171
-		));
171
+		) );
172 172
 
173 173
 	}
174 174
 
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
 	 */
186 186
 	public function filter_gravityview_entry_default_field( $entry_default_fields, $form, $context ) {
187 187
 
188
-		if ( ! isset( $entry_default_fields["{$this->name}"] ) && 'edit' !== $context ) {
189
-			$entry_default_fields["{$this->name}"] = array(
188
+		if ( ! isset( $entry_default_fields[ "{$this->name}" ] ) && 'edit' !== $context ) {
189
+			$entry_default_fields[ "{$this->name}" ] = array(
190 190
 				'label' => $this->label,
191 191
 				'desc'  => $this->description,
192 192
 				'type'  => $this->name,
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -107,9 +107,9 @@  discard block
 block discarded – undo
107 107
 		) );
108 108
 
109 109
 		// This is just HTML we don't need.
110
-		unset( $response['message'] );
110
+		unset( $response[ 'message' ] );
111 111
 
112
-		switch ( intval( $response['license_limit'] ) ) {
112
+		switch ( intval( $response[ 'license_limit' ] ) ) {
113 113
 			case 1:
114 114
 				$package = 'Sol';
115 115
 				break;
@@ -120,24 +120,24 @@  discard block
 block discarded – undo
120 120
 				$package = 'Interstellar';
121 121
 				break;
122 122
 			default:
123
-				$package = sprintf( '%d-Site License', $response['license_limit'] );
123
+				$package = sprintf( '%d-Site License', $response[ 'license_limit' ] );
124 124
 		}
125 125
 
126 126
 		$data = array(
127 127
 			'email'                 => GravityView_Settings::getSetting( 'support-email' ),
128
-			'name'                  => $response['customer_name'],
129
-			'Valid License?'        => ucwords( $response['license'] ),
130
-			'License Key'           => $response['license_key'],
128
+			'name'                  => $response[ 'customer_name' ],
129
+			'Valid License?'        => ucwords( $response[ 'license' ] ),
130
+			'License Key'           => $response[ 'license_key' ],
131 131
 			'License Level'         => $package,
132 132
 			'Site Admin Email'      => get_bloginfo( 'admin_email' ),
133 133
 			'Support Email'         => GravityView_Settings::getSetting( 'support-email' ),
134
-			'License Limit'         => $response['license_limit'],
135
-			'Site Count'            => $response['site_count'],
136
-			'License Expires'       => $response['expires'],
137
-			'Activations Left'      => $response['activations_left'],
138
-			'Payment ID'            => $response['payment_id'],
139
-			'Payment Name'          => $response['customer_name'],
140
-			'Payment Email'         => $response['customer_email'],
134
+			'License Limit'         => $response[ 'license_limit' ],
135
+			'Site Count'            => $response[ 'site_count' ],
136
+			'License Expires'       => $response[ 'expires' ],
137
+			'Activations Left'      => $response[ 'activations_left' ],
138
+			'Payment ID'            => $response[ 'payment_id' ],
139
+			'Payment Name'          => $response[ 'customer_name' ],
140
+			'Payment Email'         => $response[ 'customer_email' ],
141 141
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
142 142
 			'PHP Version'           => phpversion(),
143 143
 			'GravityView Version'   => GravityView_Plugin::version,
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-custom.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
42 42
 
43
-		unset ( $field_options['search_filter'], $field_options['show_as_link'] );
43
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] );
44 44
 
45 45
 		$new_fields = array(
46 46
 			'content' => array(
@@ -60,8 +60,8 @@  discard block
 block discarded – undo
60 60
 			),
61 61
 		);
62 62
 
63
-		if( 'edit' === $context ) {
64
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'] );
63
+		if ( 'edit' === $context ) {
64
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ] );
65 65
 		}
66 66
 
67 67
 		return $new_fields + $field_options;
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 
96 96
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
97 97
 		// TODO: Make this available to other custom GV field types
98
-		foreach ( (array) $edit_fields as $edit_field ) {
98
+		foreach ( (array)$edit_fields as $edit_field ) {
99 99
 
100
-			if( 'custom' === rgar( $edit_field, 'id') ) {
100
+			if ( 'custom' === rgar( $edit_field, 'id' ) ) {
101 101
 
102 102
 				$field_data = array(
103 103
 					'label' => rgar( $edit_field, 'custom_label' ),
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry, false, false );
111 111
 				}
112 112
 
113
-				$field_data['cssClass'] = rgar( $edit_field, 'custom_class' );
113
+				$field_data[ 'cssClass' ] = rgar( $edit_field, 'custom_class' );
114 114
 
115
-				$new_fields[] = new GF_Field_HTML( $field_data );
115
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
116 116
 
117 117
 			} else {
118
-				if( isset( $fields[ $i ] ) ) {
119
-					$new_fields[] =  $fields[ $i ];
118
+				if ( isset( $fields[ $i ] ) ) {
119
+					$new_fields[ ] = $fields[ $i ];
120 120
 				}
121 121
 				$i++;
122 122
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-image.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 
66 66
 		$atts = wp_parse_args( $atts, $defaults );
67 67
 
68
-		foreach( $atts as $key => $val ) {
68
+		foreach ( $atts as $key => $val ) {
69 69
 			$this->{$key} = $val;
70 70
 		}
71 71
 
72
-		$this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
72
+		$this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class;
73 73
 
74 74
 		$this->set_image_size();
75 75
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 */
86 86
 	function validate_image_src() {
87 87
 
88
-		if ( !$this->validate_src ) { return true; }
88
+		if ( ! $this->validate_src ) { return true; }
89 89
 
90 90
 		$info = pathinfo( $this->src );
91 91
 
@@ -93,9 +93,9 @@  discard block
 block discarded – undo
93 93
 		 * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag
94 94
 		 * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']`
95 95
 		 */
96
-		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ));
96
+		$image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) );
97 97
 
98
-		return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts);
98
+		return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts );
99 99
 	}
100 100
 
101 101
 	/**
@@ -111,16 +111,16 @@  discard block
 block discarded – undo
111 111
 
112 112
 			// And there is no string size passed
113 113
 			// 		And we want to get the image size using PHP
114
-			if ( empty( $string ) && !empty( $this->getimagesize ) ) {
114
+			if ( empty( $string ) && ! empty( $this->getimagesize ) ) {
115 115
 
116 116
 				$image_size = @getimagesize( $this->src );
117 117
 
118 118
 				// If it didn't return a response, it may be a HTTPS/SSL error
119
-				if ( empty( $image_size[0] ) ) {
119
+				if ( empty( $image_size[ 0 ] ) ) {
120 120
 					$image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) );
121 121
 				}
122 122
 
123
-				if ( !empty( $image_size ) ) {
123
+				if ( ! empty( $image_size ) ) {
124 124
 					list( $width, $height ) = $image_size;
125 125
 				}
126 126
 
@@ -133,33 +133,33 @@  discard block
 block discarded – undo
133 133
 				 * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels
134 134
 				 */
135 135
 				$image_sizes = apply_filters( 'gravityview_image_sizes', array(
136
-					'tiny' => array('width' => 40, 'height' => 30),
137
-					'small' => array('width' => 100, 'height' => 75),
138
-					'medium' => array('width' => 250, 'height' => 188),
139
-					'large' => array('width' => 448, 'height' => 336),
136
+					'tiny' => array( 'width' => 40, 'height' => 30 ),
137
+					'small' => array( 'width' => 100, 'height' => 75 ),
138
+					'medium' => array( 'width' => 250, 'height' => 188 ),
139
+					'large' => array( 'width' => 448, 'height' => 336 ),
140 140
 				) );
141 141
 
142
-				switch( $this->size ) {
142
+				switch ( $this->size ) {
143 143
 					case 'tiny':
144
-						extract($image_sizes['tiny']);
144
+						extract( $image_sizes[ 'tiny' ] );
145 145
 						break;
146 146
 					case 'small':
147 147
 					case 's':
148 148
 					case 'thumb':
149
-						extract($image_sizes['small']);
149
+						extract( $image_sizes[ 'small' ] );
150 150
 						break;
151 151
 					case 'm':
152 152
 					case 'medium':
153
-						extract($image_sizes['medium']);
153
+						extract( $image_sizes[ 'medium' ] );
154 154
 						break;
155 155
 					case 'large':
156 156
 					case 'l':
157
-						extract($image_sizes['large']);
157
+						extract( $image_sizes[ 'large' ] );
158 158
 						break;
159 159
 					default:
160 160
 						// Verify that the passed sizes are integers.
161
-						$width = !empty( $width ) ? intval( $width ) : intval( $this->width );
162
-						$height = !empty( $height ) ? intval( $height ) : intval( $this->height );
161
+						$width = ! empty( $width ) ? intval( $width ) : intval( $this->width );
162
+						$height = ! empty( $height ) ? intval( $height ) : intval( $this->height );
163 163
 				}
164 164
 
165 165
 			}
Please login to merge, or discard this patch.