Completed
Pull Request — develop (#843)
by Zack
05:39
created
includes/connector-functions.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -289,8 +289,8 @@  discard block
 block discarded – undo
289 289
  * @param  mixed $field_id Field ID or Field array
290 290
  * @return string field type
291 291
  */
292
-function gravityview_get_field_type(  $form = null , $field_id = '' ) {
293
-	return GVCommon::get_field_type(  $form, $field_id );
292
+function gravityview_get_field_type( $form = null, $field_id = '' ) {
293
+	return GVCommon::get_field_type( $form, $field_id );
294 294
 }
295 295
 
296 296
 
@@ -303,8 +303,8 @@  discard block
 block discarded – undo
303 303
  * @return string HTML of the output. Empty string if $view_id is empty.
304 304
  */
305 305
 function get_gravityview( $view_id = '', $atts = array() ) {
306
-	if( !empty( $view_id ) ) {
307
-		$atts['id'] = $view_id;
306
+	if ( ! empty( $view_id ) ) {
307
+		$atts[ 'id' ] = $view_id;
308 308
 		$args = wp_parse_args( $atts, GravityView_View_Data::get_default_args() );
309 309
 		$GravityView_frontend = GravityView_frontend::getInstance();
310 310
 		$GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) );
@@ -347,19 +347,19 @@  discard block
 block discarded – undo
347 347
  */
348 348
 function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) {
349 349
 
350
-	if( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
350
+	if ( $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) {
351 351
 
352 352
 		/** @var GF_Field_Radio|GF_Field_Checkbox $form_field */
353
-		foreach( $form_fields as $form_field ) {
353
+		foreach ( $form_fields as $form_field ) {
354 354
 			$field_id = $form_field->id;
355
-			foreach( $view_fields as $zone ) {
355
+			foreach ( $view_fields as $zone ) {
356 356
 
357 357
 				// ACF compatibility; ACF-added fields aren't arrays
358 358
 				if ( ! is_array( $zone ) ) { continue; }
359 359
 
360
-				foreach( $zone as $field ) {
360
+				foreach ( $zone as $field ) {
361 361
 					// If it's an input, not the parent and the parent ID matches a checkbox or radio
362
-					if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) {
362
+					if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) {
363 363
 						return true;
364 364
 					}
365 365
 				}
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@
 block discarded – undo
41 41
 	 * @return void
42 42
 	 */
43 43
 	private function fix_posted_fields() {
44
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
45
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
46
-				$_POST['fields'] = _gravityview_process_posted_fields();
44
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
45
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
46
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
47 47
 			}
48 48
 		}
49 49
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-phone.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@
 block discarded – undo
35 35
 	 */
36 36
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
37 37
 
38
-		if( 'edit' === $context ) {
38
+		if ( 'edit' === $context ) {
39 39
 			return $field_options;
40 40
 		}
41 41
 
42
-		$field_options['link_phone'] = array(
42
+		$field_options[ 'link_phone' ] = array(
43 43
 	        'type' => 'checkbox',
44 44
 	        'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
45
-	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
45
+	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview' ),
46 46
 	        'value' => true,
47 47
         );
48 48
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-notes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 		// Make sure the keys are all set
68 68
 		$note = wp_parse_args( $note, $default_note );
69 69
 
70
-		GFFormsModel::add_note( intval( $note['lead_id'] ), intval( $note['user_id'] ), esc_attr( $note['user_name'] ), $note['note'], esc_attr( $note['note_type'] ) );
70
+		GFFormsModel::add_note( intval( $note[ 'lead_id' ] ), intval( $note[ 'user_id' ] ), esc_attr( $note[ 'user_name' ] ), $note[ 'note' ], esc_attr( $note[ 'note_type' ] ) );
71 71
 
72 72
 		// If last_error is empty string, there was no error.
73
-		if( empty( $wpdb->last_error ) ) {
73
+		if ( empty( $wpdb->last_error ) ) {
74 74
 			$return = $wpdb->insert_id;
75 75
 		} else {
76 76
 			$return = new WP_Error( 'gravityview-add-note', $wpdb->last_error );
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public static function delete_notes( $note_ids = array() ) {
98 98
 
99
-		if( !is_array( $note_ids ) ) {
99
+		if ( ! is_array( $note_ids ) ) {
100 100
 
101 101
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Note IDs not an array. Not processing delete request.', $note_ids );
102 102
 
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			)
152 152
 		);
153 153
 
154
-		return $results ? $results[0] : false;
154
+		return $results ? $results[ 0 ] : false;
155 155
 	}
156 156
 
157 157
 	/**
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	public static function filter_avatar( $avatar = '', $note ) {
166 166
 
167
-		if( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
168
-			$avatar =  sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
167
+		if ( 'gravityview' === $note->note_type && -1 === (int)$note->user_id ) {
168
+			$avatar = sprintf( '<img src="%s" width="48" height="48" alt="GravityView" class="avatar avatar-48 gravityview-avatar" />', esc_url_raw( plugins_url( 'assets/images/floaty-avatar.png', GRAVITYVIEW_FILE ) ) );
169 169
 		}
170 170
 
171 171
 		return $avatar;
Please login to merge, or discard this patch.
includes/extensions/entry-notes/partials/note-add-note.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@
 block discarded – undo
21 21
 		{email_fields}
22 22
 
23 23
 		<div class="gv-note-content-container">
24
-			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings('content-label'); ?></label>
24
+			<label for="gv-note-content-{entry_slug}" class="screen-reader-text"><?php echo GravityView_Field_Notes::strings( 'content-label' ); ?></label>
25 25
 			<textarea name="gv-note-content" id="gv-note-content-{entry_slug}"></textarea>
26 26
 		</div>
27 27
 
28
-		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings('add-note'); ?></button>
28
+		<button type="submit" class="button gv-add-note-submit"><?php echo GravityView_Field_Notes::strings( 'add-note' ); ?></button>
29 29
 	</div>
30 30
 </form>
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
includes/class-gravityview-roles-capabilities.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public static function get_instance() {
35 35
 
36
-		if( ! self::$instance ) {
36
+		if ( ! self::$instance ) {
37 37
 			self::$instance = new self;
38 38
 		}
39 39
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
57 57
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
58 58
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
59
-        add_action( 'admin_init', array( $this, 'add_caps') );
59
+        add_action( 'admin_init', array( $this, 'add_caps' ) );
60 60
 	}
61 61
 
62 62
 
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
78 78
 
79 79
 		// Empty caps_to_check array
80
-		if( ! $usercaps || ! $caps ) {
80
+		if ( ! $usercaps || ! $caps ) {
81 81
 			return $usercaps;
82 82
 		}
83 83
 
84 84
 		/**
85 85
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
86 86
 		 */
87
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
87
+		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) {
88 88
 
89 89
 			$all_gravityview_caps = self::all_caps();
90 90
 
91
-			foreach( $all_gravityview_caps as $gv_cap ) {
91
+			foreach ( $all_gravityview_caps as $gv_cap ) {
92 92
 				$usercaps[ $gv_cap ] = true;
93 93
 			}
94 94
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		$all = $administrator;
307 307
 
308 308
 		// If role is set, return caps_to_check for just that role.
309
-		if( $single_role ) {
309
+		if ( $single_role ) {
310 310
 			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
311 311
 			return $flat_array ? $caps : array( $single_role => $caps );
312 312
 		}
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public static function has_cap( $caps_to_check = '', $object_id = null, $user_id = null ) {
336 336
 
337
-		if( ! is_user_logged_in() || empty( $caps_to_check ) ) {
337
+		if ( ! is_user_logged_in() || empty( $caps_to_check ) ) {
338 338
 			return false;
339 339
 		}
340 340
 
@@ -344,13 +344,13 @@  discard block
 block discarded – undo
344 344
 		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
345 345
 
346 346
 		foreach ( $caps_to_check as $cap ) {
347
-			if( ! is_null( $object_id ) ) {
347
+			if ( ! is_null( $object_id ) ) {
348 348
 				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
349 349
 			} else {
350 350
 				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
351 351
 			}
352 352
 			// At the first successful response, stop checking
353
-			if( $has_cap ) {
353
+			if ( $has_cap ) {
354 354
 				break;
355 355
 			}
356 356
 		}
@@ -374,15 +374,15 @@  discard block
 block discarded – undo
374 374
 		$all_gravityview_caps = self::all_caps();
375 375
 
376 376
 		// Are there any $caps_to_check that are from GravityView?
377
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
378
-			$caps_to_check[] = 'gravityview_full_access';
377
+		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
378
+			$caps_to_check[ ] = 'gravityview_full_access';
379 379
 		}
380 380
 
381 381
 		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
382 382
 
383 383
 		// Are there any $caps_to_check that are from Gravity Forms?
384
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
385
-			$caps_to_check[] = 'gform_full_access';
384
+		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
385
+			$caps_to_check[ ] = 'gform_full_access';
386 386
 		}
387 387
 
388 388
 		return array_unique( $caps_to_check );
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 			$capabilities = self::all_caps();
405 405
 
406 406
 			// Loop through each role and remove GV caps_to_check
407
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
407
+			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) {
408 408
 				foreach ( $capabilities as $cap ) {
409 409
 					$wp_roles->remove_cap( $role_slug, $cap );
410 410
 				}
Please login to merge, or discard this patch.
includes/admin/field-types/type_html.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	 * @return string
22 22
 	 */
23 23
 	function get_field_desc() {
24
-		return !empty( $this->field['desc'] ) ? $this->field['desc'] : '';
24
+		return ! empty( $this->field[ 'desc' ] ) ? $this->field[ 'desc' ] : '';
25 25
 	}
26 26
 
27 27
 }
Please login to merge, or discard this patch.
includes/admin/field-types/type_checkboxes.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 	}
23 23
 
24 24
 	function render_input( $override_input = null ) {
25
-		if( isset( $override_input ) ) {
25
+		if ( isset( $override_input ) ) {
26 26
 			echo $override_input;
27 27
 			return;
28 28
 		}
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 		?>
31 31
 		<ul class="gv-setting-list">
32 32
 		<?php
33
-		foreach( $this->field['options'] as $value => $label ) { ?>
34
-			<li <?php if( isset( $label['requires'] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label['requires'] ); } ?>>
33
+		foreach ( $this->field[ 'options' ] as $value => $label ) { ?>
34
+			<li <?php if ( isset( $label[ 'requires' ] ) ) { printf( 'class="gv-sub-setting" data-requires="%s"', $label[ 'requires' ] ); } ?>>
35 35
 				<label>
36 36
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>" type="hidden"
37 37
 				       value="0"/>
38 38
 				<input name="<?php printf( '%s[%s]', esc_attr( $this->name ), esc_attr( $value ) ); ?>"
39 39
 				       id="<?php echo $this->get_field_id(); ?>" type="checkbox"
40 40
 				       value="1" <?php checked( ! empty( $this->value[ $value ] ) ); ?> />
41
-				<?php echo esc_html( $label['label'] ); ?>
41
+				<?php echo esc_html( $label[ 'label' ] ); ?>
42 42
 				</label>
43
-				<?php if( ! empty( $label['desc'] ) ) {
44
-					printf( '<span class="howto">%s</span>', $label['desc'] );
43
+				<?php if ( ! empty( $label[ 'desc' ] ) ) {
44
+					printf( '<span class="howto">%s</span>', $label[ 'desc' ] );
45 45
 				}
46 46
 				?>
47 47
 			</li>
Please login to merge, or discard this patch.
includes/extensions/entry-notes/fields/notes.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 $gravityview_view = GravityView_View::getInstance();
10 10
 
11 11
 $visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
12
-$show_notes_logged_out = ( ! empty( $visibility_settings['view'] ) && ! empty( $visibility_settings['view_loggedout'] ) );
12
+$show_notes_logged_out = ( ! empty( $visibility_settings[ 'view' ] ) && ! empty( $visibility_settings[ 'view_loggedout' ] ) );
13 13
 
14
-if(	! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
14
+if ( ! GVCommon::has_cap( array( 'gravityview_view_entry_notes', 'gravityview_add_entry_notes', 'gravityview_delete_entry_notes' ) ) && ! $show_notes_logged_out ) {
15 15
 	return;
16 16
 }
17 17
 
@@ -25,20 +25,20 @@  discard block
 block discarded – undo
25 25
 do_action( 'gravityview/field/notes/scripts' );
26 26
 
27 27
 $entry = $gravityview_view->getCurrentEntry();
28
-$notes = GravityView_Entry_Notes::get_notes( $entry['id'] );
28
+$notes = GravityView_Entry_Notes::get_notes( $entry[ 'id' ] );
29 29
 $strings = GravityView_Field_Notes::strings();
30
-$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
30
+$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
31 31
 
32
-$show_add = ! empty( $visibility_settings['add'] );
33
-$show_delete = ( ! empty( $visibility_settings['delete'] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
-$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings['view'] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
32
+$show_add = ! empty( $visibility_settings[ 'add' ] );
33
+$show_delete = ( ! empty( $visibility_settings[ 'delete' ] ) && GVCommon::has_cap( 'gravityview_delete_entry_notes' ) );
34
+$show_notes = $show_notes_logged_out || ( ! empty( $visibility_settings[ 'view' ] ) && GVCommon::has_cap( 'gravityview_view_entry_notes' ) );
35 35
 
36 36
 $container_class = ( sizeof( $notes ) > 0 ? 'gv-has-notes' : 'gv-no-notes' );
37 37
 $container_class .= $show_notes ? ' gv-show-notes' : ' gv-hide-notes';
38 38
 ?>
39 39
 <div class="gv-notes <?php echo $container_class; ?>">
40 40
 <?php
41
-	if( $show_notes ) {
41
+	if ( $show_notes ) {
42 42
 ?>
43 43
 	<form method="post" class="gv-notes-list">
44 44
 		<?php if ( $show_delete ) { wp_nonce_field( 'gv_delete_notes_' . $entry_slug, 'gv_delete_notes' ); } ?>
@@ -46,21 +46,21 @@  discard block
 block discarded – undo
46 46
 			<input type="hidden" name="action" value="gv_delete_notes" />
47 47
 			<input type="hidden" name="entry-slug" value="<?php echo esc_attr( $entry_slug ); ?>" />
48 48
 			<table>
49
-				<caption><?php echo $strings['caption']; ?></caption>
49
+				<caption><?php echo $strings[ 'caption' ]; ?></caption>
50 50
 				<?php
51 51
 				if ( $show_delete ) {
52 52
 				?>
53 53
 				<thead>
54 54
 					<tr>
55 55
 						<th colspan="2">
56
-							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings['toggle-notes']; ?>"><span class="screen-reader-text"><?php echo $strings['toggle-notes']; ?></span></label>
57
-							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings['delete']; ?></button>
56
+							<label><input type="checkbox" value="" class="gv-notes-toggle" title="<?php echo $strings[ 'toggle-notes' ]; ?>"><span class="screen-reader-text"><?php echo $strings[ 'toggle-notes' ]; ?></span></label>
57
+							<button type="submit" class="button button-small gv-notes-delete"><?php echo $strings[ 'delete' ]; ?></button>
58 58
 						</th>
59 59
 					</tr>
60 60
 				</thead>
61 61
 				<?php } ?>
62 62
 				<tbody>
63
-					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings['no-notes']; ?></td></tr>
63
+					<tr class="gv-notes-no-notes"><td colspan="2"><?php echo $strings[ 'no-notes' ]; ?></td></tr>
64 64
 					<?php
65 65
 						foreach ( $notes as $note ) {
66 66
 							echo GravityView_Field_Notes::display_note( $note, $show_delete );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 <?php
74 74
 	} // End if can view notes
75 75
 
76
-	if( $show_add ) {
76
+	if ( $show_add ) {
77 77
 		echo do_shortcode( '[gv_note_add]' );
78 78
 	}
79 79
 ?>
Please login to merge, or discard this patch.