Completed
Pull Request — master (#651)
by Zack
03:46
created
includes/fields/class-gravityview-field-textarea.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@
 block discarded – undo
21 21
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
22 22
 		);
23 23
 
24
-        $field_options['make_clickable'] = array(
25
-            'type' => 'checkbox',
26
-            'merge_tags' => false,
27
-            'value' => 0,
28
-            'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
29
-            'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
30
-        );
24
+		$field_options['make_clickable'] = array(
25
+			'type' => 'checkbox',
26
+			'merge_tags' => false,
27
+			'value' => 0,
28
+			'label' => __( 'Convert text URLs to HTML links', 'gravityview' ),
29
+			'tooltip' => __( 'Converts URI, www, FTP, and email addresses in HTML links', 'gravityview' ),
30
+		);
31 31
 
32 32
 		return $field_options;
33 33
 	}
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
25 25
 
26 26
 	function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) {
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$field_options['trim_words'] = array(
32
+		$field_options[ 'trim_words' ] = array(
33 33
 			'type' => 'number',
34 34
 			'merge_tags' => false,
35 35
 			'value' => null,
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 			'tooltip' => __( 'Enter the number of words to be shown. If specified it truncates the text. Leave it blank if you want to show the full text.', 'gravityview' ),
38 38
 		);
39 39
 
40
-        $field_options['make_clickable'] = array(
40
+        $field_options[ 'make_clickable' ] = array(
41 41
             'type' => 'checkbox',
42 42
             'merge_tags' => false,
43 43
             'value' => 0,
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-time.php 2 patches
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -255,7 +255,6 @@
 block discarded – undo
255 255
 	 * Get the default date format for a field based on the field ID and the time format setting
256 256
 	 *
257 257
 	 * @since 1.14
258
-
259 258
 	 * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14}
260 259
 	 * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14}
261 260
 	 *
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 
60 60
 		add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 );
61 61
 
62
-		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
62
+		add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 );
63 63
 	}
64 64
 
65 65
 	/**
@@ -100,31 +100,31 @@  discard block
 block discarded – undo
100 100
 	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) {
101 101
 
102 102
 		// If the search is being sorted
103
-		if( ! empty( $criteria['sorting']['key'] ) ) {
103
+		if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) {
104 104
 
105
-			$pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] );
105
+			$pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] );
106 106
 
107 107
 			/**
108 108
 			 * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL
109 109
 			 * @see modify_sort_id()
110 110
 			 */
111
-			if( ! empty( $pieces[1] ) ) {
111
+			if ( ! empty( $pieces[ 1 ] ) ) {
112 112
 
113 113
 				// Pass these to the _modify_query_sort_by_time_hack() method
114
-				$this->_time_format = $pieces[1];
115
-				$this->_date_format = $pieces[2];
114
+				$this->_time_format = $pieces[ 1 ];
115
+				$this->_date_format = $pieces[ 2 ];
116 116
 
117 117
 				// Remove fake input IDs (5.1 doesn't exist. Use 5)
118
-				$criteria['sorting']['key'] = floor( $pieces[0] );
118
+				$criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] );
119 119
 
120 120
 				/**
121 121
 				 * Make sure sorting is numeric (# of seconds). IMPORTANT.
122 122
 				 * @see GVCommon::is_field_numeric() is_numeric should also be set here
123 123
 				 */
124
-				$criteria['sorting']['is_numeric'] = true;
124
+				$criteria[ 'sorting' ][ 'is_numeric' ] = true;
125 125
 
126 126
 				// Modify the Gravity Forms WP Query
127
-				add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) );
127
+				add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) );
128 128
 			}
129 129
 		}
130 130
 
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
 		 * then we want to modify the query.
148 148
 		 * @see GFFormsModel::sort_by_field_query()
149 149
 		 */
150
-		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
150
+		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) {
151 151
 
152
-			if( $this->_time_format === '24' ) {
152
+			if ( $this->_time_format === '24' ) {
153 153
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )";
154 154
 			} else {
155 155
 				$sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )";
@@ -195,18 +195,18 @@  discard block
 block discarded – undo
195 195
 		// Set variables
196 196
 		parent::field_options( $field_options, $template_id, $field_id, $context, $input_type );
197 197
 
198
-		if( 'edit' === $context ) {
198
+		if ( 'edit' === $context ) {
199 199
 			return $field_options;
200 200
 		}
201 201
 
202 202
 		/**
203 203
 		 * Set default date format based on field ID and Form ID
204 204
 		 */
205
-		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
205
+		add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
206 206
 
207
-		$this->add_field_support('date_display', $field_options );
207
+		$this->add_field_support( 'date_display', $field_options );
208 208
 
209
-		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
209
+		remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) );
210 210
 
211 211
 		return $field_options;
212 212
 	}
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	private function _get_time_format() {
222 222
 		global $post;
223 223
 
224
-		$current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID );
224
+		$current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID );
225 225
 
226 226
 		return self::_get_time_format_for_field( $this->_field_id, $current_form );
227 227
 	}
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 		// GF defaults to 12, so should we.
241 241
 		$time_format = '12';
242 242
 
243
-		if( $form_id ) {
243
+		if ( $form_id ) {
244 244
 			$form = GFAPI::get_form( $form_id );
245 245
 
246 246
 			if ( $form ) {
@@ -284,12 +284,12 @@  discard block
 block discarded – undo
284 284
 
285 285
 		$field_id_array = explode( '.', $field_id );
286 286
 
287
-		$field_input_id = isset( $field_id_array[1] ) ? intval( $field_id_array[1] ) : 0;
287
+		$field_input_id = isset( $field_id_array[ 1 ] ) ? intval( $field_id_array[ 1 ] ) : 0;
288 288
 
289 289
 		$default = 'h:i A';
290 290
 
291 291
 		// This doesn't take into account 24-hour
292
-		switch( $field_input_id ) {
292
+		switch ( $field_input_id ) {
293 293
 			// Hours
294 294
 			case 1:
295 295
 				return ( $time_format === '12' ) ? 'h' : 'H';
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-date_range.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Display the search by entry date input boxes
4
- *
5
- * @see class-search-widget.php
6
- */
3
+			 * Display the search by entry date input boxes
4
+			 *
5
+			 * @see class-search-widget.php
6
+			 */
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $search_field = $gravityview_view->search_field;
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
10
-$value = $gravityview_view->search_field['value'];
11
-$label = $gravityview_view->search_field['label'];
12
-$name = $gravityview_view->search_field['name'];
10
+$value = $gravityview_view->search_field[ 'value' ];
11
+$label = $gravityview_view->search_field[ 'label' ];
12
+$name = $gravityview_view->search_field[ 'name' ];
13 13
 ?>
14 14
 
15 15
 <div class="gv-search-box gv-search-date">
16
-	<?php if( ! gv_empty( $label, false ) ) { ?>
17
-	<label for="search-box-<?php echo esc_attr( $name ).'-start'; ?>"><?php echo esc_html( $label ); ?></label>
16
+	<?php if ( ! gv_empty( $label, false ) ) { ?>
17
+	<label for="search-box-<?php echo esc_attr( $name ) . '-start'; ?>"><?php echo esc_html( $label ); ?></label>
18 18
 	<?php } ?>
19 19
 	<p>
20
-		<input name="<?php echo esc_attr( $name ).'[start]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('Start date', 'gravityview' ); ?>" value="<?php echo $value['start']; ?>">
21
-		<input name="<?php echo esc_attr( $name ).'[end]'; ?>" id="search-box-<?php echo esc_attr( $name ).'-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e('End date', 'gravityview' ); ?>" value="<?php echo $value['end']; ?>">
20
+		<input name="<?php echo esc_attr( $name ) . '[start]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-start'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'Start date', 'gravityview' ); ?>" value="<?php echo $value[ 'start' ]; ?>">
21
+		<input name="<?php echo esc_attr( $name ) . '[end]'; ?>" id="search-box-<?php echo esc_attr( $name ) . '-end'; ?>" type="text" class="<?php echo esc_html( $gravityview_view->datepicker_class ); ?>" placeholder="<?php esc_attr_e( 'End date', 'gravityview' ); ?>" value="<?php echo $value[ 'end' ]; ?>">
22 22
 	</p>
23 23
 </div>
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-hidden.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Display hidden field input
4
- *
5
- * @see class-search-widget.php
6
- */
3
+			 * Display hidden field input
4
+			 *
5
+			 * @see class-search-widget.php
6
+			 */
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $search_field = $gravityview_view->search_field;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,4 +7,4 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $search_field = $gravityview_view->search_field;
10
-?><div><input type="hidden" name="<?php echo esc_attr( $search_field['name'] ); ?>" value="<?php echo esc_attr( $search_field['value'] ); ?>"></div>
11 10
\ No newline at end of file
11
+?><div><input type="hidden" name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" value="<?php echo esc_attr( $search_field[ 'value' ] ); ?>"></div>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
includes/class-common.php 4 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -167,7 +167,6 @@  discard block
 block discarded – undo
167 167
 	 * Returns the list of available forms
168 168
 	 *
169 169
 	 * @access public
170
-	 * @param mixed $form_id
171 170
 	 * @return array Empty array if GFAPI isn't available or no forms. Otherwise, associative array with id, title keys
172 171
 	 */
173 172
 	public static function get_forms() {
@@ -188,7 +187,7 @@  discard block
 block discarded – undo
188 187
 	 * Return array of fields' id and label, for a given Form ID
189 188
 	 *
190 189
 	 * @access public
191
-	 * @param string|array $form_id (default: '') or $form object
190
+	 * @param string|array $form (default: '') or $form object
192 191
 	 * @return array
193 192
 	 */
194 193
 	public static function get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) {
Please login to merge, or discard this patch.
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Set of common functions to separate main plugin from Gravity Forms API and other cross-plugin methods
4
- *
5
- * @package   GravityView
6
- * @license   GPL2+
7
- * @author    Katz Web Services, Inc.
8
- * @link      http://gravityview.co
9
- * @copyright Copyright 2014, Katz Web Services, Inc.
10
- *
11
- * @since 1.5.2
12
- */
3
+	 * Set of common functions to separate main plugin from Gravity Forms API and other cross-plugin methods
4
+	 *
5
+	 * @package   GravityView
6
+	 * @license   GPL2+
7
+	 * @author    Katz Web Services, Inc.
8
+	 * @link      http://gravityview.co
9
+	 * @copyright Copyright 2014, Katz Web Services, Inc.
10
+	 *
11
+	 * @since 1.5.2
12
+	 */
13 13
 
14 14
 /** If this file is called directly, abort. */
15 15
 if ( ! defined( 'ABSPATH' ) ) {
@@ -240,13 +240,13 @@  discard block
 block discarded – undo
240 240
 
241 241
 				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
242 242
 					foreach ( $field['inputs'] as $input ) {
243
-                        /**
244
-                         * @hack
245
-                         * In case of email/email confirmation, the input for email has the same id as the parent field
246
-                         */
247
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
248
-                            continue;
249
-                        }
243
+						/**
244
+						 * @hack
245
+						 * In case of email/email confirmation, the input for email has the same id as the parent field
246
+						 */
247
+						if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
248
+							continue;
249
+						}
250 250
 						$fields[ (string)$input['id'] ] = array(
251 251
 							'label' => rgar( $input, 'label' ),
252 252
 							'customLabel' => rgar( $input, 'customLabel' ),
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
470 470
 			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
471 471
 		} elseif( !isset( $criteria['context_view_id'] ) ) {
472
-            // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
472
+			// Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
473 473
 			$criteria['context_view_id'] = null;
474 474
 		}
475 475
 
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 			),
1169 1169
 		);
1170 1170
 
1171
-        $fields = $date_created + $fields;
1171
+		$fields = $date_created + $fields;
1172 1172
 
1173 1173
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1174 1174
 
@@ -1180,13 +1180,13 @@  discard block
 block discarded – undo
1180 1180
 			}
1181 1181
 		}
1182 1182
 
1183
-        /**
1184
-         * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1185
-         * @since 1.12
1186
-         * @param array $fields Sub-set of GF form fields that are sortable
1187
-         * @param int $formid The Gravity Forms form ID that the fields are from
1188
-         */
1189
-        $fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1183
+		/**
1184
+		 * @filter `gravityview/common/sortable_fields` Filter the sortable fields
1185
+		 * @since 1.12
1186
+		 * @param array $fields Sub-set of GF form fields that are sortable
1187
+		 * @param int $formid The Gravity Forms form ID that the fields are from
1188
+		 */
1189
+		$fields = apply_filters( 'gravityview/common/sortable_fields', $fields, $formid );
1190 1190
 
1191 1191
 		return $fields;
1192 1192
 	}
@@ -1464,17 +1464,17 @@  discard block
 block discarded – undo
1464 1464
 	}
1465 1465
 
1466 1466
 
1467
-    /**
1468
-     * Display updated/error notice
1469
-     *
1470
-     * @param string $notice text/HTML of notice
1471
-     * @param string $class CSS class for notice (`updated` or `error`)
1472
-     *
1473
-     * @return string
1474
-     */
1475
-    public static function generate_notice( $notice, $class = '' ) {
1476
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1477
-    }
1467
+	/**
1468
+	 * Display updated/error notice
1469
+	 *
1470
+	 * @param string $notice text/HTML of notice
1471
+	 * @param string $class CSS class for notice (`updated` or `error`)
1472
+	 *
1473
+	 * @return string
1474
+	 */
1475
+	public static function generate_notice( $notice, $class = '' ) {
1476
+		return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1477
+	}
1478 1478
 
1479 1479
 
1480 1480
 
Please login to merge, or discard this patch.
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 					$has_poll_fields = true;
291 291
 				}
