Completed
Push — develop ( 488d60...36a6ed )
by Zack
20:06
created
includes/fields/class-gravityview-field-is-approved.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,6 @@
 block discarded – undo
59 59
 	 *
60 60
 	 * @param string $output HTML value output
61 61
 	 * @param array  $entry The GF entry array
62
-	 * @param array  $field_settings Settings for the particular GV field
63 62
 	 * @param array  $field Field array, as fetched from GravityView_View::getCurrentField()
64 63
 	 *
65 64
 	 * @return string The field setting label for the current status. Uses defaults, if not configured.
Please login to merge, or discard this 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
 				gravityview()->log->error( '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/class-admin.php 2 patches
Indentation   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return void
97 97
 	 */
98 98
 	public static function connected_form_warning( $form_id = 0 ) {
99
-        global $pagenow;
99
+		global $pagenow;
100 100
 
101 101
 		if ( ! is_int( $form_id ) || $pagenow === 'post-new.php' ) {
102 102
 			return;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
243 243
 			8  => __( 'View submitted.', 'gravityview' ),
244 244
 			9  => sprintf(
245
-		        /* translators: Date and time the View is scheduled to be published */
245
+				/* translators: Date and time the View is scheduled to be published */
246 246
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
247 247
 				// translators: Publish box date format, see http://php.net/date
248 248
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -299,7 +299,6 @@  discard block
 block discarded – undo
299 299
 	 *
300 300
 	 * @deprecated since 1.12
301 301
 	 * @see GravityView_Compatibility::get_plugin_status()
302
-
303 302
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
304 303
 	 */
305 304
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -4,10 +4,10 @@  discard block
 block discarded – undo
4 4
 
5 5
 	function __construct() {
6 6
 
7
-		if( ! is_admin() ) { return; }
7
+		if ( ! is_admin() ) { return; }
8 8
 
9 9
 		// If Gravity Forms isn't active or compatibile, stop loading
10
-		if( false === GravityView_Compatibility::is_valid() ) {
10
+		if ( false === GravityView_Compatibility::is_valid() ) {
11 11
 			return;
12 12
 		}
13 13
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		add_filter( 'post_updated_messages', array( $this, 'post_updated_messages' ) );
49 49
 		add_filter( 'bulk_post_updated_messages', array( $this, 'post_updated_messages' ) );
50 50
 
51
-		add_filter( 'plugin_action_links_'. plugin_basename( GRAVITYVIEW_FILE ) , array( $this, 'plugin_action_links' ) );
51
+		add_filter( 'plugin_action_links_' . plugin_basename( GRAVITYVIEW_FILE ), array( $this, 'plugin_action_links' ) );
52 52
 
53 53
 		add_action( 'plugins_loaded', array( $this, 'backend_actions' ), 100 );
54 54
 
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public static function no_views_text() {
66 66
 		
67
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
67
+		if ( isset( $_REQUEST[ 'post_status' ] ) && 'trash' === $_REQUEST[ 'post_status' ] ) {
68 68
 			return __( 'No Views found in Trash', 'gravityview' );
69
-		} elseif( ! empty( $_GET['s'] ) ) {
69
+		} elseif ( ! empty( $_GET[ 's' ] ) ) {
70 70
 			return __( 'No Views found.', 'gravityview' );
71 71
 		}
72 72
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			$error .= ' ' . esc_html__( 'or select another form.', 'gravityview' );
111 111
 		}
112 112
 
113
-		if( $error ) {
113
+		if ( $error ) {
114 114
 			?>
115 115
 			<div class="wp-dialog notice-warning inline error wp-clearfix">
116 116
 				<?php echo gravityview_get_floaty(); ?>
@@ -129,22 +129,22 @@  discard block
 block discarded – undo
129 129
 	public function backend_actions() {
130 130
 
131 131
 		/** @define "GRAVITYVIEW_DIR" "../" */
132
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.field.type.php' );
133
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class.render.settings.php' );
134
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-item.php' );
135
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-field.php' );
136
-		include_once( GRAVITYVIEW_DIR .'includes/admin/class-gravityview-admin-view-widget.php' );
137
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-views.php' );
138
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-welcome.php' );
139
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-add-shortcode.php' );
140
-		include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
132
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.field.type.php' );
133
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class.render.settings.php' );
134
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-item.php' );
135
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-field.php' );
136
+		include_once( GRAVITYVIEW_DIR . 'includes/admin/class-gravityview-admin-view-widget.php' );
137
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-views.php' );
138
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-welcome.php' );
139
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-add-shortcode.php' );
140
+		include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
141 141
 
142 142
 		/**
143 143
 		 * @action `gravityview_include_backend_actions` Triggered after all GravityView admin files are loaded
144 144
 		 *
145 145
 		 * Nice place to insert extensions' backend stuff
146 146
 		 */
147
-		do_action('gravityview_include_backend_actions');
147
+		do_action( 'gravityview_include_backend_actions' );
148 148
 	}
149 149
 
150 150
 	/**
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
160 160
 
161 161
 		$actions = array();
162 162
 
163
-		if( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
164
-			$actions[] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
163
+		if ( GVCommon::has_cap( 'gravityview_view_settings' ) ) {
164
+			$actions[ ] = sprintf( '<a href="%s">%s</a>', admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ), esc_html__( 'Settings', 'gravityview' ) );
165 165
 		}
166 166
 
167
-		if( GVCommon::has_cap( 'gravityview_support_port' ) ) {
168
-			$actions[] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
167
+		if ( GVCommon::has_cap( 'gravityview_support_port' ) ) {
168
+			$actions[ ] = '<a href="https://docs.gravityview.co">' . esc_html__( 'Support', 'gravityview' ) . '</a>';
169 169
 		}
170 170
 
171 171
 		return array_merge( $actions, $links );
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 		// By default, there will only be one item being modified.
194 194
 		// When in the `bulk_post_updated_messages` filter, there will be passed a number
195 195
 		// of modified items that will override this array.
196
-		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1 , 'locked' => 1 , 'deleted' => 1 , 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
196
+		$bulk_counts = is_null( $bulk_counts ) ? array( 'updated' => 1, 'locked' => 1, 'deleted' => 1, 'trashed' => 1, 'untrashed' => 1 ) : $bulk_counts;
197 197
 
198 198
 		// If we're starting fresh, a new form was created.
199 199
 		// We should let the user know this is the case.
@@ -201,60 +201,60 @@  discard block
 block discarded – undo
201 201
 
202 202
 		$new_form_text = '';
203 203
 
204
-		if( !empty( $start_fresh ) ) {
204
+		if ( ! empty( $start_fresh ) ) {
205 205
 
206 206
 			// Get the form that was created
207 207
 			$connected_form = gravityview_get_form_id( $post_id );
208 208
 
209
-			if( !empty( $connected_form ) ) {
209
+			if ( ! empty( $connected_form ) ) {
210 210
 				$form = gravityview_get_form( $connected_form );
211
-				$form_name = esc_attr( $form['title'] );
211
+				$form_name = esc_attr( $form[ 'title' ] );
212 212
 				$image = self::get_floaty();
213
-				$new_form_text .= '<h3>'.$image.sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ).'</h3>';
214
-				$new_form_text .=  sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
213
+				$new_form_text .= '<h3>' . $image . sprintf( __( 'A new form was created for this View: "%s"', 'gravityview' ), $form_name ) . '</h3>';
214
+				$new_form_text .= sprintf( __( '%sThere are no entries for the new form, so the View will also be empty.%s To start collecting entries, you can add submissions through %sthe preview form%s and also embed the form on a post or page using this code: %s
215 215
 
216 216
 					You can %sedit the form%s in Gravity Forms and the updated fields will be available here. Don&rsquo;t forget to %scustomize the form settings%s.
217
-					', 'gravityview' ), '<strong>', '</strong>', '<a href="'.site_url( '?gf_page=preview&amp;id='.$connected_form ).'">', '</a>', '<code>[gravityform id="'.$connected_form.'" name="'.$form_name.'"]</code>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;id='.$connected_form ).'">', '</a>', '<a href="'.admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id='.$connected_form ).'">', '</a>');
217
+					', 'gravityview' ), '<strong>', '</strong>', '<a href="' . site_url( '?gf_page=preview&amp;id=' . $connected_form ) . '">', '</a>', '<code>[gravityform id="' . $connected_form . '" name="' . $form_name . '"]</code>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;id=' . $connected_form ) . '">', '</a>', '<a href="' . admin_url( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=' . $connected_form ) . '">', '</a>' );
218 218
 				$new_form_text = wpautop( $new_form_text );
219 219
 
220 220
 				delete_post_meta( $post_id, '_gravityview_start_fresh' );
221 221
 			}
222 222
 		}
223 223
 
224
-		$messages['gravityview'] = array(
224
+		$messages[ 'gravityview' ] = array(
225 225
 			0  => '', // Unused. Messages start at index 1.
226 226
 			/* translators: %s and %s are HTML tags linking to the View on the website */
227
-			1  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
227
+			1  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
228 228
 			/* translators: %s and %s are HTML tags linking to the View on the website */
229
-			2  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
229
+			2  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
230 230
 			3  => __( 'View deleted.', 'gravityview' ),
231 231
 			/* translators: %s and %s are HTML tags linking to the View on the website */
232
-			4  => sprintf(__( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>'),
232
+			4  => sprintf( __( 'View updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ),
233 233
 			/* translators: %s: date and time of the revision */
234
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
234
+			5  => isset( $_GET[ 'revision' ] ) ? sprintf( __( 'View restored to revision from %s', 'gravityview' ), wp_post_revision_title( (int)$_GET[ 'revision' ], false ) ) : false,
235 235
 			/* translators: %s and %s are HTML tags linking to the View on the website */
236
-			6  => sprintf(__( 'View published. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
236
+			6  => sprintf( __( 'View published. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
237 237
 			/* translators: %s and %s are HTML tags linking to the View on the website */
238
-			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
238
+			7  => sprintf( __( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
239 239
 			8  => __( 'View submitted.', 'gravityview' ),
240 240
 			9  => sprintf(
241 241
 		        /* translators: Date and time the View is scheduled to be published */
242 242
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
243 243
 				// translators: Publish box date format, see http://php.net/date
244
-				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
244
+				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL ) ) )
245 245
 			) . $new_form_text,
246 246
 			/* translators: %s and %s are HTML tags linking to the View on the website */
247
-			10  => sprintf(__( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
247
+			10  => sprintf( __( 'View draft updated. %sView on website.%s', 'gravityview' ), '<a href="' . get_permalink( $post_id ) . '">', '</a>' ) . $new_form_text,
248 248
 
249 249
 			/**
250 250
 			 * These apply to `bulk_post_updated_messages`
251 251
 			 * @file wp-admin/edit.php
252 252
 			 */
253
-			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts['updated'], 'gravityview' ),
254
-			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts['locked'], 'gravityview' ),
255
-			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts['deleted'], 'gravityview' ),
256
-			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts['trashed'], 'gravityview' ),
257
-			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts['untrashed'], 'gravityview' ),
253
+			'updated'   => _n( '%s View updated.', '%s Views updated.', $bulk_counts[ 'updated' ], 'gravityview' ),
254
+			'locked'    => _n( '%s View not updated, somebody is editing it.', '%s Views not updated, somebody is editing them.', $bulk_counts[ 'locked' ], 'gravityview' ),
255
+			'deleted'   => _n( '%s View permanently deleted.', '%s Views permanently deleted.', $bulk_counts[ 'deleted' ], 'gravityview' ),
256
+			'trashed'   => _n( '%s View moved to the Trash.', '%s Views moved to the Trash.', $bulk_counts[ 'trashed' ], 'gravityview' ),
257
+			'untrashed' => _n( '%s View restored from the Trash.', '%s Views restored from the Trash.', $bulk_counts[ 'untrashed' ], 'gravityview' ),
258 258
 		);
259 259
 
260 260
 		return $messages;
Please login to merge, or discard this patch.
includes/class-template.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -329,34 +329,34 @@  discard block
 block discarded – undo
329 329
 	}
330 330
 
331 331
 	/**
332
-     * Get the fields for a specific context
333
-     *
334
-     * @since 1.19.2
335
-     *
332
+	 * Get the fields for a specific context
333
+	 *
334
+	 * @since 1.19.2
335
+	 *
336 336
 	 * @param string $context [Optional] "directory", "single", or "edit"
337 337
 	 *
338 338
 	 * @return array Array of GravityView field layout configurations
339 339
 	 */
340 340
 	public function getContextFields( $context = '' ) {
341 341
 
342
-	    if( '' === $context ) {
343
-	        $context = $this->getContext();
344
-        }
342
+		if( '' === $context ) {
343
+			$context = $this->getContext();
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
-            // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
351
-            $matches = explode( '_', $key );
350
+			// Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
351
+			$matches = explode( '_', $key );
352 352
 
353
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
354
-                return $context_fields;
355
-            }
356
-        }
353
+			if( isset( $matches[0] ) && $matches[0] === $context ) {
354
+				return $context_fields;
355
+			}
356
+		}
357 357
 
358 358
 		return array();
359
-    }
359
+	}
360 360
 
361 361
 	/**
362 362
 	 * @param array $fields
@@ -449,10 +449,10 @@  discard block
 block discarded – undo
449 449
 	 */
450 450
 	public function getPaging() {
451 451
 
452
-	    $default_params = array(
453
-            'offset' => 0,
454
-            'page_size' => 20,
455
-        );
452
+		$default_params = array(
453
+			'offset' => 0,
454
+			'page_size' => 20,
455
+		);
456 456
 
457 457
 		return wp_parse_args( $this->paging, $default_params );
458 458
 	}
@@ -509,10 +509,10 @@  discard block
 block discarded – undo
509 509
 	public function getSorting() {
510 510
 
511 511
 		$defaults_params = array(
512
-            'sort_field' => 'date_created',
513
-            'sort_direction' => 'ASC',
514
-            'is_numeric' => false,
515
-        );
512
+			'sort_field' => 'date_created',
513
+			'sort_direction' => 'ASC',
514
+			'is_numeric' => false,
515
+		);
516 516
 
517 517
 		return wp_parse_args( $this->sorting, $defaults_params );
518 518
 	}
Please login to merge, or discard this patch.
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -219,6 +219,9 @@  discard block
 block discarded – undo
219 219
 
220 220
 	}
221 221
 
222
+	/**
223
+	 * @param string $key
224
+	 */
222 225
 	public function getCurrentFieldSetting( $key ) {
223 226
 		$settings = $this->getCurrentField('field_settings');
224 227
 
@@ -725,6 +728,7 @@  discard block
 block discarded – undo
725 728
 	 *
726 729
 	 * @inheritdoc
727 730
 	 * @see Gamajo_Template_Loader::locate_template()
731
+	 * @param string $template_names
728 732
 	 * @return null|string NULL: Template not found; String: path to template
729 733
 	 */
730 734
 	function locate_template( $template_names, $load = false, $require_once = true ) {
Please login to merge, or discard this patch.
Spacing   +49 added lines, -49 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;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	static function getInstance( $passed_post = NULL ) {
190 190
 
191
-		if( empty( self::$instance ) ) {
191
+		if ( empty( self::$instance ) ) {
192 192
 			self::$instance = new self( $passed_post );
193 193
 		}
194 194
 
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 	 */
202 202
 	public function getCurrentField( $key = NULL ) {
203 203
 
204
-		if( !empty( $key ) ) {
205
-			if( isset( $this->_current_field[ $key ] ) ) {
204
+		if ( ! empty( $key ) ) {
205
+			if ( isset( $this->_current_field[ $key ] ) ) {
206 206
 				return $this->_current_field[ $key ];
207 207
 			}
208 208
 			return NULL;
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
 
214 214
 	public function setCurrentFieldSetting( $key, $value ) {
215 215
 
216
-		if( !empty( $this->_current_field ) ) {
217
-			$this->_current_field['field_settings'][ $key ] = $value;
216
+		if ( ! empty( $this->_current_field ) ) {
217
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
218 218
 		}
219 219
 
220 220
 	}
221 221
 
222 222
 	public function getCurrentFieldSetting( $key ) {
223
-		$settings = $this->getCurrentField('field_settings');
223
+		$settings = $this->getCurrentField( 'field_settings' );
224 224
 
225
-		if( $settings && !empty( $settings[ $key ] ) ) {
225
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
226 226
 			return $settings[ $key ];
227 227
 		}
228 228
 
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function getAtts( $key = NULL ) {
255 255
 
256
-		if( !empty( $key ) ) {
257
-			if( isset( $this->atts[ $key ] ) ) {
256
+		if ( ! empty( $key ) ) {
257
+			if ( isset( $this->atts[ $key ] ) ) {
258 258
 				return $this->atts[ $key ];
259 259
 			}
260 260
 			return NULL;
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
322 322
 
323
-		if( $fields && !empty( $key ) ) {
323
+		if ( $fields && ! empty( $key ) ) {
324 324
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
325 325
 		}
326 326
 
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
341
+	    if ( '' === $context ) {
342 342
 	        $context = $this->getContext();
343 343
         }
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+        foreach ( (array)$fields as $key => $context_fields ) {
348 348
 
349 349
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350 350
             $matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
352
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
353 353
                 return $context_fields;
354 354
             }
355 355
         }
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	 */
371 371
 	public function getField( $key ) {
372 372
 
373
-		if( !empty( $key ) ) {
374
-			if( isset( $this->fields[ $key ] ) ) {
373
+		if ( ! empty( $key ) ) {
374
+			if ( isset( $this->fields[ $key ] ) ) {
375 375
 				return $this->fields[ $key ];
376 376
 			}
377 377
 		}
@@ -477,8 +477,8 @@  discard block
 block discarded – undo
477 477
 	public function getPaginationCounts() {
478 478
 
479 479
 		$paging = $this->getPaging();
480
-		$offset = $paging['offset'];
481
-		$page_size = $paging['page_size'];
480
+		$offset = $paging[ 'offset' ];
481
+		$page_size = $paging[ 'page_size' ];
482 482
 		$total = $this->getTotalEntries();
483 483
 
484 484
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 		 */
500 500
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
501 501
 
502
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
502
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
503 503
 	}
504 504
 
505 505
 	/**
@@ -595,16 +595,16 @@  discard block
 block discarded – undo
595 595
 	 */
596 596
 	public function getCurrentEntry() {
597 597
 
598
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
598
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
599 599
 			$entries = $this->getEntries();
600
-			$entry = $entries[0];
600
+			$entry = $entries[ 0 ];
601 601
 		} else {
602 602
 			$entry = $this->_current_entry;
603 603
 		}
604 604
 
605 605
 		/** @since 1.16 Fixes DataTables empty entry issue */
606
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
607
-			$entry = $this->_current_field['entry'];
606
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
607
+			$entry = $this->_current_field[ 'entry' ];
608 608
 		}
609 609
 
610 610
 		return $entry;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
645 645
 
646 646
 		if ( empty( $zone ) ) {
647
-			gravityview()->log->error( 'No zone defined.');
647
+			gravityview()->log->error( 'No zone defined.' );
648 648
 			return NULL;
649 649
 		}
650 650
 
@@ -653,16 +653,16 @@  discard block
 block discarded – undo
653 653
 			'context' => $this->getContext(),
654 654
 			'entry' => $this->getCurrentEntry(),
655 655
 			'form' => $this->getForm(),
656
-			'hide_empty' => $this->getAtts('hide_empty'),
656
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
657 657
 		);
658 658
 
659 659
 		$final_atts = wp_parse_args( $atts, $defaults );
660 660
 
661 661
 		$output = '';
662 662
 
663
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
663
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
664 664
 
665
-		$fields = $this->getField( $final_atts['zone_id'] );
665
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
666 666
 
667 667
 		// Backward compatibility
668 668
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 			 * @param GravityView_View $this
673 673
 			 * @deprecated Use `gravityview/template/table/fields`
674 674
 			 */
675
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
675
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
676 676
 		}
677 677
 
678 678
 		if ( empty( $fields ) ) {
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 
685 685
 		$field_output = '';
686 686
 		foreach ( $fields as $field ) {
687
-			$final_atts['field'] = $field;
687
+			$final_atts[ 'field' ] = $field;
688 688
 
689 689
 			$field_output .= gravityview_field_output( $final_atts );
690 690
 		}
@@ -701,17 +701,17 @@  discard block
 block discarded – undo
701 701
 			return NULL;
702 702
 		}
703 703
 
704
-		if( !empty( $final_atts['wrapper_class'] ) ) {
705
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
704
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
705
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
706 706
 		}
707 707
 
708 708
 		$output .= $field_output;
709 709
 
710
-		if( !empty( $final_atts['wrapper_class'] ) ) {
710
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
711 711
 			$output .= '</div>';
712 712
 		}
713 713
 
714
-		if( $echo ) {
714
+		if ( $echo ) {
715 715
 			echo $output;
716 716
 		}
717 717
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 	 */
730 730
 	function locate_template( $template_names, $load = false, $require_once = true ) {
731 731
 
732
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
732
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
733 733
 
734 734
 			$located = $this->located_templates[ $template_names ];
735 735
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 			// Set $load to always false so we handle it here.
739 739
 			$located = parent::locate_template( $template_names, false, $require_once );
740 740
 
741
-			if( is_string( $template_names ) ) {
741
+			if ( is_string( $template_names ) ) {
742 742
 				$this->located_templates[ $template_names ] = $located;
743 743
 			}
744 744
 		}
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * @return mixed|null    The stored data.
757 757
 	 */
758 758
 	public function __get( $name ) {
759
-		if( isset( $this->{$name} ) ) {
759
+		if ( isset( $this->{$name} ) ) {
760 760
 			return $this->{$name};
761 761
 		} else {
762 762
 			return NULL;
@@ -785,17 +785,17 @@  discard block
 block discarded – undo
785 785
 		$additional = array();
786 786
 
787 787
 		// form-19-table-body.php
788
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
788
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
789 789
 
790
-		if( $view_id = $this->getViewId() ) {
790
+		if ( $view_id = $this->getViewId() ) {
791 791
 			// view-3-table-body.php
792
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
792
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
793 793
 		}
794 794
 
795
-		if( $this->getPostId() ) {
795
+		if ( $this->getPostId() ) {
796 796
 
797 797
 			// page-19-table-body.php
798
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
798
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
799 799
 		}
800 800
 
801 801
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 
818 818
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
819 819
 
820
-		if( !empty( $template_file) ) {
820
+		if ( ! empty( $template_file ) ) {
821 821
 
822 822
 			if ( $require_once ) {
823 823
 				require_once( $template_file );
@@ -884,7 +884,7 @@  discard block
 block discarded – undo
884 884
 
885 885
 		// Prevent being called twice
886 886
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
887
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
887
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
888 888
 			return;
889 889
 		}
890 890
 
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 		 * @param string $zone Current widget zone, either `header` or `footer`
907 907
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
908 908
 		 */
909
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
909
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
910 910
 
911 911
 		$css_class = gravityview_sanitize_html_class( $css_class );
912 912
 
@@ -914,15 +914,15 @@  discard block
 block discarded – undo
914 914
 		?>
915 915
 		<div class="<?php echo $css_class; ?>">
916 916
 			<?php
917
-			foreach( $rows as $row ) {
918
-				foreach( $row as $col => $areas ) {
917
+			foreach ( $rows as $row ) {
918
+				foreach ( $row as $col => $areas ) {
919 919
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
920 920
 				?>
921 921
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
922 922
 						<?php
923 923
 						if ( ! empty( $areas ) ) {
924 924
 							foreach ( $areas as $area ) {
925
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
925
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
926 926
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
927 927
 								}
928 928
 							}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-transaction-id.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 
15 15
 	var $is_numeric = true;
16 16
 
17
-	var $search_operators = array( 'is', 'isnot', 'starts_with', 'ends_with'  );
17
+	var $search_operators = array( 'is', 'isnot', 'starts_with', 'ends_with' );
18 18
 
19 19
 	var $group = 'pricing';
20 20
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-checkbox.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 		$field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
46 46
 
47 47
 		// It's not the parent field; it's an input
48
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
48
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
49 49
 
50
-			if( $this->is_choice_value_enabled() ) {
50
+			if ( $this->is_choice_value_enabled() ) {
51 51
 
52 52
 				$desc = esc_html__( 'This input has a label and a value. What should be displayed?', 'gravityview' );
53 53
 				$default = 'value';
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 				);
66 66
 			}
67 67
 
68
-			$field_options['choice_display'] = array(
68
+			$field_options[ 'choice_display' ] = array(
69 69
 				'type'    => 'radio',
70 70
 				'class'   => 'vertical',
71 71
 				'label'   => __( 'What should be displayed:', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-product.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	function clear_product_info_cache( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
51 51
 
52
-		if( $this->should_hide_product_fields( $Edit_Entry_Render->entry ) ) {
52
+		if ( $this->should_hide_product_fields( $Edit_Entry_Render->entry ) ) {
53 53
 			return;
54 54
 		}
55 55
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		 * @see GVCommon::entry_has_transaction_data()
102 102
 		 * @param boolean $hide_product_fields Whether to hide product fields in the editor. Uses $entry data to determine.
103 103
 		 */
104
-		$hide_product_fields = (bool) apply_filters( 'gravityview/edit_entry/hide-product-fields', $has_transaction_data );
104
+		$hide_product_fields = (bool)apply_filters( 'gravityview/edit_entry/hide-product-fields', $has_transaction_data );
105 105
 
106 106
 		return $hide_product_fields;
107 107
 	}
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-metabox-tab.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 	 * @param string $icon_class_name Icon class used in vertical tabs. Supports non-dashicon. If dashicons, no need for `dashicons ` prefix
96 96
 	 * @param string $callback Function to render the metabox, if $file is not defined.
97 97
 	 * @param array $callback_args Arguments passed to the callback
98
-	 * @return void
98
+	 * @return GravityView_Metabox_Tab
99 99
 	 */
100 100
 	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
101 101
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
 	 * @param array $callback_args Arguments passed to the callback
98 98
 	 * @return void
99 99
 	 */
100
-	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array()  ) {
100
+	function __construct( $id, $title = '', $file = '', $icon_class_name = '', $callback = '', $callback_args = array() ) {
101 101
 
102
-		$this->id = $this->prefix.$id;
102
+		$this->id = $this->prefix . $id;
103 103
 		$this->title = $title;
104 104
 		$this->render_template_file = $file;
105 105
 		$this->callback = $callback;
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	function parse_icon_class_name( $icon_class_name = '' ) {
120 120
 
121
-		if( preg_match( '/dashicon/i', $icon_class_name ) ) {
121
+		if ( preg_match( '/dashicon/i', $icon_class_name ) ) {
122 122
 			$icon_class_name = 'dashicons ' . $icon_class_name;
123 123
 		}
124 124
 
@@ -142,29 +142,29 @@  discard block
 block discarded – undo
142 142
 	 */
143 143
 	function render( $post ) {
144 144
 
145
-		if( !empty( $this->render_template_file ) ) {
145
+		if ( ! empty( $this->render_template_file ) ) {
146 146
 
147 147
 			$file = $this->render_template_file;
148 148
 
149 149
 			// If the full path exists, use it
150
-			if( file_exists( $file ) ) {
150
+			if ( file_exists( $file ) ) {
151 151
 				$path = $file;
152 152
 			} else {
153
-				$path = GRAVITYVIEW_DIR .'includes/admin/metaboxes/views/'.$file;
153
+				$path = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/views/' . $file;
154 154
 			}
155 155
 
156
-			if( file_exists( $path ) ) {
156
+			if ( file_exists( $path ) ) {
157 157
 				include $path;
158 158
 			} else {
159 159
 				gravityview()->log->error( 'Metabox template file not found', array( 'data' => $this ) );
160 160
 			}
161 161
 
162
-		} else if( !empty( $this->callback ) ) {
162
+		} else if ( ! empty( $this->callback ) ) {
163 163
 
164
-			if( is_callable( $this->callback ) ) {
164
+			if ( is_callable( $this->callback ) ) {
165 165
 
166 166
 				/** @see do_accordion_sections() */
167
-				call_user_func( $this->callback, $post, (array) $this );
167
+				call_user_func( $this->callback, $post, (array)$this );
168 168
 
169 169
 			} else {
170 170
 				gravityview()->log->error( 'Metabox callback was not callable', array( 'data' => $this ) );
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 	 * @param  int $entry_id ID of the Gravity Forms entry
372 372
 	 * @param  string $status String whether entry is approved or not. `0` for not approved, `Approved` for approved.
373 373
 	 * @param int $form_id ID of the form of the entry being updated. Improves query performance.
374
-	 * @param string $approvedcolumn Gravity Forms Field ID
374
+	 * @param integer $approvedcolumn Gravity Forms Field ID
375 375
 	 *
376 376
 	 * @return true|WP_Error
377 377
 	 */
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 	 *
425 425
 	 * @since 1.19
426 426
 	 *
427
-	 * @param array|int $form Form ID or form array
427
+	 * @param integer $form Form ID or form array
428 428
 	 * @param string $approved_column Approved column field ID
429 429
 	 *
430 430
 	 * @return string|null
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 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
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 		$nonce = \GV\Utils::_POST( '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
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
112 112
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 
138 138
 			gravityview()->log->error( '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
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $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
 			gravityview()->log->error( '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
 			gravityview()->log->error( '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
 			gravityview()->log->error( '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
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $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
@@ -436,12 +436,12 @@  discard block
 block discarded – undo
436 436
 		// If the user has enabled a different value than the label (for some reason), use it.
437 437
 		// This is highly unlikely
438 438
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
439
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
439
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
440 440
 		}
441 441
 
442 442
 		// Otherwise, fall back on the inputs array
443 443
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
444
-			return $field->inputs[0]['label'];
444
+			return $field->inputs[ 0 ][ 'label' ];
445 445
 		}
446 446
 
447 447
 		return null;
@@ -469,9 +469,9 @@  discard block
 block discarded – undo
469 469
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
470 470
 
471 471
 		// update entry meta
472
-		if( function_exists('gform_update_meta') ) {
472
+		if ( function_exists( 'gform_update_meta' ) ) {
473 473
 
474
-			if( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
474
+			if ( GravityView_Entry_Approval_Status::is_unapproved( $status ) ) {
475 475
 				gform_delete_meta( $entry_id, self::meta_key );
476 476
 			} else {
477 477
 				gform_update_meta( $entry_id, self::meta_key, $status, $form_id );
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 			 * @since 1.18 Added "unapproved"
495 495
 			 * @param  int $entry_id ID of the Gravity Forms entry
496 496
 			 */
497
-			do_action( 'gravityview/approve_entries/' . $action , $entry_id );
497
+			do_action( 'gravityview/approve_entries/' . $action, $entry_id );
498 498
 
499 499
 		} else {
500 500
 
@@ -513,11 +513,11 @@  discard block
 block discarded – undo
513 513
 	 */
514 514
 	static public function get_approved_column( $form ) {
515 515
 
516
-		if( empty( $form ) ) {
516
+		if ( empty( $form ) ) {
517 517
 			return null;
518 518
 		}
519 519
 
520
-		if( !is_array( $form ) ) {
520
+		if ( ! is_array( $form ) ) {
521 521
 			$form = GVCommon::get_form( $form );
522 522
 		}
523 523
 
@@ -527,22 +527,22 @@  discard block
 block discarded – undo
527 527
 		 * @var string $key
528 528
 		 * @var GF_Field $field
529 529
 		 */
530
-		foreach( $form['fields'] as $key => $field ) {
530
+		foreach ( $form[ 'fields' ] as $key => $field ) {
531 531
 
532 532
 			$inputs = $field->get_entry_inputs();
533 533
 
534
-			if( !empty( $field->gravityview_approved ) ) {
535
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
536
-					$approved_column_id = $inputs[0]['id'];
534
+			if ( ! empty( $field->gravityview_approved ) ) {
535
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
536
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
537 537
 					break;
538 538
 				}
539 539
 			}
540 540
 
541 541
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
542
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
542
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
543 543
 				foreach ( $inputs as $input ) {
544
-					if ( 'approved' === strtolower( $input['label'] ) ) {
545
-						$approved_column_id = $input['id'];
544
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
545
+						$approved_column_id = $input[ 'id' ];
546 546
 						break;
547 547
 					}
548 548
 				}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,7 @@
 block discarded – undo
245 245
 	 * @param bool $url_encode Whether to URL-encode output
246 246
 	 * @param bool $esc_html Whether to apply `esc_html()` to output
247 247
 	 *
248
-	 * @return mixed
248
+	 * @return string
249 249
 	 */
250 250
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
251 251
 
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -134,17 +134,17 @@  discard block
 block discarded – undo
134 134
 
135 135
 		add_filter( 'gravityview/sortable/field_blacklist', array( $this, '_filter_sortable_fields' ), 1 );
136 136
 
137
-		if( $this->entry_meta_key ) {
137
+		if ( $this->entry_meta_key ) {
138 138
 			add_filter( 'gform_entry_meta', array( $this, 'add_entry_meta' ) );
139 139
 			add_filter( 'gravityview/common/sortable_fields', array( $this, 'add_sortable_field' ), 10, 2 );
140 140
 		}
141 141
 
142
-		if( $this->_custom_merge_tag ) {
142
+		if ( $this->_custom_merge_tag ) {
143 143
 			add_filter( 'gform_custom_merge_tags', array( $this, '_filter_gform_custom_merge_tags' ), 10, 4 );
144 144
 			add_filter( 'gform_replace_merge_tags', array( $this, '_filter_gform_replace_merge_tags' ), 10, 7 );
145 145
 		}
146 146
 
147
-		if( 'meta' === $this->group || '' !== $this->default_search_label ) {
147
+		if ( 'meta' === $this->group || '' !== $this->default_search_label ) {
148 148
 			add_filter( 'gravityview_search_field_label', array( $this, 'set_default_search_label' ), 10, 3 );
149 149
 		}
150 150
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * Auto-assign label from Gravity Forms label, if exists
153 153
 		 * @since 1.20
154 154
 		 */
155
-		if( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
155
+		if ( empty( $this->label ) && ! empty( $this->_gf_field_class_name ) && class_exists( $this->_gf_field_class_name ) ) {
156 156
 			$this->label = ucfirst( GF_Fields::get( $this->name )->get_form_editor_field_title() );
157 157
 		}
158 158
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			'type'  => $this->name
176 176
 		);
177 177
 
178
-		$fields["{$this->entry_meta_key}"] = $added_field;
178
+		$fields[ "{$this->entry_meta_key}" ] = $added_field;
179 179
 
180 180
 		return $fields;
181 181
 	}
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 */
196 196
 	function set_default_search_label( $label = '', $gf_field = null, $field = array() ) {
197 197
 
198
-		if( $this->name === $field['field'] && '' === $label ) {
198
+		if ( $this->name === $field[ 'field' ] && '' === $label ) {
199 199
 			$label = esc_html( $this->default_search_label );
200 200
 		}
201 201
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 	 *
217 217
 	 * @return string Original text if {_custom_merge_tag} isn't found. Otherwise, replaced text.
218 218
 	 */
219
-	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false  ) {
219
+	public function _filter_gform_replace_merge_tags( $text, $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
220 220
 
221 221
 		// Is there is field merge tag? Strip whitespace off the ned, too.
222 222
 		preg_match_all( '/{' . preg_quote( $this->_custom_merge_tag ) . ':?(.*?)(?:\s)?}/ism', $text, $matches, PREG_SET_ORDER );
@@ -249,19 +249,19 @@  discard block
 block discarded – undo
249 249
 	 */
250 250
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
251 251
 
252
-		foreach( $matches as $match ) {
252
+		foreach ( $matches as $match ) {
253 253
 
254
-			$full_tag = $match[0];
254
+			$full_tag = $match[ 0 ];
255 255
 
256 256
 			// Strip the Merge Tags
257
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
257
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
258 258
 
259 259
 			// Replace the value from the entry, if exists
260
-			if( isset( $entry[ $tag ] ) ) {
260
+			if ( isset( $entry[ $tag ] ) ) {
261 261
 
262 262
 				$value = $entry[ $tag ];
263 263
 
264
-				if( is_callable( array( $this, 'get_content') ) ) {
264
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
265 265
 					$value = $this->get_content( $value );
266 266
 				}
267 267
 
@@ -334,8 +334,8 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public function _filter_sortable_fields( $not_sortable ) {
336 336
 
337
-		if( ! $this->is_sortable ) {
338
-			$not_sortable[] = $this->name;
337
+		if ( ! $this->is_sortable ) {
338
+			$not_sortable[ ] = $this->name;
339 339
 		}
340 340
 
341 341
 		return $not_sortable;
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 	 */
353 353
 	function add_entry_meta( $entry_meta ) {
354 354
 
355
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
355
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
356 356
 
357 357
 			$added_meta = array(
358 358
 				'label'             => $this->label,
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 			);
362 362
 
363 363
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
364
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
364
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
365 365
 			}
366 366
 
367
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
367
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
368 368
 
369 369
 		} else {
370
-			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta["{$this->entry_meta_key}"] ) );
370
+			gravityview()->log->error( 'Entry meta already set: {meta_key}', array( 'meta_key' => $this->entry_meta_key, 'data' =>  $entry_meta[ "{$this->entry_meta_key}" ] ) );
371 371
 		}
372 372
 
373 373
 		return $entry_meta;
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 			'date_display' => array(
397 397
 				'type' => 'text',
398 398
 				'label' => __( 'Override Date Format', 'gravityview' ),
399
-				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview'), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
399
+				'desc' => sprintf( __( 'Define how the date is displayed (using %sthe PHP date format%s)', 'gravityview' ), '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">', '</a>' ),
400 400
 				/**
401 401
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
402 402
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 
422 422
 		$options = $this->field_support_options();
423 423
 
424
-		if( isset( $options[ $key ] ) ) {
424
+		if ( isset( $options[ $key ] ) ) {
425 425
 			$field_options[ $key ] = $options[ $key ];
426 426
 		}
427 427
 
@@ -485,11 +485,11 @@  discard block
 block discarded – undo
485 485
 		$connected_form = \GV\Utils::_POST( 'form_id' );
486 486
 
487 487
 		// Otherwise, get the Form ID from the Post page
488
-		if( empty( $connected_form ) ) {
488
+		if ( empty( $connected_form ) ) {
489 489
 			$connected_form = gravityview_get_form_id( get_the_ID() );
490 490
 		}
491 491
 
492
-		if( empty( $connected_form ) ) {
492
+		if ( empty( $connected_form ) ) {
493 493
 			gravityview()->log->error( 'Form not found for form ID "{form_id}"', array( 'form_id' => $connected_form ) );
494 494
 			return false;
495 495
 		}
Please login to merge, or discard this patch.