Completed
Push — master ( 9cf7be...029c15 )
by Zack
04:07
created
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,10 +116,10 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $group = '' ) {
118 118
 
119
-		if( '' !== $group ) {
119
+		if ( '' !== $group ) {
120 120
 			$return_fields = self::$_fields;
121 121
 			foreach ( $return_fields as $key => $field ) {
122
-				if( $group !== $field->group ) {
122
+				if ( $group !== $field->group ) {
123 123
 					unset( $return_fields[ $key ] );
124 124
 				}
125 125
 			}
Please login to merge, or discard this patch.
includes/class-gravityview-gfformsmodel.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
          * If the method changes to public, use Gravity Forms' method
25 25
          * @todo: If/when the method is public, remove the unneeded copied code.
26 26
          */
27
-        if( $reflection->isPublic() ) {
27
+        if ( $reflection->isPublic() ) {
28 28
             return parent::copy_post_image( $url, $post_id );
29 29
         }
30 30
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         }
43 43
 
44 44
         //making sure there is a valid upload folder
45
-        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir['error'] ) ) {
45
+        if ( ! ( ( $upload_dir = wp_upload_dir( $time ) ) && false === $upload_dir[ 'error' ] ) ) {
46 46
             return false;
47 47
         }
48 48
 
@@ -57,17 +57,17 @@  discard block
 block discarded – undo
57 57
          */
58 58
         $upload_dir = gf_apply_filters( 'gform_media_upload_path', $form_id, $upload_dir, $form_id, $post_id );
59 59
 
60
-        if ( ! file_exists( $upload_dir['path'] ) ) {
61
-            if ( ! wp_mkdir_p( $upload_dir['path'] ) ) {
60
+        if ( ! file_exists( $upload_dir[ 'path' ] ) ) {
61
+            if ( ! wp_mkdir_p( $upload_dir[ 'path' ] ) ) {
62 62
                 return false;
63 63
             }
64 64
         }
65 65
 
66 66
         $name     = basename( $url );
67
-        $filename = wp_unique_filename( $upload_dir['path'], $name );
67
+        $filename = wp_unique_filename( $upload_dir[ 'path' ], $name );
68 68
 
69 69
         // the destination path
70
-        $new_file = $upload_dir['path'] . "/$filename";
70
+        $new_file = $upload_dir[ 'path' ] . "/$filename";
71 71
 
72 72
         // the source path
73 73
         $y                = substr( $time, 0, 4 );
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $target_root_url  = RGFormsModel::get_upload_url( $form_id ) . "/$y/$m/";
77 77
         $upload_root_info = array( 'path' => $target_root, 'url' => $target_root_url );
78 78
         $upload_root_info = gf_apply_filters( 'gform_upload_path', $form_id, $upload_root_info, $form_id );
79
-        $path             = str_replace( $upload_root_info['url'], $upload_root_info['path'], $url );
79
+        $path             = str_replace( $upload_root_info[ 'url' ], $upload_root_info[ 'path' ], $url );
80 80
 
81 81
         // copy the file to the destination path
82 82
         if ( ! copy( $path, $new_file ) ) {
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 
86 86
         // Set correct file permissions
87 87
         $stat  = stat( dirname( $new_file ) );
88
-        $perms = $stat['mode'] & 0000666;
88
+        $perms = $stat[ 'mode' ] & 0000666;
89 89
         @ chmod( $new_file, $perms );
90 90
 
91 91
         // Compute the URL
92
-        $url = $upload_dir['url'] . "/$filename";
92
+        $url = $upload_dir[ 'url' ] . "/$filename";
93 93
 
94 94
         if ( is_multisite() ) {
95 95
             delete_transient( 'dirsize_cache' );
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $type = wp_check_filetype( $new_file );
99 99
 
100
-        return array( 'file' => $new_file, 'url' => $url, 'type' => $type['type'] );
100
+        return array( 'file' => $new_file, 'url' => $url, 'type' => $type[ 'type' ] );
101 101
 
102 102
     }
103 103
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
          * If the method changes to public, use Gravity Forms' method
125 125
          * @todo: If/when the method is public, remove the unneeded copied code.
126 126
          */
127
-        if( $reflection->isPublic() ) {
127
+        if ( $reflection->isPublic() ) {
128 128
             return parent::media_handle_upload( $url, $post_id, $post_data );
129 129
         }
130 130
 
@@ -145,21 +145,21 @@  discard block
 block discarded – undo
145 145
         }
146 146
 
147 147
         $name_parts = pathinfo( $name );
148
-        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts['extension'] ) ) ) );
148
+        $name       = trim( substr( $name, 0, - ( 1 + strlen( $name_parts[ 'extension' ] ) ) ) );
149 149
 
150
-        $url     = $file['url'];
151
-        $type    = $file['type'];
152
-        $file    = $file['file'];
150
+        $url     = $file[ 'url' ];
151
+        $type    = $file[ 'type' ];
152
+        $file    = $file[ 'file' ];
153 153
         $title   = $name;
154 154
         $content = '';
155 155
 
156 156
         // use image exif/iptc data for title and caption defaults if possible
157 157
         if ( $image_meta = @wp_read_image_metadata( $file ) ) {
158
-            if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
159
-                $title = $image_meta['title'];
158
+            if ( trim( $image_meta[ 'title' ] ) && ! is_numeric( sanitize_title( $image_meta[ 'title' ] ) ) ) {
159
+                $title = $image_meta[ 'title' ];
160 160
             }
161
-            if ( trim( $image_meta['caption'] ) ) {
162
-                $content = $image_meta['caption'];
161
+            if ( trim( $image_meta[ 'caption' ] ) ) {
162
+                $content = $image_meta[ 'caption' ];
163 163
             }
164 164
         }
165 165
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-image.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -23,16 +23,16 @@  discard block
 block discarded – undo
23 23
 
24 24
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
25 25
 
26
-		unset ( $field_options['search_filter'] );
26
+		unset ( $field_options[ 'search_filter' ] );
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$this->add_field_support('link_to_post', $field_options );
32
+		$this->add_field_support( 'link_to_post', $field_options );
33 33
 
34 34
 		// @since 1.5.4
35
-		$this->add_field_support('dynamic_data', $field_options );
35
+		$this->add_field_support( 'dynamic_data', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$url = $title = $caption = $description = '';
59 59
 
60 60
 		// If there's a |:| match, process. Otherwise, empty array!
61
-		if( preg_match( '/\|\:\|/', $value ) ) {
61
+		if ( preg_match( '/\|\:\|/', $value ) ) {
62 62
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
63 63
 		}
64 64
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) {
89 89
 
90
-		$id = (int) $field->id;
91
-		$form_id = $form['id'];
90
+		$id = (int)$field->id;
91
+		$form_id = $form[ 'id' ];
92 92
 		$input_name = "input_{$id}";
93 93
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
94 94
 		$img_name = null;
@@ -96,16 +96,16 @@  discard block
 block discarded – undo
96 96
 		// Convert |:| to associative array
97 97
 		$img_array = $this->explode_value( $value );
98 98
 
99
-		if( ! empty( $img_array['url'] ) ) {
99
+		if ( ! empty( $img_array[ 'url' ] ) ) {
100 100
 
101
-			$img_name = basename( $img_array['url'] );
101
+			$img_name = basename( $img_array[ 'url' ] );
102 102
 
103 103
 			/**
104 104
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
105 105
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
106 106
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
107 107
 			 */
108
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
108
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
109 109
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
110 110
 			}
111 111
 		}
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 		 * @hack
135 135
 		 */
136 136
 		if ( $img_name ) {
137
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
138
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
137
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
138
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
139 139
 		}
140 140
 
141 141
 		return $gf_post_image_field_output;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-render.php 1 patch
Spacing   +209 added lines, -209 removed lines patch added patch discarded remove patch
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
     function load() {
102 102
 
103 103
         /** @define "GRAVITYVIEW_DIR" "../../../" */
104
-        include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' );
104
+        include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' );
105 105
 
106 106
         // Don't display an embedded form when editing an entry
107 107
         add_action( 'wp_head', array( $this, 'prevent_render_form' ) );
108 108
         add_action( 'wp_footer', array( $this, 'prevent_render_form' ) );
109 109
 
110 110
         // Stop Gravity Forms processing what is ours!
111
-        add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 );
111
+        add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 );
112 112
 
113
-        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') );
113
+        add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) );
114 114
 
115 115
         add_action( 'gravityview_edit_entry', array( $this, 'init' ) );
116 116
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
         add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 );
122 122
 
123 123
         // Add fields expected by GFFormDisplay::validate()
124
-        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') );
124
+        add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) );
125 125
 
126 126
     }
127 127
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
      * @return void
137 137
      */
138 138
     function prevent_render_form() {
139
-        if( $this->is_edit_entry() ) {
140
-            if( 'wp_head' === current_filter() ) {
139
+        if ( $this->is_edit_entry() ) {
140
+            if ( 'wp_head' === current_filter() ) {
141 141
                 add_filter( 'gform_shortcode_form', '__return_empty_string' );
142 142
             } else {
143 143
                 remove_filter( 'gform_shortcode_form', '__return_empty_string' );
@@ -152,10 +152,10 @@  discard block
 block discarded – undo
152 152
      */
153 153
     function prevent_maybe_process_form() {
154 154
 
155
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
155
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
156 156
 
157
-        if( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
158
-            remove_action( 'wp',  array( 'RGForms', 'maybe_process_form'), 9 );
157
+        if ( $this->is_edit_entry_submission() && $this->verify_nonce() ) {
158
+            remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 );
159 159
         }
160 160
     }
161 161
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 
168 168
         $gf_page = ( 'entry' === RGForms::get( 'view' ) );
169 169
 
170
-        return ( $gf_page && isset( $_GET['edit'] ) || RGForms::post( 'action' ) === 'update' );
170
+        return ( $gf_page && isset( $_GET[ 'edit' ] ) || RGForms::post( 'action' ) === 'update' );
171 171
     }
172 172
 
173 173
 	/**
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 * @return boolean
177 177
 	 */
178 178
 	public function is_edit_entry_submission() {
179
-		return !empty( $_POST[ self::$nonce_field ] );
179
+		return ! empty( $_POST[ self::$nonce_field ] );
180 180
 	}
181 181
 
182 182
     /**
@@ -187,13 +187,13 @@  discard block
 block discarded – undo
187 187
 
188 188
 
189 189
         $entries = $gravityview_view->getEntries();
190
-        $this->entry = $entries[0];
190
+        $this->entry = $entries[ 0 ];
191 191
 
192 192
         $this->form = $gravityview_view->getForm();
193 193
         $this->form_id = $gravityview_view->getFormId();
194 194
         $this->view_id = $gravityview_view->getViewId();
195 195
 
196
-        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] );
196
+        self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] );
197 197
     }
198 198
 
199 199
 
@@ -213,12 +213,12 @@  discard block
 block discarded – undo
213 213
         $this->setup_vars();
214 214
 
215 215
         // Multiple Views embedded, don't proceed if nonce fails
216
-        if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) {
216
+        if ( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) {
217 217
             return;
218 218
         }
219 219
 
220 220
         // Sorry, you're not allowed here.
221
-        if( false === $this->user_can_edit_entry( true ) ) {
221
+        if ( false === $this->user_can_edit_entry( true ) ) {
222 222
             return;
223 223
         }
224 224
 
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
238 238
     function print_scripts() {
239 239
         $gravityview_view = GravityView_View::getInstance();
240 240
 
241
-        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
241
+        wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) );
242 242
 
243
-        GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false);
243
+        GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false );
244 244
 
245 245
         // Sack is required for images
246 246
         wp_print_scripts( array( 'sack', 'gform_gravityforms' ) );
@@ -252,32 +252,32 @@  discard block
 block discarded – undo
252 252
      */
253 253
     function process_save() {
254 254
 
255
-        if( empty( $_POST ) ) {
255
+        if ( empty( $_POST ) ) {
256 256
             return;
257 257
         }
258 258
 
259 259
         // Make sure the entry, view, and form IDs are all correct
260 260
         $valid = $this->verify_nonce();
261 261
 
262
-        if( !$valid ) {
263
-            do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
262
+        if ( ! $valid ) {
263
+            do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' );
264 264
             return;
265 265
         }
266 266
 
267
-        if( $this->entry['id'] !== $_POST['lid'] ) {
268
-            do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
267
+        if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) {
268
+            do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' );
269 269
             return;
270 270
         }
271 271
 
272
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
272
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
273 273
 
274 274
         $this->process_save_process_files( $this->form_id );
275 275
 
276 276
         $this->validate();
277 277
 
278
-        if( $this->is_valid ) {
278
+        if ( $this->is_valid ) {
279 279
 
280
-            do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
280
+            do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' );
281 281
 
282 282
             /**
283 283
              * @hack This step is needed to unset the adminOnly from form fields
@@ -287,12 +287,12 @@  discard block
 block discarded – undo
287 287
             /**
288 288
              * @hack to avoid the capability validation of the method save_lead for GF 1.9+
289 289
              */
290
-            unset( $_GET['page'] );
290
+            unset( $_GET[ 'page' ] );
291 291
 
292 292
             GFFormsModel::save_lead( $form, $this->entry );
293 293
 
294 294
             // If there's a post associated with the entry, process post fields
295
-            if( !empty( $this->entry['post_id'] ) ) {
295
+            if ( ! empty( $this->entry[ 'post_id' ] ) ) {
296 296
                 $this->maybe_update_post_fields( $form );
297 297
             }
298 298
 
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
              * @param array $form Gravity Forms form array
305 305
              * @param string $entry_id Numeric ID of the entry that was updated
306 306
              */
307
-            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] );
307
+            do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ] );
308 308
         }
309 309
 
310 310
     } // process_save
@@ -338,11 +338,11 @@  discard block
 block discarded – undo
338 338
      * @return mixed
339 339
      */
340 340
     public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) {
341
-        if( ! $this->is_edit_entry() ) {
341
+        if ( ! $this->is_edit_entry() ) {
342 342
             return $plupload_init;
343 343
         }
344 344
 
345
-        $plupload_init['gf_vars']['max_files'] = 0;
345
+        $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0;
346 346
 
347 347
         return $plupload_init;
348 348
     }
@@ -356,15 +356,15 @@  discard block
 block discarded – undo
356 356
         $form = $this->form;
357 357
 
358 358
         // add the fields with calculation properties so they could be recalculated
359
-        $form['fields'] = array_merge( $form['fields'], $this->fields_with_calculation );
359
+        $form[ 'fields' ] = array_merge( $form[ 'fields' ], $this->fields_with_calculation );
360 360
 
361
-        foreach( $form['fields'] as &$field ) {
361
+        foreach ( $form[ 'fields' ] as &$field ) {
362 362
 
363 363
             $field->adminOnly = false;
364 364
 
365
-            if( isset( $field->inputs ) && is_array( $field->inputs ) ) {
366
-                foreach( $field->inputs as $key => $input ) {
367
-                    $field->inputs[ $key ][ 'id' ] = (string)$input['id'];
365
+            if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
366
+                foreach ( $field->inputs as $key => $input ) {
367
+                    $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ];
368 368
                 }
369 369
             }
370 370
         }
@@ -382,11 +382,11 @@  discard block
 block discarded – undo
382 382
      */
383 383
     function maybe_update_post_fields( $form ) {
384 384
 
385
-        $post_id = $this->entry['post_id'];
385
+        $post_id = $this->entry[ 'post_id' ];
386 386
 
387 387
         // Security check
388
-        if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
389
-            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id );
388
+        if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) {
389
+            do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id );
390 390
             return;
391 391
         }
392 392
 
@@ -400,16 +400,16 @@  discard block
 block discarded – undo
400 400
 
401 401
             $field = RGFormsModel::get_field( $form, $field_id );
402 402
 
403
-            if( class_exists('GF_Fields') ) {
403
+            if ( class_exists( 'GF_Fields' ) ) {
404 404
                 $field = GF_Fields::create( $field );
405 405
             }
406 406
 
407
-            if( GFCommon::is_post_field( $field ) ) {
407
+            if ( GFCommon::is_post_field( $field ) ) {
408 408
 
409 409
                 // Get the value of the field, including $_POSTed value
410 410
                 $value = RGFormsModel::get_field_value( $field );
411 411
 
412
-                switch( $field->type ) {
412
+                switch ( $field->type ) {
413 413
 
414 414
                     case 'post_title':
415 415
                     case 'post_content':
@@ -427,14 +427,14 @@  discard block
 block discarded – undo
427 427
                         wp_set_post_categories( $post_id, $categories, false );
428 428
 
429 429
                         // if post_category is type checkbox, then value is an array of inputs
430
-                        if( isset( $value[ strval( $field_id ) ] ) ) {
431
-                            foreach( $value as $input_id => $val ) {
430
+                        if ( isset( $value[ strval( $field_id ) ] ) ) {
431
+                            foreach ( $value as $input_id => $val ) {
432 432
                                 $input_name = 'input_' . str_replace( '.', '_', $input_id );
433
-                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry['id'] );
433
+                                $this->entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $this->entry[ 'id' ] );
434 434
                             }
435 435
                         } else {
436 436
                             $input_name = 'input_' . str_replace( '.', '_', $field_id );
437
-                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
437
+                            $this->entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry[ 'id' ] );
438 438
                         }
439 439
 
440 440
                         break;
@@ -444,12 +444,12 @@  discard block
 block discarded – undo
444 444
                         $custom_field_name = $field->postCustomFieldName;
445 445
 
446 446
                         // Only certain custom field types are supported
447
-                        switch( $input_type ) {
447
+                        switch ( $input_type ) {
448 448
                             case 'fileupload':
449 449
                             /** @noinspection PhpMissingBreakStatementInspection */
450 450
                             case 'list':
451
-                                if( ! is_string( $value ) ) {
452
-                                    $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value );
451
+                                if ( ! is_string( $value ) ) {
452
+                                    $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value );
453 453
                                 }
454 454
                             // break; left intentionally out
455 455
                             default:
@@ -462,11 +462,11 @@  discard block
 block discarded – undo
462 462
 
463 463
                         $input_name = 'input_' . $field_id;
464 464
 
465
-                        if ( !empty( $_FILES[ $input_name ]['name'] ) ) {
465
+                        if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
466 466
 
467 467
                             // We have a new image
468 468
 
469
-                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry['id'] );
469
+                            $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $this->entry[ 'id' ] );
470 470
 
471 471
                             // is this field set as featured image, if not, leave
472 472
                             if ( ! $field->postFeaturedImage ) {
@@ -476,9 +476,9 @@  discard block
 block discarded – undo
476 476
                             $ary = ! empty( $value ) ? explode( '|:|', $value ) : array();
477 477
                             $img_url = rgar( $ary, 0 );
478 478
 
479
-                            $img_title       = count( $ary ) > 1 ? $ary[1] : '';
480
-                            $img_caption     = count( $ary ) > 2 ? $ary[2] : '';
481
-                            $img_description = count( $ary ) > 3 ? $ary[3] : '';
479
+                            $img_title       = count( $ary ) > 1 ? $ary[ 1 ] : '';
480
+                            $img_caption     = count( $ary ) > 2 ? $ary[ 2 ] : '';
481
+                            $img_description = count( $ary ) > 3 ? $ary[ 3 ] : '';
482 482
 
483 483
                             $image_meta = array(
484 484
                                 'post_excerpt' => $img_caption,
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
 
488 488
                             //adding title only if it is not empty. It will default to the file name if it is not in the array
489 489
                             if ( ! empty( $img_title ) ) {
490
-                                $image_meta['post_title'] = $img_title;
490
+                                $image_meta[ 'post_title' ] = $img_title;
491 491
                             }
492 492
 
493 493
                             //todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class.
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 
501 501
                             break;
502 502
 
503
-                        } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
503
+                        } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) {
504 504
 
505 505
                             // Same image although the image title, caption or description might have changed
506 506
 
@@ -508,11 +508,11 @@  discard block
 block discarded – undo
508 508
                             $img_url = rgar( $ary, 0 );
509 509
 
510 510
                             // is this really the same image or something went wrong ?
511
-                            if( $img_url === $_POST[ $input_name ] ) {
511
+                            if ( $img_url === $_POST[ $input_name ] ) {
512 512
 
513
-                                $img_title       = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : '';
514
-                                $img_caption     = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : '';
515
-                                $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : '';
513
+                                $img_title       = isset( $value[ $field_id . '.1' ] ) ? $value[ $field_id . '.1' ] : '';
514
+                                $img_caption     = isset( $value[ $field_id . '.4' ] ) ? $value[ $field_id . '.4' ] : '';
515
+                                $img_description = isset( $value[ $field_id . '.7' ] ) ? $value[ $field_id . '.7' ] : '';
516 516
 
517 517
                                 $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : '';
518 518
 
@@ -546,12 +546,12 @@  discard block
 block discarded – undo
546 546
                 }
547 547
 
548 548
                 //ignore fields that have not changed
549
-                if ( $value === rgget( (string) $field_id, $this->entry ) ) {
549
+                if ( $value === rgget( (string)$field_id, $this->entry ) ) {
550 550
                     continue;
551 551
                 }
552 552
 
553 553
                 // update entry
554
-                if( 'post_category' !== $field->type ) {
554
+                if ( 'post_category' !== $field->type ) {
555 555
                     $this->entry[ strval( $field_id ) ] = $value;
556 556
                 }
557 557
 
@@ -561,25 +561,25 @@  discard block
 block discarded – undo
561 561
 
562 562
         }
563 563
 
564
-        if( $update_entry ) {
564
+        if ( $update_entry ) {
565 565
 
566 566
             $return_entry = GFAPI::update_entry( $this->entry );
567 567
 
568
-            if( is_wp_error( $return_entry ) ) {
568
+            if ( is_wp_error( $return_entry ) ) {
569 569
                 do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry );
570 570
             } else {
571
-                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' );
571
+                do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' );
572 572
             }
573 573
 
574 574
         }
575 575
 
576 576
         $return_post = wp_update_post( $updated_post, true );
577 577
 
578
-        if( is_wp_error( $return_post ) ) {
578
+        if ( is_wp_error( $return_post ) ) {
579 579
             $return_post->add_data( $updated_post, '$updated_post' );
580 580
             do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post );
581 581
         } else {
582
-            do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post );
582
+            do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post );
583 583
         }
584 584
 
585 585
     }
@@ -596,18 +596,18 @@  discard block
 block discarded – undo
596 596
      */
597 597
     function after_update() {
598 598
 
599
-        do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] );
600
-        do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] );
599
+        do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ] );
600
+        do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ] );
601 601
 
602 602
         // Re-define the entry now that we've updated it.
603
-        $entry = RGFormsModel::get_lead( $this->entry['id'] );
603
+        $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] );
604 604
 
605 605
         $entry = GFFormsModel::set_entry_meta( $entry, $this->form );
606 606
 
607 607
         // We need to clear the cache because Gravity Forms caches the field values, which
608 608
         // we have just updated.
609
-        foreach ($this->form['fields'] as $key => $field) {
610
-            GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id );
609
+        foreach ( $this->form[ 'fields' ] as $key => $field ) {
610
+            GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id );
611 611
         }
612 612
 
613 613
         $this->entry = $entry;
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
 
626 626
         <div class="gv-edit-entry-wrapper"><?php
627 627
 
628
-            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this );
628
+            $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this );
629 629
 
630 630
             /**
631 631
              * Fixes weird wpautop() issue
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
                      * @param string $edit_entry_title Modify the "Edit Entry" title
642 642
                      * @param GravityView_Edit_Entry_Render $this This object
643 643
                      */
644
-                    $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this );
644
+                    $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this );
645 645
 
646 646
                     echo esc_attr( $edit_entry_title );
647 647
             ?></span>
@@ -681,20 +681,20 @@  discard block
 block discarded – undo
681 681
      */
682 682
     private function maybe_print_message() {
683 683
 
684
-        if( rgpost('action') === 'update' ) {
684
+        if ( rgpost( 'action' ) === 'update' ) {
685 685
 
686 686
             $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) );
687 687
 
688
-            if( ! $this->is_valid ){
688
+            if ( ! $this->is_valid ) {
689 689
 
690 690
                 // Keeping this compatible with Gravity Forms.
691
-                $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>";
692
-                $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form);
691
+                $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>";
692
+                $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form );
693 693
 
694
-                echo GVCommon::generate_notice( $message , 'gv-error' );
694
+                echo GVCommon::generate_notice( $message, 'gv-error' );
695 695
 
696 696
             } else {
697
-                $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' );
697
+                $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' );
698 698
 
699 699
                 /**
700 700
                  * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link)
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
                  * @param array $entry Gravity Forms entry array
705 705
                  * @param string $back_link URL to return to the original entry. @since 1.6
706 706
                  */
707
-                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link );
707
+                $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link );
708 708
 
709 709
                 echo GVCommon::generate_notice( $message );
710 710
             }
@@ -725,15 +725,15 @@  discard block
 block discarded – undo
725 725
      */
726 726
     private function render_edit_form() {
727 727
 
728
-        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 );
729
-        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') );
728
+        add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 );
729
+        add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
730 730
         add_filter( 'gform_disable_view_counter', '__return_true' );
731 731
 
732 732
         add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 );
733 733
         add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 );
734 734
 
735 735
         // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin.
736
-        unset( $_GET['page'] );
736
+        unset( $_GET[ 'page' ] );
737 737
 
738 738
         // TODO: Make sure validation isn't handled by GF
739 739
         // TODO: Include CSS for file upload fields
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
         // TODO: Product fields are not editable
742 742
         // TODO: Check Updated and Error messages
743 743
 
744
-        $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry );
744
+        $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry );
745 745
 
746 746
 	    remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 );
747 747
         remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) );
@@ -758,7 +758,7 @@  discard block
 block discarded – undo
758 758
      * @return string
759 759
      */
760 760
     public function render_form_buttons() {
761
-        return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this );
761
+        return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this );
762 762
     }
763 763
 
764 764
 
@@ -778,17 +778,17 @@  discard block
 block discarded – undo
778 778
     public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) {
779 779
 
780 780
         // In case we have validated the form, use it to inject the validation results into the form render
781
-        if( isset( $this->form_after_validation ) ) {
781
+        if ( isset( $this->form_after_validation ) ) {
782 782
             $form = $this->form_after_validation;
783 783
         } else {
784
-            $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id );
784
+            $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id );
785 785
         }
786 786
 
787 787
         $form = $this->filter_conditional_logic( $form );
788 788
 
789 789
         // for now we don't support Save and Continue feature.
790
-        if( ! self::$supports_save_and_continue ) {
791
-	        unset( $form['save'] );
790
+        if ( ! self::$supports_save_and_continue ) {
791
+	        unset( $form[ 'save' ] );
792 792
         }
793 793
 
794 794
         return $form;
@@ -809,29 +809,29 @@  discard block
 block discarded – undo
809 809
      */
810 810
     function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) {
811 811
 
812
-        if( GFCommon::is_post_field( $field ) ) {
812
+        if ( GFCommon::is_post_field( $field ) ) {
813 813
 
814 814
             $message = null;
815 815
 
816 816
             // First, make sure they have the capability to edit the post.
817
-            if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) {
817
+            if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) {
818 818
 
819 819
                 /**
820 820
                  * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post
821 821
                  * @param string $message The existing "You don't have permission..." text
822 822
                  */
823
-                $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don&rsquo;t have permission to edit this post.', 'gravityview') );
823
+                $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don&rsquo;t have permission to edit this post.', 'gravityview' ) );
824 824
 
825
-            } elseif( null === get_post( $this->entry['post_id'] ) ) {
825
+            } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) {
826 826
                 /**
827 827
                  * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists
828 828
                  * @param string $message The existing "This field is not editable; the post no longer exists." text
829 829
                  */
830
-                $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) );
830
+                $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) );
831 831
             }
832 832
 
833
-            if( $message ) {
834
-                $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
833
+            if ( $message ) {
834
+                $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) );
835 835
             }
836 836
         }
837 837
 
@@ -856,8 +856,8 @@  discard block
 block discarded – undo
856 856
 
857 857
         // If the form has been submitted, then we don't need to pre-fill the values,
858 858
         // Except for fileupload type and when a field input is overridden- run always!!
859
-        if(
860
-            ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
859
+        if (
860
+            ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) )
861 861
             && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) )
862 862
             || ! empty( $field_content )
863 863
             || GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable
@@ -866,8 +866,8 @@  discard block
 block discarded – undo
866 866
         }
867 867
 
868 868
         // Turn on Admin-style display for file upload fields only
869
-        if( 'fileupload' === $field->type ) {
870
-            $_GET['page'] = 'gf_entries';
869
+        if ( 'fileupload' === $field->type ) {
870
+            $_GET[ 'page' ] = 'gf_entries';
871 871
         }
872 872
 
873 873
         // SET SOME FIELD DEFAULTS TO PREVENT ISSUES
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 	    // Prevent any PHP warnings, like undefined index
892 892
 	    ob_start();
893 893
 
894
-        if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
894
+        if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) {
895 895
             $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field );
896 896
         } else {
897 897
 	        $return = $field->get_field_input( $this->form, $field_value, $this->entry );
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 	    // If there was output, it's an error
902 902
 	    $warnings = ob_get_clean();
903 903
 
904
-	    if( !empty( $warnings ) ) {
904
+	    if ( ! empty( $warnings ) ) {
905 905
 		    do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value );
906 906
 	    }
907 907
 
@@ -910,7 +910,7 @@  discard block
 block discarded – undo
910 910
          * We need the fileupload html field to render with the proper id
911 911
          *  ( <li id="field_80_16" ... > )
912 912
          */
913
-        unset( $_GET['page'] );
913
+        unset( $_GET[ 'page' ] );
914 914
 
915 915
         return $return;
916 916
     }
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
         $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field );
934 934
 
935 935
         // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs)
936
-        if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) {
936
+        if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) {
937 937
 
938 938
             $field_value = array();
939 939
 
@@ -942,10 +942,10 @@  discard block
 block discarded – undo
942 942
 
943 943
             foreach ( (array)$field->inputs as $input ) {
944 944
 
945
-                $input_id = strval( $input['id'] );
945
+                $input_id = strval( $input[ 'id' ] );
946 946
                 
947 947
                 if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) {
948
-                    $field_value[ $input_id ] =  'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
948
+                    $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ];
949 949
                     $allow_pre_populated = false;
950 950
                 }
951 951
 
@@ -953,7 +953,7 @@  discard block
 block discarded – undo
953 953
 
954 954
             $pre_value = $field->get_value_submission( array(), false );
955 955
 
956
-            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
956
+            $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value;
957 957
 
958 958
         } else {
959 959
 
@@ -964,13 +964,13 @@  discard block
 block discarded – undo
964 964
 
965 965
             // saved field entry value (if empty, fallback to the pre-populated value, if exists)
966 966
             // or pre-populated value if not empty and set to override saved value
967
-            $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
967
+            $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value;
968 968
 
969 969
             // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs.
970
-            if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) {
970
+            if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) {
971 971
                 $categories = array();
972 972
                 foreach ( explode( ',', $field_value ) as $cat_string ) {
973
-                    $categories[] = GFCommon::format_post_category( $cat_string, true );
973
+                    $categories[ ] = GFCommon::format_post_category( $cat_string, true );
974 974
                 }
975 975
                 $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories );
976 976
             }
@@ -995,12 +995,12 @@  discard block
 block discarded – undo
995 995
      */
996 996
     function gform_pre_validation( $form ) {
997 997
 
998
-        if( ! $this->verify_nonce() ) {
998
+        if ( ! $this->verify_nonce() ) {
999 999
             return $form;
1000 1000
         }
1001 1001
 
1002 1002
         // Fix PHP warning regarding undefined index.
1003
-        foreach ( $form['fields'] as &$field) {
1003
+        foreach ( $form[ 'fields' ] as &$field ) {
1004 1004
 
1005 1005
             // This is because we're doing admin form pretending to be front-end, so Gravity Forms
1006 1006
             // expects certain field array items to be set.
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
                 $field['emailConfirmEnabled'] = '';
1014 1014
             }*/
1015 1015
 
1016
-            switch( RGFormsModel::get_input_type( $field ) ) {
1016
+            switch ( RGFormsModel::get_input_type( $field ) ) {
1017 1017
 
1018 1018
                 /**
1019 1019
                  * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend.
@@ -1027,37 +1027,37 @@  discard block
 block discarded – undo
1027 1027
                     // Set the previous value
1028 1028
                     $entry = $this->get_entry();
1029 1029
 
1030
-                    $input_name = 'input_'.$field->id;
1031
-                    $form_id = $form['id'];
1030
+                    $input_name = 'input_' . $field->id;
1031
+                    $form_id = $form[ 'id' ];
1032 1032
 
1033 1033
                     $value = NULL;
1034 1034
 
1035 1035
                     // Use the previous entry value as the default.
1036
-                    if( isset( $entry[ $field->id ] ) ) {
1036
+                    if ( isset( $entry[ $field->id ] ) ) {
1037 1037
                         $value = $entry[ $field->id ];
1038 1038
                     }
1039 1039
 
1040 1040
                     // If this is a single upload file
1041
-                    if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) {
1042
-                        $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] );
1043
-                        $value = $file_path['url'];
1041
+                    if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) {
1042
+                        $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] );
1043
+                        $value = $file_path[ 'url' ];
1044 1044
 
1045 1045
                     } else {
1046 1046
 
1047 1047
                         // Fix PHP warning on line 1498 of form_display.php for post_image fields
1048 1048
                         // Fix PHP Notice:  Undefined index:  size in form_display.php on line 1511
1049
-                        $_FILES[ $input_name ] = array('name' => '', 'size' => '' );
1049
+                        $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' );
1050 1050
 
1051 1051
                     }
1052 1052
 
1053
-                    if( rgar($field, "multipleFiles") ) {
1053
+                    if ( rgar( $field, "multipleFiles" ) ) {
1054 1054
 
1055 1055
                         // If there are fresh uploads, process and merge them.
1056 1056
                         // Otherwise, use the passed values, which should be json-encoded array of URLs
1057
-                        if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) {
1057
+                        if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
1058 1058
                             $value = empty( $value ) ? '[]' : $value;
1059 1059
                             $value = stripslashes_deep( $value );
1060
-                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array());
1060
+                            $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() );
1061 1061
                         }
1062 1062
 
1063 1063
                     } else {
@@ -1075,14 +1075,14 @@  discard block
 block discarded – undo
1075 1075
 
1076 1076
                 case 'number':
1077 1077
                     // Fix "undefined index" issue at line 1286 in form_display.php
1078
-                    if( !isset( $_POST['input_'.$field->id ] ) ) {
1079
-                        $_POST['input_'.$field->id ] = NULL;
1078
+                    if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) {
1079
+                        $_POST[ 'input_' . $field->id ] = NULL;
1080 1080
                     }
1081 1081
                     break;
1082 1082
                 case 'captcha':
1083 1083
                     // Fix issue with recaptcha_check_answer() on line 1458 in form_display.php
1084
-                    $_POST['recaptcha_challenge_field'] = NULL;
1085
-                    $_POST['recaptcha_response_field'] = NULL;
1084
+                    $_POST[ 'recaptcha_challenge_field' ] = NULL;
1085
+                    $_POST[ 'recaptcha_response_field' ] = NULL;
1086 1086
                     break;
1087 1087
             }
1088 1088
 
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
1111 1111
          * You can enter whatever you want!
1112 1112
          * We try validating, and customize the results using `self::custom_validation()`
1113 1113
          */
1114
-        add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4);
1114
+        add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 );
1115 1115
 
1116 1116
         // Needed by the validate funtion
1117 1117
         $failed_validation_page = NULL;
@@ -1119,14 +1119,14 @@  discard block
 block discarded – undo
1119 1119
 
1120 1120
         // Prevent entry limit from running when editing an entry, also
1121 1121
         // prevent form scheduling from preventing editing
1122
-        unset( $this->form['limitEntries'], $this->form['scheduleForm'] );
1122
+        unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] );
1123 1123
 
1124 1124
         // Hide fields depending on Edit Entry settings
1125
-        $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1125
+        $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id );
1126 1126
 
