@@ -106,16 +106,16 @@ discard block |
||
106 | 106 | function load() { |
107 | 107 | |
108 | 108 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
109 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
109 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
110 | 110 | |
111 | 111 | // Don't display an embedded form when editing an entry |
112 | 112 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
113 | 113 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
114 | 114 | |
115 | 115 | // Stop Gravity Forms processing what is ours! |
116 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
116 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
117 | 117 | |
118 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
118 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
119 | 119 | |
120 | 120 | add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
121 | 121 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
127 | 127 | |
128 | 128 | // Add fields expected by GFFormDisplay::validate() |
129 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
129 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
130 | 130 | |
131 | 131 | } |
132 | 132 | |
@@ -141,8 +141,8 @@ discard block |
||
141 | 141 | * @return void |
142 | 142 | */ |
143 | 143 | public function prevent_render_form() { |
144 | - if( $this->is_edit_entry() ) { |
|
145 | - if( 'wp_head' === current_filter() ) { |
|
144 | + if ( $this->is_edit_entry() ) { |
|
145 | + if ( 'wp_head' === current_filter() ) { |
|
146 | 146 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
147 | 147 | } else { |
148 | 148 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -157,12 +157,12 @@ discard block |
||
157 | 157 | */ |
158 | 158 | public function prevent_maybe_process_form() { |
159 | 159 | |
160 | - if( ! empty( $_POST ) ) { |
|
160 | + if ( ! empty( $_POST ) ) { |
|
161 | 161 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
162 | 162 | } |
163 | 163 | |
164 | - if( $this->is_edit_entry_submission() ) { |
|
165 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
164 | + if ( $this->is_edit_entry_submission() ) { |
|
165 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | */ |
173 | 173 | public function is_edit_entry() { |
174 | 174 | |
175 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
175 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
176 | 176 | |
177 | 177 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | * @return boolean |
184 | 184 | */ |
185 | 185 | public function is_edit_entry_submission() { |
186 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
186 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
@@ -194,15 +194,15 @@ discard block |
||
194 | 194 | |
195 | 195 | |
196 | 196 | $entries = $gravityview_view->getEntries(); |
197 | - self::$original_entry = $entries[0]; |
|
198 | - $this->entry = $entries[0]; |
|
197 | + self::$original_entry = $entries[ 0 ]; |
|
198 | + $this->entry = $entries[ 0 ]; |
|
199 | 199 | |
200 | 200 | self::$original_form = $gravityview_view->getForm(); |
201 | 201 | $this->form = $gravityview_view->getForm(); |
202 | 202 | $this->form_id = $gravityview_view->getFormId(); |
203 | 203 | $this->view_id = $gravityview_view->getViewId(); |
204 | 204 | |
205 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
205 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | |
@@ -222,14 +222,14 @@ discard block |
||
222 | 222 | $this->setup_vars(); |
223 | 223 | |
224 | 224 | // Multiple Views embedded, don't proceed if nonce fails |
225 | - if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) { |
|
226 | - do_action('gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
225 | + if ( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) { |
|
226 | + do_action( 'gravityview_log_error', __METHOD__ . ': Nonce validation failed for the Edit Entry request; returning' ); |
|
227 | 227 | return; |
228 | 228 | } |
229 | 229 | |
230 | 230 | // Sorry, you're not allowed here. |
231 | - if( false === $this->user_can_edit_entry( true ) ) { |
|
232 | - do_action('gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
231 | + if ( false === $this->user_can_edit_entry( true ) ) { |
|
232 | + do_action( 'gravityview_log_error', __METHOD__ . ': User is not allowed to edit this entry; returning', $this->entry ); |
|
233 | 233 | return; |
234 | 234 | } |
235 | 235 | |
@@ -249,9 +249,9 @@ discard block |
||
249 | 249 | private function print_scripts() { |
250 | 250 | $gravityview_view = GravityView_View::getInstance(); |
251 | 251 | |
252 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
252 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
253 | 253 | |
254 | - GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false); |
|
254 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
255 | 255 | |
256 | 256 | // Sack is required for images |
257 | 257 | wp_print_scripts( array( 'sack', 'gform_gravityforms' ) ); |
@@ -263,32 +263,32 @@ discard block |
||
263 | 263 | */ |
264 | 264 | private function process_save() { |
265 | 265 | |
266 | - if( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
266 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
267 | 267 | return; |
268 | 268 | } |
269 | 269 | |
270 | 270 | // Make sure the entry, view, and form IDs are all correct |
271 | 271 | $valid = $this->verify_nonce(); |
272 | 272 | |
273 | - if( !$valid ) { |
|
274 | - do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
273 | + if ( ! $valid ) { |
|
274 | + do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
275 | 275 | return; |
276 | 276 | } |
277 | 277 | |
278 | - if( $this->entry['id'] !== $_POST['lid'] ) { |
|
279 | - do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
278 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
279 | + do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
280 | 280 | return; |
281 | 281 | } |
282 | 282 | |
283 | - do_action('gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
283 | + do_action( 'gravityview_log_debug', __METHOD__ . ': $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
284 | 284 | |
285 | 285 | $this->process_save_process_files( $this->form_id ); |
286 | 286 | |
287 | 287 | $this->validate(); |
288 | 288 | |
289 | - if( $this->is_valid ) { |
|
289 | + if ( $this->is_valid ) { |
|
290 | 290 | |
291 | - do_action('gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
291 | + do_action( 'gravityview_log_debug', __METHOD__ . ': Submission is valid.' ); |
|
292 | 292 | |
293 | 293 | /** |
294 | 294 | * @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields |
@@ -298,22 +298,22 @@ discard block |
||
298 | 298 | /** |
299 | 299 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
300 | 300 | */ |
301 | - unset( $_GET['page'] ); |
|
301 | + unset( $_GET[ 'page' ] ); |
|
302 | 302 | |
303 | - $date_created = $this->entry['date_created']; |
|
303 | + $date_created = $this->entry[ 'date_created' ]; |
|
304 | 304 | |
305 | 305 | /** |
306 | 306 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
307 | 307 | * @since 1.17.2 |
308 | 308 | */ |
309 | - unset( $this->entry['date_created'] ); |
|
309 | + unset( $this->entry[ 'date_created' ] ); |
|
310 | 310 | |
311 | 311 | GFFormsModel::save_lead( $form, $this->entry ); |
312 | 312 | |
313 | 313 | // Delete the values for hidden inputs |
314 | 314 | $this->unset_hidden_field_values(); |
315 | 315 | |
316 | - $this->entry['date_created'] = $date_created; |
|
316 | + $this->entry[ 'date_created' ] = $date_created; |
|
317 | 317 | |
318 | 318 | // Process calculation fields |
319 | 319 | $this->update_calculation_fields(); |
@@ -333,10 +333,10 @@ discard block |
||
333 | 333 | * @param string $entry_id Numeric ID of the entry that was updated |
334 | 334 | * @param GravityView_Edit_Entry_Render $this This object |
335 | 335 | */ |
336 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this ); |
|
336 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this ); |
|
337 | 337 | |
338 | 338 | } else { |
339 | - do_action('gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
339 | + do_action( 'gravityview_log_error', __METHOD__ . ': Submission is NOT valid.', $this->entry ); |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | } // process_save |
@@ -353,8 +353,8 @@ discard block |
||
353 | 353 | private function unset_hidden_field_values() { |
354 | 354 | global $wpdb; |
355 | 355 | |
356 | - $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
357 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
356 | + $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
357 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
358 | 358 | |
359 | 359 | foreach ( $this->entry as $input_id => $field_value ) { |
360 | 360 | |
@@ -407,11 +407,11 @@ discard block |
||
407 | 407 | * @return mixed |
408 | 408 | */ |
409 | 409 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
410 | - if( ! $this->is_edit_entry() ) { |
|
410 | + if ( ! $this->is_edit_entry() ) { |
|
411 | 411 | return $plupload_init; |
412 | 412 | } |
413 | 413 | |
414 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
414 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
415 | 415 | |
416 | 416 | return $plupload_init; |
417 | 417 | } |
@@ -426,22 +426,22 @@ discard block |
||
426 | 426 | $form = $this->form; |
427 | 427 | |
428 | 428 | /** @var GF_Field $field */ |
429 | - foreach( $form['fields'] as $k => &$field ) { |
|
429 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
430 | 430 | |
431 | 431 | /** |
432 | 432 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
433 | 433 | * @since 1.16.3 |
434 | 434 | * @var GF_Field $field |
435 | 435 | */ |
436 | - if( $field->has_calculation() ) { |
|
437 | - unset( $form['fields'][ $k ] ); |
|
436 | + if ( $field->has_calculation() ) { |
|
437 | + unset( $form[ 'fields' ][ $k ] ); |
|
438 | 438 | } |
439 | 439 | |
440 | 440 | $field->adminOnly = false; |
441 | 441 | |
442 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
443 | - foreach( $field->inputs as $key => $input ) { |
|
444 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
442 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
443 | + foreach ( $field->inputs as $key => $input ) { |
|
444 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
445 | 445 | } |
446 | 446 | } |
447 | 447 | } |
@@ -455,30 +455,30 @@ discard block |
||
455 | 455 | $update = false; |
456 | 456 | |
457 | 457 | // get the most up to date entry values |
458 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
458 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
459 | 459 | |
460 | - if( !empty( $this->fields_with_calculation ) ) { |
|
460 | + if ( ! empty( $this->fields_with_calculation ) ) { |
|
461 | 461 | $update = true; |
462 | 462 | foreach ( $this->fields_with_calculation as $calc_field ) { |
463 | 463 | $inputs = $calc_field->get_entry_inputs(); |
464 | 464 | if ( is_array( $inputs ) ) { |
465 | 465 | foreach ( $inputs as $input ) { |
466 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
467 | - $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
466 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
467 | + $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
468 | 468 | } |
469 | 469 | } else { |
470 | - $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
471 | - $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
470 | + $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
471 | + $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
472 | 472 | } |
473 | 473 | } |
474 | 474 | |
475 | 475 | } |
476 | 476 | |
477 | - if( $update ) { |
|
477 | + if ( $update ) { |
|
478 | 478 | |
479 | 479 | $return_entry = GFAPI::update_entry( $entry ); |
480 | 480 | |
481 | - if( is_wp_error( $return_entry ) ) { |
|
481 | + if ( is_wp_error( $return_entry ) ) { |
|
482 | 482 | do_action( 'gravityview_log_error', 'Updating the entry calculation fields failed', $return_entry ); |
483 | 483 | } else { |
484 | 484 | do_action( 'gravityview_log_debug', 'Updating the entry calculation fields succeeded' ); |
@@ -509,18 +509,18 @@ discard block |
||
509 | 509 | |
510 | 510 | $input_name = 'input_' . $field_id; |
511 | 511 | |
512 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
512 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
513 | 513 | |
514 | 514 | // We have a new image |
515 | 515 | |
516 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
516 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
517 | 517 | |
518 | 518 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
519 | 519 | $img_url = rgar( $ary, 0 ); |
520 | 520 | |
521 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
522 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
523 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
521 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
522 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
523 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
524 | 524 | |
525 | 525 | $image_meta = array( |
526 | 526 | 'post_excerpt' => $img_caption, |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | |
530 | 530 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
531 | 531 | if ( ! empty( $img_title ) ) { |
532 | - $image_meta['post_title'] = $img_title; |
|
532 | + $image_meta[ 'post_title' ] = $img_title; |
|
533 | 533 | } |
534 | 534 | |
535 | 535 | /** |
@@ -544,22 +544,22 @@ discard block |
||
544 | 544 | set_post_thumbnail( $post_id, $media_id ); |
545 | 545 | } |
546 | 546 | |
547 | - } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
547 | + } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
548 | 548 | |
549 | 549 | // Same image although the image title, caption or description might have changed |
550 | 550 | |
551 | 551 | $ary = array(); |
552 | - if( ! empty( $entry[ $field_id ] ) ) { |
|
552 | + if ( ! empty( $entry[ $field_id ] ) ) { |
|
553 | 553 | $ary = is_array( $entry[ $field_id ] ) ? $entry[ $field_id ] : explode( '|:|', $entry[ $field_id ] ); |
554 | 554 | } |
555 | 555 | $img_url = rgar( $ary, 0 ); |
556 | 556 | |
557 | 557 | // is this really the same image or something went wrong ? |
558 | - if( $img_url === $_POST[ $input_name ] ) { |
|
558 | + if ( $img_url === $_POST[ $input_name ] ) { |
|
559 | 559 | |
560 | - $img_title = rgar( $value, $field_id .'.1' ); |
|
561 | - $img_caption = rgar( $value, $field_id .'.4' ); |
|
562 | - $img_description = rgar( $value, $field_id .'.7' ); |
|
560 | + $img_title = rgar( $value, $field_id . '.1' ); |
|
561 | + $img_caption = rgar( $value, $field_id . '.4' ); |
|
562 | + $img_description = rgar( $value, $field_id . '.7' ); |
|
563 | 563 | |
564 | 564 | $value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : ''; |
565 | 565 | |
@@ -599,16 +599,16 @@ discard block |
||
599 | 599 | */ |
600 | 600 | private function maybe_update_post_fields( $form ) { |
601 | 601 | |
602 | - if( empty( $this->entry['post_id'] ) ) { |
|
602 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
603 | 603 | do_action( 'gravityview_log_debug', __METHOD__ . ': This entry has no post fields. Continuing...' ); |
604 | 604 | return; |
605 | 605 | } |
606 | 606 | |
607 | - $post_id = $this->entry['post_id']; |
|
607 | + $post_id = $this->entry[ 'post_id' ]; |
|
608 | 608 | |
609 | 609 | // Security check |
610 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
611 | - do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id ); |
|
610 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
611 | + do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id ); |
|
612 | 612 | return; |
613 | 613 | } |
614 | 614 | |
@@ -620,25 +620,25 @@ discard block |
||
620 | 620 | |
621 | 621 | $field = RGFormsModel::get_field( $form, $field_id ); |
622 | 622 | |
623 | - if( ! $field ) { |
|
623 | + if ( ! $field ) { |
|
624 | 624 | continue; |
625 | 625 | } |
626 | 626 | |
627 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
627 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
628 | 628 | |
629 | 629 | // Get the value of the field, including $_POSTed value |
630 | 630 | $value = RGFormsModel::get_field_value( $field ); |
631 | 631 | |
632 | 632 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
633 | 633 | $entry_tmp = $this->entry; |
634 | - $entry_tmp["{$field_id}"] = $value; |
|
634 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
635 | 635 | |
636 | - switch( $field->type ) { |
|
636 | + switch ( $field->type ) { |
|
637 | 637 | |
638 | 638 | case 'post_title': |
639 | 639 | $post_title = $value; |
640 | - if( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
641 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
640 | + if ( rgar( $form, 'postTitleTemplateEnabled' ) ) { |
|
641 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
642 | 642 | } |
643 | 643 | $updated_post->post_title = $post_title; |
644 | 644 | $updated_post->post_name = $post_title; |
@@ -647,8 +647,8 @@ discard block |
||
647 | 647 | |
648 | 648 | case 'post_content': |
649 | 649 | $post_content = $value; |
650 | - if( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
651 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
650 | + if ( rgar( $form, 'postContentTemplateEnabled' ) ) { |
|
651 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
652 | 652 | } |
653 | 653 | $updated_post->post_content = $post_content; |
654 | 654 | unset( $post_content ); |
@@ -662,12 +662,12 @@ discard block |
||
662 | 662 | case 'post_category': |
663 | 663 | break; |
664 | 664 | case 'post_custom_field': |
665 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
665 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
666 | 666 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
667 | 667 | } |
668 | 668 | |
669 | 669 | if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
670 | - $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value ); |
|
670 | + $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value ); |
|
671 | 671 | } |
672 | 672 | |
673 | 673 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | } |
681 | 681 | |
682 | 682 | // update entry after |
683 | - $this->entry["{$field_id}"] = $value; |
|
683 | + $this->entry[ "{$field_id}" ] = $value; |
|
684 | 684 | |
685 | 685 | $update_entry = true; |
686 | 686 | |
@@ -689,25 +689,25 @@ discard block |
||
689 | 689 | |
690 | 690 | } |
691 | 691 | |
692 | - if( $update_entry ) { |
|
692 | + if ( $update_entry ) { |
|
693 | 693 | |
694 | 694 | $return_entry = GFAPI::update_entry( $this->entry ); |
695 | 695 | |
696 | - if( is_wp_error( $return_entry ) ) { |
|
696 | + if ( is_wp_error( $return_entry ) ) { |
|
697 | 697 | do_action( 'gravityview_log_error', 'Updating the entry post fields failed', array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ); |
698 | 698 | } else { |
699 | - do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' ); |
|
699 | + do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' ); |
|
700 | 700 | } |
701 | 701 | |
702 | 702 | } |
703 | 703 | |
704 | 704 | $return_post = wp_update_post( $updated_post, true ); |
705 | 705 | |
706 | - if( is_wp_error( $return_post ) ) { |
|
706 | + if ( is_wp_error( $return_post ) ) { |
|
707 | 707 | $return_post->add_data( $updated_post, '$updated_post' ); |
708 | 708 | do_action( 'gravityview_log_error', 'Updating the post content failed', compact( 'updated_post', 'return_post' ) ); |
709 | 709 | } else { |
710 | - do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post ); |
|
710 | + do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post ); |
|
711 | 711 | } |
712 | 712 | } |
713 | 713 | |
@@ -725,7 +725,7 @@ discard block |
||
725 | 725 | $input_type = RGFormsModel::get_input_type( $field ); |
726 | 726 | |
727 | 727 | // Only certain custom field types are supported |
728 | - switch( $input_type ) { |
|
728 | + switch ( $input_type ) { |
|
729 | 729 | case 'fileupload': |
730 | 730 | case 'list': |
731 | 731 | case 'multiselect': |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
763 | 763 | |
764 | 764 | // replace conditional shortcodes |
765 | - if( $do_shortcode ) { |
|
765 | + if ( $do_shortcode ) { |
|
766 | 766 | $output = do_shortcode( $output ); |
767 | 767 | } |
768 | 768 | |
@@ -781,18 +781,18 @@ discard block |
||
781 | 781 | */ |
782 | 782 | private function after_update() { |
783 | 783 | |
784 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
785 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
784 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
785 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
786 | 786 | |
787 | 787 | // Re-define the entry now that we've updated it. |
788 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
788 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
789 | 789 | |
790 | 790 | $entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
791 | 791 | |
792 | 792 | // We need to clear the cache because Gravity Forms caches the field values, which |
793 | 793 | // we have just updated. |
794 | - foreach ($this->form['fields'] as $key => $field) { |
|
795 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
794 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
795 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
796 | 796 | } |
797 | 797 | |
798 | 798 | $this->entry = $entry; |
@@ -810,7 +810,7 @@ discard block |
||
810 | 810 | |
811 | 811 | <div class="gv-edit-entry-wrapper"><?php |
812 | 812 | |
813 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
813 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
814 | 814 | |
815 | 815 | /** |
816 | 816 | * Fixes weird wpautop() issue |
@@ -826,7 +826,7 @@ discard block |
||
826 | 826 | * @param string $edit_entry_title Modify the "Edit Entry" title |
827 | 827 | * @param GravityView_Edit_Entry_Render $this This object |
828 | 828 | */ |
829 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
829 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
830 | 830 | |
831 | 831 | echo esc_attr( $edit_entry_title ); |
832 | 832 | ?></span> |
@@ -872,20 +872,20 @@ discard block |
||
872 | 872 | */ |
873 | 873 | private function maybe_print_message() { |
874 | 874 | |
875 | - if( rgpost('action') === 'update' ) { |
|
875 | + if ( rgpost( 'action' ) === 'update' ) { |
|
876 | 876 | |
877 | 877 | $back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
878 | 878 | |
879 | - if( ! $this->is_valid ){ |
|
879 | + if ( ! $this->is_valid ) { |
|
880 | 880 | |
881 | 881 | // Keeping this compatible with Gravity Forms. |
882 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
883 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
882 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
883 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
884 | 884 | |
885 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
885 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
886 | 886 | |
887 | 887 | } else { |
888 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
888 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
889 | 889 | |
890 | 890 | /** |
891 | 891 | * @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | * @param array $entry Gravity Forms entry array |
896 | 896 | * @param string $back_link URL to return to the original entry. @since 1.6 |
897 | 897 | */ |
898 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
898 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
899 | 899 | |
900 | 900 | echo GVCommon::generate_notice( $message ); |
901 | 901 | } |
@@ -919,21 +919,21 @@ discard block |
||
919 | 919 | */ |
920 | 920 | do_action( 'gravityview/edit-entry/render/before', $this ); |
921 | 921 | |
922 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
923 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
922 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
923 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
924 | 924 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
925 | 925 | |
926 | 926 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
927 | 927 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
928 | 928 | |
929 | 929 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
930 | - unset( $_GET['page'] ); |
|
930 | + unset( $_GET[ 'page' ] ); |
|
931 | 931 | |
932 | 932 | // TODO: Verify multiple-page forms |
933 | 933 | |
934 | 934 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
935 | 935 | |
936 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
936 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
937 | 937 | |
938 | 938 | ob_get_clean(); |
939 | 939 | |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | * @return string |
960 | 960 | */ |
961 | 961 | public function render_form_buttons() { |
962 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
962 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
963 | 963 | } |
964 | 964 | |
965 | 965 | |
@@ -979,10 +979,10 @@ discard block |
||
979 | 979 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
980 | 980 | |
981 | 981 | // In case we have validated the form, use it to inject the validation results into the form render |
982 | - if( isset( $this->form_after_validation ) ) { |
|
982 | + if ( isset( $this->form_after_validation ) ) { |
|
983 | 983 | $form = $this->form_after_validation; |
984 | 984 | } else { |
985 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
985 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
986 | 986 | } |
987 | 987 | |
988 | 988 | $form = $this->filter_conditional_logic( $form ); |
@@ -990,8 +990,8 @@ discard block |
||
990 | 990 | $form = $this->prefill_conditional_logic( $form ); |
991 | 991 | |
992 | 992 | // for now we don't support Save and Continue feature. |
993 | - if( ! self::$supports_save_and_continue ) { |
|
994 | - unset( $form['save'] ); |
|
993 | + if ( ! self::$supports_save_and_continue ) { |
|
994 | + unset( $form[ 'save' ] ); |
|
995 | 995 | } |
996 | 996 | |
997 | 997 | return $form; |
@@ -1012,29 +1012,29 @@ discard block |
||
1012 | 1012 | */ |
1013 | 1013 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1014 | 1014 | |
1015 | - if( GFCommon::is_post_field( $field ) ) { |
|
1015 | + if ( GFCommon::is_post_field( $field ) ) { |
|
1016 | 1016 | |
1017 | 1017 | $message = null; |
1018 | 1018 | |
1019 | 1019 | // First, make sure they have the capability to edit the post. |
1020 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1020 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1021 | 1021 | |
1022 | 1022 | /** |
1023 | 1023 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1024 | 1024 | * @param string $message The existing "You don't have permission..." text |
1025 | 1025 | */ |
1026 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1026 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1027 | 1027 | |
1028 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1028 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1029 | 1029 | /** |
1030 | 1030 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1031 | 1031 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1032 | 1032 | */ |
1033 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1033 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1034 | 1034 | } |
1035 | 1035 | |
1036 | - if( $message ) { |
|
1037 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1036 | + if ( $message ) { |
|
1037 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1038 | 1038 | } |
1039 | 1039 | } |
1040 | 1040 | |
@@ -1059,8 +1059,8 @@ discard block |
||
1059 | 1059 | |
1060 | 1060 | // If the form has been submitted, then we don't need to pre-fill the values, |
1061 | 1061 | // Except for fileupload type and when a field input is overridden- run always!! |
1062 | - if( |
|
1063 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1062 | + if ( |
|
1063 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1064 | 1064 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1065 | 1065 | && ! GFCommon::is_product_field( $field->type ) |
1066 | 1066 | || ! empty( $field_content ) |
@@ -1080,7 +1080,7 @@ discard block |
||
1080 | 1080 | $return = null; |
1081 | 1081 | |
1082 | 1082 | /** @var GravityView_Field $gv_field */ |
1083 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1083 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1084 | 1084 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1085 | 1085 | } else { |
1086 | 1086 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1089,7 +1089,7 @@ discard block |
||
1089 | 1089 | // If there was output, it's an error |
1090 | 1090 | $warnings = ob_get_clean(); |
1091 | 1091 | |
1092 | - if( !empty( $warnings ) ) { |
|
1092 | + if ( ! empty( $warnings ) ) { |
|
1093 | 1093 | do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value ); |
1094 | 1094 | } |
1095 | 1095 | |
@@ -1114,7 +1114,7 @@ discard block |
||
1114 | 1114 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1115 | 1115 | |
1116 | 1116 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1117 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1117 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1118 | 1118 | |
1119 | 1119 | $field_value = array(); |
1120 | 1120 | |
@@ -1123,10 +1123,10 @@ discard block |
||
1123 | 1123 | |
1124 | 1124 | foreach ( (array)$field->inputs as $input ) { |
1125 | 1125 | |
1126 | - $input_id = strval( $input['id'] ); |
|
1126 | + $input_id = strval( $input[ 'id' ] ); |
|
1127 | 1127 | |
1128 | 1128 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1129 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1129 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1130 | 1130 | $allow_pre_populated = false; |
1131 | 1131 | } |
1132 | 1132 | |
@@ -1134,7 +1134,7 @@ discard block |
||
1134 | 1134 | |
1135 | 1135 | $pre_value = $field->get_value_submission( array(), false ); |
1136 | 1136 | |
1137 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1137 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1138 | 1138 | |
1139 | 1139 | } else { |
1140 | 1140 | |
@@ -1145,13 +1145,13 @@ discard block |
||
1145 | 1145 | |
1146 | 1146 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1147 | 1147 | // or pre-populated value if not empty and set to override saved value |
1148 | - $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1148 | + $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1149 | 1149 | |
1150 | 1150 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1151 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1151 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1152 | 1152 | $categories = array(); |
1153 | 1153 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1154 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1154 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1155 | 1155 | } |
1156 | 1156 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1157 | 1157 | } |
@@ -1179,7 +1179,7 @@ discard block |
||
1179 | 1179 | * @param GF_Field $field Gravity Forms field object |
1180 | 1180 | * @param GravityView_Edit_Entry_Render $this Current object |
1181 | 1181 | */ |
1182 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1182 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1183 | 1183 | |
1184 | 1184 | return $field_value; |
1185 | 1185 | } |
@@ -1196,12 +1196,12 @@ discard block |
||
1196 | 1196 | */ |
1197 | 1197 | public function gform_pre_validation( $form ) { |
1198 | 1198 | |
1199 | - if( ! $this->verify_nonce() ) { |
|
1199 | + if ( ! $this->verify_nonce() ) { |
|
1200 | 1200 | return $form; |
1201 | 1201 | } |
1202 | 1202 | |
1203 | 1203 | // Fix PHP warning regarding undefined index. |
1204 | - foreach ( $form['fields'] as &$field) { |
|
1204 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1205 | 1205 | |
1206 | 1206 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1207 | 1207 | // expects certain field array items to be set. |
@@ -1209,7 +1209,7 @@ discard block |
||
1209 | 1209 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1210 | 1210 | } |
1211 | 1211 | |
1212 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1212 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1213 | 1213 | |
1214 | 1214 | /** |
1215 | 1215 | * 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. |
@@ -1223,37 +1223,37 @@ discard block |
||
1223 | 1223 | // Set the previous value |
1224 | 1224 | $entry = $this->get_entry(); |
1225 | 1225 | |
1226 | - $input_name = 'input_'.$field->id; |
|
1227 | - $form_id = $form['id']; |
|
1226 | + $input_name = 'input_' . $field->id; |
|
1227 | + $form_id = $form[ 'id' ]; |
|
1228 | 1228 | |
1229 | 1229 | $value = NULL; |
1230 | 1230 | |
1231 | 1231 | // Use the previous entry value as the default. |
1232 | - if( isset( $entry[ $field->id ] ) ) { |
|
1232 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1233 | 1233 | $value = $entry[ $field->id ]; |
1234 | 1234 | } |
1235 | 1235 | |
1236 | 1236 | // If this is a single upload file |
1237 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1238 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1239 | - $value = $file_path['url']; |
|
1237 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1238 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1239 | + $value = $file_path[ 'url' ]; |
|
1240 | 1240 | |
1241 | 1241 | } else { |
1242 | 1242 | |
1243 | 1243 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1244 | 1244 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1245 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1245 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1246 | 1246 | |
1247 | 1247 | } |
1248 | 1248 | |
1249 | - if( rgar($field, "multipleFiles") ) { |
|
1249 | + if ( rgar( $field, "multipleFiles" ) ) { |
|
1250 | 1250 | |
1251 | 1251 | // If there are fresh uploads, process and merge them. |
1252 | 1252 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1253 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1253 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1254 | 1254 | $value = empty( $value ) ? '[]' : $value; |
1255 | 1255 | $value = stripslashes_deep( $value ); |
1256 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1256 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1257 | 1257 | } |
1258 | 1258 | |
1259 | 1259 | } else { |
@@ -1271,8 +1271,8 @@ discard block |
||
1271 | 1271 | |
1272 | 1272 | case 'number': |
1273 | 1273 | // Fix "undefined index" issue at line 1286 in form_display.php |
1274 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1275 | - $_POST['input_'.$field->id ] = NULL; |
|
1274 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1275 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1276 | 1276 | } |
1277 | 1277 | break; |
1278 | 1278 | } |
@@ -1309,7 +1309,7 @@ discard block |
||
1309 | 1309 | * You can enter whatever you want! |
1310 | 1310 | * We try validating, and customize the results using `self::custom_validation()` |
1311 | 1311 | */ |
1312 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1312 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1313 | 1313 | |
1314 | 1314 | // Needed by the validate funtion |
1315 | 1315 | $failed_validation_page = NULL; |
@@ -1317,14 +1317,14 @@ discard block |
||
1317 | 1317 | |
1318 | 1318 | // Prevent entry limit from running when editing an entry, also |
1319 | 1319 | // prevent form scheduling from preventing editing |
1320 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1320 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1321 | 1321 | |
1322 | 1322 | // Hide fields depending on Edit Entry settings |
1323 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1323 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1324 | 1324 | |
1325 | 1325 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1326 | 1326 | |
1327 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1327 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1328 | 1328 | } |
1329 | 1329 | |
1330 | 1330 | |
@@ -1341,13 +1341,13 @@ discard block |
||
1341 | 1341 | */ |
1342 | 1342 | public function custom_validation( $validation_results ) { |
1343 | 1343 | |
1344 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
1344 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
1345 | 1345 | |
1346 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
1346 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
1347 | 1347 | |
1348 | 1348 | $gv_valid = true; |
1349 | 1349 | |
1350 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1350 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1351 | 1351 | |
1352 | 1352 | $value = RGFormsModel::get_field_value( $field ); |
1353 | 1353 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1360,35 +1360,35 @@ discard block |
||
1360 | 1360 | case 'post_image': |
1361 | 1361 | |
1362 | 1362 | // in case nothing is uploaded but there are already files saved |
1363 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1363 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1364 | 1364 | $field->failed_validation = false; |
1365 | 1365 | unset( $field->validation_message ); |
1366 | 1366 | } |
1367 | 1367 | |
1368 | 1368 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1369 | - if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) { |
|
1369 | + if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) { |
|
1370 | 1370 | |
1371 | 1371 | $input_name = 'input_' . $field->id; |
1372 | 1372 | //uploaded |
1373 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1373 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1374 | 1374 | |
1375 | 1375 | //existent |
1376 | 1376 | $entry = $this->get_entry(); |
1377 | 1377 | $value = NULL; |
1378 | - if( isset( $entry[ $field->id ] ) ) { |
|
1378 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1379 | 1379 | $value = json_decode( $entry[ $field->id ], true ); |
1380 | 1380 | } |
1381 | 1381 | |
1382 | 1382 | // count uploaded files and existent entry files |
1383 | 1383 | $count_files = count( $file_names ) + count( $value ); |
1384 | 1384 | |
1385 | - if( $count_files > $field->maxFiles ) { |
|
1385 | + if ( $count_files > $field->maxFiles ) { |
|
1386 | 1386 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1387 | 1387 | $field->failed_validation = 1; |
1388 | 1388 | $gv_valid = false; |
1389 | 1389 | |
1390 | 1390 | // in case of error make sure the newest upload files are removed from the upload input |
1391 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1391 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1392 | 1392 | } |
1393 | 1393 | |
1394 | 1394 | } |
@@ -1399,7 +1399,7 @@ discard block |
||
1399 | 1399 | } |
1400 | 1400 | |
1401 | 1401 | // This field has failed validation. |
1402 | - if( !empty( $field->failed_validation ) ) { |
|
1402 | + if ( ! empty( $field->failed_validation ) ) { |
|
1403 | 1403 | |
1404 | 1404 | do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) ); |
1405 | 1405 | |
@@ -1417,32 +1417,32 @@ discard block |
||
1417 | 1417 | } |
1418 | 1418 | |
1419 | 1419 | // You can't continue inside a switch, so we do it after. |
1420 | - if( empty( $field->failed_validation ) ) { |
|
1420 | + if ( empty( $field->failed_validation ) ) { |
|
1421 | 1421 | continue; |
1422 | 1422 | } |
1423 | 1423 | |
1424 | 1424 | // checks if the No Duplicates option is not validating entry against itself, since |
1425 | 1425 | // we're editing a stored entry, it would also assume it's a duplicate. |
1426 | - if( !empty( $field->noDuplicates ) ) { |
|
1426 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1427 | 1427 | |
1428 | 1428 | $entry = $this->get_entry(); |
1429 | 1429 | |
1430 | 1430 | // If the value of the entry is the same as the stored value |
1431 | 1431 | // Then we can assume it's not a duplicate, it's the same. |
1432 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1432 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1433 | 1433 | //if value submitted was not changed, then don't validate |
1434 | 1434 | $field->failed_validation = false; |
1435 | 1435 | |
1436 | 1436 | unset( $field->validation_message ); |
1437 | 1437 | |
1438 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
1438 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
1439 | 1439 | |
1440 | 1440 | continue; |
1441 | 1441 | } |
1442 | 1442 | } |
1443 | 1443 | |
1444 | 1444 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1445 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1445 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1446 | 1446 | unset( $field->validation_message ); |
1447 | 1447 | $field->validation_message = false; |
1448 | 1448 | continue; |
@@ -1454,12 +1454,12 @@ discard block |
||
1454 | 1454 | |
1455 | 1455 | } |
1456 | 1456 | |
1457 | - $validation_results['is_valid'] = $gv_valid; |
|
1457 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1458 | 1458 | |
1459 | - do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
1459 | + do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
1460 | 1460 | |
1461 | 1461 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1462 | - $this->form_after_validation = $validation_results['form']; |
|
1462 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1463 | 1463 | |
1464 | 1464 | return $validation_results; |
1465 | 1465 | } |
@@ -1472,7 +1472,7 @@ discard block |
||
1472 | 1472 | */ |
1473 | 1473 | public function get_entry() { |
1474 | 1474 | |
1475 | - if( empty( $this->entry ) ) { |
|
1475 | + if ( empty( $this->entry ) ) { |
|
1476 | 1476 | // Get the database value of the entry that's being edited |
1477 | 1477 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1478 | 1478 | } |
@@ -1499,10 +1499,10 @@ discard block |
||
1499 | 1499 | $properties = GravityView_View_Data::getInstance()->get_fields( $view_id ); |
1500 | 1500 | |
1501 | 1501 | // If edit tab not yet configured, show all fields |
1502 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1502 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1503 | 1503 | |
1504 | 1504 | // Hide fields depending on admin settings |
1505 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1505 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1506 | 1506 | |
1507 | 1507 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1508 | 1508 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1534,7 +1534,7 @@ discard block |
||
1534 | 1534 | */ |
1535 | 1535 | private function filter_fields( $fields, $configured_fields ) { |
1536 | 1536 | |
1537 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1537 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1538 | 1538 | return $fields; |
1539 | 1539 | } |
1540 | 1540 | |
@@ -1547,18 +1547,18 @@ discard block |
||
1547 | 1547 | |
1548 | 1548 | // Remove the fields that have calculation properties and keep them to be used later |
1549 | 1549 | // @since 1.16.2 |
1550 | - if( $field->has_calculation() ) { |
|
1551 | - $this->fields_with_calculation[] = $field; |
|
1550 | + if ( $field->has_calculation() ) { |
|
1551 | + $this->fields_with_calculation[ ] = $field; |
|
1552 | 1552 | // don't remove the calculation fields on form render. |
1553 | 1553 | } |
1554 | 1554 | |
1555 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1555 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1556 | 1556 | unset( $fields[ $key ] ); |
1557 | 1557 | } |
1558 | 1558 | } |
1559 | 1559 | |
1560 | 1560 | // The Edit tab has not been configured, so we return all fields by default. |
1561 | - if( empty( $configured_fields ) ) { |
|
1561 | + if ( empty( $configured_fields ) ) { |
|
1562 | 1562 | return $fields; |
1563 | 1563 | } |
1564 | 1564 | |
@@ -1568,8 +1568,8 @@ discard block |
||
1568 | 1568 | /** @var GF_Field $field */ |
1569 | 1569 | foreach ( $fields as $field ) { |
1570 | 1570 | |
1571 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1572 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1571 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1572 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1573 | 1573 | break; |
1574 | 1574 | } |
1575 | 1575 | |
@@ -1592,14 +1592,14 @@ discard block |
||
1592 | 1592 | |
1593 | 1593 | $return_field = $field; |
1594 | 1594 | |
1595 | - if( empty( $field_setting['show_label'] ) ) { |
|
1595 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1596 | 1596 | $return_field->label = ''; |
1597 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1598 | - $return_field->label = $field_setting['custom_label']; |
|
1597 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
1598 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
1599 | 1599 | } |
1600 | 1600 | |
1601 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
1602 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
1601 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
1602 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1603 | 1603 | } |
1604 | 1604 | |
1605 | 1605 | /** |
@@ -1637,16 +1637,16 @@ discard block |
||
1637 | 1637 | */ |
1638 | 1638 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
1639 | 1639 | |
1640 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1641 | - foreach( $fields as $k => $field ) { |
|
1642 | - if( $field->adminOnly ) { |
|
1640 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
1641 | + foreach ( $fields as $k => $field ) { |
|
1642 | + if ( $field->adminOnly ) { |
|
1643 | 1643 | unset( $fields[ $k ] ); |
1644 | 1644 | } |
1645 | 1645 | } |
1646 | 1646 | return $fields; |
1647 | 1647 | } |
1648 | 1648 | |
1649 | - foreach( $fields as &$field ) { |
|
1649 | + foreach ( $fields as &$field ) { |
|
1650 | 1650 | $field->adminOnly = false; |
1651 | 1651 | } |
1652 | 1652 | |
@@ -1670,22 +1670,22 @@ discard block |
||
1670 | 1670 | */ |
1671 | 1671 | function prefill_conditional_logic( $form ) { |
1672 | 1672 | |
1673 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1673 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1674 | 1674 | return $form; |
1675 | 1675 | } |
1676 | 1676 | |
1677 | 1677 | // Have Conditional Logic pre-fill fields as if the data were default values |
1678 | 1678 | /** @var GF_Field $field */ |
1679 | - foreach ( $form['fields'] as &$field ) { |
|
1679 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1680 | 1680 | |
1681 | - if( 'checkbox' === $field->type ) { |
|
1681 | + if ( 'checkbox' === $field->type ) { |
|
1682 | 1682 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
1683 | - $input_id = $input['id']; |
|
1683 | + $input_id = $input[ 'id' ]; |
|
1684 | 1684 | $choice = $field->choices[ $key ]; |
1685 | 1685 | $value = rgar( $this->entry, $input_id ); |
1686 | 1686 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
1687 | - if( $match ) { |
|
1688 | - $field->choices[ $key ]['isSelected'] = true; |
|
1687 | + if ( $match ) { |
|
1688 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
1689 | 1689 | } |
1690 | 1690 | } |
1691 | 1691 | } else { |
@@ -1693,15 +1693,15 @@ discard block |
||
1693 | 1693 | // We need to run through each field to set the default values |
1694 | 1694 | foreach ( $this->entry as $field_id => $field_value ) { |
1695 | 1695 | |
1696 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1696 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1697 | 1697 | |
1698 | - if( 'list' === $field->type ) { |
|
1698 | + if ( 'list' === $field->type ) { |
|
1699 | 1699 | $list_rows = maybe_unserialize( $field_value ); |
1700 | 1700 | |
1701 | 1701 | $list_field_value = array(); |
1702 | - foreach ( (array) $list_rows as $row ) { |
|
1703 | - foreach ( (array) $row as $column ) { |
|
1704 | - $list_field_value[] = $column; |
|
1702 | + foreach ( (array)$list_rows as $row ) { |
|
1703 | + foreach ( (array)$row as $column ) { |
|
1704 | + $list_field_value[ ] = $column; |
|
1705 | 1705 | } |
1706 | 1706 | } |
1707 | 1707 | |
@@ -1736,16 +1736,16 @@ discard block |
||
1736 | 1736 | */ |
1737 | 1737 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
1738 | 1738 | |
1739 | - if( $use_conditional_logic ) { |
|
1739 | + if ( $use_conditional_logic ) { |
|
1740 | 1740 | return $form; |
1741 | 1741 | } |
1742 | 1742 | |
1743 | - foreach( $form['fields'] as &$field ) { |
|
1743 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1744 | 1744 | /* @var GF_Field $field */ |
1745 | 1745 | $field->conditionalLogic = null; |
1746 | 1746 | } |
1747 | 1747 | |
1748 | - unset( $form['button']['conditionalLogic'] ); |
|
1748 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
1749 | 1749 | |
1750 | 1750 | return $form; |
1751 | 1751 | |
@@ -1762,7 +1762,7 @@ discard block |
||
1762 | 1762 | */ |
1763 | 1763 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
1764 | 1764 | |
1765 | - if( ! $this->is_edit_entry() ) { |
|
1765 | + if ( ! $this->is_edit_entry() ) { |
|
1766 | 1766 | return $has_conditional_logic; |
1767 | 1767 | } |
1768 | 1768 | |
@@ -1794,44 +1794,44 @@ discard block |
||
1794 | 1794 | * 2. There are two entries embedded using oEmbed |
1795 | 1795 | * 3. One of the entries has just been saved |
1796 | 1796 | */ |
1797 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
1797 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
1798 | 1798 | |
1799 | 1799 | $error = true; |
1800 | 1800 | |
1801 | 1801 | } |
1802 | 1802 | |
1803 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
1803 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
1804 | 1804 | |
1805 | 1805 | $error = true; |
1806 | 1806 | |
1807 | - } elseif( ! $this->verify_nonce() ) { |
|
1807 | + } elseif ( ! $this->verify_nonce() ) { |
|
1808 | 1808 | |
1809 | 1809 | /** |
1810 | 1810 | * If the Entry is embedded, there may be two entries on the same page. |
1811 | 1811 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
1812 | 1812 | */ |
1813 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1813 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1814 | 1814 | $error = true; |
1815 | 1815 | } else { |
1816 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
1816 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
1817 | 1817 | } |
1818 | 1818 | |
1819 | 1819 | } |
1820 | 1820 | |
1821 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1822 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
1821 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1822 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
1823 | 1823 | } |
1824 | 1824 | |
1825 | - if( $this->entry['status'] === 'trash' ) { |
|
1826 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1825 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
1826 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1827 | 1827 | } |
1828 | 1828 | |
1829 | 1829 | // No errors; everything's fine here! |
1830 | - if( empty( $error ) ) { |
|
1830 | + if ( empty( $error ) ) { |
|
1831 | 1831 | return true; |
1832 | 1832 | } |
1833 | 1833 | |
1834 | - if( $echo && $error !== true ) { |
|
1834 | + if ( $echo && $error !== true ) { |
|
1835 | 1835 | |
1836 | 1836 | $error = esc_html( $error ); |
1837 | 1837 | |
@@ -1839,13 +1839,13 @@ discard block |
||
1839 | 1839 | * @since 1.9 |
1840 | 1840 | */ |
1841 | 1841 | if ( ! empty( $this->entry ) ) { |
1842 | - $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;" ) ); |
|
1842 | + $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;" ) ); |
|
1843 | 1843 | } |
1844 | 1844 | |
1845 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
1845 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
1846 | 1846 | } |
1847 | 1847 | |
1848 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
1848 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
1849 | 1849 | |
1850 | 1850 | return false; |
1851 | 1851 | } |
@@ -1862,20 +1862,20 @@ discard block |
||
1862 | 1862 | |
1863 | 1863 | $error = NULL; |
1864 | 1864 | |
1865 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
1866 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
1865 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
1866 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
1867 | 1867 | } |
1868 | 1868 | |
1869 | 1869 | // No errors; everything's fine here! |
1870 | - if( empty( $error ) ) { |
|
1870 | + if ( empty( $error ) ) { |
|
1871 | 1871 | return true; |
1872 | 1872 | } |
1873 | 1873 | |
1874 | - if( $echo ) { |
|
1875 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
1874 | + if ( $echo ) { |
|
1875 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
1876 | 1876 | } |
1877 | 1877 | |
1878 | - do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
1878 | + do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
1879 | 1879 | |
1880 | 1880 | return false; |
1881 | 1881 | |
@@ -1893,15 +1893,15 @@ discard block |
||
1893 | 1893 | private function check_user_cap_edit_field( $field ) { |
1894 | 1894 | |
1895 | 1895 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
1896 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
1896 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
1897 | 1897 | return true; |
1898 | 1898 | } |
1899 | 1899 | |
1900 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
1900 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
1901 | 1901 | |
1902 | 1902 | // If the field has custom editing capaibilities set, check those |
1903 | - if( $field_cap ) { |
|
1904 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
1903 | + if ( $field_cap ) { |
|
1904 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
1905 | 1905 | } |
1906 | 1906 | |
1907 | 1907 | return false; |
@@ -1915,17 +1915,17 @@ discard block |
||
1915 | 1915 | public function verify_nonce() { |
1916 | 1916 | |
1917 | 1917 | // Verify form submitted for editing single |
1918 | - if( $this->is_edit_entry_submission() ) { |
|
1918 | + if ( $this->is_edit_entry_submission() ) { |
|
1919 | 1919 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
1920 | 1920 | } |
1921 | 1921 | |
1922 | 1922 | // Verify |
1923 | - else if( ! $this->is_edit_entry() ) { |
|
1923 | + else if ( ! $this->is_edit_entry() ) { |
|
1924 | 1924 | $valid = false; |
1925 | 1925 | } |
1926 | 1926 | |
1927 | 1927 | else { |
1928 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
1928 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
1929 | 1929 | } |
1930 | 1930 | |
1931 | 1931 | /** |
@@ -71,13 +71,13 @@ discard block |
||
71 | 71 | continue; |
72 | 72 | } |
73 | 73 | |
74 | - if ( ! isset( $shortcode->atts['id'] ) ) { |
|
74 | + if ( ! isset( $shortcode->atts[ 'id' ] ) ) { |
|
75 | 75 | do_action( 'gravityview_log_error', __METHOD__ . ': [gravityview] shortcode has no `id` attribute' ); |
76 | 76 | continue; |
77 | 77 | } |
78 | 78 | |
79 | - if ( is_numeric( $shortcode->atts['id'] ) ) { |
|
80 | - $views->append( View::by_id( $shortcode->atts['id'] ) ); |
|
79 | + if ( is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
80 | + $views->append( View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | continue; |
108 | 108 | } |
109 | 109 | |
110 | - if ( is_numeric( $shortcode->atts['id'] ) ) { |
|
111 | - $views->append( View::by_id( $shortcode->atts['id'] ) ); |
|
110 | + if ( is_numeric( $shortcode->atts[ 'id' ] ) ) { |
|
111 | + $views->append( View::by_id( $shortcode->atts[ 'id' ] ) ); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | } |