Completed
Push — develop ( 3f9285...c35b1f )
by Zack
07:37
created
includes/fields/class-gravityview-field.php 1 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 );
@@ -247,19 +247,19 @@  discard block
 block discarded – undo
247 247
 	 */
248 248
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
249 249
 
250
-		foreach( $matches as $match ) {
250
+		foreach ( $matches as $match ) {
251 251
 
252
-			$full_tag = $match[0];
252
+			$full_tag = $match[ 0 ];
253 253
 
254 254
 			// Strip the Merge Tags
255
-			$tag = str_replace( array( '{', '}'), '', $full_tag );
255
+			$tag = str_replace( array( '{', '}' ), '', $full_tag );
256 256
 
257 257
 			// Replace the value from the entry, if exists
258
-			if( isset( $entry[ $tag ] ) ) {
258
+			if ( isset( $entry[ $tag ] ) ) {
259 259
 
260 260
 				$value = $entry[ $tag ];
261 261
 
262
-				if( is_callable( array( $this, 'get_content') ) ) {
262
+				if ( is_callable( array( $this, 'get_content' ) ) ) {
263 263
 					$value = $this->get_content( $value );
264 264
 				}
265 265
 
@@ -332,8 +332,8 @@  discard block
 block discarded – undo
332 332
 	 */
333 333
 	public function _filter_sortable_fields( $not_sortable ) {
334 334
 
335
-		if( ! $this->is_sortable ) {
336
-			$not_sortable[] = $this->name;
335
+		if ( ! $this->is_sortable ) {
336
+			$not_sortable[ ] = $this->name;
337 337
 		}
338 338
 
339 339
 		return $not_sortable;
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 	 */
351 351
 	function add_entry_meta( $entry_meta ) {
352 352
 
353
-		if( ! isset( $entry_meta["{$this->entry_meta_key}"] ) ) {
353
+		if ( ! isset( $entry_meta[ "{$this->entry_meta_key}" ] ) ) {
354 354
 
355 355
 			$added_meta = array(
356 356
 				'label'             => $this->label,
@@ -359,13 +359,13 @@  discard block
 block discarded – undo
359 359
 			);
360 360
 
361 361
 			if ( $this->entry_meta_update_callback && is_callable( $this->entry_meta_update_callback ) ) {
362
-				$added_meta['update_entry_meta_callback'] = $this->entry_meta_update_callback;
362
+				$added_meta[ 'update_entry_meta_callback' ] = $this->entry_meta_update_callback;
363 363
 			}
364 364
 
365
-			$entry_meta["{$this->entry_meta_key}"] = $added_meta;
365
+			$entry_meta[ "{$this->entry_meta_key}" ] = $added_meta;
366 366
 
367 367
 		} else {
368
-			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta["{$this->entry_meta_key}"] );
368
+			do_action( 'gravityview_log_error', __METHOD__ . ' Entry meta already set: ' . $this->entry_meta_key, $entry_meta[ "{$this->entry_meta_key}" ] );
369 369
 		}
370 370
 
371 371
 		return $entry_meta;
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
 			'date_display' => array(
395 395
 				'type' => 'text',
396 396
 				'label' => __( 'Override Date Format', 'gravityview' ),
397
-				'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>' ),
397
+				'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>' ),
398 398
 				/**
399 399
 				 * @filter `gravityview_date_format` Override the date format with a [PHP date format](https://codex.wordpress.org/Formatting_Date_and_Time)
400 400
 				 * @param[in,out] null|string $date_format Date Format (default: null)
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$options = $this->field_support_options();
421 421
 
422
-		if( isset( $options[ $key ] ) ) {
422
+		if ( isset( $options[ $key ] ) ) {
423 423
 			$field_options[ $key ] = $options[ $key ];
424 424
 		}
425 425
 
@@ -483,11 +483,11 @@  discard block
 block discarded – undo
483 483
 		$connected_form = rgpost( 'form_id' );
484 484
 
485 485
 		// Otherwise, get the Form ID from the Post page
486
-		if( empty( $connected_form ) ) {
486
+		if ( empty( $connected_form ) ) {
487 487
 			$connected_form = gravityview_get_form_id( get_the_ID() );
488 488
 		}
489 489
 
490
-		if( empty( $connected_form ) ) {
490
+		if ( empty( $connected_form ) ) {
491 491
 			do_action( 'gravityview_log_error', sprintf( '%s: Form not found for form ID "%s"', __METHOD__, $connected_form ) );
492 492
 			return false;
493 493
 		}
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	     * @since 1.11
53 53
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
54 54
 	     */
55
-	    if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
55
+	    if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
56 56
 
57
-	    	add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
57
+	    	add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
58 58
 
59 59
 		    // last resort in case the current user display name don't match any of the defaults
60 60
 		    add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public function update_user( $form = array(), $entry_id = 0 ) {
74 74
 
75
-        if( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
75
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GF_User_Registration' ) ) {
76 76
 	        do_action( 'gravityview_log_error', __METHOD__ . ': GFAPI or User Registration class not found; not updating the user' );
77 77
 	        return;
78
-        } elseif( empty( $entry_id ) ) {
78
+        } elseif ( empty( $entry_id ) ) {
79 79
         	do_action( 'gravityview_log_error', __METHOD__ . ': Entry ID is empty; not updating the user', $entry_id );
80 80
 	        return;
81 81
         }
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	    }
102 102
 
103 103
 	    // If an Update feed, make sure the conditions are met.
104
-	    if( rgars( $config, 'meta/feedType' ) === 'update' ) {
105
-	    	if( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
104
+	    if ( rgars( $config, 'meta/feedType' ) === 'update' ) {
105
+	    	if ( ! $gf_user_registration->is_feed_condition_met( $config, $form, $entry ) ) {
106 106
 			    return;
107 107
 		    }
108 108
 	    }
@@ -149,17 +149,17 @@  discard block
 block discarded – undo
149 149
 	     */
150 150
 	    $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
151 151
 
152
-	    if( $preserve_role ) {
153
-		    $config['meta']['role'] = 'gfur_preserve_role';
152
+	    if ( $preserve_role ) {
153
+		    $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
154 154
 	    }
155 155
 
156
-	    $displayname = $this->match_current_display_name( $entry['created_by'] );
156
+	    $displayname = $this->match_current_display_name( $entry[ 'created_by' ] );
157 157
 
158 158
 	    /**
159 159
 	     * Make sure the current display name is not changed with the update user method.
160 160
 	     * @since 1.15
161 161
 	     */
162
-	    $config['meta']['displayname'] = $displayname ? $displayname : $config['meta']['displayname'];
162
+	    $config[ 'meta' ][ 'displayname' ] = $displayname ? $displayname : $config[ 'meta' ][ 'displayname' ];
163 163
 
164 164
 	    /**
165 165
 	     * @filter `gravityview/edit_entry/user_registration/config` Modify the User Registration Addon feed configuration
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
         $user = get_userdata( $user_id );
188 188
 
189
-        if( ! $user ) {
189
+        if ( ! $user ) {
190 190
         	return false;
191 191
         }
192 192
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
          * In case we can't find the current display name format, trigger last resort method at the 'gform_user_updated' hook
199 199
          * @see restore_display_name
200 200
          */
201
-        if( false === $format ) {
201
+        if ( false === $format ) {
202 202
             $this->_user_before_update = $user;
203 203
         }
204 204
 
@@ -216,20 +216,20 @@  discard block
 block discarded – undo
216 216
     public function generate_display_names( $profileuser ) {
217 217
 
218 218
         $public_display = array();
219
-        $public_display['nickname']  = $profileuser->nickname;
220
-        $public_display['username']  = $profileuser->user_login;
219
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
220
+        $public_display[ 'username' ]  = $profileuser->user_login;
221 221
 
222
-        if ( !empty($profileuser->first_name) ) {
223
-	        $public_display['firstname'] = $profileuser->first_name;
222
+        if ( ! empty( $profileuser->first_name ) ) {
223
+	        $public_display[ 'firstname' ] = $profileuser->first_name;
224 224
         }
225 225
 
226
-        if ( !empty($profileuser->last_name) ) {
227
-	        $public_display['lastname'] = $profileuser->last_name;
226
+        if ( ! empty( $profileuser->last_name ) ) {
227
+	        $public_display[ 'lastname' ] = $profileuser->last_name;
228 228
         }
229 229
 
230
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
231
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
232
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
230
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
231
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
232
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
233 233
         }
234 234
 
235 235
         $public_display = array_map( 'trim', $public_display );
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
          */
260 260
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
261 261
 
262
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
262
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
263 263
 
264 264
         /**
265 265
          * Don't restore display name:
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
          *   - or we don't need as we found the correct format before updating user.
269 269
          * @since 1.14.4
270 270
          */
271
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
271
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
272 272
             return null;
273 273
         }
274 274
 
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 
277 277
         // User not found
278 278
 	    if ( ! $user_after_update ) {
279
-	    	do_action('gravityview_log_error', __METHOD__ . sprintf( ' - User not found at $user_id #%d', $user_id ) );
279
+	    	do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - User not found at $user_id #%d', $user_id ) );
280 280
 		    return false;
281 281
 	    }
282 282
 
@@ -300,10 +300,10 @@  discard block
 block discarded – undo
300 300
 
301 301
         $updated = wp_update_user( $restored_user );
302 302
 
303
-        if( is_wp_error( $updated ) ) {
304
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
303
+        if ( is_wp_error( $updated ) ) {
304
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
305 305
         } else {
306
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
306
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
307 307
         }
308 308
 
309 309
         $this->_user_before_update = null;
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-theme-hooks-wpml.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 		add_filter( 'icl_ls_languages', array( $this, 'wpml_ls_filter' ) );
64 64
 
65
-		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link') );
65
+		add_filter( 'gravityview_directory_link', array( $this, 'filter_gravityview_back_link' ) );
66 66
 	}
67 67
 
68 68
 	/**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 	function filter_gravityview_back_link( $link ) {
83 83
 		global $wpml_url_filters;
84 84
 
85
-		if( $wpml_url_filters ) {
85
+		if ( $wpml_url_filters ) {
86 86
 			$link = $wpml_url_filters->permalink_filter( $link, GravityView_frontend::getInstance()->getPostId() );
87 87
 		}
88 88
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	private function remove_url_hooks() {
100 100
 		global $wpml_url_filters;
101 101
 
102
-		if( ! $wpml_url_filters ) {
102
+		if ( ! $wpml_url_filters ) {
103 103
 			return;
104 104
 		}
105 105
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 	private function add_url_hooks() {
123 123
 		global $wpml_url_filters;
124 124
 
125
-		if( ! $wpml_url_filters ) {
125
+		if ( ! $wpml_url_filters ) {
126 126
 			return;
127 127
 		}
128 128
 
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 			$this->remove_url_hooks();
163 163
 
164
-			if( $translations ) {
164
+			if ( $translations ) {
165 165
 				foreach ( $languages as $lang_code => $language ) {
166 166
 
167 167
 					$lang_post_id = $translations[ $lang_code ]->element_id;
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 							break;
195 195
 					}
196 196
 
197
-					$languages[ $lang_code ]['url'] = $entry_link;
197
+					$languages[ $lang_code ][ 'url' ] = $entry_link;
198 198
 				}
199 199
 			}
200 200
 
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/data-source.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@  discard block
 block discarded – undo
11 11
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
12 12
 
13 13
 //current value
14
-$current_form = (int) rgar( (array) $_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
14
+$current_form = (int)rgar( (array)$_GET, 'form_id', gravityview_get_form_id( $post->ID ) );
15 15
 
16 16
 // If form is in trash or not existing, show error
17 17
 GravityView_Admin::connected_form_warning( $current_form );
18 18
 
19 19
 // check for available gravity forms
20
-$forms = gravityview_get_forms('any');
20
+$forms = gravityview_get_forms( 'any' );
21 21
 ?>
22 22
 <label for="gravityview_form_id" ><?php esc_html_e( 'Where would you like the data to come from for this View?', 'gravityview' ); ?></label>
23 23
 
@@ -28,24 +28,24 @@  discard block
 block discarded – undo
28 28
 		?>
29 29
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
30 30
 
31
-		<?php if( !empty( $forms ) ) { ?>
31
+		<?php if ( ! empty( $forms ) ) { ?>
32 32
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
33 33
 		<?php }
34 34
 	}
35 35
 
36 36
 	// If there are no forms to select, show no forms.
37
-	if( !empty( $forms ) ) { ?>
37
+	if ( ! empty( $forms ) ) { ?>
38 38
 		<select name="gravityview_form_id" id="gravityview_form_id">
39 39
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
40
-			<?php foreach( $forms as $form ) { ?>
41
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
40
+			<?php foreach ( $forms as $form ) { ?>
41
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
42 42
 			<?php } ?>
43 43
 		</select>
44 44
 	<?php } else { ?>
45 45
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
46 46
 	<?php } ?>
47 47
 
48
-	&nbsp;<a class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
48
+	&nbsp;<a class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" href="#gv_switch_view" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></a>
49 49
 </p>
50 50
 
51 51
 <?php // confirm dialog box ?>
Please login to merge, or discard this patch.
includes/class-admin-welcome.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 	 * @since 1.0
35 35
 	 */
36 36
 	public function __construct() {
37
-		add_action( 'admin_menu', array( $this, 'admin_menus'), 200 );
37
+		add_action( 'admin_menu', array( $this, 'admin_menus' ), 200 );
38 38
 		add_action( 'admin_head', array( $this, 'admin_head' ) );
39
-		add_action( 'admin_init', array( $this, 'welcome'    ) );
40
-		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page'), 10, 2 );
39
+		add_action( 'admin_init', array( $this, 'welcome' ) );
40
+		add_filter( 'gravityview_is_admin_page', array( $this, 'is_dashboard_page' ), 10, 2 );
41 41
 	}
42 42
 
43 43
 	/**
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 		// Add help page to GravityView menu
54 54
 		add_submenu_page(
55 55
 			'edit.php?post_type=gravityview',
56
-			__('GravityView: Getting Started', 'gravityview'),
57
-			__('Getting Started', 'gravityview'),
56
+			__( 'GravityView: Getting Started', 'gravityview' ),
57
+			__( 'Getting Started', 'gravityview' ),
58 58
 			$this->minimum_capability,
59 59
 			'gv-getting-started',
60 60
 			array( $this, 'getting_started_screen' )
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
 	 *
88 88
 	 * @return boolean  $is_page   True: yep; false: nope
89 89
 	 */
90
-	public function is_dashboard_page($is_page = false, $hook = NULL) {
90
+	public function is_dashboard_page( $is_page = false, $hook = NULL ) {
91 91
 		global $plugin_page;
92 92
 
93
-		if($is_page) { return $is_page; }
93
+		if ( $is_page ) { return $is_page; }
94 94
 
95 95
 		return in_array( $plugin_page, array( 'gv-about', 'gv-credits', 'gv-getting-started' ) );
96 96
 	}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-credits' );
109 109
 		remove_submenu_page( 'edit.php?post_type=gravityview', 'gv-changelog' );
110 110
 
111
-		if( !$this->is_dashboard_page() ) { return; }
111
+		if ( ! $this->is_dashboard_page() ) { return; }
112 112
 
113 113
 		?>
114 114
 		<style type="text/css" media="screen">
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		// Don't fetch -beta, etc.
142 142
 		list( $display_version ) = explode( '-', GravityView_Plugin::version );
143 143
 
144
-		$selected = !empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
144
+		$selected = ! empty( $plugin_page ) ? $plugin_page : 'gv-getting-started';
145 145
 
146 146
 		echo gravityview_get_floaty( 132 );
147 147
 		?>
@@ -150,13 +150,13 @@  discard block
 block discarded – undo
150 150
 		<div class="about-text"><?php esc_html_e( 'Thank you for installing GravityView. Beautifully display your Gravity Forms entries.', 'gravityview' ); ?></div>
151 151
 
152 152
 		<h2 class="nav-tab-wrapper clear">
153
-			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
153
+			<a class="nav-tab <?php echo $selected == 'gv-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-getting-started', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
154 154
 				<?php _e( "Getting Started", 'gravityview' ); ?>
155 155
 			</a>
156
-			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
156
+			<a class="nav-tab <?php echo $selected == 'gv-changelog' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-changelog', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
157 157
 				<?php _e( "List of Changes", 'gravityview' ); ?>
158 158
 			</a>
159
-			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview'), 'edit.php' ) ) ); ?>">
159
+			<a class="nav-tab <?php echo $selected == 'gv-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'gv-credits', 'post_type' => 'gravityview' ), 'edit.php' ) ) ); ?>">
160 160
 				<?php _e( 'Credits', 'gravityview' ); ?>
161 161
 			</a>
162 162
 		</h2>
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 					<h2>Create a View</h2>
193 193
 
194 194
 					<ol class="ol-decimal">
195
-						<li>Go to <a href="<?php echo admin_url('post-new.php?post_type=gravityview'); ?>">Views &gt; New View</a></li>
195
+						<li>Go to <a href="<?php echo admin_url( 'post-new.php?post_type=gravityview' ); ?>">Views &gt; New View</a></li>
196 196
 						<li>If you want to <strong>create a new form</strong>, click the "Use a Form Preset" button</li>
197 197
 						<li>If you want to <strong>use an existing form&rsquo;s entries</strong>, select from the dropdown.</li>
198 198
 						<li>Select the type of View you would like to create. There are two core types of Views: <strong>Table</strong> and <strong>Listing</strong>.
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 					</ul>
766 766
 
767 767
 					<h4><?php esc_attr_e( 'Want to contribute?', 'gravityview' ); ?></h4>
768
-					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview'), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
768
+					<p><?php echo sprintf( esc_attr__( 'If you want to contribute to the code, %syou can on Github%s. If your contributions are accepted, you will be thanked here.', 'gravityview' ), '<a href="https://github.com/katzwebservices/GravityView">', '</a>' ); ?></p>
769 769
 				</div>
770 770
 			</div>
771 771
 
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
 		global $plugin_page;
809 809
 
810 810
 		// Bail if we're just editing the plugin
811
-		if( $plugin_page === 'plugin-editor.php' ) { return; }
811
+		if ( $plugin_page === 'plugin-editor.php' ) { return; }
812 812
 
813 813
 		// Bail if no activation redirect
814 814
 		if ( ! get_transient( '_gv_activation_redirect' ) ) { return; }
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 		$upgrade = get_option( 'gv_version_upgraded_from' );
820 820
 
821 821
 		// Don't do anything if they've already seen the new version info
822
-		if( $upgrade === GravityView_Plugin::version ) {
822
+		if ( $upgrade === GravityView_Plugin::version ) {
823 823
 			return;
824 824
 		}
825 825
 
@@ -827,10 +827,10 @@  discard block
 block discarded – undo
827 827
 		update_option( 'gv_version_upgraded_from', GravityView_Plugin::version );
828 828
 
829 829
 		// Bail if activating from network, or bulk
830
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) { return; }
830
+		if ( is_network_admin() || isset( $_GET[ 'activate-multi' ] ) ) { return; }
831 831
 
832 832
 		// First time install
833
-		if( ! $upgrade ) {
833
+		if ( ! $upgrade ) {
834 834
 			wp_safe_redirect( admin_url( 'edit.php?post_type=gravityview&page=gv-getting-started' ) ); exit;
835 835
 		}
836 836
 		// Update
Please login to merge, or discard this patch.
includes/class-admin-views.php 1 patch
Spacing   +174 added lines, -174 removed lines patch added patch discarded remove patch
@@ -28,30 +28,30 @@  discard block
 block discarded – undo
28 28
 		add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 );
29 29
 
30 30
 		// Tooltips
31
-		add_filter( 'gform_tooltips', array( $this, 'tooltips') );
31
+		add_filter( 'gform_tooltips', array( $this, 'tooltips' ) );
32 32
 
33 33
 		// adding styles and scripts
34
-		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 );
35
-		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') );
36
-		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') );
37
-		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') );
38
-		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') );
39
-
40
-		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 );
41
-		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 );
42
-		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 );
43
-		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') );
44
-		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 );
34
+		add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 );
35
+		add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) );
36
+		add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) );
37
+		add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) );
38
+		add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) );
39
+
40
+		add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 );
41
+		add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 );
42
+		add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 );
43
+		add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) );
44
+		add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 );
45 45
 