1127 1127
         $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page );
1128 1128
 
1129
-        remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 );
1129
+        remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 );
1130 1130
     }
1131 1131
 
1132 1132
 
@@ -1143,13 +1143,13 @@  discard block
 block discarded – undo
1143 1143
      */
1144 1144
     function custom_validation( $validation_results ) {
1145 1145
 
1146
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1146
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results );
1147 1147
 
1148
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1148
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) );
1149 1149
 
1150 1150
         $gv_valid = true;
1151 1151
 
1152
-        foreach ( $validation_results['form']['fields'] as $key => &$field ) {
1152
+        foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) {
1153 1153
 
1154 1154
             $value = RGFormsModel::get_field_value( $field );
1155 1155
             $field_type = RGFormsModel::get_input_type( $field );
@@ -1162,35 +1162,35 @@  discard block
 block discarded – undo
1162 1162
                 case 'post_image':
1163 1163
 
1164 1164
                     // in case nothing is uploaded but there are already files saved
1165
-                    if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) {
1165
+                    if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) {
1166 1166
                         $field->failed_validation = false;
1167 1167
                         unset( $field->validation_message );
1168 1168
                     }
1169 1169
 
1170 1170
                     // validate if multi file upload reached max number of files [maxFiles] => 2
1171
-                    if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) {
1171
+                    if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) {
1172 1172
 
1173 1173
                         $input_name = 'input_' . $field->id;
1174 1174
                         //uploaded
1175
-                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array();
1175
+                        $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array();
1176 1176
 
1177 1177
                         //existent
1178 1178
                         $entry = $this->get_entry();
1179 1179
                         $value = NULL;
1180
-                        if( isset( $entry[ $field->id ] ) ) {
1180
+                        if ( isset( $entry[ $field->id ] ) ) {
1181 1181
                             $value = json_decode( $entry[ $field->id ], true );
1182 1182
                         }
1183 1183
 
1184 1184
                         // count uploaded files and existent entry files
1185 1185
                         $count_files = count( $file_names ) + count( $value );
1186 1186
 
1187
-                        if( $count_files > $field->maxFiles ) {
1187
+                        if ( $count_files > $field->maxFiles ) {
1188 1188
                             $field->validation_message = __( 'Maximum number of files reached', 'gravityview' );
1189 1189
                             $field->failed_validation = 1;
1190 1190
                             $gv_valid = false;
1191 1191
 
1192 1192
                             // in case of error make sure the newest upload files are removed from the upload input
1193
-                            GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null;
1193
+                            GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null;
1194 1194
                         }
1195 1195
 
1196 1196
                     }
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
             }
1202 1202
 
1203 1203
             // This field has failed validation.
1204
-            if( !empty( $field->failed_validation ) ) {
1204
+            if ( ! empty( $field->failed_validation ) ) {
1205 1205
 
1206 1206
                 do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) );
1207 1207
 
@@ -1219,32 +1219,32 @@  discard block
 block discarded – undo
1219 1219
                 }
1220 1220
 
1221 1221
                 // You can't continue inside a switch, so we do it after.
1222
-                if( empty( $field->failed_validation ) ) {
1222
+                if ( empty( $field->failed_validation ) ) {
1223 1223
                     continue;
1224 1224
                 }
1225 1225
 
1226 1226
                 // checks if the No Duplicates option is not validating entry against itself, since
1227 1227
                 // we're editing a stored entry, it would also assume it's a duplicate.
1228
-                if( !empty( $field->noDuplicates ) ) {
1228
+                if ( ! empty( $field->noDuplicates ) ) {
1229 1229
 
1230 1230
                     $entry = $this->get_entry();
1231 1231
 
1232 1232
                     // If the value of the entry is the same as the stored value
1233 1233
                     // Then we can assume it's not a duplicate, it's the same.
1234
-                    if( !empty( $entry ) && $value == $entry[ $field->id ] ) {
1234
+                    if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) {
1235 1235
                         //if value submitted was not changed, then don't validate
1236 1236
                         $field->failed_validation = false;
1237 1237
 
1238 1238
                         unset( $field->validation_message );
1239 1239
 
1240
-                        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1240
+                        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry );
1241 1241
 
1242 1242
                         continue;
1243 1243
                     }
1244 1244
                 }
1245 1245
 
1246 1246
                 // if here then probably we are facing the validation 'At least one field must be filled out'
1247
-                if( GFFormDisplay::is_empty( $field, $this->form_id  ) && empty( $field->isRequired ) ) {
1247
+                if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) {
1248 1248
                     unset( $field->validation_message );
1249 1249
 	                $field->validation_message = false;
1250 1250
                     continue;
@@ -1256,12 +1256,12 @@  discard block
 block discarded – undo
1256 1256
 
1257 1257
         }
1258 1258
 
1259
-        $validation_results['is_valid'] = $gv_valid;
1259
+        $validation_results[ 'is_valid' ] = $gv_valid;
1260 1260
 
1261
-        do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1261
+        do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results );
1262 1262
 
1263 1263
         // We'll need this result when rendering the form ( on GFFormDisplay::get_form )
1264
-        $this->form_after_validation = $validation_results['form'];
1264
+        $this->form_after_validation = $validation_results[ 'form' ];
1265 1265
 
1266 1266
         return $validation_results;
1267 1267
     }
@@ -1274,7 +1274,7 @@  discard block
 block discarded – undo
1274 1274
      */
1275 1275
     private function get_entry() {
1276 1276
 
1277
-        if( empty( $this->entry ) ) {
1277
+        if ( empty( $this->entry ) ) {
1278 1278
             // Get the database value of the entry that's being edited
1279 1279
             $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() );
1280 1280
         }
@@ -1301,13 +1301,13 @@  discard block
 block discarded – undo
1301 1301
         $properties = GravityView_View_Data::getInstance()->get_fields( $view_id );
1302 1302
 
1303 1303
         // If edit tab not yet configured, show all fields
1304
-        $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL;
1304
+        $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL;
1305 1305
 
1306 1306
 	    // Show hidden fields as text fields
1307 1307
 	    $form = $this->fix_hidden_fields( $form );
1308 1308
 
1309 1309
         // Hide fields depending on admin settings
1310
-        $fields = $this->filter_fields( $form['fields'], $edit_fields );
1310
+        $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields );
1311 1311
 
1312 1312
 	    // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't.
1313 1313
 	    $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id );
@@ -1325,11 +1325,11 @@  discard block
 block discarded – undo
