Completed
Pull Request — master (#1171)
by Gennady
73:03 queued 17:46
created
includes/fields/class-gravityview-fields.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $group = '' ) {
118 118
 
119
-		if( '' !== $group ) {
119
+		if ( '' !== $group ) {
120 120
 			$return_fields = self::$_fields;
121 121
 			foreach ( $return_fields as $key => $field ) {
122
-				if( $group !== $field->group ) {
122
+				if ( $group !== $field->group ) {
123 123
 					unset( $return_fields[ $key ] );
124 124
 				}
125 125
 			}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 	/**
78 78
 	 * Alias for get_instance()
79 79
 	 *
80
-	 * @param $field_name
80
+	 * @param string $field_name
81 81
 	 *
82 82
 	 * @return GravityView_Field|false
83 83
 	 */
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-quiz.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
20 20
 
21
-		if( 'edit' === $context ) {
21
+		if ( 'edit' === $context ) {
22 22
 			return $field_options;
23 23
 		}
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			'quiz_show_explanation' => array(
27 27
 				'type' => 'checkbox',
28 28
 				'label' => __( 'Show Answer Explanation?', 'gravityview' ),
29
-				'desc' => __('If the field has an answer explanation, show it?', 'gravityview'),
29
+				'desc' => __( 'If the field has an answer explanation, show it?', 'gravityview' ),
30 30
 				'value' => false,
31 31
 				'merge_tags' => false,
32 32
 			),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-phone.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,11 +40,11 @@
 block discarded – undo
40 40
 		}
41 41
 
42 42
 		$field_options['link_phone'] = array(
43
-	        'type' => 'checkbox',
44
-	        'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
45
-	        'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
46
-	        'value' => true,
47
-        );
43
+			'type' => 'checkbox',
44
+			'label' => __( 'Make Phone Number Clickable', 'gravityview' ),
45
+			'desc' => __( 'Allow dialing a number by clicking it?', 'gravityview'),
46
+			'value' => true,
47
+		);
48 48
 
49 49
 		return $field_options;
50 50
 	}
Please login to merge, or discard this 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/extensions/entry-notes/class-gravityview-field-notes.php 3 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 *
317 317
 	 * @param array $file_paths List of template paths ordered
318 318
 	 *
319
-	 * @return array File paths with `./` and `./partials/` paths added
319
+	 * @return string[] File paths with `./` and `./partials/` paths added
320 320
 	 */
321 321
 	public function add_template_path( $file_paths ) {
322 322
 
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 	 * @param array $entry
486 486
 	 * @param array $data Note details array
487 487
 	 *
488
-	 * @return int|WP_Error
488
+	 * @return integer
489 489
 	 */
490 490
 	private function add_note( $entry, $data ) {
491 491
 		global $current_user, $wpdb;
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 	 *
585 585
 	 * @since 1.17
586 586
 	 *
587
-	 * @param int|string $entry_slug Current entry unique ID
587
+	 * @param string $entry_slug Current entry unique ID
588 588
 	 *
589 589
 	 * @return string HTML output
590 590
 	 */
Please login to merge, or discard this patch.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 
176 176
 		if( 'gv_note_add' === $_POST['action'] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
-                do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
-                return;
181
-            }
178
+			if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
+				do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
+				return;
181
+			}
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 *
279 279
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
280 280
 	 *
281
-  	 * @since 1.17
281
+	 * @since 1.17
282 282
 	 *
283 283
 	 * @see process_delete_notes
284 284
 	 *
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
434
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
434
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
435 435
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
436 436
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
437 437
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -501,11 +501,11 @@  discard block
 block discarded – undo
501 501
 
502 502
 		if ( $context instanceof \GV\Template_Context ) {
503 503
 
504
-		    ob_start();
505
-		    $context->template->get_template_part( 'note', 'detail', true );
506
-            $note_detail_html = ob_get_clean();
504
+			ob_start();
505
+			$context->template->get_template_part( 'note', 'detail', true );
506
+			$note_detail_html = ob_get_clean();
507 507
 
508
-            ob_start();
508
+			ob_start();
509 509
 			$context->template->get_template_part( 'note', $note_row_template, true );
510 510
 			$note_row = ob_get_clean();
511 511
 		} else {
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 				'gv-note-to-custom' => '',
762 762
 				'gv-note-subject' => '',
763 763
 				'gv-note-content' => '',
764
-                'current-url' => '',
764
+				'current-url' => '',
765 765
 			);
766 766
 
767 767
 			$current_user  = wp_get_current_user();
@@ -813,9 +813,9 @@  discard block
 block discarded – undo
813 813
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
814 814
 
815 815
 			/**
816
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
816
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
817 817
 			 * @since 1.18
818
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
818
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
819 819
 			 */
820 820
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
821 821
 
@@ -835,12 +835,12 @@  discard block
 block discarded – undo
835 835
 	}
836 836
 
837 837
 	/**
838
-     * Get the footer for Entry Note emails
839
-     *
840
-     * `{url}` is replaced by the URL of the page where the note form was embedded
841
-     *
842
-     * @since 1.18
843
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
838
+	 * Get the footer for Entry Note emails
839
+	 *
840
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
841
+	 *
842
+	 * @since 1.18
843
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
844 844
 	 *
845 845
 	 * @param string $email_footer The message footer value
846 846
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -849,10 +849,10 @@  discard block
 block discarded – undo
849 849
 	 */
850 850
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
851 851
 
852
-	    $output = '';
852
+		$output = '';
853 853
 
854 854
 		if( ! empty( $email_footer ) ) {
855
-		    $url = \GV\Utils::get( $email_data, 'current-url' );
855
+			$url = \GV\Utils::get( $email_data, 'current-url' );
856 856
 			$url = html_entity_decode( $url );
857 857
 			$url = site_url( $url );
858 858
 
Please login to merge, or discard this patch.
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 		
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -164,31 +164,31 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	function maybe_add_note() {
166 166
 
167
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
167
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
168 168
 			gravityview()->log->error( 'The user isnt allowed to add entry notes.' );
169 169
 			return;
170 170
 		}
171 171
 
172
-		if( ! isset( $_POST['action'] ) ) {
172
+		if ( ! isset( $_POST[ 'action' ] ) ) {
173 173
 			return;
174 174
 		}
175 175
 
176
-		if( 'gv_note_add' === $_POST['action'] ) {
176
+		if ( 'gv_note_add' === $_POST[ 'action' ] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
178
+            if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179 179
                 do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180 180
                 return;
181 181
             }
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
185
-			if( $this->doing_ajax ) {
186
-				parse_str( $post['data'], $data );
185
+			if ( $this->doing_ajax ) {
186
+				parse_str( $post[ 'data' ], $data );
187 187
 			} else {
188 188
 				$data = $post;
189 189
 			}
190 190
 
191
-			$this->process_add_note( (array) $data );
191
+			$this->process_add_note( (array)$data );
192 192
 		}
193 193
 	}
194 194
 
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 		$error = false;
216 216
 		$success = false;
217 217
 
218
-		if( empty( $data['entry-slug'] ) ) {
218
+		if ( empty( $data[ 'entry-slug' ] ) ) {
219 219
 
220
-			$error = self::strings('error-invalid');
220
+			$error = self::strings( 'error-invalid' );
221 221
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
222 222
 
223 223
 		} else {
224 224
 
225
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
225
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
226 226
 			
227 227
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
228 228
 
229
-			if( ! $has_cap ) {
229
+			if ( ! $has_cap ) {
230 230
 				$error = self::strings( 'error-cap-add' );
231 231
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
232 232
 			} elseif ( $valid ) {
233 233
 
234
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
234
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
235 235
 
236 236
 				$added = $this->add_note( $entry, $data );
237 237
 
@@ -249,22 +249,22 @@  discard block
 block discarded – undo
249 249
 					$this->maybe_send_entry_notes( $note, $entry, $data );
250 250
 
251 251
 					if ( $note ) {
252
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
252
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
253 253
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
254 254
 					} else {
255
-						$error = self::strings('error-add-note');
255
+						$error = self::strings( 'error-add-note' );
256 256
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
257 257
 					}
258 258
 				}
259 259
 			} else {
260
-				$error = self::strings('error-invalid');
260
+				$error = self::strings( 'error-invalid' );
261 261
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
262 262
 			}
263 263
 		}
264 264
 
265 265
 
266
-		if( $this->doing_ajax ) {
267
-			if( $success ) {
266
+		if ( $this->doing_ajax ) {
267
+			if ( $success ) {
268 268
 				wp_send_json_success( array( 'html' => $success ) );
269 269
 			} else {
270 270
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 			return;
291 291
 		}
292 292
 
293
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
293
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
294 294
 
295 295
 			$post = wp_unslash( $_POST );
296 296
 			if ( $this->doing_ajax ) {
297
-				parse_str( $post['data'], $data );
297
+				parse_str( $post[ 'data' ], $data );
298 298
 			} else {
299 299
 				$data = $post;
300 300
 			}
@@ -325,18 +325,18 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	function process_delete_notes( $data ) {
327 327
 
328
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
328
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
329 329
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
330 330
 		$success = false;
331 331
 
332 332
 		if ( $valid && $has_cap ) {
333
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
333
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
334 334
 			$success = true;
335 335
 		}
336 336
 
337
-		if( $this->doing_ajax ) {
337
+		if ( $this->doing_ajax ) {
338 338
 
339
-			if( $success ) {
339
+			if ( $success ) {
340 340
 				wp_send_json_success();
341 341
 			} else {
342 342
 				if ( ! $valid ) {
@@ -369,13 +369,13 @@  discard block
 block discarded – undo
369 369
 
370 370
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
371 371
 
372
-		unset( $field_options['show_as_link'] );
372
+		unset( $field_options[ 'show_as_link' ] );
373 373
 
374 374
 		$notes_options = array(
375 375
 			'notes' => array(
376 376
 				'type' => 'checkboxes',
377
-				'label' => __('Note Settings', 'gravityview'),
378
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
377
+				'label' => __( 'Note Settings', 'gravityview' ),
378
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
379 379
 				'options' => array(
380 380
 					'view' => array(
381 381
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
428 428
 			'other-email' => __( 'Other email address', 'gravityview' ),
429 429
 			'email-label' => __( 'Email address', 'gravityview' ),
430
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
430
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		 */
448 448
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
449 449
 
450
-		if( $key ) {
450
+		if ( $key ) {
451 451
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
452 452
 		}
453 453
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	 */
470 470
 	static public function display_note( $note, $show_delete = false, $context = null ) {
471 471
 
472
-		if( ! is_object( $note ) ) {
472
+		if ( ! is_object( $note ) ) {
473 473
 			return '';
474 474
 		}
475 475
 
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		}
525 525
 
526 526
 		$replacements = array(
527
-			'{note_id}' => $note_content['note_id'],
527
+			'{note_id}' => $note_content[ 'note_id' ],
528 528
 			'{row_class}' => 'gv-note',
529 529
 			'{note_detail}' => $note_detail_html
530 530
 		);
@@ -556,13 +556,13 @@  discard block
 block discarded – undo
556 556
 
557 557
 		$user_data = get_userdata( $current_user->ID );
558 558
 
559
-		$note_content = trim( $data['gv-note-content'] );
559
+		$note_content = trim( $data[ 'gv-note-content' ] );
560 560
 
561
-		if( empty( $note_content ) ) {
561
+		if ( empty( $note_content ) ) {
562 562
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
563 563
 		}
564 564
 
565
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
565
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
566 566
 
567 567
 		return $return;
568 568
 	}
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 
583 583
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
584 584
 
585
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
585
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
586 586
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
587 587
 			return '';
588 588
 		}
@@ -604,8 +604,8 @@  discard block
 block discarded – undo
604 604
 
605 605
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
606 606
 
607
-			if ( $atts['entry'] ) {
608
-				$entry = GFAPI::get_entry( $atts['entry'] );
607
+			if ( $atts[ 'entry' ] ) {
608
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
609 609
 			}
610 610
 
611 611
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -615,19 +615,19 @@  discard block
 block discarded – undo
615 615
 
616 616
 		// Strip extra whitespace in template
617 617
 		$add_note_html = gravityview_strip_whitespace( $add_note_html );
618
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
618
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
619 619
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
620 620
 
621 621
 		// Only generate the dropdown if the field settings allow it
622 622
 		$email_fields = '';
623
-		if( ! empty( $visibility_settings['email'] ) ) {
623
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
624 624
 			$email_fields = self::get_note_email_fields( $entry_slug );
625 625
 		}
626 626
 
627 627
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
628 628
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
629
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
630
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
629
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
630
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
631 631
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
632 632
 
633 633
 		return $add_note_html;
@@ -652,8 +652,8 @@  discard block
 block discarded – undo
652 652
 		$note_emails = array();
653 653
 
654 654
 		foreach ( $email_fields as $email_field ) {
655
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
656
-				$note_emails[] = $entry["{$email_field->id}"];
655
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
656
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
657 657
 			}
658 658
 		}
659 659
 
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 		 */
666 666
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
667 667
 
668
-		return (array) $note_emails;
668
+		return (array)$note_emails;
669 669
 	}
670 670
 
671 671
 	/**
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
 	 */
682 682
 	private static function get_note_email_fields( $entry_slug = '' ) {
683 683
 
684
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
684
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
685 685
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
686 686
 			return '';
687 687
 		}
@@ -703,27 +703,27 @@  discard block
 block discarded – undo
703 703
 
704 704
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
705 705
 			<div class="gv-note-email-container">
706
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
706
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
707 707
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
708
-					<option value=""><?php echo $strings['also-email'];  ?></option>
708
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
709 709
 					<?php foreach ( $note_emails as  $email ) {
710 710
 						?>
711 711
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
712 712
 					<?php }
713
-					if( $include_custom ) { ?>
714
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
713
+					if ( $include_custom ) { ?>
714
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
715 715
 					<?php } ?>
716 716
 				</select>
717 717
 				<fieldset class="gv-note-to-container">
718
-					<?php if( $include_custom ) { ?>
718
+					<?php if ( $include_custom ) { ?>
719 719
 					<div class='gv-note-to-custom-container'>
720
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
721
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
720
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
721
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
722 722
 					</div>
723 723
 					<?php } ?>
724 724
 		            <div class='gv-note-subject-container'>
725
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
726
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
725
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
726
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
727 727
 		            </div>
728 728
 				</fieldset>
729 729
 			</div>
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 	 */
747 747
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
748 748
 
749
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
749
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
750 750
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
751 751
 			return;
752 752
 		}
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
755 755
 
756 756
 		//emailing notes if configured
757
-		if ( ! empty( $data['gv-note-to'] ) ) {
757
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
758 758
 
759 759
 			$default_data = array(
760 760
 				'gv-note-to' => '',
@@ -764,11 +764,11 @@  discard block
 block discarded – undo
764 764
                 'current-url' => '',
765 765
 			);
766 766
 
767
-			$current_user  = wp_get_current_user();
767
+			$current_user = wp_get_current_user();
768 768
 			$email_data = wp_parse_args( $data, $default_data );
769 769
 
770
-			$from    = $current_user->user_email;
771
-			$to = $email_data['gv-note-to'];
770
+			$from = $current_user->user_email;
771
+			$to = $email_data[ 'gv-note-to' ];
772 772
 
773 773
 			/**
774 774
 			 * Documented in get_note_email_fields
@@ -776,8 +776,8 @@  discard block
 block discarded – undo
776 776
 			 */
777 777
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
778 778
 
779
-			if( 'custom' === $to && $include_custom ) {
780
-				$to = $email_data['gv-note-to-custom'];
779
+			if ( 'custom' === $to && $include_custom ) {
780
+				$to = $email_data[ 'gv-note-to-custom' ];
781 781
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
782 782
 			}
783 783
 
@@ -788,13 +788,13 @@  discard block
 block discarded – undo
788 788
 
789 789
 			$bcc = false;
790 790
 			$reply_to = $from;
791
-			$subject = trim( $email_data['gv-note-subject'] );
791
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
792 792
 
793 793
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
794 794
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
795
-			$message = $email_data['gv-note-content'];
795
+			$message = $email_data[ 'gv-note-content' ];
796 796
 			$email_footer = self::strings( 'email-footer' );
797
-			$from_name     = $current_user->display_name;
797
+			$from_name = $current_user->display_name;
798 798
 			$message_format = 'html';
799 799
 
800 800
 			/**
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 
826 826
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
827 827
 
828
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
828
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
829 829
 
830 830
 			/**
831 831
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 
852 852
 	    $output = '';
853 853
 
854
-		if( ! empty( $email_footer ) ) {
854
+		if ( ! empty( $email_footer ) ) {
855 855
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
856 856
 			$url = html_entity_decode( $url );
857 857
 			$url = site_url( $url );
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/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.
plugin-and-theme-hooks/class-gravityview-theme-hooks-church-themes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	 */
51 51
 	public function if_gravityview_return_true( $has_content = false ) {
52 52
 
53
-		if( ! class_exists( 'GravityView_frontend' ) ) {
53
+		if ( ! class_exists( 'GravityView_frontend' ) ) {
54 54
 			return $has_content;
55 55
 		}
56 56
 
Please login to merge, or discard this patch.