46 46
 		// @todo check if this hook is needed..
47 47
 		//add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 );
48 48
 
49 49
 		// Add Connected Form column
50
-		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) );
50
+		add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) );
51 51
 
52 52
 		add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 );
53 53
 
54
-		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 );
54
+		add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 );
55 55
 
56 56
 		add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) );
57 57
 
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) {
67 67
 		global $pagenow;
68 68
 
69
-		if ( !is_admin() ) {
69
+		if ( ! is_admin() ) {
70 70
 			return;
71 71
 		}
72 72
 
73
-		if( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
73
+		if ( 'edit.php' !== $pagenow || ! rgget( 'gravityview_form_id' ) || ! isset( $query->query_vars[ 'post_type' ] ) ) {
74 74
 			return;
75 75
 		}
76 76
 
@@ -87,18 +87,18 @@  discard block
 block discarded – undo
87 87
 	function add_view_dropdown() {
88 88
 		$current_screen = get_current_screen();
89 89
 
90
-		if( 'gravityview' !== $current_screen->post_type ) {
90
+		if ( 'gravityview' !== $current_screen->post_type ) {
91 91
 			return;
92 92
 		}
93 93
 
94 94
 		$forms = gravityview_get_forms();
95 95
 		$current_form = rgget( 'gravityview_form_id' );
96 96
 		// If there are no forms to select, show no forms.
97
-		if( !empty( $forms ) ) { ?>
97
+		if ( ! empty( $forms ) ) { ?>
98 98
 			<select name="gravityview_form_id" id="gravityview_form_id">
99 99
 				<option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option>
100
-				<?php foreach( $forms as $form ) { ?>
101
-					<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
100
+				<?php foreach ( $forms as $form ) { ?>
101
+					<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
102 102
 				<?php } ?>
103 103
 			</select>
104 104
 		<?php }
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) {
113 113
 		_deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' );
114
-		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id );
114
+		GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id );
115 115
 	}
116 116
 
117 117
 	/**
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$connected_views = gravityview_get_connected_views( $id );
136 136
 
137
-		if( empty( $connected_views ) ) {
137
+		if ( empty( $connected_views ) ) {
138 138
 
139
-		    $menu_items['gravityview'] = array(
139
+		    $menu_items[ 'gravityview' ] = array(
140 140
 				'label'          => esc_attr__( 'Create a View', 'gravityview' ),
141 141
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
142 142
 				'title'          => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -152,22 +152,22 @@  discard block
 block discarded – undo
152 152
 		$sub_menu_items = array();
153 153
 		foreach ( (array)$connected_views as $view ) {
154 154
 
155
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
155
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
156 156
 				continue;
157 157
 			}
158 158
 
159
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
159
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
160 160
 
161
-			$sub_menu_items[] = array(
161
+			$sub_menu_items[ ] = array(
162 162
 				'label' => esc_attr( $label ),
163
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
163
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
164 164
 			);
165 165
 		}
166 166
 
167 167
 		// If there were no items added, then let's create the parent menu
168
-		if( $sub_menu_items ) {
168
+		if ( $sub_menu_items ) {
169 169
 
170
-		    $sub_menu_items[] = array(
170
+		    $sub_menu_items[ ] = array(
171 171
 			    'label' => esc_attr__( 'Create a View', 'gravityview' ),
172 172
                 'link_class' => 'gv-create-view',
173 173
 			    'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ),
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
             );
177 177
 
178 178
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
179
-			$sub_menu_items[] = array(
179
+			$sub_menu_items[ ] = array(
180 180
 				'url' => '#',
181 181
 				'label' => '',
182 182
 				'menu_class' => 'hidden',
183 183
 				'capabilities' => '',
184 184
 			);
185 185
 
186
-			$menu_items['gravityview'] = array(
186
+			$menu_items[ 'gravityview' ] = array(
187 187
 				'label'          => __( 'Connected Views', 'gravityview' ),
188 188
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
189 189
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -212,8 +212,8 @@  discard block
 block discarded – undo
212 212
 		$add = array( 'captcha', 'page' );
213 213
 
214 214
 		// Don't allowing editing the following values:
215
-		if( $context === 'edit' ) {
216
-			$add[] = 'post_id';
215
+		if ( $context === 'edit' ) {
216
+			$add[ ] = 'post_id';
217 217
 		}
218 218
 
219 219
 		$return = array_merge( $array, $add );
@@ -236,32 +236,32 @@  discard block
 block discarded – undo
236 236
 		foreach ( $default_args as $key => $arg ) {
237 237
 
238 238
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
239
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
239
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
240 240
 
241 241
 			// By default, use `tooltip` if defined.
242
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
242
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
243 243
 
244 244
 			// Otherwise, use the description as a tooltip.
245
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
246
-				$tooltip = $arg['desc'];
245
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
246
+				$tooltip = $arg[ 'desc' ];
247 247
 			}
248 248
 
249 249
 			// If there's no tooltip set, continue
250
-			if( empty( $tooltip ) ) {
250
+			if ( empty( $tooltip ) ) {
251 251
 				continue;
252 252
 			}
253 253
 
254 254
 			// Add the tooltip
255
-			$gv_tooltips[ 'gv_'.$key ] = array(
256
-				'title'	=> $arg['label'],
255
+			$gv_tooltips[ 'gv_' . $key ] = array(
256
+				'title'	=> $arg[ 'label' ],
257 257
 				'value'	=> $tooltip,
258 258
 			);
259 259
 
260 260
 		}
261 261
 
262
-		$gv_tooltips['gv_css_merge_tags'] = array(
263
-			'title' => __('CSS Merge Tags', 'gravityview'),
264
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
262
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
263
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
264
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
265 265
 		);
266 266
 
267 267
 		/**
@@ -272,9 +272,9 @@  discard block
 block discarded – undo
272 272
 
273 273
 		foreach ( $gv_tooltips as $key => $tooltip ) {
274 274
 
275
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
275
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
276 276
 
277
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
277
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
278 278
 		}
279 279
 
280 280
 		return $tooltips;
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
 	 *
289 289
 	 * @return void
290 290
 	 */
291
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
291
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
292 292
 
293 293
 		$output = '';
294 294
 
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
311 311
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
312 312
 
313
-				$output = $template ? $template['label'] : $template_id_pretty;
313
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
314 314
 
315 315
 				break;
316 316
 
@@ -351,44 +351,44 @@  discard block
 block discarded – undo
351 351
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
352 352
 
353 353
 		// Either the form is empty or the form ID is 0, not yet set.
354
-		if( empty( $form ) ) {
354
+		if ( empty( $form ) ) {
355 355
 			return '';
356 356
 		}
357 357
 
358 358
 		// The $form is passed as the form ID
359
-		if( !is_array( $form ) ) {
359
+		if ( ! is_array( $form ) ) {
360 360
 			$form = gravityview_get_form( $form );
361 361
 		}
362 362
 
363
-		$form_id = $form['id'];
363
+		$form_id = $form[ 'id' ];
364 364
 		$links = array();
365 365
 
366
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
366
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
367 367
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
368
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
369
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
368
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
369
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
370 370
 		} else {
371
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
371
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
372 372
 		}
373 373
 
374
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
374
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
375 375
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
376
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
376
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
377 377
 		}
378 378
 
379
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
379
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
380 380
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
381
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
381
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
382 382
 		}
383 383
 
384
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
384
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
385 385
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
386
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
386
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
387 387
 		}
388 388
 
389 389
 		$output = '';
390 390
 
391
-		if( !empty( $include_form_link ) ) {
391
+		if ( ! empty( $include_form_link ) ) {
392 392
 			$output .= $form_link;
393 393
 		}
394 394
 
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 		 */
401 401
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
402 402
 
403
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
403
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
404 404
 
405 405
 		return $output;
406 406
 	}
@@ -414,8 +414,8 @@  discard block
 block discarded – undo
414 414
 		// Get the date column and save it for later to add back in.
415 415
 		// This adds it after the Data Source column.
416 416
 		// This way, we don't need to do array_slice, array_merge, etc.
417
-		$date = $columns['date'];
418
-		unset( $columns['date'] );
417
+		$date = $columns[ 'date' ];
418
+		unset( $columns[ 'date' ] );
419 419
 
420 420
 		$data_source_required_caps = array(
421 421
 			'gravityforms_edit_forms',
@@ -426,14 +426,14 @@  discard block
 block discarded – undo
426 426
 			'gravityforms_preview_forms',
427 427
 		);
428 428
 
429
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
430
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
429
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
430
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
431 431
 		}
432 432
 
433
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
433
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
434 434
 
435 435
 		// Add the date back in.
436
-		$columns['date'] = $date;
436
+		$columns[ 'date' ] = $date;
437 437
 
438 438
 		return $columns;
439 439
 	}