292 292
 
293
-				if( GFCommon::is_product_field( $field['type'] ) ){
293
+				if( GFCommon::is_product_field( $field['type'] ) ) {
294 294
 					$has_product_fields = true;
295 295
 				}
296 296
 
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
 
374 374
 		$fields = array();
375 375
 
376
-		foreach ( $extra_fields as $key => $field ){
376
+		foreach ( $extra_fields as $key => $field ) {
377 377
 			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
378 378
 				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
379 379
 			}
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
913 913
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
914 914
 	 */
915 915
 	public static function get_field( $form, $field_id ) {
916
-		if ( class_exists( 'GFFormsModel' ) ){
916
+		if ( class_exists( 'GFFormsModel' ) ) {
917 917
 			return GFFormsModel::get_field( $form, $field_id );
918 918
 		} else {
919 919
 			return null;
@@ -960,7 +960,7 @@  discard block
 block discarded – undo
960 960
 			$shortcodes = array();
961 961
 
962 962
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
963
-			if ( empty( $matches ) ){
963
+			if ( empty( $matches ) ) {
964 964
 				return false;
965 965
 			}
966 966
 
@@ -1423,7 +1423,7 @@  discard block
 block discarded – undo
1423 1423
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
1424 1424
 		$merged = $array1;
1425 1425
 
1426
-		foreach ( $array2 as $key => &$value )  {
1426
+		foreach ( $array2 as $key => &$value ) {
1427 1427
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1428 1428
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1429 1429
 			} else {
Please login to merge, or discard this patch.
Spacing   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 
125 125
 		$entry = self::get_entry( $entry_slug, true );
126 126
 
127
-		$form = self::get_form( $entry['form_id'] );
127
+		$form = self::get_form( $entry[ 'form_id' ] );
128 128
 
129 129
 		return $form;
130 130
 	}
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 
176 176
 		$results = GFAPI::get_entries( 0, $search_criteria, null, $paging );
177 177
 
178
-		$result = ( ! empty( $results ) && ! empty( $results[0]['id'] ) ) ? $results[0]['id'] : null;
178
+		$result = ( ! empty( $results ) && ! empty( $results[ 0 ][ 'id' ] ) ) ? $results[ 0 ][ 'id' ] : null;
179 179
 
180 180
 		return $result;
181 181
 	}
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 		if ( class_exists( 'GFAPI' ) ) {
194 194
 			$gf_forms = GFAPI::get_forms();
195 195
 			foreach ( $gf_forms as $form ) {
196
-				$forms[] = array(
197
-					'id' => $form['id'],
198
-					'title' => $form['title'],
196
+				$forms[ ] = array(
197
+					'id' => $form[ 'id' ],
198
+					'title' => $form[ 'title' ],
199 199
 				);
200 200
 			}
201 201
 		}
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 		}
228 228
 
229 229
 		if ( $form ) {
230
-			foreach ( $form['fields'] as $field ) {
231
-				if ( $include_parent_field || empty( $field['inputs'] ) ) {
232
-					$fields[ $field['id'] ] = array(
230
+			foreach ( $form[ 'fields' ] as $field ) {
231
+				if ( $include_parent_field || empty( $field[ 'inputs' ] ) ) {
232
+					$fields[ $field[ 'id' ] ] = array(
233 233
 						'label' => rgar( $field, 'label' ),
234 234
 						'parent' => null,
235 235
 						'type' => rgar( $field, 'type' ),
@@ -238,16 +238,16 @@  discard block
 block discarded – undo
238 238
 					);
239 239
 				}
240 240
 
241
-				if ( $add_default_properties && ! empty( $field['inputs'] ) ) {
242
-					foreach ( $field['inputs'] as $input ) {
241
+				if ( $add_default_properties && ! empty( $field[ 'inputs' ] ) ) {
242
+					foreach ( $field[ 'inputs' ] as $input ) {
243 243
                         /**
244 244
                          * @hack
245 245
                          * In case of email/email confirmation, the input for email has the same id as the parent field
246 246
                          */
247
-                        if( 'email' == rgar( $field, 'type' ) && false === strpos( $input['id'], '.' ) ) {
247
+                        if ( 'email' == rgar( $field, 'type' ) && false === strpos( $input[ 'id' ], '.' ) ) {
248 248
                             continue;
249 249
                         }
250
-						$fields[ (string)$input['id'] ] = array(
250
+						$fields[ (string)$input[ 'id' ] ] = array(
251 251
 							'label' => rgar( $input, 'label' ),
252 252
 							'customLabel' => rgar( $input, 'customLabel' ),
253 253
 							'parent' => $field,
@@ -259,11 +259,11 @@  discard block
 block discarded – undo
259 259
 				}
260 260
 
261 261
 				/** @since 1.14 */
262
-				if( 'list' === $field['type'] && !empty( $field['enableColumns'] ) ) {
262
+				if ( 'list' === $field[ 'type' ] && ! empty( $field[ 'enableColumns' ] ) ) {
263 263
 
264
-					foreach ( (array)$field['choices'] as $key => $input ) {
264
+					foreach ( (array)$field[ 'choices' ] as $key => $input ) {
265 265
 
266
-						$input_id = sprintf( '%d.%d', $field['id'], $key ); // {field_id}.{column_key}
266
+						$input_id = sprintf( '%d.%d', $field[ 'id' ], $key ); // {field_id}.{column_key}
267 267
 
268 268
 						$fields[ $input_id ] = array(
269 269
 							'label'       => rgar( $input, 'text' ),
@@ -279,25 +279,25 @@  discard block
 block discarded – undo
279 279
 				/**
280 280
 				 * @since 1.8
281 281
 				 */
282
-				if( 'quiz' === $field['type'] ) {
282
+				if ( 'quiz' === $field[ 'type' ] ) {
283 283
 					$has_quiz_fields = true;
284 284
 				}
285 285
 
286 286
 				/**
287 287
 				 * @since 1.8
288 288
 				 */
289
-				if( 'poll' === $field['type'] ) {
289
+				if ( 'poll' === $field[ 'type' ] ) {
290 290
 					$has_poll_fields = true;
291 291
 				}
292 292
 
293
-				if( GFCommon::is_product_field( $field['type'] ) ){
293
+				if ( GFCommon::is_product_field( $field[ 'type' ] ) ) {
294 294
 					$has_product_fields = true;
295 295
 				}
296 296
 
297 297
 				/**
298 298
 				 * @hack Version 1.9
299 299
 				 */
300
-				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object) $field : (array) $field;
300
+				$field_for_is_post_field = class_exists( 'GF_Fields' ) ? (object)$field : (array)$field;
301 301
 
302 302
 				if ( GFCommon::is_post_field( $field_for_is_post_field ) ) {
303 303
 					$has_post_fields = true;
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 		 * @since 1.7
310 310
 		 */
311 311
 		if ( $has_post_fields ) {
312
-			$fields['post_id'] = array(
312
+			$fields[ 'post_id' ] = array(
313 313
 				'label' => __( 'Post ID', 'gravityview' ),
314 314
 				'type' => 'post_id',
315 315
 			);
@@ -320,10 +320,10 @@  discard block
 block discarded – undo
320 320
 			$payment_fields = GravityView_Fields::get_all( 'pricing' );
321 321
 
322 322
 			foreach ( $payment_fields as $payment_field ) {
323
-				if( isset( $fields["{$payment_field->name}"] ) ) {
323
+				if ( isset( $fields[ "{$payment_field->name}" ] ) ) {
324 324
 					continue;
325 325
 				}
326
-				$fields["{$payment_field->name}"] = array(
326
+				$fields[ "{$payment_field->name}" ] = array(
327 327
 					'label' => $payment_field->label,
328 328
 					'desc' => $payment_field->description,
329 329
 					'type' => $payment_field->name,
@@ -334,24 +334,24 @@  discard block
 block discarded – undo
334 334
 		/**
335 335
 		 * @since 1.8
336 336
 		 */
337
-		if( $has_quiz_fields ) {
337
+		if ( $has_quiz_fields ) {
338 338
 
339
-			$fields['gquiz_score']   = array(
339
+			$fields[ 'gquiz_score' ] = array(
340 340
 				'label' => __( 'Quiz Score Total', 'gravityview' ),
341 341
 				'type'  => 'quiz_score',
342 342
 				'desc'  => __( 'Displays the number of correct Quiz answers the user submitted.', 'gravityview' ),
343 343
 			);
344
-			$fields['gquiz_percent'] = array(
344
+			$fields[ 'gquiz_percent' ] = array(
345 345
 				'label' => __( 'Quiz Percentage Grade', 'gravityview' ),
346 346
 				'type'  => 'quiz_percent',
347 347
 				'desc'  => __( 'Displays the percentage of correct Quiz answers the user submitted.', 'gravityview' ),
348 348
 			);
349
-			$fields['gquiz_grade']   = array(
349
+			$fields[ 'gquiz_grade' ] = array(
350 350
 				'label' => __( 'Quiz Letter Grade', 'gravityview' ),
351 351
 				'type'  => 'quiz_grade',
352 352
 				'desc'  => __( 'Displays the Grade the user achieved based on Letter Grading configured in the Quiz Settings.', 'gravityview' ),
353 353
 			);
354
-			$fields['gquiz_is_pass'] = array(
354
+			$fields[ 'gquiz_is_pass' ] = array(
355 355
 				'label' => __( 'Quiz Pass/Fail', 'gravityview' ),
356 356
 				'type'  => 'quiz_is_pass',
357 357
 				'desc'  => __( 'Displays either Passed or Failed based on the Pass/Fail settings configured in the Quiz Settings.', 'gravityview' ),
@@ -373,9 +373,9 @@  discard block
 block discarded – undo
373 373
 
374 374
 		$fields = array();
375 375
 
376
-		foreach ( $extra_fields as $key => $field ){
377
-			if ( ! empty( $only_default_column ) && ! empty( $field['is_default_column'] ) ) {
378
-				$fields[ $key ] = array( 'label' => $field['label'], 'type' => 'entry_meta' );
376
+		foreach ( $extra_fields as $key => $field ) {
377
+			if ( ! empty( $only_default_column ) && ! empty( $field[ 'is_default_column' ] ) ) {
378
+				$fields[ $key ] = array( 'label' => $field[ 'label' ], 'type' => 'entry_meta' );
379 379
 			}
380 380
 		}
381 381
 
@@ -415,32 +415,32 @@  discard block
 block discarded – undo
415 415
 			'search_criteria' => null,
416 416
 			'sorting' => null,
417 417
 			'paging' => null,
418
-			'cache' => (isset( $passed_criteria['cache'] ) ? $passed_criteria['cache'] : true),
418
+			'cache' => ( isset( $passed_criteria[ 'cache' ] ) ? $passed_criteria[ 'cache' ] : true ),
419 419
 		);
420 420
 
421 421
 		$criteria = wp_parse_args( $passed_criteria, $search_criteria_defaults );
422 422
 
423
-		if ( ! empty( $criteria['search_criteria']['field_filters'] ) ) {
424
-			foreach ( $criteria['search_criteria']['field_filters'] as &$filter ) {
423
+		if ( ! empty( $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
424
+			foreach ( $criteria[ 'search_criteria' ][ 'field_filters' ] as &$filter ) {
425 425
 
426 426
 				if ( ! is_array( $filter ) ) {
427 427
 					continue;
428 428
 				}
429 429
 
430 430
 				// By default, we want searches to be wildcard for each field.
431
-				$filter['operator'] = empty( $filter['operator'] ) ? 'contains' : $filter['operator'];
431
+				$filter[ 'operator' ] = empty( $filter[ 'operator' ] ) ? 'contains' : $filter[ 'operator' ];
432 432
 
433 433
 				/**
434 434
 				 * @filter `gravityview_search_operator` Modify the search operator for the field (contains, is, isnot, etc)
435 435
 				 * @param string $operator Existing search operator
436 436
 				 * @param array $filter array with `key`, `value`, `operator`, `type` keys
437 437
 				 */
438
-				$filter['operator'] = apply_filters( 'gravityview_search_operator', $filter['operator'], $filter );
438
+				$filter[ 'operator' ] = apply_filters( 'gravityview_search_operator', $filter[ 'operator' ], $filter );
439 439
 			}
440 440
 
441 441
 			// don't send just the [mode] without any field filter.
442
-			if( count( $criteria['search_criteria']['field_filters'] ) === 1 && array_key_exists( 'mode' , $criteria['search_criteria']['field_filters'] ) ) {
443
-				unset( $criteria['search_criteria']['field_filters']['mode'] );
442
+			if ( count( $criteria[ 'search_criteria' ][ 'field_filters' ] ) === 1 && array_key_exists( 'mode', $criteria[ 'search_criteria' ][ 'field_filters' ] ) ) {
443
+				unset( $criteria[ 'search_criteria' ][ 'field_filters' ][ 'mode' ] );
444 444
 			}
445 445
 
446 446
 		}
@@ -451,21 +451,21 @@  discard block
 block discarded – undo
451 451
 		 * Prepare date formats to be in Gravity Forms DB format;
452 452
 		 * $passed_criteria may include date formats incompatible with Gravity Forms.
453 453
 		 */
454
-		foreach ( array('start_date', 'end_date' ) as $key ) {
454
+		foreach ( array( 'start_date', 'end_date' ) as $key ) {
455 455
 
456
-			if ( ! empty( $criteria['search_criteria'][ $key ] ) ) {
456
+			if ( ! empty( $criteria[ 'search_criteria' ][ $key ] ) ) {
457 457
 
458 458
 				// Use date_create instead of new DateTime so it returns false if invalid date format.
459
-				$date = date_create( $criteria['search_criteria'][ $key ] );
459
+				$date = date_create( $criteria[ 'search_criteria' ][ $key ] );
460 460
 
461 461
 				if ( $date ) {
462 462
 					// Gravity Forms wants dates in the `Y-m-d H:i:s` format.
463
-					$criteria['search_criteria'][ $key ] = $date->format( 'Y-m-d H:i:s' );
463
+					$criteria[ 'search_criteria' ][ $key ] = $date->format( 'Y-m-d H:i:s' );
464 464
 				} else {
465 465
 					// If it's an invalid date, unset it. Gravity Forms freaks out otherwise.
466
-					unset( $criteria['search_criteria'][ $key ] );
466
+					unset( $criteria[ 'search_criteria' ][ $key ] );
467 467
 
468
-					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] '.$key.' Date format not valid:', $criteria['search_criteria'][ $key ] );
468
+					do_action( 'gravityview_log_error', '[filter_get_entries_criteria] ' . $key . ' Date format not valid:', $criteria[ 'search_criteria' ][ $key ] );
469 469
 				}
470 470
 			}
471 471
 		}
@@ -473,12 +473,12 @@  discard block
 block discarded – undo
473 473
 
474 474
 		// When multiple views are embedded, OR single entry, calculate the context view id and send it to the advanced filter
475 475
 		if ( class_exists( 'GravityView_View_Data' ) && GravityView_View_Data::getInstance()->has_multiple_views() || GravityView_frontend::getInstance()->getSingleEntry() ) {
476
-			$criteria['context_view_id'] = GravityView_frontend::getInstance()->get_context_view_id();
476
+			$criteria[ 'context_view_id' ] = GravityView_frontend::getInstance()->get_context_view_id();
477 477
 		} elseif ( 'delete' === RGForms::get( 'action' ) ) {
478
-			$criteria['context_view_id'] = isset( $_GET['view_id'] ) ? $_GET['view_id'] : null;
479
-		} elseif( !isset( $criteria['context_view_id'] ) ) {
478
+			$criteria[ 'context_view_id' ] = isset( $_GET[ 'view_id' ] ) ? $_GET[ 'view_id' ] : null;
479
+		} elseif ( ! isset( $criteria[ 'context_view_id' ] ) ) {
480 480
             // Prevent overriding the Context View ID: Some widgets could set the context_view_id (e.g. Recent Entries widget)
481
-			$criteria['context_view_id'] = null;
481
+			$criteria[ 'context_view_id' ] = null;
482 482
 		}
483 483
 
484 484
 		/**
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 		 * @param array $form_ids Forms to search
488 488
 		 * @param int $view_id ID of the view being used to search
489 489
 		 */
490
-		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria['context_view_id'] );
490
+		$criteria = apply_filters( 'gravityview_search_criteria', $criteria, $form_ids, $criteria[ 'context_view_id' ] );
491 491
 
492 492
 		return (array)$criteria;
493 493
 
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 		/** Reduce # of database calls */
519 519
 		add_filter( 'gform_is_encrypted_field', '__return_false' );
520 520
 
521
-		if ( ! empty( $criteria['cache'] ) ) {
521
+		if ( ! empty( $criteria[ 'cache' ] ) ) {
522 522
 
523 523
 			$Cache = new GravityView_Cache( $form_ids, $criteria );
524 524
 
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 
527 527
 				// Still update the total count when using cached results
528 528
 				if ( ! is_null( $total ) ) {
529
-					$total = GFAPI::count_entries( $form_ids, $criteria['search_criteria'] );
529
+					$total = GFAPI::count_entries( $form_ids, $criteria[ 'search_criteria' ] );
530 530
 				}
531 531
 
532 532
 				$return = $entries;
@@ -546,9 +546,9 @@  discard block
 block discarded – undo
546 546
 			$entries = apply_filters( 'gravityview_before_get_entries', null, $criteria, $passed_criteria, $total );
547 547
 
548 548
 			// No entries returned from gravityview_before_get_entries
549
-			if( is_null( $entries ) ) {
549
+			if ( is_null( $entries ) ) {
550 550
 
551
-				$entries = GFAPI::get_entries( $form_ids, $criteria['search_criteria'], $criteria['sorting'], $criteria['paging'], $total );
551
+				$entries = GFAPI::get_entries( $form_ids, $criteria[ 'search_criteria' ], $criteria[ 'sorting' ], $criteria[ 'paging' ], $total );
552 552
 
553 553
 				if ( is_wp_error( $entries ) ) {
554 554
 					do_action( 'gravityview_log_error', $entries->get_error_message(), $entries );
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 				}
558 558
 			}
559 559
 
560
-			if ( ! empty( $criteria['cache'] ) && isset( $Cache ) ) {
560
+			if ( ! empty( $criteria[ 'cache' ] ) && isset( $Cache ) ) {
561 561
 
562 562
 				// Cache results
563 563
 				$Cache->set( $entries, 'entries' );
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 			 */
645 645
 			$check_entry_display = apply_filters( 'gravityview/common/get_entry/check_entry_display', $check_entry_display, $entry );
646 646
 
647
-			if( $check_entry_display ) {
647
+			if ( $check_entry_display ) {
648 648
 				// Is the entry allowed
649 649
 				$entry = self::check_entry_display( $entry );
650 650
 			}
@@ -677,12 +677,12 @@  discard block
 block discarded – undo
677 677
 
678 678
 		$value = false;
679 679
 
680
-		if( 'context' === $val1 ) {
680
+		if ( 'context' === $val1 ) {
681 681
 
682 682
 			$matching_contexts = array( $val2 );
683 683
 
684 684
 			// We allow for non-standard contexts.
685
-			switch( $val2 ) {
685
+			switch ( $val2 ) {
686 686
 				// Check for either single or edit
687 687
 				case 'singular':
688 688
 					$matching_contexts = array( 'single', 'edit' );
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 			return false;
743 743
 		}
744 744
 
745
-		if ( empty( $entry['form_id'] ) ) {
745
+		if ( empty( $entry[ 'form_id' ] ) ) {
746 746
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry is empty! Entry:', $entry );
747 747
 			return false;
748 748
 		}
@@ -750,26 +750,26 @@  discard block
 block discarded – undo
750 750
 		$criteria = self::calculate_get_entries_criteria();
751 751
 
752 752
 		// Make sure the current View is connected to the same form as the Entry
753
-		if( ! empty( $criteria['context_view_id'] ) ) {
754
-			$context_view_id = intval( $criteria['context_view_id'] );
753
+		if ( ! empty( $criteria[ 'context_view_id' ] ) ) {
754
+			$context_view_id = intval( $criteria[ 'context_view_id' ] );
755 755
 			$context_form_id = gravityview_get_form_id( $context_view_id );
756
-			if( intval( $context_form_id ) !== intval( $entry['form_id'] ) ) {
757
-				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry['form_id'] ), $criteria['context_view_id'] );
756
+			if ( intval( $context_form_id ) !== intval( $entry[ 'form_id' ] ) ) {
757
+				do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry form ID does not match current View connected form ID:', $entry[ 'form_id' ] ), $criteria[ 'context_view_id' ] );
758 758
 				return false;
759 759
 			}
760 760
 		}
761 761
 
762
-		if ( empty( $criteria['search_criteria'] ) || ! is_array( $criteria['search_criteria'] ) ) {
762
+		if ( empty( $criteria[ 'search_criteria' ] ) || ! is_array( $criteria[ 'search_criteria' ] ) ) {
763 763
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No search criteria found:', $criteria );
764 764
 			return $entry;
765 765
 		}
766 766
 
767
-		$search_criteria = $criteria['search_criteria'];
767
+		$search_criteria = $criteria[ 'search_criteria' ];
768 768
 		unset( $criteria );
769 769
 
770 770
 		// check entry status
771
-		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria['status'] != $entry['status'] ) {
772
-			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry['status'] ), $search_criteria );
771
+		if ( array_key_exists( 'status', $search_criteria ) && $search_criteria[ 'status' ] != $entry[ 'status' ] ) {
772
+			do_action( 'gravityview_log_debug', sprintf( '[apply_filters_to_entry] Entry status - %s - is not valid according to filter:', $entry[ 'status' ] ), $search_criteria );
773 773
 			return false;
774 774
 		}
775 775
 
@@ -777,37 +777,37 @@  discard block
 block discarded – undo
777 777
 		// @todo: Does it make sense to apply the Date create filters to the single entry?
778 778
 
779 779
 		// field_filters
780
-		if ( empty( $search_criteria['field_filters'] ) || ! is_array( $search_criteria['field_filters'] ) ) {
780
+		if ( empty( $search_criteria[ 'field_filters' ] ) || ! is_array( $search_criteria[ 'field_filters' ] ) ) {
781 781
 			do_action( 'gravityview_log_debug', '[apply_filters_to_entry] Entry approved! No field filters criteria found:', $search_criteria );
782 782
 			return $entry;
783 783
 		}
784 784
 
785
-		$filters = $search_criteria['field_filters'];
785
+		$filters = $search_criteria[ 'field_filters' ];
786 786
 		unset( $search_criteria );
787 787
 
788
-		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters['mode'] ) : 'all';
789
-		unset( $filters['mode'] );
788
+		$mode = array_key_exists( 'mode', $filters ) ? strtolower( $filters[ 'mode' ] ) : 'all';
789
+		unset( $filters[ 'mode' ] );
790 790
 
791
-		$form = self::get_form( $entry['form_id'] );
791
+		$form = self::get_form( $entry[ 'form_id' ] );
792 792
 
793 793
 		foreach ( $filters as $filter ) {
794 794
 
795
-			if ( ! isset( $filter['key'] ) ) {
795
+			if ( ! isset( $filter[ 'key' ] ) ) {
796 796
 				continue;
797 797
 			}
798 798
 
799
-			$k = $filter['key'];
799
+			$k = $filter[ 'key' ];
800 800
 
801 801
 			if ( in_array( $k, array( 'created_by', 'payment_status' ) ) ) {
802 802
 				$field_value = $entry[ $k ];
803 803
 				$field = null;
804 804
 			} else {
805 805
 				$field = self::get_field( $form, $k );
806
-				$field_value  = GFFormsModel::get_lead_field_value( $entry, $field );
806
+				$field_value = GFFormsModel::get_lead_field_value( $entry, $field );
807 807
 			}
808 808
 
809
-			$operator = isset( $filter['operator'] ) ? strtolower( $filter['operator'] ) : 'is';
810
-			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter['value'], $operator, $field );
809
+			$operator = isset( $filter[ 'operator' ] ) ? strtolower( $filter[ 'operator' ] ) : 'is';
810
+			$is_value_match = GFFormsModel::is_value_match( $field_value, $filter[ 'value' ], $operator, $field );
811 811
 
812 812
 			// verify if we are already free to go!
813 813
 			if ( ! $is_value_match && 'all' === $mode ) {
@@ -865,25 +865,25 @@  discard block
 block discarded – undo
865 865
 		 * Gravity Forms code to adjust date to locally-configured Time Zone
866 866
 		 * @see GFCommon::format_date() for original code
867 867
 		 */
868
-		$date_gmt_time   = mysql2date( 'G', $date_string );
868
+		$date_gmt_time = mysql2date( 'G', $date_string );
869 869
 		$date_local_timestamp = GFCommon::get_local_timestamp( $date_gmt_time );
870 870
 
871
-		$format  = rgar( $atts, 'format' );
872
-		$is_human  = ! empty( $atts['human'] );
873
-		$is_diff  = ! empty( $atts['diff'] );
874
-		$is_raw = ! empty( $atts['raw'] );
875
-		$is_timestamp = ! empty( $atts['timestamp'] );
876
-		$include_time = ! empty( $atts['time'] );
871
+		$format = rgar( $atts, 'format' );
872
+		$is_human = ! empty( $atts[ 'human' ] );
873
+		$is_diff = ! empty( $atts[ 'diff' ] );
874
+		$is_raw = ! empty( $atts[ 'raw' ] );
875
+		$is_timestamp = ! empty( $atts[ 'timestamp' ] );
876
+		$include_time = ! empty( $atts[ 'time' ] );
877 877
 
878 878
 		// If we're using time diff, we want to have a different default format
879
-		if( empty( $format ) ) {
879
+		if ( empty( $format ) ) {
880 880
 			$format = $is_diff ? esc_html__( '%s ago', 'gravityview' ) : get_option( 'date_format' );
881 881
 		}
882 882
 
883 883
 		// If raw was specified, don't modify the stored value
884 884
 		if ( $is_raw ) {
885 885
 			$formatted_date = $date_string;
886
-		} elseif( $is_timestamp ) {
886
+		} elseif ( $is_timestamp ) {
887 887
 			$formatted_date = $date_local_timestamp;
888 888
 		} elseif ( $is_diff ) {
889 889
 			$formatted_date = sprintf( $format, human_time_diff( $date_gmt_time ) );
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 		}
912 912
 
913 913
 		$field = self::get_field( $form, $field_id );
914
-		return isset( $field['label'] ) ?  $field['label'] : '';
914
+		return isset( $field[ 'label' ] ) ? $field[ 'label' ] : '';
915 915
 
916 916
 	}
917 917
 
@@ -929,7 +929,7 @@  discard block
 block discarded – undo
929 929
 	 * @return array|null Array: Gravity Forms field array; NULL: Gravity Forms GFFormsModel does not exist
930 930
 	 */
931 931
 	public static function get_field( $form, $field_id ) {
932
-		if ( class_exists( 'GFFormsModel' ) ){
932
+		if ( class_exists( 'GFFormsModel' ) ) {
933 933
 			return GFFormsModel::get_field( $form, $field_id );
934 934
 		} else {
935 935
 			return null;
@@ -976,17 +976,17 @@  discard block
 block discarded – undo
976 976
 			$shortcodes = array();
977 977
 
978 978
 			preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
979
-			if ( empty( $matches ) ){
979
+			if ( empty( $matches ) ) {
980 980
 				return false;
981 981
 			}
982 982
 
983 983
 			foreach ( $matches as $shortcode ) {
984
-				if ( $tag === $shortcode[2] ) {
984
+				if ( $tag === $shortcode[ 2 ] ) {
985 985
 
986 986
 					// Changed this to $shortcode instead of true so we get the parsed atts.
987
-					$shortcodes[] = $shortcode;
987
+					$shortcodes[ ] = $shortcode;
988 988
 
989
-				} else if ( isset( $shortcode[5] ) && $result = self::has_shortcode_r( $shortcode[5], $tag ) ) {
989
+				} else if ( isset( $shortcode[ 5 ] ) && $result = self::has_shortcode_r( $shortcode[ 5 ], $tag ) ) {
990 990
 					$shortcodes = $result;
991 991
 				}
992 992
 			}
@@ -1137,7 +1137,7 @@  discard block
 block discarded – undo
1137 1137
 	 * @return string         html
1138 1138
 	 */
1139 1139
 	public static function get_sortable_fields( $formid, $current = '' ) {
1140
-		$output = '<option value="" ' . selected( '', $current, false ).'>' . esc_html__( 'Default', 'gravityview' ) .'</option>';
1140
+		$output = '<option value="" ' . selected( '', $current, false ) . '>' . esc_html__( 'Default', 'gravityview' ) . '</option>';
1141 1141
 
1142 1142
 		if ( empty( $formid ) ) {
1143 1143
 			return $output;
@@ -1150,11 +1150,11 @@  discard block
 block discarded – undo
1150 1150
 			$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', array( 'list', 'textarea' ), null );
1151 1151
 
1152 1152
 			foreach ( $fields as $id => $field ) {
1153
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
1153
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1154 1154
 					continue;
1155 1155
 				}
1156 1156
 
1157
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'>'. esc_attr( $field['label'] ) .'</option>';
1157
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . '>' . esc_attr( $field[ 'label' ] ) . '</option>';
1158 1158
 			}
1159 1159
 		}
1160 1160
 
@@ -1189,9 +1189,9 @@  discard block
 block discarded – undo
1189 1189
 		$blacklist_field_types = apply_filters( 'gravityview_blacklist_field_types', $blacklist, NULL );
1190 1190
 
1191 1191
 		// TODO: Convert to using array_filter
1192
-		foreach( $fields as $id => $field ) {
1192
+		foreach ( $fields as $id => $field ) {
1193 1193
 
1194
-			if( in_array( $field['type'], $blacklist_field_types ) ) {
1194
+			if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
1195 1195
 				unset( $fields[ $id ] );
1196 1196
 			}
1197 1197
 		}
@@ -1232,14 +1232,14 @@  discard block
 block discarded – undo
1232 1232
 	 * @param  int|array  $field field key or field array
1233 1233
 	 * @return boolean
1234 1234
 	 */
1235
-	public static function is_field_numeric(  $form = null, $field = '' ) {
1235
+	public static function is_field_numeric( $form = null, $field = '' ) {
1236 1236
 
1237 1237
 		if ( ! is_array( $form ) && ! is_array( $field ) ) {
1238 1238
 			$form = self::get_form( $form );
1239 1239
 		}
1240 1240
 
1241 1241
 		// If entry meta, it's a string. Otherwise, numeric
1242
-		if( ! is_numeric( $field ) && is_string( $field ) ) {
1242
+		if ( ! is_numeric( $field ) && is_string( $field ) ) {
1243 1243
 			$type = $field;
1244 1244
 		} else {
1245 1245
 			$type = self::get_field_type( $form, $field );
@@ -1253,9 +1253,9 @@  discard block
 block discarded – undo
1253 1253
 		$numeric_types = apply_filters( 'gravityview/common/numeric_types', array( 'number', 'time' ) );
1254 1254
 
1255 1255
 		// Defer to GravityView_Field setting, if the field type is registered and `is_numeric` is true
1256
-		if( $gv_field = GravityView_Fields::get( $type ) ) {
1257
-			if( true === $gv_field->is_numeric ) {
1258
-				$numeric_types[] = $gv_field->is_numeric;
1256
+		if ( $gv_field = GravityView_Fields::get( $type ) ) {
1257
+			if ( true === $gv_field->is_numeric ) {
1258
+				$numeric_types[ ] = $gv_field->is_numeric;
1259 1259
 			}
1260 1260
 		}
1261 1261
 
@@ -1405,11 +1405,11 @@  discard block
 block discarded – undo
1405 1405
 		$final_atts = array_filter( $final_atts );
1406 1406
 
1407 1407
 		// If the href wasn't passed as an attribute, use the value passed to the function
1408
-		if ( empty( $final_atts['href'] ) && ! empty( $href ) ) {
1409
-			$final_atts['href'] = $href;
1408
+		if ( empty( $final_atts[ 'href' ] ) && ! empty( $href ) ) {
1409
+			$final_atts[ 'href' ] = $href;
1410 1410
 		}
1411 1411
 
1412
-		$final_atts['href'] = esc_url_raw( $href );
1412
+		$final_atts[ 'href' ] = esc_url_raw( $href );
1413 1413
 
1414 1414
 		// Sort the attributes alphabetically, to help testing
1415 1415
 		ksort( $final_atts );
@@ -1420,7 +1420,7 @@  discard block
 block discarded – undo
1420 1420
 			$output .= sprintf( ' %s="%s"', $attr, esc_attr( $value ) );
1421 1421
 		}
1422 1422
 
1423
-		if( '' !== $output ) {
1423
+		if ( '' !== $output ) {
1424 1424
 			$output = '<a' . $output . '>' . $anchor_text . '</a>';
1425 1425
 		}
1426 1426
 
@@ -1444,7 +1444,7 @@  discard block
 block discarded – undo
1444 1444
 	public static function array_merge_recursive_distinct( array &$array1, array &$array2 ) {
1445 1445
 		$merged = $array1;
1446 1446
 
1447
-		foreach ( $array2 as $key => &$value )  {
1447
+		foreach ( $array2 as $key => &$value ) {
1448 1448
 			if ( is_array( $value ) && isset( $merged[ $key ] ) && is_array( $merged[ $key ] ) ) {
1449 1449
 				$merged[ $key ] = self::array_merge_recursive_distinct( $merged[ $key ], $value );
1450 1450
 			} else {
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
 		 * `$context` is where are we using this information (e.g. change_entry_creator, search_widget ..)
1480 1480
 		 * @param array $settings Settings array, with `number` key defining the # of users to display
1481 1481
 		 */
1482
-		$get_users_settings = apply_filters( 'gravityview/get_users/'. $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1482
+		$get_users_settings = apply_filters( 'gravityview/get_users/' . $context, apply_filters( 'gravityview_change_entry_creator_user_parameters', $get_users_settings ) );
1483 1483
 
1484 1484
 		return get_users( $get_users_settings );
1485 1485
 	}
@@ -1494,7 +1494,7 @@  discard block
 block discarded – undo
1494 1494
      * @return string
1495 1495
      */
1496 1496
     public static function generate_notice( $notice, $class = '' ) {
1497
-        return '<div class="gv-notice '.gravityview_sanitize_html_class( $class ) .'">'. $notice .'</div>';
1497
+        return '<div class="gv-notice ' . gravityview_sanitize_html_class( $class ) . '">' . $notice . '</div>';
1498 1498
     }
1499 1499
 
1500 1500
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-transaction-type.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 	 *
70 70
 	 * @since 1.16
71 71
 	 *
72
-	 * @param int|string $value Number value for the field
72
+	 * @param string $value Number value for the field
73 73
 	 *
74 74
 	 * @return string Based on $value; `1`: "One-Time Payment"; `2`: "Subscription"
75 75
 	 */
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	public function get_content( $output, $entry, $field_settings, $field ) {
60 60
 
61 61
 		/** Overridden by a template. */
62
-		if( ! empty( $field['field_path'] ) ) { return $output; }
62
+		if ( ! empty( $field[ 'field_path' ] ) ) { return $output; }
63 63
 
64 64
 		return $this->get_string_from_value( $output );
65 65
 	}
@@ -78,11 +78,11 @@  discard block
 block discarded – undo
78 78
 		switch ( intval( $value ) ) {
79 79
 			case self::ONE_TIME_PAYMENT:
80 80
 			default:
81
-				$return = __('One-Time Payment', 'gravityview');
81
+				$return = __( 'One-Time Payment', 'gravityview' );
82 82
 				break;
83 83
 
84 84
 			case self::SUBSCRIPTION:
85
-				$return = __('Subscription', 'gravityview');
85
+				$return = __( 'Subscription', 'gravityview' );
86 86
 				break;
87 87
 		}
88 88
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-search_all.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Display the search all input box
4
- *
5
- * @see class-search-widget.php
6
- */
3
+			 * Display the search all input box
4
+			 *
5
+			 * @see class-search-widget.php
6
+			 */
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,14 +7,14 @@
 block discarded – undo
7 7
 
8 8
 $gravityview_view = GravityView_View::getInstance();
9 9
 $view_id = $gravityview_view->getViewId();
10
-$value = $gravityview_view->search_field['value'];
11
-$label = $gravityview_view->search_field['label'];
10
+$value = $gravityview_view->search_field[ 'value' ];
11
+$label = $gravityview_view->search_field[ 'label' ];
12 12
 
13 13
 ?>
14 14
 
15 15
 <div class="gv-search-box">
16 16
 	<div class="gv-search">
17
-	<?php if( ! gv_empty( $label, false ) ) { ?>
17
+	<?php if ( ! gv_empty( $label, false ) ) { ?>
18 18
 		<label for="gv_search_<?php echo $view_id; ?>"><?php echo esc_html( $label ); ?></label>
19 19
 	<?php } ?>
20 20
 		<p><input type="text" name="gv_search" id="gv_search_<?php echo $view_id; ?>" value="<?php echo $value; ?>" /></p>
Please login to merge, or discard this patch.
includes/presets/event-listings/class-gravityview-preset-event-listings.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * GravityView preset template
4
- *
5
- * @file class-gravityview-preset-event-listings.php
6
- * @package   GravityView
7
- * @license   GPL2+
8
- * @author    Katz Web Services, Inc.
9
- * @link      http://gravityview.co
10
- * @copyright Copyright 2015, Katz Web Services, Inc.
11
- *
12
- * @since 1.15
13
- */
3
+	 * GravityView preset template
4
+	 *
5
+	 * @file class-gravityview-preset-event-listings.php
6
+	 * @package   GravityView
7
+	 * @license   GPL2+
8
+	 * @author    Katz Web Services, Inc.
9
+	 * @link      http://gravityview.co
10
+	 * @copyright Copyright 2015, Katz Web Services, Inc.
11
+	 *
12
+	 * @since 1.15
13
+	 */
14 14
 
15 15
 class GravityView_Preset_Event_Listings extends GravityView_Default_Template_List {
16 16
 
Please login to merge, or discard this patch.
includes/class-admin-views.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1037,15 +1037,15 @@
 block discarded – undo
1037 1037
 		GFForms::register_scripts();
1038 1038
 
1039 1039
 		$scripts = array(
1040
-		    'sack',
1041
-		    'gform_gravityforms',
1042
-		    'gform_forms',
1043
-		    'gform_form_admin',
1044
-		    'jquery-ui-autocomplete'
1040
+			'sack',
1041
+			'gform_gravityforms',
1042
+			'gform_forms',
1043
+			'gform_form_admin',
1044
+			'jquery-ui-autocomplete'
1045 1045
 		);
1046 1046
 
1047 1047
 		if ( wp_is_mobile() ) {
1048
-				    $scripts[] = 'jquery-touch-punch';
1048
+					$scripts[] = 'jquery-touch-punch';
1049 1049
 		}
1050 1050
 
1051 1051
 		foreach ($scripts as $script) {
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @return void
272 272
 	 */
273
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
273
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
274 274
 
275 275
 		$output = '';
276 276
 
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	function save_postdata( $post_id ) {
431 431
 
432
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
432
+		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
433 433
 			return;
434 434
 		}
435 435
 
Please login to merge, or discard this patch.
Spacing   +177 added lines, -177 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,37 +134,37 @@  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
 			return $menu_items;
139 139
 		}
140 140
 
141 141
 		$sub_menu_items = array();
142 142
 		foreach ( (array)$connected_views as $view ) {
143 143
 
144
-			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
144
+			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) {
145 145
 				continue;
146 146
 			}
147 147
 
148
-			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
148
+			$label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title;
149 149
 
150
-			$sub_menu_items[] = array(
150
+			$sub_menu_items[ ] = array(
151 151
 				'label' => esc_attr( $label ),
152
-				'url' => admin_url( 'post.php?action=edit&post='.$view->ID ),
152
+				'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ),
153 153
 			);
154 154
 		}
155 155
 
156 156
 		// If there were no items added, then let's create the parent menu
157
-		if( $sub_menu_items ) {
157
+		if ( $sub_menu_items ) {
158 158
 
159 159
 			// Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown
160
-			$sub_menu_items[] = array(
160
+			$sub_menu_items[ ] = array(
161 161
 				'url' => '#',
162 162
 				'label' => '',
163 163
 				'menu_class' => 'hidden',
164 164
 				'capabilities' => '',
165 165
 			);
166 166
 
167
-			$menu_items['gravityview'] = array(
167
+			$menu_items[ 'gravityview' ] = array(
168 168
 				'label'          => __( 'Connected Views', 'gravityview' ),
169 169
 				'icon'           => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>',
170 170
 				'title'          => __( 'GravityView Views using this form as a data source', 'gravityview' ),
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
 		$add = array( 'captcha', 'page' );
195 195
 
196 196
 		// Don't allowing editing the following values:
197
-		if( $context === 'edit' ) {
198
-			$add[] = 'post_id';
197
+		if ( $context === 'edit' ) {
198
+			$add[ ] = 'post_id';
199 199
 		}
200 200
 
201 201
 		$return = array_merge( $array, $add );
@@ -218,32 +218,32 @@  discard block
 block discarded – undo
218 218
 		foreach ( $default_args as $key => $arg ) {
219 219
 
220 220
 			// If an arg has `tooltip` defined, but it's false, don't display a tooltip
221
-			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; }
221
+			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; }
222 222
 
223 223
 			// By default, use `tooltip` if defined.
224
-			$tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip'];
224
+			$tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ];
225 225
 
226 226
 			// Otherwise, use the description as a tooltip.
227
-			if( empty( $tooltip ) && !empty( $arg['desc'] ) ) {
228
-				$tooltip = $arg['desc'];
227
+			if ( empty( $tooltip ) && ! empty( $arg[ 'desc' ] ) ) {
228
+				$tooltip = $arg[ 'desc' ];
229 229
 			}
230 230
 
231 231
 			// If there's no tooltip set, continue
232
-			if( empty( $tooltip ) ) {
232
+			if ( empty( $tooltip ) ) {
233 233
 				continue;
234 234
 			}
235 235
 
236 236
 			// Add the tooltip
237
-			$gv_tooltips[ 'gv_'.$key ] = array(
238
-				'title'	=> $arg['label'],
237
+			$gv_tooltips[ 'gv_' . $key ] = array(
238
+				'title'	=> $arg[ 'label' ],
239 239
 				'value'	=> $tooltip,
240 240
 			);
241 241
 
242 242
 		}
243 243
 
244
-		$gv_tooltips['gv_css_merge_tags'] = array(
245
-			'title' => __('CSS Merge Tags', 'gravityview'),
246
-			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' )
244
+		$gv_tooltips[ 'gv_css_merge_tags' ] = array(
245
+			'title' => __( 'CSS Merge Tags', 'gravityview' ),
246
+			'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' )
247 247
 		);
248 248
 
249 249
 		/**
@@ -254,9 +254,9 @@  discard block
 block discarded – undo
254 254
 
255 255
 		foreach ( $gv_tooltips as $key => $tooltip ) {
256 256
 
257
-			$title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>';
257
+			$title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>';
258 258
 
259
-			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) );
259
+			$tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) );
260 260
 		}
261 261
 
262 262
 		return $tooltips;
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * @return void
272 272
 	 */
273
-	public function add_custom_column_content( $column_name = NULL, $post_id )	{
273
+	public function add_custom_column_content( $column_name = NULL, $post_id ) {
274 274
 
275 275
 		$output = '';
276 276
 
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 				// Generate backup if label doesn't exist: `example_name` => `Example Name`
293 293
 				$template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) );
294 294
 
295
-				$output = $template ? $template['label'] : $template_id_pretty;
295
+				$output = $template ? $template[ 'label' ] : $template_id_pretty;
296 296
 
297 297
 				break;
298 298
 
@@ -333,44 +333,44 @@  discard block
 block discarded – undo
333 333
 	static public function get_connected_form_links( $form, $include_form_link = true ) {
334 334
 
335 335
 		// Either the form is empty or the form ID is 0, not yet set.
336
-		if( empty( $form ) ) {
336
+		if ( empty( $form ) ) {
337 337
 			return '';
338 338
 		}
339 339
 
340 340
 		// The $form is passed as the form ID
341
-		if( !is_array( $form ) ) {
341
+		if ( ! is_array( $form ) ) {
342 342
 			$form = gravityview_get_form( $form );
343 343
 		}
344 344
 
345
-		$form_id = $form['id'];
345
+		$form_id = $form[ 'id' ];
346 346
 		$links = array();
347 347
 
348
-		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
348
+		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) {
349 349
 			$form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;id=%d', $form_id ) );
350
-			$form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>';
351
-			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>';
350
+			$form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>';
351
+			$links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>';
352 352
 		} else {
353
-			$form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>';
353
+			$form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>';
354 354
 		}
355 355
 
356
-		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
356
+		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) {
357 357
 			$entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&amp;id=%d', $form_id ) );
358
-			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>';
358
+			$links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>';
359 359
 		}
360 360
 
361
-		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
361
+		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) {
362 362
 			$settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&amp;view=settings&amp;id=%d', $form_id ) );
363
-			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>';
363
+			$links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>';
364 364
 		}
365 365
 
366
-		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) {
366
+		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) {
367 367
 			$preview_url = site_url( sprintf( '?gf_page=preview&amp;id=%d', $form_id ) );
368
-			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>';
368
+			$links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>';
369 369
 		}
370 370
 
371 371
 		$output = '';
372 372
 
373
-		if( !empty( $include_form_link ) ) {
373
+		if ( ! empty( $include_form_link ) ) {
374 374
 			$output .= $form_link;
375 375
 		}
376 376
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		 */
383 383
 		$links = apply_filters( 'gravityview_connected_form_links', $links, $form );
384 384
 
385
-		$output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>';
385
+		$output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>';
386 386
 
387 387
 		return $output;
388 388
 	}
@@ -396,8 +396,8 @@  discard block
 block discarded – undo
396 396
 		// Get the date column and save it for later to add back in.
397 397
 		// This adds it after the Data Source column.
398 398
 		// This way, we don't need to do array_slice, array_merge, etc.
399
-		$date = $columns['date'];
400
-		unset( $columns['date'] );
399
+		$date = $columns[ 'date' ];
400
+		unset( $columns[ 'date' ] );
401 401
 
402 402
 		$data_source_required_caps = array(
403 403
 			'gravityforms_edit_forms',
@@ -408,14 +408,14 @@  discard block
 block discarded – undo
408 408
 			'gravityforms_preview_forms',
409 409
 		);
410 410
 
411
-		if( GVCommon::has_cap( $data_source_required_caps ) ) {
412
-			$columns['gv_connected_form'] = __( 'Data Source', 'gravityview' );
411
+		if ( GVCommon::has_cap( $data_source_required_caps ) ) {
412
+			$columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' );
413 413
 		}
414 414
 
415
-		$columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
415
+		$columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' );
416 416
 
417 417
 		// Add the date back in.
418
-		$columns['date'] = $date;
418
+		$columns[ 'date' ] = $date;
419 419
 
420 420
 		return $columns;
421 421
 	}
@@ -429,12 +429,12 @@  discard block
 block discarded – undo
429 429
 	 */
430 430
 	function save_postdata( $post_id ) {
431 431
 
432
-		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){
432
+		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
433 433
 			return;
434 434
 		}
435 435
 
436 436
 		// validate post_type
437
-		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) {
437
+		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) {
438 438
 			return;
439 439
 		}
440 440
 
@@ -449,90 +449,90 @@  discard block
 block discarded – undo
449 449
 		$statii = array();
450 450
 
451 451
 		// check if this is a start fresh View
452
-		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) {
452
+		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) {
453 453
 
454
-			$form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : '';
454
+			$form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : '';
455 455
 			// save form id
456
-			$statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
456
+			$statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id );
457 457
 
458 458
 		}
459 459
 
460
-		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) {
460
+		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) {
461 461
 			do_action( 'gravityview_log_error', __METHOD__ . ' - Current user does not have the capability to create a new Form.', wp_get_current_user() );
462 462
 			return;
463 463
 		}
464 464
 
465 465
 		// Was this a start fresh?
466
-		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) {
467
-			$statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
466
+		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) {
467
+			$statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 );
468 468
 		} else {
469
-			$statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
469
+			$statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' );
470 470
 		}
471 471
 
472 472
 		// Check if we have a template id
473
-		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) {
473
+		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) {
474 474
 
475
-			$template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : '';
475
+			$template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : '';
476 476
 
477 477
 			// now save template id
478
-			$statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
478
+			$statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id );
479 479
 		}
480 480
 
481 481
 
482 482
 		// save View Configuration metabox
483
-		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) {
483
+		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) {
484 484
 
485 485
 			// template settings
486
-			if( empty( $_POST['template_settings'] ) ) {
487
-				$_POST['template_settings'] = array();
486
+			if ( empty( $_POST[ 'template_settings' ] ) ) {
487
+				$_POST[ 'template_settings' ] = array();
488 488
 			}
489
-			$statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] );
489
+			$statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] );
490 490
 
491 491
 			$fields = array();
492 492
 
493 493
 			// Directory&single Visible Fields
494
-			if( !empty( $preset_fields ) ) {
494
+			if ( ! empty( $preset_fields ) ) {
495 495
 
496 496
 				$fields = $preset_fields;
497 497
 
498
-			} elseif( !empty( $_POST['fields'] ) ) {
498
+			} elseif ( ! empty( $_POST[ 'fields' ] ) ) {
499 499
 
500
-				if( !is_array( $_POST['fields'] ) ) {
500
+				if ( ! is_array( $_POST[ 'fields' ] ) ) {
501 501
 
502 502
 					// Fields are passed as a jQuery-serialized array, created in admin-views.js in the serializeForm method
503 503
 					// Not using parse_str due to max_input_vars limitation
504 504
 					$fields_holder = array();
505
-					GVCommon::gv_parse_str( $_POST['fields'], $fields_holder );
505
+					GVCommon::gv_parse_str( $_POST[ 'fields' ], $fields_holder );
506 506
 
507
-					if( isset( $fields_holder['fields'] ) ) {
507
+					if ( isset( $fields_holder[ 'fields' ] ) ) {
508 508
 
509 509
 						// When parsed, there's a m
510
-						$fields = $fields_holder['fields'];
510
+						$fields = $fields_holder[ 'fields' ];
511 511
 
512 512
 					} else {
513 513
 
514
-						do_action('gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
514
+						do_action( 'gravityview_log_error', '[save_postdata] No `fields` key was found after parsing $fields string', $fields_holder );
515 515
 
516 516
 					}
517 517
 
518 518
 				} else {
519 519
 
520
-					$fields = $_POST['fields'];
520
+					$fields = $_POST[ 'fields' ];
521 521
 
522 522
 				}
523 523
 			}
524 524
 
525
-			$statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
525
+			$statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields );
526 526
 
527 527
 			// Directory Visible Widgets
528
-			if( empty( $_POST['widgets'] ) ) {
529
-				$_POST['widgets'] = array();
528
+			if ( empty( $_POST[ 'widgets' ] ) ) {
529
+				$_POST[ 'widgets' ] = array();
530 530
 			}
531
-			$statii['directory_widgets'] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST['widgets'] );
531
+			$statii[ 'directory_widgets' ] = update_post_meta( $post_id, '_gravityview_directory_widgets', $_POST[ 'widgets' ] );
532 532
 
533 533
 		} // end save view configuration
534 534
 
535
-		do_action('gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
535
+		do_action( 'gravityview_log_debug', '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array_map( 'intval', $statii ) );
536 536
 	}
537 537
 
538 538
 	/**
@@ -564,20 +564,20 @@  discard block
 block discarded – undo
564 564
 
565 565
 		$output = '';
566 566
 
567
-		if( !empty( $fields ) ) {
567
+		if ( ! empty( $fields ) ) {
568 568
 
569
-			foreach( $fields as $id => $details ) {
569
+			foreach ( $fields as $id => $details ) {
570 570
 
571
-				if( in_array( $details['type'], $blacklist_field_types ) ) {
571
+				if ( in_array( $details[ 'type' ], $blacklist_field_types ) ) {
572 572
 					continue;
573 573
 				}
574 574
 
575 575
 				// Edit mode only allows editing the parent fields, not single inputs.
576
-				if( $context === 'edit' && !empty( $details['parent'] ) ) {
576
+				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) {
577 577
 					continue;
578 578
 				}
579 579
 
580
-				$output .= new GravityView_Admin_View_Field( $details['label'], $id, $details );
580
+				$output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details );
581 581
 
582 582
 			} // End foreach
583 583
 		}
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
 		echo $output;
586 586
 
587 587
 		// For the EDIT view we only want to allow the form fields.
588
-		if( $context === 'edit' ) {
588
+		if ( $context === 'edit' ) {
589 589
 			return;
590 590
 		}
591 591
 
@@ -609,16 +609,16 @@  discard block
 block discarded – undo
609 609
 		$additional_fields = apply_filters( 'gravityview_additional_fields', array(
610 610
 			array(
611 611
 				'label_text' => __( '+ Add All Fields', 'gravityview' ),
612
-				'desc' => __('Add all the available fields at once.', 'gravityview'),
612
+				'desc' => __( 'Add all the available fields at once.', 'gravityview' ),
613 613
 				'field_id' => 'all-fields',
614 614
 				'label_type' => 'field',
615 615
 				'input_type' => NULL,
616 616
 				'field_options' => NULL,
617 617
 				'settings_html'	=> NULL,
618 618
 			)
619
-		));
619
+		) );
620 620
 
621
-		if( !empty( $additional_fields )) {
621
+		if ( ! empty( $additional_fields ) ) {
622 622
 			foreach ( (array)$additional_fields as $item ) {
623 623
 
624 624
 				// Prevent items from not having index set
@@ -629,16 +629,16 @@  discard block
 block discarded – undo
629 629
 					'input_type' => NULL,
630 630
 					'field_options' => NULL,
631 631
 					'settings_html'	=> NULL,
632
-				));
632
+				) );
633 633
 
634 634
 				// Backward compat.
635
-				if( !empty( $item['field_options'] ) ) {
635
+				if ( ! empty( $item[ 'field_options' ] ) ) {
636 636
 					// Use settings_html from now on.
637
-					$item['settings_html'] = $item['field_options'];
637
+					$item[ 'settings_html' ] = $item[ 'field_options' ];
638 638
 				}
639 639
 
640 640
 				// Render a label for each of them
641
-				echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item );
641
+				echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item );
642 642
 
643 643
 			}
644 644
 		}
@@ -651,64 +651,64 @@  discard block
 block discarded – undo
651 651
 	 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
652 652
 	 * @return array
653 653
 	 */
654
-	function get_entry_default_fields($form, $zone) {
654
+	function get_entry_default_fields( $form, $zone ) {
655 655
 
656 656
 		$entry_default_fields = array();
657 657
 
658
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
658
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
659 659
 
660 660
 			$entry_default_fields = array(
661 661
 				'id' => array(
662
-					'label' => __('Entry ID', 'gravityview'),
662
+					'label' => __( 'Entry ID', 'gravityview' ),
663 663
 					'type' => 'id',
664
-					'desc'	=> __('The unique ID of the entry.', 'gravityview'),
664
+					'desc'	=> __( 'The unique ID of the entry.', 'gravityview' ),
665 665
 				),
666 666
 				'date_created' => array(
667
-					'label' => __('Entry Date', 'gravityview'),
668
-					'desc'	=> __('The date the entry was created.', 'gravityview'),
667
+					'label' => __( 'Entry Date', 'gravityview' ),
668
+					'desc'	=> __( 'The date the entry was created.', 'gravityview' ),
669 669
 					'type' => 'date_created',
670 670
 				),
671 671
 				'source_url' => array(
672
-					'label' => __('Source URL', 'gravityview'),
672
+					'label' => __( 'Source URL', 'gravityview' ),
673 673
 					'type' => 'source_url',
674
-					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'),
674
+					'desc'	=> __( 'The URL of the page where the form was submitted.', 'gravityview' ),
675 675
 				),
676 676
 				'ip' => array(
677
-					'label' => __('User IP', 'gravityview'),
677
+					'label' => __( 'User IP', 'gravityview' ),
678 678
 					'type' => 'ip',
679
-					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'),
679
+					'desc'	=> __( 'The IP Address of the user who created the entry.', 'gravityview' ),
680 680
 				),
681 681
 				'created_by' => array(
682
-					'label' => __('User', 'gravityview'),
682
+					'label' => __( 'User', 'gravityview' ),
683 683
 					'type' => 'created_by',
684
-					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'),
684
+					'desc'	=> __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ),
685 685
 				),
686 686
 
687 687
 				/**
688 688
 				 * @since  1.2
689 689
 				 */
690 690
 				'custom'	=> array(
691
-					'label'	=> __('Custom Content', 'gravityview'),
691
+					'label'	=> __( 'Custom Content', 'gravityview' ),
692 692
 					'type'	=> 'custom',
693
-					'desc'	=> __('Insert custom text or HTML.', 'gravityview'),
693
+					'desc'	=> __( 'Insert custom text or HTML.', 'gravityview' ),
694 694
 				),
695 695
 
696 696
 				/**
697 697
 				 * @since 1.7.2
698 698
 				 */
699 699
 				'other_entries' => array(
700
-					'label'	=> __('Other Entries', 'gravityview'),
700
+					'label'	=> __( 'Other Entries', 'gravityview' ),
701 701
 					'type'	=> 'other_entries',
702
-					'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'),
702
+					'desc'	=> __( 'Display other entries created by the entry creator.', 'gravityview' ),
703 703
 				),
704 704
 			);
705 705
 
706 706
 
707
-			if( 'single' !== $zone) {
707
+			if ( 'single' !== $zone ) {
708 708
 
709
-				$entry_default_fields['entry_link'] = array(
710
-					'label' => __('Link to Entry', 'gravityview'),
711
-					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'),
709
+				$entry_default_fields[ 'entry_link' ] = array(
710
+					'label' => __( 'Link to Entry', 'gravityview' ),
711
+					'desc'	=> __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ),
712 712
 					'type' => 'entry_link',
713 713
 				);
714 714
 			}
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
 		 * @param  string|array $form form_ID or form object
723 723
 		 * @param  string $zone   Either 'single', 'directory', 'header', 'footer'
724 724
 		 */
725
-		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone);
725
+		return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone );
726 726
 	}
727 727
 
728 728
 	/**
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 	 */
734 734
 	function get_available_fields( $form = '', $zone = NULL ) {
735 735
 
736
-		if( empty( $form ) ) {
736
+		if ( empty( $form ) ) {
737 737
 			do_action( 'gravityview_log_error', '[get_available_fields] $form is empty' );
738 738
 			return array();
739 739
 		}
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 		$fields = gravityview_get_form_fields( $form, true );
743 743
 
744 744
 		// get meta fields ( only if form was already created )
745
-		if( !is_array( $form ) ) {
745
+		if ( ! is_array( $form ) ) {
746 746
 			$meta_fields = gravityview_get_entry_meta( $form );
747 747
 		} else {
748 748
 			$meta_fields = array();
@@ -766,11 +766,11 @@  discard block
 block discarded – undo
766 766
 
767 767
 		$widgets = $this->get_registered_widgets();
768 768
 
769
-		if( !empty( $widgets ) ) {
769
+		if ( ! empty( $widgets ) ) {
770 770
 
771
-			foreach( $widgets as $id => $details ) {
771
+			foreach ( $widgets as $id => $details ) {
772 772
 
773
-				echo new GravityView_Admin_View_Widget( $details['label'], $id, $details );
773
+				echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details );
774 774
 
775 775
 			}
776 776
 		}
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
 	function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
805 805
 		global $post;
806 806
 
807
-		if( $type === 'widget' ) {
807
+		if ( $type === 'widget' ) {
808 808
 			$button_label = __( 'Add Widget', 'gravityview' );
809 809
 		} else {
810 810
 			$button_label = __( 'Add Field', 'gravityview' );
@@ -813,15 +813,15 @@  discard block
 block discarded – undo
813 813
 		$available_items = array();
814 814
 
815 815
 		// if saved values, get available fields to label everyone
816
-		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) {
816
+		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) {
817 817
 
818
-			if( !empty( $_POST['template_id'] ) ) {
819
-				$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
818
+			if ( ! empty( $_POST[ 'template_id' ] ) ) {
819
+				$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
820 820
 			} else {
821 821
 				$form = gravityview_get_form_id( $post->ID );
822 822
 			}
823 823
 
824
-			if( 'field' === $type ) {
824
+			if ( 'field' === $type ) {
825 825
 				$available_items = $this->get_available_fields( $form, $zone );
826 826
 			} else {
827 827
 				$available_items = $this->get_registered_widgets();
@@ -829,39 +829,39 @@  discard block
 block discarded – undo
829 829
 
830 830
 		}
831 831
 
832
-		foreach( $rows as $row ) :
833
-			foreach( $row as $col => $areas ) :
834
-				$column = ($col == '2-2') ? '1-2' : $col; ?>
832
+		foreach ( $rows as $row ) :
833
+			foreach ( $row as $col => $areas ) :
834
+				$column = ( $col == '2-2' ) ? '1-2' : $col; ?>
835 835
 
836 836
 				<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
837 837
 
838
-					<?php foreach( $areas as $area ) : 	?>
838
+					<?php foreach ( $areas as $area ) : 	?>
839 839
 
840 840
 						<div class="gv-droppable-area">
841
-							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>">
841
+							<div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>">
842 842
 
843 843
 								<?php // render saved fields
844 844
 
845
-								if( !empty( $values[ $zone .'_'. $area['areaid'] ] ) ) {
845
+								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
846 846
 
847
-									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) {
847
+									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) {
848 848
 
849 849
 										$input_type = NULL;
850
-										$original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ;
850
+										$original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false;
851 851
 
852
-										if( !$original_item ) {
852
+										if ( ! $original_item ) {
853 853
 
854
-											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 ));
854
+											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 ) );
855 855
 
856 856
 											$original_item = $field;
857 857
 										} else {
858 858
 
859
-											$input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL;
859
+											$input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL;
860 860
 
861 861
 										}
862 862
 
863 863
 										// Field options dialog box
864
-										$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 );
864
+										$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 );
865 865
 
866 866
 										$item = array(
867 867
 											'input_type' => $input_type,
@@ -870,16 +870,16 @@  discard block
 block discarded – undo
870 870
 										);
871 871
 
872 872
 										// Merge the values with the current item to pass things like widget descriptions and original field names
873
-										if( $original_item ) {
873
+										if ( $original_item ) {
874 874
 											$item = wp_parse_args( $item, $original_item );
875 875
 										}
876 876
 
877
-										switch( $type ) {
877
+										switch ( $type ) {
878 878
 											case 'widget':
879
-												echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field );
879
+												echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field );
880 880
 												break;
881 881
 											default:
882
-												echo new GravityView_Admin_View_Field( $item['label'], $field['id'], $item, $field );
882
+												echo new GravityView_Admin_View_Field( $item[ 'label' ], $field[ 'id' ], $item, $field );
883 883
 										}
884 884
 
885 885
 
@@ -889,11 +889,11 @@  discard block
 block discarded – undo
889 889
 
890 890
 								} // End if zone is not empty ?>
891 891
 
892
-								<span class="drop-message"><?php echo sprintf(esc_attr__('"+ %s" or drag existing %ss here.', 'gravityview'), $button_label, $type ); ?></span>
892
+								<span class="drop-message"><?php echo sprintf( esc_attr__( '"+ %s" or drag existing %ss here.', 'gravityview' ), $button_label, $type ); ?></span>
893 893
 							</div>
894 894
 							<div class="gv-droppable-area-action">
895
-								<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>
896
-								<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>
895
+								<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>
896
+								<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>
897 897
 							</div>
898 898
 						</div>
899 899
 
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
 		$default_widget_areas = GravityView_Plugin::get_default_widget_areas();
916 916
 
917 917
 		$widgets = array();
918
-		if( !empty( $post_id ) ) {
918
+		if ( ! empty( $post_id ) ) {
919 919
 			$widgets = get_post_meta( $post_id, '_gravityview_directory_widgets', true );
920 920
 
921 921
 		}
@@ -946,19 +946,19 @@  discard block
 block discarded – undo
946 946
 	 */
947 947
 	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) {
948 948
 
949
-		if( empty( $template_id ) ) {
949
+		if ( empty( $template_id ) ) {
950 950
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] $template_id is empty' );
951 951
 			return;
952 952
 		}
953 953
 
954 954
 		$template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context );
955 955
 
956
-		if( empty( $template_areas ) ) {
956
+		if ( empty( $template_areas ) ) {
957 957
 
958 958
 			do_action( 'gravityview_log_debug', '[render_directory_active_areas] No areas defined. Maybe template %s is disabled.', $template_id );
959 959
 			$output = '<div>';
960
-			$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>';
961
-			$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>';
960
+			$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>';
961
+			$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>';
962 962
 			$output .= '</div>';
963 963
 		} else {
964 964
 
@@ -973,7 +973,7 @@  discard block
 block discarded – undo
973 973
 
974 974
 		}
975 975
 
976
-		if( $echo ) {
976
+		if ( $echo ) {
977 977
 			echo $output;
978 978
 		}
979 979
 
@@ -993,25 +993,25 @@  discard block
 block discarded – undo
993 993
 		$is_widgets_page = ( $pagenow === 'widgets.php' );
994 994
 
995 995
 		// Add the GV font (with the Astronaut)
996
-		wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
996
+		wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
997 997
 
998
-		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version, true );
998
+		wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
999 999
 
1000 1000
 		// Don't process any scripts below here if it's not a GravityView page.
1001
-		if( !gravityview_is_admin_page($hook) && !$is_widgets_page ) { return; }
1001
+		if ( ! gravityview_is_admin_page( $hook ) && ! $is_widgets_page ) { return; }
1002 1002
 
1003 1003
 		// Only enqueue the following on single pages
1004
-		if( gravityview_is_admin_page($hook, 'single') || $is_widgets_page ) {
1004
+		if ( gravityview_is_admin_page( $hook, 'single' ) || $is_widgets_page ) {
1005 1005
 
1006 1006
 			wp_enqueue_script( 'jquery-ui-datepicker' );
1007
-			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), GravityView_Plugin::version );
1007
+			wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), GravityView_Plugin::version );
1008 1008
 
1009
-			$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
1009
+			$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1010 1010
 
1011 1011
 			//enqueue scripts
1012 1012
 			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 );
1013 1013
 
1014
-			wp_localize_script('gravityview_views_scripts', 'gvGlobals', array(
1014
+			wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array(
1015 1015
 				'cookiepath' => COOKIEPATH,
1016 1016
 				'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ),
1017 1017
 				'label_viewname' => __( 'Enter View name here', 'gravityview' ),
@@ -1024,9 +1024,9 @@  discard block
 block discarded – undo
1024 1024
 				'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ),
1025 1025
 				'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ),
1026 1026
 				'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' ),
1027
-			));
1027
+			) );
1028 1028
 
1029
-			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array('dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1029
+			wp_enqueue_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), GravityView_Plugin::version );
1030 1030
 
1031 1031
 			self::enqueue_gravity_forms_scripts();
1032 1032
 
@@ -1045,10 +1045,10 @@  discard block
 block discarded – undo
1045 1045
 		);
1046 1046
 
1047 1047
 		if ( wp_is_mobile() ) {
1048
-				    $scripts[] = 'jquery-touch-punch';
1048
+				    $scripts[ ] = 'jquery-touch-punch';
1049 1049
 		}
1050 1050
 
1051
-		foreach ($scripts as $script) {
1051
+		foreach ( $scripts as $script ) {
1052 1052
 			wp_enqueue_script( $script );
1053 1053
 		}
1054 1054
 	}
@@ -1057,11 +1057,11 @@  discard block
 block discarded – undo
1057 1057
 
1058 1058
 		$filter = current_filter();
1059 1059
 
1060
-		if( preg_match('/script/ism', $filter ) ) {
1060
+		if ( preg_match( '/script/ism', $filter ) ) {
1061 1061
 			$allow_scripts = array( 'jquery-ui-core', 'jquery-ui-dialog', 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'gravityview_views_scripts', 'gravityview-support', 'gravityview-jquery-cookie', 'gravityview_views_datepicker',
1062 1062
 			'sack', 'gform_gravityforms', 'gform_forms', 'gform_form_admin', 'jquery-ui-autocomplete' );
1063 1063
 			$registered = array_merge( $registered, $allow_scripts );
1064
-		} elseif( preg_match('/style/ism', $filter ) ) {
1064
+		} elseif ( preg_match( '/style/ism', $filter ) ) {
1065 1065
 			$allow_styles = array( 'dashicons', 'wp-jquery-ui-dialog', 'gravityview_views_styles', 'gravityview_global', 'gravityview_views_datepicker' );
1066 1066
 			$registered = array_merge( $registered, $allow_styles );
1067 1067
 		}
Please login to merge, or discard this patch.