1325 1325
 	private function fix_hidden_fields( $form ) {
1326 1326
 
1327 1327
 		/** @var GF_Field $field */
1328
-		foreach( $form['fields'] as $key => $field ) {
1329
-			if( 'hidden' === $field->type ) {
1328
+		foreach ( $form[ 'fields' ] as $key => $field ) {
1329
+			if ( 'hidden' === $field->type ) {
1330 1330
 				$text_field = new GF_Field_Text( $field );
1331 1331
 				$text_field->type = 'text';
1332
-				$form['fields'][ $key ] = $text_field;
1332
+				$form[ 'fields' ][ $key ] = $text_field;
1333 1333
 			}
1334 1334
 		}
1335 1335
 
@@ -1350,7 +1350,7 @@  discard block
 block discarded – undo
1350 1350
      */
1351 1351
     private function filter_fields( $fields, $configured_fields ) {
1352 1352
 
1353
-        if( empty( $fields ) || !is_array( $fields ) ) {
1353
+        if ( empty( $fields ) || ! is_array( $fields ) ) {
1354 1354
             return $fields;
1355 1355
         }
1356 1356
 
@@ -1367,13 +1367,13 @@  discard block
 block discarded – undo
1367 1367
 	     */
1368 1368
 	    $hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) );
1369 1369
 
1370
-	    if( $hide_product_fields ) {
1371
-		    $field_type_blacklist[] = 'option';
1372
-		    $field_type_blacklist[] = 'quantity';
1373
-            $field_type_blacklist[] = 'product';
1374
-            $field_type_blacklist[] = 'total';
1375
-            $field_type_blacklist[] = 'shipping';
1376
-            $field_type_blacklist[] = 'calculation';
1370
+	    if ( $hide_product_fields ) {
1371
+		    $field_type_blacklist[ ] = 'option';
1372
+		    $field_type_blacklist[ ] = 'quantity';
1373
+            $field_type_blacklist[ ] = 'product';
1374
+            $field_type_blacklist[ ] = 'total';
1375
+            $field_type_blacklist[ ] = 'shipping';
1376
+            $field_type_blacklist[ ] = 'calculation';
1377 1377
 	    }
1378 1378
 
1379 1379
         // First, remove blacklist or calculation fields
@@ -1381,18 +1381,18 @@  discard block
 block discarded – undo
1381 1381
 
1382 1382
             // Remove the fields that have calculation properties and keep them to be used later
1383 1383
             // @since 1.16.2
1384
-            if( $field->has_calculation() || 'number' === $field->type ) {
1385
-                $this->fields_with_calculation[] = $field;
1384
+            if ( $field->has_calculation() || 'number' === $field->type ) {
1385
+                $this->fields_with_calculation[ ] = $field;
1386 1386
                 unset( $fields[ $key ] );
1387 1387
             }
1388 1388
 
1389
-            if( in_array( $field->type, $field_type_blacklist ) ) {
1389
+            if ( in_array( $field->type, $field_type_blacklist ) ) {
1390 1390
                 unset( $fields[ $key ] );
1391 1391
             }
1392 1392
         }
1393 1393
 
1394 1394
         // The Edit tab has not been configured, so we return all fields by default.
1395
-        if( empty( $configured_fields ) ) {
1395
+        if ( empty( $configured_fields ) ) {
1396 1396
             return $fields;
1397 1397
         }
1398 1398
 
@@ -1402,8 +1402,8 @@  discard block
 block discarded – undo
1402 1402
 	        /** @var GF_Field $field */
1403 1403
 	        foreach ( $fields as $field ) {
1404 1404
 
1405
-                if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1406
-                    $edit_fields[] = $this->merge_field_properties( $field, $configured_field );
1405
+                if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) {
1406
+                    $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field );
1407 1407
                     break;
1408 1408
                 }
1409 1409
 
@@ -1426,14 +1426,14 @@  discard block
 block discarded – undo
1426 1426
 
1427 1427
         $return_field = $field;
1428 1428
 
1429
-        if( empty( $field_setting['show_label'] ) ) {
1429
+        if ( empty( $field_setting[ 'show_label' ] ) ) {
1430 1430
             $return_field->label = '';
1431
-        } elseif ( !empty( $field_setting['custom_label'] ) ) {
1432
-            $return_field->label = $field_setting['custom_label'];
1431
+        } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) {
1432
+            $return_field->label = $field_setting[ 'custom_label' ];
1433 1433
         }
1434 1434
 
1435
-        if( !empty( $field_setting['custom_class'] ) ) {
1436
-            $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] );
1435
+        if ( ! empty( $field_setting[ 'custom_class' ] ) ) {
1436
+            $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] );
1437 1437
         }
1438 1438
 
1439 1439
         /**
@@ -1471,16 +1471,16 @@  discard block
 block discarded – undo
1471 1471
 	     */
1472 1472
 	    $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id );
1473 1473
 
1474
-	    if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) {
1475
-            foreach( $fields as $k => $field ) {
1476
-                if( $field->adminOnly ) {
1474
+	    if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) {
1475
+            foreach ( $fields as $k => $field ) {
1476
+                if ( $field->adminOnly ) {
1477 1477
                     unset( $fields[ $k ] );
1478 1478
                 }
1479 1479
             }
1480 1480
             return $fields;
1481 1481
         }
1482 1482
 
1483
-	    foreach( $fields as &$field ) {
1483
+	    foreach ( $fields as &$field ) {
1484 1484
 		    $field->adminOnly = false;
1485 1485
         }
1486 1486
 
@@ -1507,16 +1507,16 @@  discard block
 block discarded – undo
1507 1507
          */
1508 1508
         $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form );
1509 1509
 
1510
-        if( $use_conditional_logic ) {
1510
+        if ( $use_conditional_logic ) {
1511 1511
             return $form;
1512 1512
         }
1513 1513
 
1514
-        foreach( $form['fields'] as &$field ) {
1514
+        foreach ( $form[ 'fields' ] as &$field ) {
1515 1515
             /* @var GF_Field $field */
1516 1516
             $field->conditionalLogic = null;
1517 1517
         }
1518 1518
 
1519
-        unset( $form['button']['conditionalLogic'] );
1519
+        unset( $form[ 'button' ][ 'conditionalLogic' ] );
1520 1520
 
1521 1521
         return $form;
1522 1522
 
@@ -1533,7 +1533,7 @@  discard block
 block discarded – undo
1533 1533
      */
1534 1534
     function manage_conditional_logic( $has_conditional_logic, $form ) {
1535 1535
 
1536
-        if( ! $this->is_edit_entry() ) {
1536
+        if ( ! $this->is_edit_entry() ) {
1537 1537
             return $has_conditional_logic;
1538 1538
         }
1539 1539
 
@@ -1564,44 +1564,44 @@  discard block
 block discarded – undo
1564 1564
          *  2. There are two entries embedded using oEmbed
1565 1565
          *  3. One of the entries has just been saved
1566 1566
          */
1567
-        if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) {
1567
+        if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) {
1568 1568
 
1569 1569
             $error = true;
1570 1570
 
1571 1571
         }
1572 1572
 
1573
-        if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) {
1573
+        if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) {
1574 1574
 
1575 1575
             $error = true;
1576 1576
 
1577
-        } elseif( ! $this->verify_nonce() ) {
1577
+        } elseif ( ! $this->verify_nonce() ) {
1578 1578
 
1579 1579
             /**
1580 1580
              * If the Entry is embedded, there may be two entries on the same page.
1581 1581
              * If that's the case, and one is being edited, the other should fail gracefully and not display an error.
1582 1582
              */
1583
-            if( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1583
+            if ( GravityView_oEmbed::getInstance()->get_entry_id() ) {
1584 1584
                 $error = true;
1585 1585
             } else {
1586
-                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview');
1586
+                $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' );
1587 1587
             }
1588 1588
 
1589 1589
         }
1590 1590
 
1591
-        if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1592
-            $error = __( 'You do not have permission to edit this entry.', 'gravityview');
1591
+        if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) {
1592
+            $error = __( 'You do not have permission to edit this entry.', 'gravityview' );
1593 1593
         }
1594 1594
 
1595
-        if( $this->entry['status'] === 'trash' ) {
1596
-            $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' );
1595
+        if ( $this->entry[ 'status' ] === 'trash' ) {
1596
+            $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' );
1597 1597
         }
1598 1598
 
1599 1599
         // No errors; everything's fine here!
1600
-        if( empty( $error ) ) {
1600
+        if ( empty( $error ) ) {
1601 1601
             return true;
1602 1602
         }
1603 1603
 
1604
-        if( $echo && $error !== true ) {
1604
+        if ( $echo && $error !== true ) {
1605 1605
 
1606 1606
 	        $error = esc_html( $error );
1607 1607
 
@@ -1609,13 +1609,13 @@  discard block
 block discarded – undo
1609 1609
 	         * @since 1.9
1610 1610
 	         */
1611 1611
 	        if ( ! empty( $this->entry ) ) {
1612
-		        $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
1612
+		        $error .= ' ' . gravityview_get_link( '#', _x( 'Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) );
1613 1613
 	        }
1614 1614
 
1615
-            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error');
1615
+            echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' );
1616 1616
         }
1617 1617
 
1618
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1618
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error );
1619 1619
 
1620 1620
         return false;
1621 1621
     }
@@ -1632,20 +1632,20 @@  discard block
 block discarded – undo
1632 1632
 
1633 1633
         $error = NULL;
1634 1634
 
1635
-        if( ! $this->check_user_cap_edit_field( $field ) ) {
1636
-            $error = __( 'You do not have permission to edit this field.', 'gravityview');
1635
+        if ( ! $this->check_user_cap_edit_field( $field ) ) {
1636
+            $error = __( 'You do not have permission to edit this field.', 'gravityview' );
1637 1637
         }
1638 1638
 
1639 1639
         // No errors; everything's fine here!
1640
-        if( empty( $error ) ) {
1640
+        if ( empty( $error ) ) {
1641 1641
             return true;
1642 1642
         }
1643 1643
 
1644
-        if( $echo ) {
1645
-            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error');
1644
+        if ( $echo ) {
1645
+            echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' );
1646 1646
         }
1647 1647
 
1648
-        do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1648
+        do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error );
1649 1649
 
1650 1650
         return false;
1651 1651
 
@@ -1663,15 +1663,15 @@  discard block
 block discarded – undo
1663 1663
     private function check_user_cap_edit_field( $field ) {
1664 1664
 
1665 1665
         // If they can edit any entries (as defined in Gravity Forms), we're good.
1666
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1666
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) {
1667 1667
             return true;
1668 1668
         }
1669 1669
 
1670
-        $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false;
1670
+        $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false;
1671 1671
 
1672 1672
         // If the field has custom editing capaibilities set, check those
1673
-        if( $field_cap ) {
1674
-            return GVCommon::has_cap( $field['allow_edit_cap'] );
1673
+        if ( $field_cap ) {
1674
+            return GVCommon::has_cap( $field[ 'allow_edit_cap' ] );
1675 1675
         }
1676 1676
 
1677 1677
         return false;
@@ -1685,17 +1685,17 @@  discard block
 block discarded – undo
1685 1685
     public function verify_nonce() {
1686 1686
 
1687 1687
         // Verify form submitted for editing single
1688
-        if( $this->is_edit_entry_submission() ) {
1688
+        if ( $this->is_edit_entry_submission() ) {
1689 1689
             $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field );
1690 1690
         }
1691 1691
 
1692 1692
         // Verify
1693
-        else if( ! $this->is_edit_entry() ) {
1693
+        else if ( ! $this->is_edit_entry() ) {
1694 1694
             $valid = false;
1695 1695
         }
1696 1696
 
1697 1697
         else {
1698
-            $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key );
1698
+            $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key );
1699 1699
         }
1700 1700
 
1701 1701
         /**
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( 'Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'includes/lib/class-gamajo-template-loader.php' );
21 21
 }
22 22
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 			'atts'	  => NULL,
158 158
 		) );
159 159
 
160
-		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
160
+		foreach ( $atts as $key => $value ) {
161
+			if ( is_null( $value ) ) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 */
190 190
 	static function getInstance( $passed_post = NULL ) {
191 191
 
192
-		if( empty( self::$instance ) ) {
192
+		if ( empty( self::$instance ) ) {
193 193
 			self::$instance = new self( $passed_post );
194 194
 		}
195 195
 
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public function getCurrentField( $key = NULL ) {
204 204
 
205
-		if( !empty( $key ) ) {
206
-			if( isset( $this->_current_field[ $key ] ) ) {
205
+		if ( ! empty( $key ) ) {
206
+			if ( isset( $this->_current_field[ $key ] ) ) {
207 207
 				return $this->_current_field[ $key ];
208 208
 			}
209 209
 			return NULL;
@@ -214,16 +214,16 @@  discard block
 block discarded – undo
214 214
 
215 215
 	public function setCurrentFieldSetting( $key, $value ) {
216 216
 
217
-		if( !empty( $this->_current_field ) ) {
218
-			$this->_current_field['field_settings'][ $key ] = $value;
217
+		if ( ! empty( $this->_current_field ) ) {
218
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
219 219
 		}
220 220
 
221 221
 	}
222 222
 
223 223
 	public function getCurrentFieldSetting( $key ) {
224
-		$settings = $this->getCurrentField('field_settings');
224
+		$settings = $this->getCurrentField( 'field_settings' );
225 225
 
226
-		if( $settings && !empty( $settings[ $key ] ) ) {
226
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
227 227
 			return $settings[ $key ];
228 228
 		}
229 229
 
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 	 */
255 255
 	public function getAtts( $key = NULL ) {
256 256
 
257
-		if( !empty( $key ) ) {
258
-			if( isset( $this->atts[ $key ] ) ) {
257
+		if ( ! empty( $key ) ) {
258
+			if ( isset( $this->atts[ $key ] ) ) {
259 259
 				return $this->atts[ $key ];
260 260
 			}
261 261
 			return NULL;
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
323 323
 
324
-		if( $fields && !empty( $key ) ) {
324
+		if ( $fields && ! empty( $key ) ) {
325 325
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
326 326
 		}
327 327
 
@@ -341,8 +341,8 @@  discard block
 block discarded – undo
341 341
 	 */
342 342
 	public function getField( $key ) {
343 343
 
344
-		if( !empty( $key ) ) {
345
-			if( isset( $this->fields[ $key ] ) ) {
344
+		if ( ! empty( $key ) ) {
345
+			if ( isset( $this->fields[ $key ] ) ) {
346 346
 				return $this->fields[ $key ];
347 347
 			}
348 348
 		}
@@ -442,8 +442,8 @@  discard block
 block discarded – undo
442 442
 	public function getPaginationCounts() {
443 443
 
444 444
 		$paging = $this->getPaging();
445
-		$offset = $paging['offset'];
446
-		$page_size = $paging['page_size'];
445
+		$offset = $paging[ 'offset' ];
446
+		$page_size = $paging[ 'page_size' ];
447 447
 		$total = $this->getTotalEntries();
448 448
 
449 449
 		if ( empty( $total ) ) {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		 */
465 465
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
466 466
 
467
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
467
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
468 468
 	}
469 469
 
470 470
 	/**
@@ -548,16 +548,16 @@  discard block
 block discarded – undo
548 548
 	 */
549 549
 	public function getCurrentEntry() {
550 550
 
551
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
551
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
552 552
 			$entries = $this->getEntries();
553
-			$entry = $entries[0];
553
+			$entry = $entries[ 0 ];
554 554
 		} else {
555 555
 			$entry = $this->_current_entry;
556 556
 		}
557 557
 
558 558
 		/** @since 1.16 Fixes DataTables empty entry issue */
559
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
560
-			$entry = $this->_current_field['entry'];
559
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
560
+			$entry = $this->_current_field[ 'entry' ];
561 561
 		}
562 562
 
563 563
 		return $entry;
@@ -591,8 +591,8 @@  discard block
 block discarded – undo
591 591
 	 */
592 592
 	public function renderZone( $zone = '', $atts = array() ) {
593 593
 
594
-		if( empty( $zone ) ) {
595
-			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
594
+		if ( empty( $zone ) ) {
595
+			do_action( 'gravityview_log_error', 'GravityView_View[renderZone] No zone defined.' );
596 596
 			return NULL;
597 597
 		}
598 598
 
@@ -601,33 +601,33 @@  discard block
 block discarded – undo
601 601
 			'context' => $this->getContext(),
602 602
 			'entry' => $this->getCurrentEntry(),
603 603
 			'form' => $this->getForm(),
604
-			'hide_empty' => $this->getAtts('hide_empty'),
604
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
605 605
 		);
606 606
 
607 607
 		$final_atts = wp_parse_args( $atts, $defaults );
608 608
 
609 609
 		$output = '';
610 610
 
611
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
611
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
612 612
 
613
-		$fields = $this->getField( $final_atts['zone_id'] );
613
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
614 614
 
615 615
 		// Backward compatibility
616
-		if( 'table' === $this->getTemplatePartSlug() ) {
616
+		if ( 'table' === $this->getTemplatePartSlug() ) {
617 617
 			/**
618 618
 			 * Modify the fields displayed in the table
619 619
 			 * @var array
620 620
 			 */
621
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
621
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
622 622
 		}
623 623
 
624
-		if( empty( $fields ) ) {
624
+		if ( empty( $fields ) ) {
625 625
 			return NULL;
626 626
 		}
627 627
 
628 628
 		$field_output = '';
629 629
 		foreach ( $fields as $field ) {
630
-			$final_atts['field'] = $field;
630
+			$final_atts[ 'field' ] = $field;
631 631
 
632 632
 			$field_output .= gravityview_field_output( $final_atts );
633 633
 		}
@@ -638,17 +638,17 @@  discard block
 block discarded – undo
638 638
 		 * @since 1.7.6
639 639
 		 * @param boolean $hide_empty_zone Default: false
640 640
 		 */
641
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
641
+		if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
642 642
 			return NULL;
643 643
 		}
644 644
 
645
-		if( !empty( $final_atts['wrapper_class'] ) ) {
646
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
645
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
646
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
647 647
 		}
648 648
 
649 649
 		$output .= $field_output;
650 650
 
651
-		if( !empty( $final_atts['wrapper_class'] ) ) {
651
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
652 652
 			$output .= '</div>';
653 653
 		}
654 654
 
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 	 */
669 669
 	function locate_template( $template_names, $load = false, $require_once = true ) {
670 670
 
671
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
671
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
672 672
 
673 673
 			$located = $this->located_templates[ $template_names ];
674 674
 
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 			// Set $load to always false so we handle it here.
678 678
 			$located = parent::locate_template( $template_names, false, $require_once );
679 679
 
680
-			if( is_string( $template_names ) ) {
680
+			if ( is_string( $template_names ) ) {
681 681
 				$this->located_templates[ $template_names ] = $located;
682 682
 			}
683 683
 		}
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 	 * @return mixed|null    The stored data.
696 696
 	 */
697 697
 	public function __get( $name ) {
698
-		if( isset( $this->{$name} ) ) {
698
+		if ( isset( $this->{$name} ) ) {
699 699
 			return $this->{$name};
700 700
 		} else {
701 701
 			return NULL;
@@ -724,15 +724,15 @@  discard block
 block discarded – undo
724 724
 		$additional = array();
725 725
 
726 726
 		// form-19-table-body.php
727
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
727
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
728 728
 
729 729
 		// view-3-table-body.php
730
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
730
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
731 731
 
732
-		if( $this->getPostId() ) {
732
+		if ( $this->getPostId() ) {
733 733
 
734 734
 			// page-19-table-body.php
735
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
735
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
736 736
 		}
737 737
 
738 738
 		// Combine with existing table-body.php and table.php
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
 
755 755
 		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
756 756
 
757
-		if( !empty( $template_file) ) {
757
+		if ( ! empty( $template_file ) ) {
758 758
 
759 759
 			if ( $require_once ) {
760 760
 				require_once( $template_file );
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
 	 */
772 772
 	public function render_widget_hooks( $view_id ) {
773 773
 
774
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
774
+		if ( empty( $view_id ) || 'single' == gravityview_get_context() ) {
775 775
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
776 776
 			return;
777 777
 		}
@@ -779,9 +779,9 @@  discard block
 block discarded – undo
779 779
 		$view_data = gravityview_get_current_view_data( $view_id );
780 780
 
781 781
 		// get View widget configuration
782
-		$widgets = (array)$view_data['widgets'];
782
+		$widgets = (array)$view_data[ 'widgets' ];
783 783
 
784
-		switch( current_filter() ) {
784
+		switch ( current_filter() ) {
785 785
 			default:
786 786
 			case 'gravityview_before':
787 787
 				$zone = 'header';
@@ -795,9 +795,9 @@  discard block
 block discarded – undo
795 795
 		 * Filter widgets not in the current zone
796 796
 		 * @since 1.16
797 797
 		 */
798
-		foreach( $widgets as $key => $widget ) {
798
+		foreach ( $widgets as $key => $widget ) {
799 799
 			// The widget isn't in the current zone
800
-			if( false === strpos( $key, $zone ) ) {
800
+			if ( false === strpos( $key, $zone ) ) {
801 801
 				unset( $widgets[ $key ] );
802 802
 			}
803 803
 		}
@@ -812,8 +812,8 @@  discard block
 block discarded – undo
812 812
 		}
813 813
 
814 814
 		// Prevent being called twice
815
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
816
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
815
+		if ( did_action( $zone . '_' . $view_id . '_widgets' ) ) {
816
+			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__, $zone . '_' . $view_id . '_widgets' ) );
817 817
 			return;
818 818
 		}
819 819
 
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
 		 * @param string $zone Current widget zone, either `header` or `footer`
830 830
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
831 831
 		 */
832
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', 'gv-grid gv-widgets-' . $zone, $zone, $widgets );
832
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', 'gv-grid gv-widgets-' . $zone, $zone, $widgets );
833 833
 
834 834
 		$css_class = gravityview_sanitize_html_class( $css_class );
835 835
 
@@ -837,17 +837,17 @@  discard block
 block discarded – undo
837 837
 		?>
838 838
 		<div class="<?php echo $css_class; ?>">
839 839
 			<?php
840
-			foreach( $rows as $row ) {
841
-				foreach( $row as $col => $areas ) {
842
-					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
840
+			foreach ( $rows as $row ) {
841
+				foreach ( $row as $col => $areas ) {
842
+					$column = ( $col == '2-2' ) ? '1-2 gv-right' : $col . ' gv-left';
843 843
 				?>
844 844
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
845 845
 						<?php
846
-						if( !empty( $areas ) ) {
847
-							foreach( $areas as $area ) {
848
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
849
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
850
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
846
+						if ( ! empty( $areas ) ) {
847
+							foreach ( $areas as $area ) {
848
+								if ( ! empty( $widgets[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
849
+									foreach ( $widgets[ $zone . '_' . $area[ 'areaid' ] ] as $widget ) {
850
+										do_action( "gravityview_render_widget_{$widget[ 'id' ]}", $widget );
851 851
 									}
852 852
 								}
853 853
 							}
@@ -863,8 +863,8 @@  discard block
 block discarded – undo
863 863
 		 * Prevent widgets from being called twice.
864 864
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
865 865
 		 */
866
-		if( did_action( 'loop_start' ) ) {
867
-			do_action( $zone.'_'.$view_id.'_widgets' );
866
+		if ( did_action( 'loop_start' ) ) {
867
+			do_action( $zone . '_' . $view_id . '_widgets' );
868 868
 		}
869 869
 	}
870 870
 
Please login to merge, or discard this patch.
includes/class-frontend-views.php 1 patch
Spacing   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	private function __construct() {}
86 86
 
87 87
 	private function initialize() {
88
-		add_action( 'wp', array( $this, 'parse_content'), 11 );
89
-		add_action( 'template_redirect', array( $this, 'set_entry_data'), 1 );
88
+		add_action( 'wp', array( $this, 'parse_content' ), 11 );
89
+		add_action( 'template_redirect', array( $this, 'set_entry_data' ), 1 );
90 90
 
91 91
 		// Enqueue scripts and styles after GravityView_Template::register_styles()
92 92
 		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts_and_styles' ), 20 );
@@ -233,15 +233,15 @@  discard block
 block discarded – undo
233 233
 
234 234
 			$this->context_view_id = $view_id;
235 235
 
236
-		} elseif ( isset( $_GET['gvid'] ) && $this->getGvOutputData()->has_multiple_views() ) {
236
+		} elseif ( isset( $_GET[ 'gvid' ] ) && $this->getGvOutputData()->has_multiple_views() ) {
237 237
 			/**
238 238
 			 * used on a has_multiple_views context
239 239
 			 * @see GravityView_API::entry_link
240 240
 			 * @see GravityView_View_Data::getInstance()->has_multiple_views()
241 241
 			 */
242
-			$this->context_view_id = $_GET['gvid'];
242
+			$this->context_view_id = $_GET[ 'gvid' ];
243 243
 
244
-		} elseif ( ! $this->getGvOutputData()->has_multiple_views() )  {
244
+		} elseif ( ! $this->getGvOutputData()->has_multiple_views() ) {
245 245
 			$array_keys = array_keys( $this->getGvOutputData()->get_views() );
246 246
 			$this->context_view_id = array_pop( $array_keys );
247 247
 			unset( $array_keys );
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 		global $post;
270 270
 
271 271
 		// If in admin and NOT AJAX request, get outta here.
272
-		if ( GravityView_Plugin::is_admin() )  {
272
+		if ( GravityView_Plugin::is_admin() ) {
273 273
 			return;
274 274
 		}
275 275
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 
282 282
 		$this->setIsGravityviewPostType( get_post_type( $post ) === 'gravityview' );
283 283
 
284
-		$post_id = $this->getPostId() ? $this->getPostId() : (isset( $post ) ? $post->ID : null );
284
+		$post_id = $this->getPostId() ? $this->getPostId() : ( isset( $post ) ? $post->ID : null );
285 285
 		$this->setPostId( $post_id );
286 286
 		$post_has_shortcode = ! empty( $post->post_content ) ? gravityview_has_shortcode_r( $post->post_content, 'gravityview' ) : false;
287 287
 		$this->setPostHasShortcode( $this->isGravityviewPostType() ? null : ! empty( $post_has_shortcode ) );
@@ -365,20 +365,20 @@  discard block
 block discarded – undo
365 365
 		 * @param boolean $in_the_loop Whether to apply the filter to the menu title and the meta tag <title> - outside the loop
366 366
 		 * @param array $entry Current entry
367 367
 		 */
368
-		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop' , in_the_loop(), $entry );
368
+		$apply_outside_loop = apply_filters( 'gravityview/single/title/out_loop', in_the_loop(), $entry );
369 369
 
370 370
 		if ( ! $apply_outside_loop ) {
371 371
 			return $title;
372 372
 		}
373 373
 
374 374
 		// User reported WooCommerce doesn't pass two args.
375
-		if ( empty( $passed_post_id ) )  {
375
+		if ( empty( $passed_post_id ) ) {
376 376
 			return $title;
377 377
 		}
378 378
 
379 379
 		// Don't modify the title for anything other than the current view/post.
380 380
 		// This is true for embedded shortcodes and Views.
381
-		if ( is_object( $post ) && (int) $post->ID !== (int) $passed_post_id ) {
381
+		if ( is_object( $post ) && (int)$post->ID !== (int)$passed_post_id ) {
382 382
 			return $title;
383 383
 		}
384 384
 
@@ -388,19 +388,19 @@  discard block
 block discarded – undo
388 388
 			$view_meta = $this->getGvOutputData()->get_view( $context_view_id );
389 389
 		} else {
390 390
 			foreach ( $this->getGvOutputData()->get_views() as $view_id => $view_data ) {
391
-				if ( intval( $view_data['form_id'] ) === intval( $entry['form_id'] ) ) {
391
+				if ( intval( $view_data[ 'form_id' ] ) === intval( $entry[ 'form_id' ] ) ) {
392 392
 					$view_meta = $view_data;
393 393
 					break;
394 394
 				}
395 395
 			}
396 396
 		}
397 397
 
398
-		if ( ! empty( $view_meta['atts']['single_title'] ) ) {
398
+		if ( ! empty( $view_meta[ 'atts' ][ 'single_title' ] ) ) {
399 399
 
400
-			$title = $view_meta['atts']['single_title'];
400
+			$title = $view_meta[ 'atts' ][ 'single_title' ];
401 401
 
402 402
 			// We are allowing HTML in the fields, so no escaping the output
403
-			$title = GravityView_API::replace_variables( $title, $view_meta['form'], $entry );
403
+			$title = GravityView_API::replace_variables( $title, $view_meta[ 'form' ], $entry );
404 404
 
405 405
 			$title = do_shortcode( $title );
406 406
 		}
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
 	public function render_view( $passed_args ) {
502 502
 
503 503
 		// validate attributes
504
-		if ( empty( $passed_args['id'] ) ) {
504
+		if ( empty( $passed_args[ 'id' ] ) ) {
505 505
 			do_action( 'gravityview_log_error', '[render_view] Returning; no ID defined.', $passed_args );
506 506
 			return null;
507 507
 		}
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 			return null;
524 524
 		}
525 525
 
526
-		$view_id = $passed_args['id'];
526
+		$view_id = $passed_args[ 'id' ];
527 527
 
528 528
 		$view_data = $this->getGvOutputData()->get_view( $view_id, $passed_args );
529 529
 
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
 		$passed_args = array_filter( $passed_args, 'strlen' );
537 537
 
538 538
 		//Override shortcode args over View template settings
539
-		$atts = wp_parse_args( $passed_args, $view_data['atts'] );
539
+		$atts = wp_parse_args( $passed_args, $view_data[ 'atts' ] );
540 540
 
541 541
 		do_action( 'gravityview_log_debug', '[render_view] Arguments after merging with View settings: ', $atts );
542 542
 
@@ -558,11 +558,11 @@  discard block
 block discarded – undo
558 558
 		 * Don't render View if user isn't allowed to see it
559 559
 		 * @since 1.15
560 560
 		 */
561
-		if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
561
+		if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
562 562
 			return null;
563 563
 		}
564 564
 
565
-		if( $this->isGravityviewPostType() ) {
565
+		if ( $this->isGravityviewPostType() ) {
566 566
 
567 567
 			/**
568 568
 			 * @filter `gravityview_direct_access` Should Views be directly accessible, or only visible using the shortcode?
@@ -574,9 +574,9 @@  discard block
 block discarded – undo
574 574
 			 */
575 575
 			$direct_access = apply_filters( 'gravityview_direct_access', true, $view_id );
576 576
 
577
-			$embed_only = ! empty( $atts['embed_only'] );
577
+			$embed_only = ! empty( $atts[ 'embed_only' ] );
578 578
 
579
-			if( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
579
+			if ( ! $direct_access || ( $embed_only && ! GVCommon::has_cap( 'read_private_gravityviews' ) ) ) {
580 580
 				return __( 'You are not allowed to view this content.', 'gravityview' );
581 581
 			}
582 582
 		}
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 
592 592
 		$gravityview_view = new GravityView_View( $view_data );
593 593
 
594
-		$post_id = ! empty( $atts['post_id'] ) ? intval( $atts['post_id'] ) : $this->getPostId();
594
+		$post_id = ! empty( $atts[ 'post_id' ] ) ? intval( $atts[ 'post_id' ] ) : $this->getPostId();
595 595
 
596 596
 		$gravityview_view->setPostId( $post_id );
597 597
 
@@ -601,20 +601,20 @@  discard block
 block discarded – undo
601 601
 			do_action( 'gravityview_log_debug', '[render_view] Executing Directory View' );
602 602
 
603 603
 			//fetch template and slug
604
-			$view_slug = apply_filters( 'gravityview_template_slug_'. $view_data['template_id'], 'table', 'directory' );
604
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'directory' );
605 605
 
606 606
 			do_action( 'gravityview_log_debug', '[render_view] View template slug: ', $view_slug );
607 607
 
608 608
 			/**
609 609
 			 * Disable fetching initial entries for views that don't need it (DataTables)
610 610
 			 */
611
-			$get_entries = apply_filters( 'gravityview_get_view_entries_'.$view_slug, true );
611
+			$get_entries = apply_filters( 'gravityview_get_view_entries_' . $view_slug, true );
612 612
 
613 613
 			/**
614 614
 			 * Hide View data until search is performed
615 615
 			 * @since 1.5.4
616 616
 			 */
617
-			if ( ! empty( $atts['hide_until_searched'] ) && ! $this->isSearch() ) {
617
+			if ( ! empty( $atts[ 'hide_until_searched' ] ) && ! $this->isSearch() ) {
618 618
 				$gravityview_view->setHideUntilSearched( true );
619 619
 				$get_entries = false;
620 620
 			}
@@ -622,23 +622,23 @@  discard block
 block discarded – undo
622 622
 
623 623
 			if ( $get_entries ) {
624 624
 
625
-				if ( ! empty( $atts['sort_columns'] ) ) {
625
+				if ( ! empty( $atts[ 'sort_columns' ] ) ) {
626 626
 					// add filter to enable column sorting
627
-					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ) , 100, 3 );
627
+					add_filter( 'gravityview/template/field_label', array( $this, 'add_columns_sort_links' ), 100, 3 );
628 628
 				}
629 629
 
630
-				$view_entries = self::get_view_entries( $atts, $view_data['form_id'] );
630
+				$view_entries = self::get_view_entries( $atts, $view_data[ 'form_id' ] );
631 631
 
632
-				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries['count'], sizeof( $view_entries['entries'] ) ) );
632
+				do_action( 'gravityview_log_debug', sprintf( '[render_view] Get Entries. Found %s entries total, showing %d entries', $view_entries[ 'count' ], sizeof( $view_entries[ 'entries' ] ) ) );
633 633
 
634 634
 			} else {
635 635
 
636 636
 				$view_entries = array( 'count' => null, 'entries' => null, 'paging' => null );
637 637
 
638
-				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_'.$view_slug.'` is false' );
638
+				do_action( 'gravityview_log_debug', '[render_view] Not fetching entries because `gravityview_get_view_entries_' . $view_slug . '` is false' );
639 639
 			}
640 640
 
641
-			$gravityview_view->setPaging( $view_entries['paging'] );
641
+			$gravityview_view->setPaging( $view_entries[ 'paging' ] );
642 642
 			$gravityview_view->setContext( 'directory' );
643 643
 			$sections = array( 'header', 'body', 'footer' );
644 644
 
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 			// user requested Single Entry View
648 648
 			do_action( 'gravityview_log_debug', '[render_view] Executing Single View' );
649 649
 
650
-			do_action( 'gravityview_render_entry_'.$view_data['id'] );
650
+			do_action( 'gravityview_render_entry_' . $view_data[ 'id' ] );
651 651
 
652 652
 			$entry = $this->getEntry();
653 653
 
@@ -674,20 +674,20 @@  discard block
 block discarded – undo
674 674
 			// We're in single view, but the view being processed is not the same view the single entry belongs to.
675 675
 			// important: do not remove this as it prevents fake attempts of displaying entries from other views/forms
676 676
 			if ( $this->getGvOutputData()->has_multiple_views() && $view_id != $this->get_context_view_id() ) {
677
-				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: '. $view_id );
677
+				do_action( 'gravityview_log_debug', '[render_view] In single entry view, but the entry does not belong to this View. Perhaps there are multiple views on the page. View ID: ' . $view_id );
678 678
 				return null;
679 679
 			}
680 680
 
681 681
 			//fetch template and slug
682
-			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data['template_id'], 'table', 'single' );
682
+			$view_slug = apply_filters( 'gravityview_template_slug_' . $view_data[ 'template_id' ], 'table', 'single' );
683 683
 			do_action( 'gravityview_log_debug', '[render_view] View single template slug: ', $view_slug );
684 684
 
685 685
 			//fetch entry detail
686
-			$view_entries['count'] = 1;
687
-			$view_entries['entries'][] = $entry;
688
-			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries['entries'] );
686
+			$view_entries[ 'count' ] = 1;
687
+			$view_entries[ 'entries' ][ ] = $entry;
688
+			do_action( 'gravityview_log_debug', '[render_view] Get single entry: ', $view_entries[ 'entries' ] );
689 689
 
690
-			$back_link_label = isset( $atts['back_link_label'] ) ? $atts['back_link_label'] : null;
690
+			$back_link_label = isset( $atts[ 'back_link_label' ] ) ? $atts[ 'back_link_label' ] : null;
691 691
 
692 692
 			// set back link label
693 693
 			$gravityview_view->setBackLinkLabel( $back_link_label );
@@ -697,11 +697,11 @@  discard block
 block discarded – undo
697 697
 		}
698 698
 
699 699
 		// add template style
700
-		self::add_style( $view_data['template_id'] );
700
+		self::add_style( $view_data[ 'template_id' ] );
701 701
 
702 702
 		// Prepare to render view and set vars
703
-		$gravityview_view->setEntries( $view_entries['entries'] );
704
-		$gravityview_view->setTotalEntries( $view_entries['count'] );
703
+		$gravityview_view->setEntries( $view_entries[ 'entries' ] );
704
+		$gravityview_view->setTotalEntries( $view_entries[ 'count' ] );
705 705
 
706 706
 		// If Edit
707 707
 		if ( 'edit' === gravityview_get_context() ) {
@@ -714,11 +714,11 @@  discard block
 block discarded – undo
714 714
 
715 715
 		} else {
716 716
 			// finaly we'll render some html
717
-			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data['template_id'] );
717
+			$sections = apply_filters( 'gravityview_render_view_sections', $sections, $view_data[ 'template_id' ] );
718 718
 
719 719
 			do_action( 'gravityview_log_debug', '[render_view] Sections to render: ', $sections );
720 720
 			foreach ( $sections as $section ) {
721
-				do_action( 'gravityview_log_debug', '[render_view] Rendering '. $section . ' section.' );
721
+				do_action( 'gravityview_log_debug', '[render_view] Rendering ' . $section . ' section.' );
722 722
 				$gravityview_view->render( $view_slug, $section, false );
723 723
 			}
724 724
 		}
@@ -772,7 +772,7 @@  discard block
 block discarded – undo
772 772
 				$datetime_format = 'Y-m-d H:i:s';
773 773
 				$search_is_outside_view_bounds = false;
774 774
 
775
-				if( ! empty( $search_criteria[ $key ] ) ) {
775
+				if ( ! empty( $search_criteria[ $key ] ) ) {
776 776
 
777 777
 					$search_date = strtotime( $search_criteria[ $key ] );
778 778
 
@@ -800,14 +800,14 @@  discard block
 block discarded – undo
800 800
 				if ( empty( $search_criteria[ $key ] ) || $search_is_outside_view_bounds ) {
801 801
 
802 802
 					// Then we override the search and re-set the start date
803
-					$return_search_criteria[ $key ] = date_i18n( $datetime_format , $date, true );
803
+					$return_search_criteria[ $key ] = date_i18n( $datetime_format, $date, true );
804 804
 				}
805 805
 			}
806 806
 		}
807 807
 
808
-		if( isset( $return_search_criteria['start_date'] ) && isset( $return_search_criteria['end_date'] ) ) {
808
+		if ( isset( $return_search_criteria[ 'start_date' ] ) && isset( $return_search_criteria[ 'end_date' ] ) ) {
809 809
 			// The start date is AFTER the end date. This will result in no results, but let's not force the issue.
810
-			if ( strtotime( $return_search_criteria['start_date'] ) > strtotime( $return_search_criteria['end_date'] ) ) {
810
+			if ( strtotime( $return_search_criteria[ 'start_date' ] ) > strtotime( $return_search_criteria[ 'end_date' ] ) ) {
811 811
 				do_action( 'gravityview_log_error', __METHOD__ . ' Invalid search: the start date is after the end date.', $return_search_criteria );
812 812
 			}
813 813
 		}
@@ -825,9 +825,9 @@  discard block
 block discarded – undo
825 825
 	 */
826 826
 	public static function process_search_only_approved( $args, $search_criteria ) {
827 827
 
828
-		if ( ! empty( $args['show_only_approved'] ) ) {
829
-			$search_criteria['field_filters'][] = array( 'key' => 'is_approved', 'value' => 'Approved' );
830
-			$search_criteria['field_filters']['mode'] = 'all'; // force all the criterias to be met
828
+		if ( ! empty( $args[ 'show_only_approved' ] ) ) {
829
+			$search_criteria[ 'field_filters' ][ ] = array( 'key' => 'is_approved', 'value' => 'Approved' );
830
+			$search_criteria[ 'field_filters' ][ 'mode' ] = 'all'; // force all the criterias to be met
831 831
 
832 832
 			do_action( 'gravityview_log_debug', '[process_search_only_approved] Search Criteria if show only approved: ', $search_criteria );
833 833
 		}
@@ -851,12 +851,12 @@  discard block
 block discarded – undo
851 851
 	 */
852 852
 	public static function is_entry_approved( $entry, $args = array() ) {
853 853
 
854
-		if ( empty( $entry['id'] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args['show_only_approved'] ) ) {
854
+		if ( empty( $entry[ 'id' ] ) || ( array_key_exists( 'show_only_approved', $args ) && ! $args[ 'show_only_approved' ] ) ) {
855 855
 			// is implicitly approved if entry is null or View settings doesn't require to check for approval
856 856
 			return true;
857 857
 		}
858 858
 
859
-		$is_approved = gform_get_meta( $entry['id'], 'is_approved' );
859
+		$is_approved = gform_get_meta( $entry[ 'id' ], 'is_approved' );
860 860
 
861 861
 		if ( $is_approved ) {
862 862
 			return true;
@@ -889,26 +889,26 @@  discard block
 block discarded – undo
889 889
 		do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after hook gravityview_fe_search_criteria: ', $search_criteria );
890 890
 
891 891
 		// implicity search
892
-		if ( ! empty( $args['search_value'] ) ) {
892
+		if ( ! empty( $args[ 'search_value' ] ) ) {
893 893
 
894 894
 			// Search operator options. Options: `is` or `contains`
895
-			$operator = ! empty( $args['search_operator'] ) && in_array( $args['search_operator'], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args['search_operator'] : 'contains';
895
+			$operator = ! empty( $args[ 'search_operator' ] ) && in_array( $args[ 'search_operator' ], array( 'is', 'isnot', '>', '<', 'contains' ) ) ? $args[ 'search_operator' ] : 'contains';
896 896
 
897
-			$search_criteria['field_filters'][] = array(
897
+			$search_criteria[ 'field_filters' ][ ] = array(
898 898
 				'key' => rgget( 'search_field', $args ), // The field ID to search
899
-				'value' => _wp_specialchars( $args['search_value'] ), // The value to search. Encode ampersands but not quotes.
899
+				'value' => _wp_specialchars( $args[ 'search_value' ] ), // The value to search. Encode ampersands but not quotes.
900 900
 				'operator' => $operator,
901 901
 			);
902 902
 		}
903 903
 
904
-		if( $search_criteria !== $original_search_criteria ) {
904
+		if ( $search_criteria !== $original_search_criteria ) {
905 905
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after implicity search: ', $search_criteria );
906 906
 		}
907 907
 
908 908
 		// Handle setting date range
909 909
 		$search_criteria = self::process_search_dates( $args, $search_criteria );
910 910
 
911
-		if( $search_criteria !== $original_search_criteria ) {
911
+		if ( $search_criteria !== $original_search_criteria ) {
912 912
 			do_action( 'gravityview_log_debug', '[get_search_criteria] Search Criteria after date params: ', $search_criteria );
913 913
 		}
914 914
 
@@ -919,7 +919,7 @@  discard block
 block discarded – undo
919 919
 		 * @filter `gravityview_status` Modify entry status requirements to be included in search results.
920 920
 		 * @param string $status Default: `active`. Accepts all Gravity Forms entry statuses, including `spam` and `trash`
921 921
 		 */
922
-		$search_criteria['status'] = apply_filters( 'gravityview_status', 'active', $args );
922
+		$search_criteria[ 'status' ] = apply_filters( 'gravityview_status', 'active', $args );
923 923
 
924 924
 		return $search_criteria;
925 925
 	}
@@ -965,16 +965,16 @@  discard block
 block discarded – undo
965 965
 		$search_criteria = self::get_search_criteria( $args, $form_id );
966 966
 
967 967
 		// Paging & offset
968
-		$page_size = ! empty( $args['page_size'] ) ? intval( $args['page_size'] ) : apply_filters( 'gravityview_default_page_size', 25 );
968
+		$page_size = ! empty( $args[ 'page_size' ] ) ? intval( $args[ 'page_size' ] ) : apply_filters( 'gravityview_default_page_size', 25 );
969 969
 
970 970
 		if ( -1 === $page_size ) {
971 971
 			$page_size = PHP_INT_MAX;
972 972
 		}
973 973
 
974
-		if ( isset( $args['offset'] ) ) {
975
-			$offset = intval( $args['offset'] );
974
+		if ( isset( $args[ 'offset' ] ) ) {
975
+			$offset = intval( $args[ 'offset' ] );
976 976
 		} else {
977
-			$curr_page = empty( $_GET['pagenum'] ) ? 1 : intval( $_GET['pagenum'] );
977
+			$curr_page = empty( $_GET[ 'pagenum' ] ) ? 1 : intval( $_GET[ 'pagenum' ] );
978 978
 			$offset = ( $curr_page - 1 ) * $page_size;
979 979
 		}
980 980
 
@@ -992,7 +992,7 @@  discard block
 block discarded – undo
992 992
 			'search_criteria' => $search_criteria,
993 993
 			'sorting' => $sorting,
994 994
 			'paging' => $paging,
995
-			'cache' => isset( $args['cache'] ) ? $args['cache'] : true,
995
+			'cache' => isset( $args[ 'cache' ] ) ? $args[ 'cache' ] : true,
996 996
 		);
997 997
 
998 998
 		/**
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		 * @param array $parameters Array with `search_criteria`, `sorting` and `paging` keys.
1018 1018
 		 * @param array $args View configuration args.
1019 1019
 		 */
1020
-		$parameters = apply_filters( 'gravityview_get_entries_'.$args['id'], $parameters, $args, $form_id );
1020
+		$parameters = apply_filters( 'gravityview_get_entries_' . $args[ 'id' ], $parameters, $args, $form_id );
1021 1021
 
1022 1022
 		do_action( 'gravityview_log_debug', '[get_view_entries] $parameters passed to gravityview_get_entries(): ', $parameters );
1023 1023
 
@@ -1057,8 +1057,8 @@  discard block
 block discarded – undo
1057 1057
 	 */
1058 1058
 	public static function updateViewSorting( $args, $form_id ) {
1059 1059
 		$sorting = array();
1060
-		$sort_field_id = isset( $_GET['sort'] ) ? $_GET['sort'] : rgar( $args, 'sort_field' );
1061
-		$sort_direction = isset( $_GET['dir'] ) ? $_GET['dir'] : rgar( $args, 'sort_direction' );
1060
+		$sort_field_id = isset( $_GET[ 'sort' ] ) ? $_GET[ 'sort' ] : rgar( $args, 'sort_field' );
1061
+		$sort_direction = isset( $_GET[ 'dir' ] ) ? $_GET[ 'dir' ] : rgar( $args, 'sort_direction' );
1062 1062
 
1063 1063
 		$sort_field_id = self::_override_sorting_id_by_field_type( $sort_field_id, $form_id );
1064 1064
 
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
 
1099 1099
 		$sort_field = GFFormsModel::get_field( $form, $sort_field_id );
1100 1100
 
1101
-		switch ( $sort_field['type'] ) {
1101
+		switch ( $sort_field[ 'type' ] ) {
1102 1102
 
1103 1103
 			case 'address':
1104 1104
 				// Sorting by full address
@@ -1115,7 +1115,7 @@  discard block
 block discarded – undo
1115 1115
 					 */
1116 1116
 					$address_part = apply_filters( 'gravityview/sorting/address', 'city', $sort_field_id, $form_id );
1117 1117
 
1118
-					switch( strtolower( $address_part ) ){
1118
+					switch ( strtolower( $address_part ) ) {
1119 1119
 						case 'street':
1120 1120
 							$sort_field_id .= '.1';
1121 1121
 							break;
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 		 */
1196 1196
 		$single_entry = apply_filters( 'gravityview/is_single_entry', $single_entry );
1197 1197
 
1198
-		if ( empty( $single_entry ) ){
1198
+		if ( empty( $single_entry ) ) {
1199 1199
 			return false;
1200 1200
 		} else {
1201 1201
 			return $single_entry;
@@ -1222,7 +1222,7 @@  discard block
 block discarded – undo
1222 1222
 				 * Don't enqueue the scripts or styles if it's not going to be displayed.
1223 1223
 				 * @since 1.15
1224 1224
 				 */
1225
-				if( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1225
+				if ( is_user_logged_in() && false === GVCommon::has_cap( 'read_gravityview', $view_id ) ) {
1226 1226
 					continue;
1227 1227
 				}
1228 1228
 
@@ -1231,19 +1231,19 @@  discard block
 block discarded – undo
1231 1231
 				$css_dependencies = array();
1232 1232
 
1233 1233
 				// If the thickbox is enqueued, add dependencies
1234
-				if ( ! empty( $data['atts']['lightbox'] ) ) {
1234
+				if ( ! empty( $data[ 'atts' ][ 'lightbox' ] ) ) {
1235 1235
 
1236 1236
 					/**
1237 1237
 					 * @filter `gravity_view_lightbox_script` Override the lightbox script to enqueue. Default: `thickbox`
1238 1238
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of it here.
1239 1239
 					 */
1240
-					$js_dependencies[] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
1240
+					$js_dependencies[ ] = apply_filters( 'gravity_view_lightbox_script', 'thickbox' );
1241 1241
 
1242 1242
 					/**
1243 1243
 					 * @filter `gravity_view_lightbox_style` Modify the lightbox CSS slug. Default: `thickbox`
1244 1244
 					 * @param string $script_slug If you want to use a different lightbox script, return the name of its CSS file here.
1245 1245
 					 */
1246
-					$css_dependencies[] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
1246
+					$css_dependencies[ ] = apply_filters( 'gravity_view_lightbox_style', 'thickbox' );
1247 1247
 				}
1248 1248
 
1249 1249
 				/**
@@ -1251,25 +1251,25 @@  discard block
 block discarded – undo
1251 1251
 				 * @see https://github.com/katzwebservices/GravityView/issues/536
1252 1252
 				 * @since 1.15
1253 1253
 				 */
1254
-				if( gravityview_view_has_single_checkbox_or_radio( $data['form'], $data['fields'] ) ) {
1255
-					$css_dependencies[] = 'dashicons';
1254
+				if ( gravityview_view_has_single_checkbox_or_radio( $data[ 'form' ], $data[ 'fields' ] ) ) {
1255
+					$css_dependencies[ ] = 'dashicons';
1256 1256
 				}
1257 1257
 
1258 1258
 				wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'includes/lib/jquery-cookie/jquery_cookie.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version, true );
1259 1259
 
1260 1260
 				$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
1261 1261
 
1262
-				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ) , GravityView_Plugin::version, true );
1262
+				wp_register_script( 'gravityview-fe-view', plugins_url( 'assets/js/fe-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), apply_filters( 'gravityview_js_dependencies', $js_dependencies ), GravityView_Plugin::version, true );
1263 1263
 
1264 1264
 				wp_enqueue_script( 'gravityview-fe-view' );
1265 1265
 
1266
-				if ( ! empty( $data['atts']['sort_columns'] ) ) {
1266
+				if ( ! empty( $data[ 'atts' ][ 'sort_columns' ] ) ) {
1267 1267
 					wp_enqueue_style( 'gravityview_font', plugins_url( 'assets/css/font.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1268 1268
 				}
1269 1269
 
1270 1270
 				wp_enqueue_style( 'gravityview_default_style', plugins_url( 'templates/css/gv-default-styles.css', GRAVITYVIEW_FILE ), $css_dependencies, GravityView_Plugin::version, 'all' );
1271 1271
 
1272
-				self::add_style( $data['template_id'] );
1272
+				self::add_style( $data[ 'template_id' ] );
1273 1273
 
1274 1274
 			}
1275 1275
 
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
 		} elseif ( empty( $template_id ) ) {
1306 1306
 			do_action( 'gravityview_log_error', '[add_style] Cannot add template style; template_id is empty' );
1307 1307
 		} else {
1308
-			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_'.$template_id ) );
1308
+			do_action( 'gravityview_log_error', sprintf( '[add_style] Cannot add template style; %s is not registered', 'gravityview_style_' . $template_id ) );
1309 1309
 		}
1310 1310
 
1311 1311
 	}
@@ -1330,11 +1330,11 @@  discard block
 block discarded – undo
1330 1330
 		 * Not a table-based template; don't add sort icons
1331 1331
 		 * @since 1.12
1332 1332
 		 */
1333
-		if( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1333
+		if ( ! preg_match( '/table/ism', GravityView_View::getInstance()->getTemplatePartSlug() ) ) {
1334 1334
 			return $label;
1335 1335
 		}
1336 1336
 
1337
-		if ( ! $this->is_field_sortable( $field['id'], $form ) ) {
1337
+		if ( ! $this->is_field_sortable( $field[ 'id' ], $form ) ) {
1338 1338
 			return $label;
1339 1339
 		}
1340 1340
 
@@ -1342,29 +1342,29 @@  discard block
 block discarded – undo
1342 1342
 
1343 1343
 		$class = 'gv-sort';
1344 1344
 
1345
-		$sort_field_id = self::_override_sorting_id_by_field_type( $field['id'], $form['id'] );
1345
+		$sort_field_id = self::_override_sorting_id_by_field_type( $field[ 'id' ], $form[ 'id' ] );
1346 1346
 
1347 1347
 		$sort_args = array(
1348
-			'sort' => $field['id'],
1348
+			'sort' => $field[ 'id' ],
1349 1349
 			'dir' => 'asc',
1350 1350
 		);
1351 1351
 
1352
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
1352
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
1353 1353
 			//toggle sorting direction.
1354
-			if ( 'asc' === $sorting['direction'] ) {
1355
-				$sort_args['dir'] = 'desc';
1354
+			if ( 'asc' === $sorting[ 'direction' ] ) {
1355
+				$sort_args[ 'dir' ] = 'desc';
1356 1356
 				$class .= ' gv-icon-sort-desc';
1357 1357
 			} else {
1358
-				$sort_args['dir'] = 'asc';
1358
+				$sort_args[ 'dir' ] = 'asc';
1359 1359
 				$class .= ' gv-icon-sort-asc';
1360 1360
 			}
1361 1361
 		} else {
1362 1362
 			$class .= ' gv-icon-caret-up-down';
1363 1363
 		}
1364 1364
 
1365
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
1365
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
1366 1366
 
1367
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $label;
1367
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $label;
1368 1368
 
1369 1369
 	}
1370 1370
 
@@ -1382,7 +1382,7 @@  discard block
 block discarded – undo
1382 1382
 
1383 1383
 		$field_type = $field_id;
1384 1384
 
1385
-		if( is_numeric( $field_id ) ) {
1385
+		if ( is_numeric( $field_id ) ) {
1386 1386
 			$field = GFFormsModel::get_field( $form, $field_id );
1387 1387
 			$field_type = $field->type;
1388 1388
 		}
@@ -1405,7 +1405,7 @@  discard block
 block discarded – undo
1405 1405
 			return false;
1406 1406
 		}
1407 1407
 
1408
-		return apply_filters( "gravityview/sortable/formfield_{$form['id']}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1408
+		return apply_filters( "gravityview/sortable/formfield_{$form[ 'id' ]}_{$field_id}", apply_filters( "gravityview/sortable/field_{$field_id}", true, $form ) );
1409 1409
 
1410 1410
 	}
1411 1411
 
Please login to merge, or discard this patch.
includes/widgets/search-widget/class-search-widget.php 1 patch
Spacing   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 				'type' => 'radio',
57 57
 				'full_width' => true,
58 58
 				'label' => esc_html__( 'Search Mode', 'gravityview' ),
59
-				'desc' => __('Should search results match all search fields, or any?', 'gravityview'),
59
+				'desc' => __( 'Should search results match all search fields, or any?', 'gravityview' ),
60 60
 				'value' => 'any',
61 61
 				'class' => 'hide-if-js',
62 62
 				'options' => array(
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		$script_min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
112 112
 		$script_source = empty( $script_min ) ? '/source' : '';
113 113
 
114
-		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js'.$script_source.'/admin-search-widget'.$script_min.'.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
114
+		wp_enqueue_script( 'gravityview_searchwidget_admin', plugins_url( 'assets/js' . $script_source . '/admin-search-widget' . $script_min . '.js', __FILE__ ), array( 'jquery', 'gravityview_views_scripts' ), GravityView_Plugin::version );
115 115
 
116 116
 
117 117
 		/**
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * Add admin script to the whitelist
164 164
 	 */
165 165
 	public function register_no_conflict( $required ) {
166
-		$required[] = 'gravityview_searchwidget_admin';
166
+		$required[ ] = 'gravityview_searchwidget_admin';
167 167
 		return $required;
168 168
 	}
169 169
 
@@ -176,24 +176,24 @@  discard block
 block discarded – undo
176 176
 	 */
177 177
 	public static function get_searchable_fields() {
178 178
 
179
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxsearchwidget' ) ) {
179
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxsearchwidget' ) ) {
180 180
 			exit( '0' );
181 181
 		}
182 182
 
183 183
 		$form = '';
184 184
 
185 185
 		// Fetch the form for the current View
186
-		if ( ! empty( $_POST['view_id'] ) ) {
186
+		if ( ! empty( $_POST[ 'view_id' ] ) ) {
187 187
 
188
-			$form = gravityview_get_form_id( $_POST['view_id'] );
188
+			$form = gravityview_get_form_id( $_POST[ 'view_id' ] );
189 189
 
190
-		} elseif ( ! empty( $_POST['formid'] ) ) {
190
+		} elseif ( ! empty( $_POST[ 'formid' ] ) ) {
191 191
 
192
-			$form = (int) $_POST['formid'];
192
+			$form = (int)$_POST[ 'formid' ];
193 193
 
194
-		} elseif ( ! empty( $_POST['template_id'] ) && class_exists( 'GravityView_Ajax' ) ) {
194
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) && class_exists( 'GravityView_Ajax' ) ) {
195 195
 
196
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
196
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
197 197
 
198 198
 		}
199 199
 
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
 			)
242 242
 		);
243 243
 
244
-		foreach( $custom_fields as $custom_field_key => $custom_field ) {
245
-			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field['type'], self::get_field_label( array('field' => $custom_field_key ) ), $custom_field['text'] );
244
+		foreach ( $custom_fields as $custom_field_key => $custom_field ) {
245
+			$output .= sprintf( '<option value="%s" %s data-inputtypes="%s" data-placeholder="%s">%s</option>', $custom_field_key, selected( $custom_field_key, $current, false ), $custom_field[ 'type' ], self::get_field_label( array( 'field' => $custom_field_key ) ), $custom_field[ 'text' ] );
246 246
 		}
247 247
 
248 248
 		if ( ! empty( $fields ) ) {
@@ -251,13 +251,13 @@  discard block
 block discarded – undo
251 251
 
252 252
 			foreach ( $fields as $id => $field ) {
253 253
 
254
-				if ( in_array( $field['type'], $blacklist_field_types ) ) {
254
+				if ( in_array( $field[ 'type' ], $blacklist_field_types ) ) {
255 255
 					continue;
256 256
 				}
257 257
 
258
-				$types = self::get_search_input_types( $id, $field['type'] );
258
+				$types = self::get_search_input_types( $id, $field[ 'type' ] );
259 259
 
260
-				$output .= '<option value="'. $id .'" '. selected( $id, $current, false ).'data-inputtypes="'. esc_attr( $types ) .'">'. esc_html( $field['label'] ) .'</option>';
260
+				$output .= '<option value="' . $id . '" ' . selected( $id, $current, false ) . 'data-inputtypes="' . esc_attr( $types ) . '">' . esc_html( $field[ 'label' ] ) . '</option>';
261 261
 			}
262 262
 		}
263 263
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 	public static function get_search_input_types( $id = '', $field_type = null ) {
280 280
 
281 281
 		// @todo - This needs to be improved - many fields have . including products and addresses
282
-		if ( false !== strpos( (string) $id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
282
+		if ( false !== strpos( (string)$id, '.' ) && in_array( $field_type, array( 'checkbox' ) ) || in_array( $id, array( 'is_fulfilled' ) ) ) {
283 283
 			$input_type = 'boolean'; // on/off checkbox
284 284
 		} elseif ( in_array( $field_type, array( 'checkbox', 'post_category', 'multiselect' ) ) ) {
285 285
 			$input_type = 'multi'; //multiselect
@@ -321,19 +321,19 @@  discard block
 block discarded – undo
321 321
 			$post_id = 0;
322 322
 
323 323
 			// We're in the WordPress Widget context, and an overriding post ID has been set.
324
-			if ( ! empty( $widget_args['post_id'] ) ) {
325
-				$post_id = absint( $widget_args['post_id'] );
324
+			if ( ! empty( $widget_args[ 'post_id' ] ) ) {
325
+				$post_id = absint( $widget_args[ 'post_id' ] );
326 326
 			}
327 327
 			// We're in the WordPress Widget context, and the base View ID should be used
328
-			else if ( ! empty( $widget_args['view_id'] ) ) {
329
-				$post_id = absint( $widget_args['view_id'] );
328
+			else if ( ! empty( $widget_args[ 'view_id' ] ) ) {
329
+				$post_id = absint( $widget_args[ 'view_id' ] );
330 330
 			}
331 331
 
332 332
 			$args = gravityview_get_permalink_query_args( $post_id );
333 333
 
334 334
 			// Add hidden fields to the search form
335 335
 			foreach ( $args as $key => $value ) {
336
-				$search_fields[] = array(
336
+				$search_fields[ ] = array(
337 337
 					'name'  => $key,
338 338
 					'input' => 'hidden',
339 339
 					'value' => $value,
@@ -365,15 +365,15 @@  discard block
 block discarded – undo
365 365
 		$get = array_map( 'urldecode', $get );
366 366
 
367 367
 		// add free search
368
-		if ( ! empty( $get['gv_search'] ) ) {
368
+		if ( ! empty( $get[ 'gv_search' ] ) ) {
369 369
 
370 370
 			// Search for a piece
371
-			$words = explode( ' ', $get['gv_search'] );
371
+			$words = explode( ' ', $get[ 'gv_search' ] );
372 372
 
373 373
 			$words = array_filter( $words );
374 374
 
375 375
 			foreach ( $words as $word ) {
376
-				$search_criteria['field_filters'][] = array(
376
+				$search_criteria[ 'field_filters' ][ ] = array(
377 377
 					'key' => null, // The field ID to search
378 378
 					'value' => $word, // The value to search
379 379
 					'operator' => 'contains', // What to search in. Options: `is` or `contains`
@@ -398,16 +398,16 @@  discard block
 block discarded – undo
398 398
 		/**
399 399
 		 * Don't set $search_criteria['start_date'] if start_date is empty as it may lead to bad query results (GFAPI::get_entries)
400 400
 		 */
401
-		if( !empty( $curr_start ) ) {
402
-			$search_criteria['start_date'] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
401
+		if ( ! empty( $curr_start ) ) {
402
+			$search_criteria[ 'start_date' ] = $adjust_tz ? get_gmt_from_date( $curr_start ) : $curr_start;
403 403
 		}
404
-		if( !empty( $curr_end ) ) {
405
-			$search_criteria['end_date'] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
404
+		if ( ! empty( $curr_end ) ) {
405
+			$search_criteria[ 'end_date' ] = $adjust_tz ? get_gmt_from_date( $curr_end ) : $curr_end;
406 406
 		}
407 407
 
408 408
 		// search for a specific entry ID
409 409
 		if ( ! empty( $get[ 'gv_id' ] ) ) {
410
-			$search_criteria['field_filters'][] = array(
410
+			$search_criteria[ 'field_filters' ][ ] = array(
411 411
 				'key' => 'id',
412 412
 				'value' => absint( $get[ 'gv_id' ] ),
413 413
 				'operator' => '=',
@@ -416,9 +416,9 @@  discard block
 block discarded – undo
416 416
 
417 417
 		// search for a specific Created_by ID
418 418
 		if ( ! empty( $get[ 'gv_by' ] ) ) {
419
-			$search_criteria['field_filters'][] = array(
419
+			$search_criteria[ 'field_filters' ][ ] = array(
420 420
 				'key' => 'created_by',
421
-				'value' => absint( $get['gv_by'] ),
421
+				'value' => absint( $get[ 'gv_by' ] ),
422 422
 				'operator' => '=',
423 423
 			);
424 424
 		}
@@ -430,22 +430,22 @@  discard block
 block discarded – undo
430 430
 		// get the other search filters
431 431
 		foreach ( $get as $key => $value ) {
432 432
 
433
-			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[0] ) ) ) {
433
+			if ( 0 !== strpos( $key, 'filter_' ) || empty( $value ) || ( is_array( $value ) && count( $value ) === 1 && empty( $value[ 0 ] ) ) ) {
434 434
 				continue;
435 435
 			}
436 436
 
437 437
 			// could return simple filter or multiple filters
438 438
 			$filter = $this->prepare_field_filter( $key, $value );
439 439
 
440
-			if ( isset( $filter[0]['value'] ) ) {
441
-				$search_criteria['field_filters'] = array_merge( $search_criteria['field_filters'], $filter );
440
+			if ( isset( $filter[ 0 ][ 'value' ] ) ) {
441
+				$search_criteria[ 'field_filters' ] = array_merge( $search_criteria[ 'field_filters' ], $filter );
442 442
 
443 443
 				// if date range type, set search mode to ALL
444
-				if ( ! empty( $filter[0]['operator'] ) && in_array( $filter[0]['operator'], array( '>', '<' ) ) ) {
444
+				if ( ! empty( $filter[ 0 ][ 'operator' ] ) && in_array( $filter[ 0 ][ 'operator' ], array( '>', '<' ) ) ) {
445 445
 					$mode = 'all';
446 446
 				}
447
-			} elseif( !empty( $filter ) ) {
448
-				$search_criteria['field_filters'][] = $filter;
447
+			} elseif ( ! empty( $filter ) ) {
448
+				$search_criteria[ 'field_filters' ][ ] = $filter;
449 449
 			}
450 450
 		}
451 451
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 		 * @since 1.5.1
455 455
 		 * @param[out,in] string $mode Search mode (`any` vs `all`)
456 456
 		 */
457
-		$search_criteria['field_filters']['mode'] = apply_filters( 'gravityview/search/mode', $mode );
457
+		$search_criteria[ 'field_filters' ][ 'mode' ] = apply_filters( 'gravityview/search/mode', $mode );
458 458
 
459 459
 		do_action( 'gravityview_log_debug', sprintf( '%s[filter_entries] Returned Search Criteria: ', get_class( $this ) ), $search_criteria );
460 460
 
@@ -490,11 +490,11 @@  discard block
 block discarded – undo
490 490
 			'value' => _wp_specialchars( $value ), // Gravity Forms encodes ampersands but not quotes
491 491
 		);
492 492
 
493
-		switch ( $form_field['type'] ) {
493
+		switch ( $form_field[ 'type' ] ) {
494 494
 
495 495
 			case 'select':
496 496
 			case 'radio':
497
-				$filter['operator'] = 'is';
497
+				$filter[ 'operator' ] = 'is';
498 498
 				break;
499 499
 
500 500
 			case 'post_category':
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 
509 509
 				foreach ( $value as $val ) {
510 510
 					$cat = get_term( $val, 'category' );
511
-					$filter[] = array(
511
+					$filter[ ] = array(
512 512
 						'key' => $field_id,
513 513
 						'value' => esc_attr( $cat->name ) . ':' . $val,
514 514
 						'operator' => 'is',
@@ -527,18 +527,18 @@  discard block
 block discarded – undo
527 527
 				$filter = array();
528 528
 
529 529
 				foreach ( $value as $val ) {
530
-					$filter[] = array( 'key' => $field_id, 'value' => $val );
530
+					$filter[ ] = array( 'key' => $field_id, 'value' => $val );
531 531
 				}
532 532
 
533 533
 				break;
534 534
 
535 535
 			case 'checkbox':
536 536
 				// convert checkbox on/off into the correct search filter
537
-				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field['inputs'] ) && ! empty( $form_field['choices'] ) ) {
538
-					foreach ( $form_field['inputs'] as $k => $input ) {
539
-						if ( $input['id'] == $field_id ) {
540
-							$filter['value'] = $form_field['choices'][ $k ]['value'];
541
-							$filter['operator'] = 'is';
537
+				if ( false !== strpos( $field_id, '.' ) && ! empty( $form_field[ 'inputs' ] ) && ! empty( $form_field[ 'choices' ] ) ) {
538
+					foreach ( $form_field[ 'inputs' ] as $k => $input ) {
539
+						if ( $input[ 'id' ] == $field_id ) {
540
+							$filter[ 'value' ] = $form_field[ 'choices' ][ $k ][ 'value' ];
541
+							$filter[ 'operator' ] = 'is';
542 542
 							break;
543 543
 						}
544 544
 					}
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
 					$filter = array();
549 549
 
550 550
 					foreach ( $value as $val ) {
551
-						$filter[] = array(
551
+						$filter[ ] = array(
552 552
 								'key'   => $field_id,
553 553
 								'value' => $val,
554 554
 								'operator' => 'is',
@@ -569,9 +569,9 @@  discard block
 block discarded – undo
569 569
 					foreach ( $words as $word ) {
570 570
 						if ( ! empty( $word ) && strlen( $word ) > 1 ) {
571 571
 							// Keep the same key for each filter
572
-							$filter['value'] = $word;
572
+							$filter[ 'value' ] = $word;
573 573
 							// Add a search for the value
574
-							$filters[] = $filter;
574
+							$filters[ ] = $filter;
575 575
 						}
576 576
 					}
577 577
 
@@ -593,14 +593,14 @@  discard block
 block discarded – undo
593 593
 						}
594 594
 						$operator = 'start' === $k ? '>' : '<';
595 595
 
596
-						$filter[] = array(
596
+						$filter[ ] = array(
597 597
 							'key' => $field_id,
598 598
 							'value' => self::get_formatted_date( $date, 'Y-m-d' ),
599 599
 							'operator' => $operator,
600 600
 						);
601 601
 					}
602 602
 				} else {
603
-					$filter['value'] = self::get_formatted_date( $value, 'Y-m-d' );
603
+					$filter[ 'value' ] = self::get_formatted_date( $value, 'Y-m-d' );
604 604
 				}
605 605
 
606 606
 				break;
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
 			'ymd_dot' => 'Y.m.d',
632 632
 		);
633 633
 
634
-		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ){
634
+		if ( ! empty( $field->dateFormat ) && isset( $datepicker[ $field->dateFormat ] ) ) {
635 635
 			$format = $datepicker[ $field->dateFormat ];
636 636
 		}
637 637
 
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 	public function add_template_path( $file_paths ) {
663 663
 
664 664
 		// Index 100 is the default GravityView template path.
665
-		$file_paths[102] = self::$file . 'templates/';
665
+		$file_paths[ 102 ] = self::$file . 'templates/';
666 666
 
667 667
 		return $file_paths;
668 668
 	}
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 		}
685 685
 
686 686
 		// get configured search fields
687
-		$search_fields = ! empty( $widget_args['search_fields'] ) ? json_decode( $widget_args['search_fields'], true ) : '';
687
+		$search_fields = ! empty( $widget_args[ 'search_fields' ] ) ? json_decode( $widget_args[ 'search_fields' ], true ) : '';
688 688
 
689 689
 		if ( empty( $search_fields ) || ! is_array( $search_fields ) ) {
690 690
 			do_action( 'gravityview_log_debug', sprintf( '%s[render_frontend] No search fields configured for widget:', get_class( $this ) ), $widget_args );
@@ -698,24 +698,24 @@  discard block
 block discarded – undo
698 698
 
699 699
 			$updated_field = $field;
700 700
 
701
-			if ( in_array( $field['input'], array( 'date', 'date_range' ) ) ) {
701
+			if ( in_array( $field[ 'input' ], array( 'date', 'date_range' ) ) ) {
702 702
 				$has_date = true;
703 703
 			}
704 704
 
705 705
 			$updated_field = $this->get_search_filter_details( $updated_field );
706 706
 
707
-			switch ( $field['field'] ) {
707
+			switch ( $field[ 'field' ] ) {
708 708
 
709 709
 				case 'search_all':
710
-					$updated_field['key'] = 'search_all';
711
-					$updated_field['input'] = 'search_all';
712
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
710
+					$updated_field[ 'key' ] = 'search_all';
711
+					$updated_field[ 'input' ] = 'search_all';
712
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_search' ) ) );
713 713
 					break;
714 714
 
715 715
 				case 'entry_date':
716
-					$updated_field['key'] = 'entry_date';
717
-					$updated_field['input'] = 'entry_date';
718
-					$updated_field['value'] = array(
716
+					$updated_field[ 'key' ] = 'entry_date';
717
+					$updated_field[ 'input' ] = 'entry_date';
718
+					$updated_field[ 'value' ] = array(
719 719
 						'start' => esc_attr( stripslashes_deep( rgget( 'gv_start' ) ) ),
720 720
 						'end' => esc_attr( stripslashes_deep( rgget( 'gv_end' ) ) ),
721 721
 					);
@@ -723,16 +723,16 @@  discard block
 block discarded – undo
723 723
 					break;
724 724
 
725 725
 				case 'entry_id':
726
-					$updated_field['key'] = 'entry_id';
727
-					$updated_field['input'] = 'entry_id';
728
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
726
+					$updated_field[ 'key' ] = 'entry_id';
727
+					$updated_field[ 'input' ] = 'entry_id';
728
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_id' ) ) );
729 729
 					break;
730 730
 
731 731
 				case 'created_by':
732
-					$updated_field['key'] = 'created_by';
733
-					$updated_field['name'] = 'gv_by';
734
-					$updated_field['value'] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
735
-					$updated_field['choices'] = self::get_created_by_choices();
732
+					$updated_field[ 'key' ] = 'created_by';
733
+					$updated_field[ 'name' ] = 'gv_by';
734
+					$updated_field[ 'value' ] = esc_attr( stripslashes_deep( rgget( 'gv_by' ) ) );
735
+					$updated_field[ 'choices' ] = self::get_created_by_choices();
736 736
 					break;
737 737
 			}
738 738
 
@@ -750,16 +750,16 @@  discard block
 block discarded – undo
750 750
 		 */
751 751
 		$gravityview_view->search_fields = apply_filters( 'gravityview_widget_search_filters', $search_fields, $this, $widget_args );
752 752
 
753
-		$gravityview_view->search_layout = ! empty( $widget_args['search_layout'] ) ? $widget_args['search_layout'] : 'horizontal';
753
+		$gravityview_view->search_layout = ! empty( $widget_args[ 'search_layout' ] ) ? $widget_args[ 'search_layout' ] : 'horizontal';
754 754
 
755 755
 		/** @since 1.14 */
756
-		$gravityview_view->search_mode = ! empty( $widget_args['search_mode'] ) ? $widget_args['search_mode'] : 'any';
756
+		$gravityview_view->search_mode = ! empty( $widget_args[ 'search_mode' ] ) ? $widget_args[ 'search_mode' ] : 'any';
757 757
 
758
-		$custom_class = ! empty( $widget_args['custom_class'] ) ? $widget_args['custom_class'] : '';
758
+		$custom_class = ! empty( $widget_args[ 'custom_class' ] ) ? $widget_args[ 'custom_class' ] : '';
759 759
 
760 760
 		$gravityview_view->search_class = self::get_search_class( $custom_class );
761 761
 
762
-		$gravityview_view->search_clear = ! empty( $widget_args['search_clear'] ) ? $widget_args['search_clear'] : false;
762
+		$gravityview_view->search_clear = ! empty( $widget_args[ 'search_clear' ] ) ? $widget_args[ 'search_clear' ] : false;
763 763
 
764 764
 		if ( $has_date ) {
765 765
 			// enqueue datepicker stuff only if needed!
@@ -779,10 +779,10 @@  discard block
 block discarded – undo
779 779
 	public static function get_search_class( $custom_class = '' ) {
780 780
 		$gravityview_view = GravityView_View::getInstance();
781 781
 
782
-		$search_class = 'gv-search-'.$gravityview_view->search_layout;
782
+		$search_class = 'gv-search-' . $gravityview_view->search_layout;
783 783
 
784
-		if ( ! empty( $custom_class )  ) {
785
-			$search_class .= ' '.$custom_class;
784
+		if ( ! empty( $custom_class ) ) {
785
+			$search_class .= ' ' . $custom_class;
786 786
 		}
787 787
 
788 788
 		/**
@@ -825,11 +825,11 @@  discard block
 block discarded – undo
825 825
 
826 826
 		$label = rgget( 'label', $field );
827 827
 
828
-		if( '' === $label ) {
828
+		if ( '' === $label ) {
829 829
 
830
-			$label = isset( $form_field['label'] ) ? $form_field['label'] : '';
830
+			$label = isset( $form_field[ 'label' ] ) ? $form_field[ 'label' ] : '';
831 831
 
832
-			switch( $field['field'] ) {
832
+			switch ( $field[ 'field' ] ) {
833 833
 				case 'search_all':
834 834
 					$label = __( 'Search Entries:', 'gravityview' );
835 835
 					break;
@@ -847,10 +847,10 @@  discard block
 block discarded – undo
847 847
 					break;
848 848
 				default:
849 849
 					// If this is a field input, not a field
850
-					if ( strpos( $field['field'], '.' ) > 0 && ! empty( $form_field['inputs'] ) ) {
850
+					if ( strpos( $field[ 'field' ], '.' ) > 0 && ! empty( $form_field[ 'inputs' ] ) ) {
851 851
 
852 852
 						// Get the label for the field in question, which returns an array
853
-						$items = wp_list_filter( $form_field['inputs'], array( 'id' => $field['field'] ) );
853
+						$items = wp_list_filter( $form_field[ 'inputs' ], array( 'id' => $field[ 'field' ] ) );
854 854
 
855 855
 						// Get the item with the `label` key
856 856
 						$values = wp_list_pluck( $items, 'label' );
@@ -887,7 +887,7 @@  discard block
 block discarded – undo
887 887
 		$form = $gravityview_view->getForm();
888 888
 
889 889
 		// for advanced field ids (eg, first name / last name )
890
-		$name = 'filter_' . str_replace( '.', '_', $field['field'] );
890
+		$name = 'filter_' . str_replace( '.', '_', $field[ 'field' ] );
891 891
 
892 892
 		// get searched value from $_GET (string or array)
893 893
 		$value = rgget( $name );
@@ -897,26 +897,26 @@  discard block
 block discarded – undo
897 897
 		$value = is_array( $value ) ? array_map( 'urldecode', $value ) : urldecode( $value );
898 898
 
899 899
 		// get form field details
900
-		$form_field = gravityview_get_field( $form, $field['field'] );
900
+		$form_field = gravityview_get_field( $form, $field[ 'field' ] );
901 901
 
902 902
 		$filter = array(
903
-			'key' => $field['field'],
903
+			'key' => $field[ 'field' ],
904 904
 			'name' => $name,
905 905
 			'label' => self::get_field_label( $field, $form_field ),
906
-			'input' => $field['input'],
906
+			'input' => $field[ 'input' ],
907 907
 			'value' => _wp_specialchars( $value ),
908
-			'type' => $form_field['type'],
908
+			'type' => $form_field[ 'type' ],
909 909
 		);
910 910
 
911 911
 		// collect choices
912
-		if ( 'post_category' === $form_field['type'] && ! empty( $form_field['displayAllCategories'] ) && empty( $form_field['choices'] ) ) {
913
-			$filter['choices'] = gravityview_get_terms_choices();
914
-		} elseif ( ! empty( $form_field['choices'] ) ) {
915
-			$filter['choices'] = $form_field['choices'];
912
+		if ( 'post_category' === $form_field[ 'type' ] && ! empty( $form_field[ 'displayAllCategories' ] ) && empty( $form_field[ 'choices' ] ) ) {
913
+			$filter[ 'choices' ] = gravityview_get_terms_choices();
914
+		} elseif ( ! empty( $form_field[ 'choices' ] ) ) {
915
+			$filter[ 'choices' ] = $form_field[ 'choices' ];
916 916
 		}
917 917
 
918
-		if ( 'date_range' === $field['input'] && empty( $value ) ) {
919
-			$filter['value'] = array( 'start' => '', 'end' => '' );
918
+		if ( 'date_range' === $field[ 'input' ] && empty( $value ) ) {
919
+			$filter[ 'value' ] = array( 'start' => '', 'end' => '' );
920 920
 		}
921 921
 
922 922
 		return $filter;
@@ -940,7 +940,7 @@  discard block
 block discarded – undo
940 940
 
941 941
 		$choices = array();
942 942
 		foreach ( $users as $user ) {
943
-			$choices[] = array(
943
+			$choices[ ] = array(
944 944
 				'value' => $user->ID,
945 945
 				'text' => $user->display_name,
946 946
 			);
@@ -974,7 +974,7 @@  discard block
 block discarded – undo
974 974
 	 */
975 975
 	public function add_datepicker_js_dependency( $js_dependencies ) {
976 976
 
977
-		$js_dependencies[] = 'jquery-ui-datepicker';
977
+		$js_dependencies[ ] = 'jquery-ui-datepicker';
978 978
 
979 979
 		return $js_dependencies;
980 980
 	}
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
 			'isRTL'             => is_rtl(),
1019 1019
 		), $view_data );
1020 1020
 
1021
-		$localizations['datepicker'] = $datepicker_settings;
1021
+		$localizations[ 'datepicker' ] = $datepicker_settings;
1022 1022
 
1023 1023
 		return $localizations;
1024 1024
 
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 		add_filter( 'gravityview_js_localization', array( $this, 'add_datepicker_localization' ), 10, 2 );
1042 1042
 
1043 1043
 		$scheme = is_ssl() ? 'https://' : 'http://';
1044
-		wp_enqueue_style( 'jquery-ui-datepicker', $scheme.'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1044
+		wp_enqueue_style( 'jquery-ui-datepicker', $scheme . 'ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/smoothness/jquery-ui.css' );
1045 1045
 
1046 1046
 		/**
1047 1047
 		 * @filter `gravityview_search_datepicker_class`
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry-user-registration.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	     * @since 1.11
44 44
 	     * @param boolean $boolean Whether to trigger update on user registration (default: true)
45 45
 	     */
46
-        if( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
47
-            add_action( 'gravityview/edit_entry/after_update' , array( $this, 'update_user' ), 10, 2 );
46
+        if ( apply_filters( 'gravityview/edit_entry/user_registration/trigger_update', true ) ) {
47
+            add_action( 'gravityview/edit_entry/after_update', array( $this, 'update_user' ), 10, 2 );
48 48
 
49 49
             // last resort in case the current user display name don't match any of the defaults
50 50
             add_action( 'gform_user_updated', array( $this, 'restore_display_name' ), 10, 4 );
@@ -62,14 +62,14 @@  discard block
 block discarded – undo
62 62
      */
63 63
     public function update_user( $form = array(), $entry_id = 0 ) {
64 64
 
65
-        if( !class_exists( 'GFAPI' ) || !class_exists( 'GFUser' ) || empty( $entry_id ) ) {
65
+        if ( ! class_exists( 'GFAPI' ) || ! class_exists( 'GFUser' ) || empty( $entry_id ) ) {
66 66
             return;
67 67
         }
68 68
 
69 69
         // support for GF User Registration 3.x
70
-        $gf_user_3 =  class_exists('GF_User_Registration') ? true : false;
70
+        $gf_user_3 = class_exists( 'GF_User_Registration' ) ? true : false;
71 71
 
72
-        if( $gf_user_3 ) {
72
+        if ( $gf_user_3 ) {
73 73
             $gf_user_registration = GF_User_Registration::get_instance();
74 74
         }
75 75
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
         /**
87 87
          * @since 1.14
88 88
          */
89
-        if( $gf_user_3 ) {
89
+        if ( $gf_user_3 ) {
90 90
             $config = $gf_user_registration->get_single_submission_feed( $entry, $form );
91 91
         } else {
92 92
             $config = GFUser::get_active_config( $form, $entry );
@@ -103,15 +103,15 @@  discard block
 block discarded – undo
103 103
          */
104 104
         $preserve_role = apply_filters( 'gravityview/edit_entry/user_registration/preserve_role', true, $config, $form, $entry );
105 105
 
106
-        if( $preserve_role ) {
107
-            $config['meta']['role'] = 'gfur_preserve_role';
106
+        if ( $preserve_role ) {
107
+            $config[ 'meta' ][ 'role' ] = 'gfur_preserve_role';
108 108
         }
109 109
 
110 110
         /**
111 111
          * Make sure the current display name is not changed with the update user method.
112 112
          * @since 1.15
113 113
          */
114
-        $config['meta']['displayname'] = $this->match_current_display_name( $entry['created_by'] );
114
+        $config[ 'meta' ][ 'displayname' ] = $this->match_current_display_name( $entry[ 'created_by' ] );
115 115
 
116 116
 
117 117
         /**
@@ -123,10 +123,10 @@  discard block
 block discarded – undo
123 123
          */
124 124
         $config = apply_filters( 'gravityview/edit_entry/user_registration/config', $config, $form, $entry );
125 125
 
126
-        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type') === 'create' );
126
+        $is_create_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'create' );
127 127
 
128 128
         // Only update if it's a create feed
129
-        if( ! $is_create_feed ) {
129
+        if ( ! $is_create_feed ) {
130 130
             return;
131 131
         }
132 132
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
         add_filter( 'send_email_change_email', '__return_false', 3 );
136 136
 
137 137
         // Trigger the User Registration update user method
138
-        if( $gf_user_3 ) {
138
+        if ( $gf_user_3 ) {
139 139
             $gf_user_registration->update_user( $entry, $form, $config );
140 140
         } else {
141 141
             GFUser::update_user( $entry, $form, $config );
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
         // In case we can't find the current display name format, or it is the 'nickname' format (which Gravity Forms doesn't support)
167 167
         //   trigger last resort method at the 'gform_user_updated' hook
168
-        if( false === $format || 'nickname' === $format ) {
168
+        if ( false === $format || 'nickname' === $format ) {
169 169
             $this->_user_before_update = $user;
170 170
             $format = 'nickname';
171 171
         }
@@ -185,18 +185,18 @@  discard block
 block discarded – undo
185 185
     public function generate_display_names( $profileuser ) {
186 186
 
187 187
         $public_display = array();
188
-        $public_display['nickname']  = $profileuser->nickname;
189
-        $public_display['username']  = $profileuser->user_login;
188
+        $public_display[ 'nickname' ]  = $profileuser->nickname;
189
+        $public_display[ 'username' ]  = $profileuser->user_login;
190 190
 
191
-        if ( !empty($profileuser->first_name) )
192
-            $public_display['firstname'] = $profileuser->first_name;
191
+        if ( ! empty( $profileuser->first_name ) )
192
+            $public_display[ 'firstname' ] = $profileuser->first_name;
193 193
 
194
-        if ( !empty($profileuser->last_name) )
195
-            $public_display['lastname'] = $profileuser->last_name;
194
+        if ( ! empty( $profileuser->last_name ) )
195
+            $public_display[ 'lastname' ] = $profileuser->last_name;
196 196
 
197
-        if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
198
-            $public_display['firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
199
-            $public_display['lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
197
+        if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
198
+            $public_display[ 'firstlast' ] = $profileuser->first_name . ' ' . $profileuser->last_name;
199
+            $public_display[ 'lastfirst' ] = $profileuser->last_name . ' ' . $profileuser->first_name;
200 200
         }
201 201
 
202 202
         $public_display = array_map( 'trim', $public_display );
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
          */
227 227
         $restore_display_name = apply_filters( 'gravityview/edit_entry/restore_display_name', true );
228 228
 
229
-        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type') === 'update' );
229
+        $is_update_feed = ( $config && rgars( $config, 'meta/feed_type' ) === 'update' );
230 230
 
231 231
         /**
232 232
          * Don't restore display name:
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
          *   - or we don't need as we found the correct format before updating user.
236 236
          * @since 1.14.4
237 237
          */
238
-        if( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
238
+        if ( ! $restore_display_name || $is_update_feed || is_null( $this->_user_before_update ) ) {
239 239
             return;
240 240
         }
241 241
 
@@ -261,10 +261,10 @@  discard block
 block discarded – undo
261 261
 
262 262
         $updated = wp_update_user( $restored_user );
263 263
 
264
-        if( is_wp_error( $updated ) ) {
265
-            do_action('gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
264
+        if ( is_wp_error( $updated ) ) {
265
+            do_action( 'gravityview_log_error', __METHOD__ . sprintf( ' - There was an error updating user #%d details', $user_id ), $updated );
266 266
         } else {
267
-            do_action('gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
267
+            do_action( 'gravityview_log_debug', __METHOD__ . sprintf( ' - User #%d details restored', $user_id ) );
268 268
         }
269 269
 
270 270
         $this->_user_before_update = null;
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
         $this->load_components( 'render' );
45 45
 
46 46
         // If GF User Registration Add-on exists
47
-        if( class_exists( 'GFUser' ) || class_exists( 'GF_User_Registration' ) ) {
47
+        if ( class_exists( 'GFUser' ) || class_exists( 'GF_User_Registration' ) ) {
48 48
             $this->load_components( 'user-registration' );
49 49
         }
50 50
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     static function getInstance() {
59 59
 
60
-        if( empty( self::$instance ) ) {
60
+        if ( empty( self::$instance ) ) {
61 61
             self::$instance = new GravityView_Edit_Entry;
62 62
         }
63 63
 
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
     private function add_hooks() {
84 84
 
85 85
         // Add front-end access to Gravity Forms delete file action
86
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file') );
86
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'RGForms', 'delete_file' ) );
87 87
 
88 88
         // Make sure this hook is run for non-admins
89
-        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file') );
89
+        add_action( 'wp_ajax_rg_delete_file', array( 'RGForms', 'delete_file' ) );
90 90
 
91 91
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
92 92
 
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	 */
102 102
 	private function addon_specific_hooks() {
103 103
 
104
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
104
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
105
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
106 106
 		}
107 107
 
108 108
 	}
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
      */
149 149
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
150 150
 
151
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
151
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
152 152
 
153 153
         $base = gv_entry_link( $entry, $post_id );
154 154
 
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 	     * Allow passing params to dynamically populate entry with values
163 163
 	     * @since 1.9.2
164 164
 	     */
165
-	    if( !empty( $field_values ) ) {
165
+	    if ( ! empty( $field_values ) ) {
166 166
 
167
-		    if( is_array( $field_values ) ) {
167
+		    if ( is_array( $field_values ) ) {
168 168
 			    // If already an array, no parse_str() needed
169 169
 			    $params = $field_values;
170 170
 		    } else {
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	 */
187 187
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
188 188
 
189
-		if( empty( $context ) || $context !== 'edit' ) {
189
+		if ( empty( $context ) || $context !== 'edit' ) {
190 190
 			return $fields;
191 191
 		}
192 192
 
@@ -228,24 +228,24 @@  discard block
 block discarded – undo
228 228
         // If they can edit any entries (as defined in Gravity Forms)
229 229
         // Or if they can edit other people's entries
230 230
         // Then we're good.
231
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
231
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
232 232
 
233
-            do_action('gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.');
233
+            do_action( 'gravityview_log_debug', __METHOD__ . ' - User has ability to edit all entries.' );
234 234
 
235 235
             $user_can_edit = true;
236 236
 
237
-        } else if( !isset( $entry['created_by'] ) ) {
237
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
238 238
 
239
-            do_action('gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.');
239
+            do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[check_user_cap_edit_entry] Entry `created_by` doesn\'t exist.' );
240 240
 
241 241
             $user_can_edit = false;
242 242
 
243 243
         } else {
244 244
 
245 245
             // get user_edit setting
246
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
246
+            if ( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
247 247
                 // if View ID not specified or is the current view
248
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
248
+                $user_edit = GravityView_View::getInstance()->getAtts( 'user_edit' );
249 249
             } else {
250 250
                 // in case is specified and not the current view
251 251
                 $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
@@ -254,21 +254,21 @@  discard block
 block discarded – undo
254 254
             $current_user = wp_get_current_user();
255 255
 
256 256
             // User edit is disabled
257
-            if( empty( $user_edit ) ) {
257
+            if ( empty( $user_edit ) ) {
258 258
 
259
-                do_action('gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
259
+                do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[check_user_cap_edit_entry] User Edit is disabled. Returning false.' );
260 260
 
261 261
                 $user_can_edit = false;
262 262
             }
263 263
 
264 264
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
265
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
265
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
266 266
 
267
-                do_action('gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
267
+                do_action( 'gravityview_log_debug', sprintf( 'GravityView_Edit_Entry[check_user_cap_edit_entry] User %s created the entry.', $current_user->ID ) );
268 268
 
269 269
                 $user_can_edit = true;
270 270
 
271
-            } else if( ! is_user_logged_in() ) {
271
+            } else if ( ! is_user_logged_in() ) {
272 272
 
273 273
                 do_action( 'gravityview_log_debug', __METHOD__ . ' No user defined; edit entry requires logged in user' );
274 274
             }
Please login to merge, or discard this patch.