@@ -447,12 +447,12 @@  discard block
 block discarded – undo
447 447
 	 */
448 448
 	function save_postdata( $post_id ) {
449 449
 
450
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
450
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
451 451
 			return;
452 452
 		}
453 453
 
454 454
 		// validate post_type
455
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
455
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
456 456
 			return;
457 457
 		}
458 458
 
@@ -467,63 +467,63 @@  discard block
 block discarded – undo
467 467
 		$statii = array();
468 468
 
469 469
 		// check if this is a start fresh View
470
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
470
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
471 471
 
472
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
472
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
473 473
 			// save form id
474
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
474
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
475 475
 
476 476
 		}
477 477
 
478
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
478
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
479 479
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
480 480
 			return;
481 481
 		}
482 482
 
483 483
 		// Was this a start fresh?
484
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
485
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
484
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
485
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
486 486
 		} else {
487
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
487
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
488 488
 		}
489 489
 
490 490
 		// Check if we have a template id
491
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
491
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
492 492
 
493
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
493
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
494 494
 
495 495
 			// now save template id
496
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
496
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
497 497
 		}
498 498
 
499 499
 
500 500
 		// save View Configuration metabox
501
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
501
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
502 502
 
503 503
 			// template settings
504
-			if( empty( $_POST['template_settings'] ) ) {
505
-				$_POST['template_settings'] = array();
504
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
505
+				$_POST[ 'template_settings' ] = array();
506 506
 			}
507
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
507
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
508 508
 
509 509
 			$fields = array();
510 510
 
511 511
 			// Directory&single Visible Fields
512
-			if( !empty( $preset_fields ) ) {
512
+			if ( ! empty( $preset_fields ) ) {
513 513
 
514 514
 				$fields = $preset_fields;
515 515
 
516
-			} elseif( !empty( $_POST['gv_fields'] ) ) {
516
+			} elseif ( ! empty( $_POST[ 'gv_fields' ] ) ) {
517 517
 				$fields = _gravityview_process_posted_fields();
518 518
 			}
519 519
 
520
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
520
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
521 521
 
522 522
 			// Directory Visible Widgets
523
-			if( empty( $_POST['widgets'] ) ) {
524
-				$_POST['widgets'] = array();
523
+			if ( empty( $_POST[ 'widgets' ] ) ) {
524
+				$_POST[ 'widgets' ] = array();
525 525
 			}
526
-			$statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] );
526
+			$statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] );
527 527
 
528 528
 		} // end save view configuration
529 529
 
@@ -533,9 +533,9 @@  discard block
 block discarded – undo
533 533
 		 * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false.
534 534
 		 * @since 1.17.2
535 535
 		 */
536
-		do_action('gravityview_view_saved', $post_id, $statii );
536
+		do_action( 'gravityview_view_saved', $post_id, $statii );
537 537
 
538
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
538
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
539 539
 	}
540 540
 
541 541
 	/**
@@ -577,20 +577,20 @@  discard block
 block discarded – undo
577 577
 
578 578
 		$output = '';
579 579
 
580
-		if( !empty( $fields ) ) {
580
+		if ( ! empty( $fields ) ) {
581 581
 
582
-			foreach( $fields as $id => $details ) {
582
+			foreach ( $fields as $id => $details ) {
583 583
 
584
-				if( in_array( $details['type'], (array) $blacklist_field_types ) ) {
584
+				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) {
585 585
 					continue;
586 586
 				}
587 587
 
588 588
 				// Edit mode only allows editing the parent fields, not single inputs.
589
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
589
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
590 590
 					continue;
591 591
 				}
592 592
 
593
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
593
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
594 594
 
595 595
 			} // End foreach
596 596
 		}
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		echo $output;
599 599
 
600 600
 		// For the EDIT view we only want to allow the form fields.
601
-		if( $context === 'edit' ) {
601
+		if ( $context === 'edit' ) {
602 602
 			return;
603 603
 		}
604 604
 
@@ -622,16 +622,16 @@  discard block
 block discarded – undo
622 622
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
623 623
 			array(
624 624
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
625
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
625
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
626 626
 				'field_id' => 'all-fields',
627 627
 				'label_type' => 'field',
628 628
 				'input_type' => NULL,
629 629
 				'field_options' => NULL,
630 630
 				'settings_html'	=> NULL,
631 631
 			)
632
-		));
632
+		) );
633 633
 
634
-		if( !empty( $additional_fields )) {
634
+		if ( ! empty( $additional_fields ) ) {
635 635
 			foreach ( (array)$additional_fields as $item ) {
636 636
 
637 637
 				// Prevent items from not having index set
@@ -642,16 +642,16 @@  discard block
 block discarded – undo
642 642
 					'input_type' => NULL,
643 643
 					'field_options' => NULL,
644 644
 					'settings_html'	=> NULL,
645
-				));
645
+				) );
646 646
 
647 647
 				// Backward compat.
648
-				if( !empty( $item['field_options'] ) ) {
648
+				if ( ! empty( $item[ 'field_options' ] ) ) {
649 649
 					// Use settings_html from now on.
650
-					$item['settings_html'] = $item['field_options'];
650
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
651 651
 				}
652 652
 
653 653
 				// Render a label for each of them
654
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
654
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
655 655
 
656 656
 			}
657 657
 		}
@@ -664,54 +664,54 @@  discard block
 block discarded – undo
664 664
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
665 665
 	 * @return array
666 666
 	 */
667
-	function get_entry_default_fields($form, $zone) {
667
+	function get_entry_default_fields( $form, $zone ) {
668 668
 
669 669
 		$entry_default_fields = array();
670 670
 
671
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
671
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
672 672
 
673 673
 			$entry_default_fields = array(
674 674
 				'id' => array(
675
-					'label' => __('Entry ID', 'gravityview'),
675
+					'label' => __( 'Entry ID', 'gravityview' ),
676 676
 					'type' => 'id',
677
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
677
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
678 678
 				),
679 679
 				'date_created' => array(
680
-					'label' => __('Entry Date', 'gravityview'),
681
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
680
+					'label' => __( 'Entry Date', 'gravityview' ),
681
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
682 682
 					'type' => 'date_created',
683 683
 				),
684 684
 				'source_url' => array(
685
-					'label' => __('Source URL', 'gravityview'),
685
+					'label' => __( 'Source URL', 'gravityview' ),
686 686
 					'type' => 'source_url',
687
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
687
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
688 688
 				),
689 689
 				'ip' => array(
690
-					'label' => __('User IP', 'gravityview'),
690
+					'label' => __( 'User IP', 'gravityview' ),
691 691
 					'type' => 'ip',
692
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
692
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
693 693
 				),
694 694
 				'created_by' => array(
695
-					'label' => __('User', 'gravityview'),
695
+					'label' => __( 'User', 'gravityview' ),
696 696
 					'type' => 'created_by',
697
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
697
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
698 698
 				),
699 699
 
700 700
 				/**
701 701
 				 * @since 1.7.2
702 702
 				 */
703 703
 			    'other_entries' => array(
704
-				    'label'	=> __('Other Entries', 'gravityview'),
704
+				    'label'	=> __( 'Other Entries', 'gravityview' ),
705 705
 				    'type'	=> 'other_entries',
706
-				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
706
+				    'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
707 707
 			    ),
708 708
 	        );
709 709
 
710
-			if( 'single' !== $zone) {
710
+			if ( 'single' !== $zone ) {
711 711
 
712
-				$entry_default_fields['entry_link'] = array(
713
-					'label' => __('Link to Entry', 'gravityview'),
714
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
712
+				$entry_default_fields[ 'entry_link' ] = array(
713
+					'label' => __( 'Link to Entry', 'gravityview' ),
714
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
715 715
 					'type' => 'entry_link',
716 716
 				);
717 717
 			}
@@ -721,10 +721,10 @@  discard block
 block discarded – undo
721 721
 		/**
722 722
 		 * @since  1.2
723 723
 		 */
724
-		$entry_default_fields['custom']	= array(
725
-			'label'	=> __('Custom Content', 'gravityview'),
724
+		$entry_default_fields[ 'custom' ] = array(
725
+			'label'	=> __( 'Custom Content', 'gravityview' ),
726 726
 			'type'	=> 'custom',
727
-			'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
727
+			'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
728 728
 		);
729 729
 
730 730
 		/**
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 		 * @param  string|array $form form_ID or form object
734 734
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
735 735
 		 */
736
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
736
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
737 737
 	}
738 738
 
739 739
 	/**
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 	 */
745 745
 	function get_available_fields( $form = '', $zone = NULL ) {
746 746
 
747
-		if( empty( $form ) ) {
747
+		if ( empty( $form ) ) {
748 748
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
749 749
 			return array();
750 750
 		}
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 		$fields = gravityview_get_form_fields( $form, true );
754 754
 
755 755
 		// get meta fields ( only if form was already created )
756
-		if( !is_array( $form ) ) {
756
+		if ( ! is_array( $form ) ) {
757 757
 			$meta_fields = gravityview_get_entry_meta( $form );
758 758
 		} else {
759 759
 			$meta_fields = array();
@@ -777,11 +777,11 @@  discard block
 block discarded – undo
777 777
 
778 778
 		$widgets = $this->get_registered_widgets();
779 779
 
780
-		if( !empty( $widgets ) ) {
780
+		if ( ! empty( $widgets ) ) {
781 781
 
782
-			foreach( $widgets as $id => $details ) {
782
+			foreach ( $widgets as $id => $details ) {
783 783
 
784
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
784
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
785 785
 
786 786
 			}
787 787
 		}
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
816 816
 		global $post;
817 817
 
818
-		if( $type === 'widget' ) {
818
+		if ( $type === 'widget' ) {
819 819
 			$button_label = __( 'Add Widget', 'gravityview' );
820 820
 		} else {
821 821
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -824,15 +824,15 @@  discard block
 block discarded – undo
824 824
 		$available_items = array();
825 825
 
826 826
 		// if saved values, get available fields to label everyone
827
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
827
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
828 828
 
829
-			if( !empty( $_POST['template_id'] ) ) {
830
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
829
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
830
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
831 831
 			} else {
832 832
 				$form = gravityview_get_form_id( $post->ID );
833 833
 			}
834 834
 
835
-			if( 'field' === $type ) {
835
+			if ( 'field' === $type ) {
836 836
 				$available_items = $this->get_available_fields( $form, $zone );
837 837
 			} else {
838 838
 				$available_items = $this->get_registered_widgets();
@@ -840,39 +840,39 @@  discard block
 block discarded – undo
840 840
 
841 841
 		}
842 842
 
843
-		foreach( $rows as $row ) :
844
-			foreach( $row as $col => $areas ) :
845
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
843
+		foreach ( $rows as $row ) :
844
+			foreach ( $row as $col => $areas ) :
845
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
846 846
 
847 847
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
848 848
 
849
-					<?php foreach( $areas as $area ) : 	?>
849
+					<?php foreach ( $areas as $area ) : 	?>
850 850
 
851 851
 						<div class="gv-droppable-area">
852
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
852
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
853 853
 
854 854
 								<?php // render saved fields
855 855
 
856
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
856
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
857 857
 
858
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
858
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
859 859
 
860 860
 										$input_type = NULL;
861
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
861
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
862 862
 
863
-										if( !$original_item ) {
863
+										if ( ! $original_item ) {
864 864
 
865
-											do_action('gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array('available_items' => $available_items, 'field' => $field ));
865
+											do_action( 'gravityview_log_error', 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( 'available_items' => $available_items, 'field' => $field ) );
866 866
 
867 867
 											$original_item = $field;
868 868
 										} else {
869 869
 
870
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
870
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
871 871
 
872 872
 										}
873 873
 
874 874
 										// Field options dialog box
875
-										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item );
875
+										$field_options = GravityView_Render_Settings::render_field_options( $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item );
876 876
 
877 877
 										$item = array(
878 878
 											'input_type' => $input_type,
@@ -881,16 +881,16 @@  discard block
 block discarded – undo
881 881
 										);
882 882
 
883 883
 										// Merge the values with the current item to pass things like widget descriptions and original field names
884
-										if( $original_item ) {
884
+										if ( $original_item ) {
885 885
 											$item = wp_parse_args( $item, $original_item );
886 886
 										}
887 887
 
888
-										switch( $type ) {
888
+										switch ( $type ) {
889 889
 											case 'widget':
890
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
890
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
891 891
 												break;
892 892
 											default:
893
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
893
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
894 894
 										}
895 895
 
896 896
 
@@ -900,11 +900,11 @@  discard block
 block discarded – undo
900 900
 
901 901
 								} // End if zone is not empty ?>
902 902
 
903
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
903
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
904 904
 							</div>
905 905
 							<div class="gv-droppable-area-action">
906
-								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ '.esc_html( $button_label ); ?></a>
907
-								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p>
906
+								<a href="#" class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"><?php echo '+ ' . esc_html( $button_label ); ?></a>
907
+								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> &ndash; <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p>
908 908
 							</div>
909 909
 						</div>
910 910
 
@@ -926,7 +926,7 @@  discard block
 block discarded – undo
926 926
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
927 927
 
928 928
 		$widgets = array();
929
-		if( !empty( $post_id ) ) {
929
+		if ( ! empty( $post_id ) ) {
930 930
 			$widgets = gravityview_get_directory_widgets( $post_id );
931 931
 		}
932 932
 
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
 	 */
957 957
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
958 958
 
959
-		if( empty( $template_id ) ) {
959
+		if ( empty( $template_id ) ) {
960 960
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
961 961
 			return '';
962 962
 		}
@@ -970,12 +970,12 @@  discard block
 block discarded – undo
970 970
 		 */
971 971
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
972 972
 
973
-		if( empty( $template_areas ) ) {
973
+		if ( empty( $template_areas ) ) {
974 974
 
975 975
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
976 976
 			$output = '<div>';
977
-			$output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>';
978
-			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>';
977
+			$output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>';
978
+			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>';
979 979
 			$output .= '</div>';
980 980
 		} else {
981 981
 
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
 
991 991
 		}
992 992
 
993
-		if( $echo ) {
993
+		if ( $echo ) {
994 994
 			echo $output;
995 995
 		}
996 996
 
@@ -1010,27 +1010,27 @@  discard block
 block discarded – undo
1010 1010
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
1011 1011
 
1012 1012
 		// Add the GV font (with the Astronaut)
1013
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
1013
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
1014 1014
 
1015
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
1015
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1016 1016
 
1017 1017
 		// Don't process any scripts below here if it's not a GravityView page.
1018
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
1018
+		if ( ! gravityview_is_admin_page( $hook ) && ! $is_widgets_page ) { return; }
1019 1019
 
1020 1020
 		// Only enqueue the following on single pages
1021
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
1021
+		if ( gravityview_is_admin_page( $hook, 'single' ) || $is_widgets_page ) {
1022 1022
 
1023 1023
 			wp_enqueue_script( 'jquery-ui-datepicker' );
1024
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1024
+			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
1025 1025
 
1026
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1026
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1027 1027
 
1028 1028
 			//enqueue scripts
1029 1029
 			wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), GravityView_Plugin::version );
1030 1030
 
1031
-			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1031
+			wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1032 1032
 				'cookiepath' => COOKIEPATH,
1033
-                'passed_form_id' => (bool) rgget( 'form_id' ),
1033
+                'passed_form_id' => (bool)rgget( 'form_id' ),
1034 1034
 				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1035 1035
 				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
1036 1036
 				'label_close' => __( 'Close', 'gravityview' ),
@@ -1042,9 +1042,9 @@  discard block
 block discarded – undo
1042 1042
 				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1043 1043
 				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1044 1044
 				'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ),
1045
-			));
1045
+			) );
1046 1046
 
1047
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1047
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1048 1048
 
1049 1049
 			self::enqueue_gravity_forms_scripts();
1050 1050
 
@@ -1063,10 +1063,10 @@  discard block
 block discarded – undo
1063 1063
 		);
1064 1064
 
1065 1065
 		if ( wp_is_mobile() ) {
1066
-		    $scripts[] = 'jquery-touch-punch';
1066
+		    $scripts[ ] = 'jquery-touch-punch';
1067 1067
 		}
1068 1068
 
1069
-		foreach ($scripts as $script) {
1069
+		foreach ( $scripts as $script ) {
1070 1070
 			wp_enqueue_script( $script );
1071 1071
 		}
1072 1072
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-total.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
 	 *
51 51
 	 * @return array Blacklist, with "total" added. If not edit context, original field blacklist. Otherwise, blacklist including total.
52 52
 	 */
53
-	public function add_to_blacklist( $blacklist = array(), $context = NULL  ){
53
+	public function add_to_blacklist( $blacklist = array(), $context = NULL ) {
54 54
 
55
-		if( empty( $context ) || $context !== 'edit' ) {
55
+		if ( empty( $context ) || $context !== 'edit' ) {
56 56
 			return $blacklist;
57 57
 		}
58 58
 
59
-		$blacklist[] = 'total';
59
+		$blacklist[ ] = 'total';
60 60
 
61 61
 		return $blacklist;
62 62
 	}
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	function edit_entry_recalculate_totals( $form = array(), $entry_id = 0, $Edit_Entry_Render = null ) {
76 76
 
77
-		$original_form = GFAPI::get_form( $form['id'] );
77
+		$original_form = GFAPI::get_form( $form[ 'id' ] );
78 78
 
79 79
 		$total_fields = GFCommon::get_fields_by_type( $original_form, 'total' );
80 80
 
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
 
86 86
 			/** @var GF_Field_Total $total_field */
87 87
 			foreach ( $total_fields as $total_field ) {
88
-				$entry["{$total_field->id}"] = GFCommon::get_order_total( $original_form, $entry );
88
+				$entry[ "{$total_field->id}" ] = GFCommon::get_order_total( $original_form, $entry );
89 89
 			}
90 90
 
91 91
 			$return_entry = GFAPI::update_entry( $entry );
92 92
 
93
-			if( is_wp_error( $return_entry ) ) {
93
+			if ( is_wp_error( $return_entry ) ) {
94 94
 				do_action( 'gravityview_log_error', __METHOD__ . ': Updating the entry total fields failed', $return_entry );
95 95
 			} else {
96 96
 				do_action( 'gravityview_log_debug', __METHOD__ . ': Updating the entry total fields succeeded' );
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview_tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
102 102
 		$approved_count = $disapproved_count = 0;
103 103
 
104 104
 		// Only count if necessary
105
-		if( $include_counts ) {
106
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
105
+		if ( $include_counts ) {
106
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
107
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
108 108
 		}
109 109
 
110
-		$filter_links[] = array(
110
+		$filter_links[ ] = array(
111 111
 			'id'            => 'gv_approved',
112 112
 			'field_filters' => $field_filters_approved,
113 113
 			'count'         => $approved_count,
114 114
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
115 115
 		);
116 116
 
117
-		$filter_links[] = array(
117
+		$filter_links[ ] = array(
118 118
 			'id'            => 'gv_disapproved',
119 119
 			'field_filters' => $field_filters_disapproved,
120 120
 			'count'         => $disapproved_count,
@@ -133,9 +133,9 @@  discard block
 block discarded – undo
133 133
 	 */
134 134
 	function tooltips( $tooltips ) {
135 135
 
136
-		$tooltips['form_gravityview_fields'] = array(
137
-			'title' => __('GravityView Fields', 'gravityview'),
138
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
136
+		$tooltips[ 'form_gravityview_fields' ] = array(
137
+			'title' => __( 'GravityView Fields', 'gravityview' ),
138
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
139 139
 		);
140 140
 
141 141
 		return $tooltips;
@@ -246,15 +246,15 @@  discard block
 block discarded – undo
246 246
 
247 247
 		$gv_bulk_action = false;
248 248
 
249
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250
-			$bulk_action = ( '-1' !== rgpost('action') ) ? rgpost('action') : rgpost('action2');
249
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
250
+			$bulk_action = ( '-1' !== rgpost( 'action' ) ) ? rgpost( 'action' ) : rgpost( 'action2' );
251 251
 		} else {
252 252
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
253
-			$bulk_action = rgpost('bulk_action') ? rgpost('bulk_action') : rgpost('bulk_action2');
253
+			$bulk_action = rgpost( 'bulk_action' ) ? rgpost( 'bulk_action' ) : rgpost( 'bulk_action2' );
254 254
 		}
255 255
 
256 256
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
257
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
257
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
258 258
 			$gv_bulk_action = $bulk_action;
259 259
 		}
260 260
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		
280 280
 		// gforms_entry_list is the nonce that confirms we're on the right page
281 281
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
282
-		if ( $bulk_action && rgpost('gforms_entry_list') && empty( $_POST['gforms_update_note'] ) ) {
282
+		if ( $bulk_action && rgpost( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
283 283
 
284 284
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
285 285
 
@@ -297,13 +297,13 @@  discard block
 block discarded – undo
297 297
 			}
298 298
 
299 299
 			// All entries are set to be updated, not just the visible ones
300
-			if ( ! empty( $_POST['all_entries'] ) ) {
300
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
301 301
 
302 302
 				// Convert the current entry search into GF-formatted search criteria
303 303
 				$search = array(
304
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
305
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
306
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
304
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
305
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
306
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
307 307
 				);
308 308
 
309 309
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			} else {
315 315
 
316 316
 				// Changed from 'lead' to 'entry' in 2.0
317
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
317
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
318 318
 
319 319
 			}
320 320
 
@@ -326,15 +326,15 @@  discard block
 block discarded – undo
326 326
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
327 327
 
328 328
 			switch ( $approved_status ) {
329
-				case $this->bulk_action_prefixes['approve']:
329
+				case $this->bulk_action_prefixes[ 'approve' ]:
330 330
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
331 331
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
332 332
 					break;
333
-				case $this->bulk_action_prefixes['unapprove']:
333
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
334 334
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
335 335
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
336 336
 					break;
337
-				case $this->bulk_action_prefixes['disapprove']:
337
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
338 338
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
339 339
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
340 340
 					break;
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
      *
357 357
 	 * @return boolean True: It worked; False: it failed
358 358
 	 */
359
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
359
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
360 360
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
361 361
 	}
362 362
 
@@ -386,20 +386,20 @@  discard block
 block discarded – undo
386 386
 	 *
387 387
 	 * @return void
388 388
 	 */
389
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
389
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
390 390
 
391
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
391
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
392 392
 			return;
393 393
 		}
394 394
 
395
-		if( empty( $entry['id'] ) ) {
395
+		if ( empty( $entry[ 'id' ] ) ) {
396 396
 			return;
397 397
 		}
398 398
 
399 399
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
400 400
 
401
-		if( $status_value ) {
402
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
401
+		if ( $status_value ) {
402
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
403 403
 		}
404 404
 	}
405 405
 
@@ -412,10 +412,10 @@  discard block
 block discarded – undo
412 412
 	 */
413 413
 	private function get_form_id() {
414 414
 
415
-		$form_id = GFForms::get('id');
415
+		$form_id = GFForms::get( 'id' );
416 416
 
417 417
 		// If there are no forms identified, use the first form. That's how GF does it.
418
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
418
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
419 419
 			$form_id = $this->get_first_form_id();
420 420
 		}
421 421
 
@@ -435,14 +435,14 @@  discard block
 block discarded – undo
435 435
 
436 436
 		$forms = RGFormsModel::get_forms( null, 'title' );
437 437
 
438
-		if( ! isset( $forms[0] ) ) {
438
+		if ( ! isset( $forms[ 0 ] ) ) {
439 439
 			do_action( 'gravityview_log_error', __METHOD__ . ': No forms were found' );
440 440
 			return 0;
441 441
 		}
442 442
 
443
-		$first_form = $forms[0];
443
+		$first_form = $forms[ 0 ];
444 444
 
445
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
445
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
446 446
 
447 447
 		return intval( $form_id );
448 448
 	}
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 	function add_scripts_and_styles( $hook ) {
452 452
 
453
-		if( ! class_exists( 'GFForms' ) ) {
453
+		if ( ! class_exists( 'GFForms' ) ) {
454 454
 
455 455
 			do_action( 'gravityview_log_error', 'GravityView_Admin_ApproveEntries[add_scripts_and_styles] GFForms does not exist.' );
456 456
 
@@ -459,26 +459,26 @@  discard block
 block discarded – undo
459 459
 
460 460
 		// enqueue styles & scripts gf_entries
461 461
 		// But only if we're on the main Entries page, not on reports pages
462
-		if( GFForms::get_page() !== 'entry_list' ) {
462
+		if ( GFForms::get_page() !== 'entry_list' ) {
463 463
 			return;
464 464
 		}
465 465
 
466 466
 		$form_id = $this->get_form_id();
467 467
 
468 468
 		// Things are broken; no forms were found
469
-		if( empty( $form_id ) ) {
469
+		if ( empty( $form_id ) ) {
470 470
 			return;
471 471
 		}
472 472
 
473
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
473
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
474 474
 
475
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
475
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
476 476
 
477
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
477
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
478 478
 
479 479
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
480
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
481
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
480
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
481
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
482 482
 			'form_id' => $form_id,
483 483
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
484 484
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -487,10 +487,10 @@  discard block
 block discarded – undo
487 487
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
488 488
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
489 489
 			'bulk_message' => $this->bulk_update_message,
490
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
491
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
492
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
493
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
490
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
491
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
492
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
493
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
494 494
 			'column_link' => esc_url( $this->get_sort_link( $form_id ) ),
495 495
 		) );
496 496
 
@@ -510,11 +510,11 @@  discard block
 block discarded – undo
510 510
 
511 511
 		$approved_column_id = self::get_approved_column( $form_id );
512 512
 
513
-		if( ! $approved_column_id ) {
513
+		if ( ! $approved_column_id ) {
514 514
 		    return '';
515 515
         }
516 516
 
517
-	    $order = ( 'desc' === rgget('order') ) ? 'asc' : 'desc';
517
+	    $order = ( 'desc' === rgget( 'order' ) ) ? 'asc' : 'desc';
518 518
 
519 519
 	    $args = array(
520 520
 		    'orderby' => $approved_column_id,
@@ -540,16 +540,16 @@  discard block
 block discarded – undo
540 540
 		$bulk_actions = array(
541 541
 			'GravityView' => array(
542 542
 				array(
543
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
544
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
543
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
544
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
545 545
 				),
546 546
 				array(
547
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
548
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
547
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
548
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
549 549
 				),
550 550
 				array(
551
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
552
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
551
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
552
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
553 553
 				),
554 554
 			),
555 555
 		);
@@ -566,8 +566,8 @@  discard block
 block discarded – undo
566 566
 		// Sanitize the values, just to be sure.
567 567
 		foreach ( $bulk_actions as $key => $group ) {
568 568
 			foreach ( $group as $i => $action ) {
569
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
570
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
569
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
570
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
571 571
 			}
572 572
 		}
573 573
 
@@ -592,13 +592,13 @@  discard block
 block discarded – undo
592 592
 		 * @since 1.7.2
593 593
 		 * @param boolean $hide_if_no_connections
594 594
 		 */
595
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
595
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
596 596
 
597
-		if( $hide_if_no_connections ) {
597
+		if ( $hide_if_no_connections ) {
598 598
 
599 599
 			$connected_views = gravityview_get_connected_views( $form_id );
600 600
 
601
-			if( empty( $connected_views ) ) {
601
+			if ( empty( $connected_views ) ) {
602 602
 				$show_approve_column = false;
603 603
 			}
604 604
 		}
@@ -608,18 +608,18 @@  discard block
 block discarded – undo
608 608
 		 * @param boolean $show_approve_column Whether the column will be shown
609 609
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
610 610
 		 */
611
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
611
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
612 612
 
613 613
 		return $show_approve_column;
614 614
 	}
615 615
 
616 616
 	function register_gform_noconflict_script( $scripts ) {
617
-		$scripts[] = 'gravityview_gf_entries_scripts';
617
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
618 618
 		return $scripts;
619 619
 	}
620 620
 
621 621
 	function register_gform_noconflict_style( $styles ) {
622
-		$styles[] = 'gravityview_entries_list';
622
+		$styles[ ] = 'gravityview_entries_list';
623 623
 		return $styles;
624 624
 	}
625 625
 
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	private function addon_specific_hooks() {
101 101
 
102
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
102
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
104 104
 		}
105 105
 
106 106
 	}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      */
147 147
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148 148
 
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
149
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
150 150
 
151 151
         $base = gv_entry_link( $entry, $post_id );
152 152
 
@@ -158,9 +158,9 @@  discard block
 block discarded – undo
158 158
 	     * Allow passing params to dynamically populate entry with values
159 159
 	     * @since 1.9.2
160 160
 	     */
161
-	    if( !empty( $field_values ) ) {
161
+	    if ( ! empty( $field_values ) ) {
162 162
 
163
-		    if( is_array( $field_values ) ) {
163
+		    if ( is_array( $field_values ) ) {
164 164
 			    // If already an array, no parse_str() needed
165 165
 			    $params = $field_values;
166 166
 		    } else {
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 	 */
182 182
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
183 183
 
184
-		if( empty( $context ) || $context !== 'edit' ) {
184
+		if ( empty( $context ) || $context !== 'edit' ) {
185 185
 			return $fields;
186 186
 		}
187 187
 
@@ -242,24 +242,24 @@  discard block
 block discarded – undo
242 242
         // If they can edit any entries (as defined in Gravity Forms)
243 243
         // Or if they can edit other people's entries
244 244
         // Then we're good.
245
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
245
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
246 246
 
247
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
247
+            do_action( 'gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.' );
248 248
 
249 249
             $user_can_edit = true;
250 250
 
251
-        } else if( !isset( $entry['created_by'] ) ) {
251
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
252 252
 
253
-            do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
253
+            do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.' );
254 254
 
255 255
             $user_can_edit = false;
256 256
 
257 257
         } else {
258 258
 
259 259
             // get user_edit setting
260
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
260
+            if ( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
261 261
                 // if View ID not specified or is the current view
262
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
262
+                $user_edit = GravityView_View::getInstance()->getAtts( 'user_edit' );
263 263
             } else {
264 264
                 // in case is specified and not the current view
265 265
                 $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
@@ -268,21 +268,21 @@  discard block
 block discarded – undo
268 268
             $current_user = wp_get_current_user();
269 269
 
270 270
             // User edit is disabled
271
-            if( empty( $user_edit ) ) {
271
+            if ( empty( $user_edit ) ) {
272 272
 
273
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
273
+                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
274 274
 
275 275
                 $user_can_edit = false;
276 276
             }
277 277
 
278 278
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
279
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
279
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
280 280
 
281
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
281
+                do_action( 'gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
282 282
 
283 283
                 $user_can_edit = true;
284 284
 
285
-            } else if( ! is_user_logged_in() ) {
285
+            } else if ( ! is_user_logged_in() ) {
286 286
 
287 287
                 do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
288 288
             }
Please login to merge, or discard this patch.