@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | private function add_hooks() { |
40 | 40 | |
41 | 41 | // in case entry is edited (on admin or frontend) |
42 | - add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2); |
|
42 | + add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 ); |
|
43 | 43 | |
44 | 44 | // when using the User opt-in field, check on entry submission |
45 | 45 | add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 ); |
46 | 46 | |
47 | 47 | // process ajax approve entry requests |
48 | - add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved')); |
|
48 | + add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) ); |
|
49 | 49 | |
50 | 50 | // autounapprove |
51 | 51 | add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 ); |
@@ -94,10 +94,10 @@ discard block |
||
94 | 94 | return; |
95 | 95 | } |
96 | 96 | |
97 | - $form = GFAPI::get_form( $entry['form_id'] ); |
|
97 | + $form = GFAPI::get_form( $entry[ 'form_id' ] ); |
|
98 | 98 | |
99 | 99 | if ( ! $form ) { |
100 | - gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) ); |
|
100 | + gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) ); |
|
101 | 101 | return; |
102 | 102 | } |
103 | 103 | |
@@ -114,10 +114,10 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public static function add_approval_notification_events( $notification_events = array(), $form = array() ) { |
116 | 116 | |
117 | - $notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
118 | - $notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
119 | - $notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
120 | - $notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
117 | + $notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
118 | + $notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
119 | + $notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
120 | + $notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' ); |
|
121 | 121 | |
122 | 122 | return $notification_events; |
123 | 123 | } |
@@ -135,13 +135,13 @@ discard block |
||
135 | 135 | */ |
136 | 136 | public static function get_entry_status( $entry, $value_or_label = 'label' ) { |
137 | 137 | |
138 | - $entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true ); |
|
138 | + $entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true ); |
|
139 | 139 | |
140 | 140 | $status = gform_get_meta( $entry_id, self::meta_key ); |
141 | 141 | |
142 | 142 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
143 | 143 | |
144 | - if( 'value' === $value_or_label ) { |
|
144 | + if ( 'value' === $value_or_label ) { |
|
145 | 145 | return $status; |
146 | 146 | } |
147 | 147 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $nonce = \GV\Utils::_POST( 'nonce' ); |
180 | 180 | |
181 | 181 | // Valid status |
182 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
182 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
183 | 183 | |
184 | 184 | gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) ); |
185 | 185 | |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' ); |
212 | 212 | |
213 | - $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') ); |
|
213 | + $result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) ); |
|
214 | 214 | |
215 | 215 | } |
216 | 216 | |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | } |
273 | 273 | |
274 | 274 | // Set default |
275 | - self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] ); |
|
275 | + self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] ); |
|
276 | 276 | |
277 | 277 | // Then check for if there is an approval column, and use that value instead |
278 | - $this->after_update_entry_update_approved_meta( $form , $entry['id'] ); |
|
278 | + $this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] ); |
|
279 | 279 | } |
280 | 280 | |
281 | 281 | /** |
@@ -289,12 +289,12 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) { |
291 | 291 | |
292 | - $approved_column = self::get_approved_column( $form['id'] ); |
|
292 | + $approved_column = self::get_approved_column( $form[ 'id' ] ); |
|
293 | 293 | |
294 | 294 | /** |
295 | 295 | * If the form doesn't contain the approve field, don't assume anything. |
296 | 296 | */ |
297 | - if( empty( $approved_column ) ) { |
|
297 | + if ( empty( $approved_column ) ) { |
|
298 | 298 | return; |
299 | 299 | } |
300 | 300 | |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | */ |
317 | 317 | $value = apply_filters( 'gravityview/approve_entries/update_unapproved_meta', $value, $form, $entry ); |
318 | 318 | |
319 | - self::update_approved_meta( $entry_id, $value, $form['id'] ); |
|
319 | + self::update_approved_meta( $entry_id, $value, $form[ 'id' ] ); |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | /** |
@@ -334,12 +334,12 @@ discard block |
||
334 | 334 | */ |
335 | 335 | public static function update_bulk( $entries = array(), $approved, $form_id ) { |
336 | 336 | |
337 | - if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) { |
|
337 | + if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) { |
|
338 | 338 | gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) ); |
339 | 339 | return NULL; |
340 | 340 | } |
341 | 341 | |
342 | - if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
342 | + if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) { |
|
343 | 343 | gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' ); |
344 | 344 | return NULL; |
345 | 345 | } |
@@ -354,10 +354,10 @@ discard block |
||
354 | 354 | $approved_column_id = self::get_approved_column( $form_id ); |
355 | 355 | |
356 | 356 | $success = true; |
357 | - foreach( $entries as $entry_id ) { |
|
357 | + foreach ( $entries as $entry_id ) { |
|
358 | 358 | $update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id ); |
359 | 359 | |
360 | - if( ! $update_success ) { |
|
360 | + if ( ! $update_success ) { |
|
361 | 361 | $success = false; |
362 | 362 | } |
363 | 363 | } |
@@ -381,12 +381,12 @@ discard block |
||
381 | 381 | */ |
382 | 382 | public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) { |
383 | 383 | |
384 | - if( !class_exists( 'GFAPI' ) ) { |
|
384 | + if ( ! class_exists( 'GFAPI' ) ) { |
|
385 | 385 | gravityview()->log->error( 'GFAPI does not exist' ); |
386 | 386 | return false; |
387 | 387 | } |
388 | 388 | |
389 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
389 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) { |
|
390 | 390 | gravityview()->log->error( 'Not a valid approval value.' ); |
391 | 391 | return false; |
392 | 392 | } |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | // If the form has an Approve/Reject field, update that value |
404 | 404 | $result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn ); |
405 | 405 | |
406 | - if( is_wp_error( $result ) ) { |
|
406 | + if ( is_wp_error( $result ) ) { |
|
407 | 407 | gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) ); |
408 | 408 | return false; |
409 | 409 | } |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | |
416 | 416 | // add note to entry if approval field updating worked or there was no approved field |
417 | 417 | // There's no validation for the meta |
418 | - if( true === $result ) { |
|
418 | + if ( true === $result ) { |
|
419 | 419 | |
420 | 420 | // Add an entry note |
421 | 421 | self::add_approval_status_updated_note( $entry_id, $approved ); |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | |
469 | 469 | $note_id = false; |
470 | 470 | |
471 | - if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
471 | + if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) { |
|
472 | 472 | |
473 | 473 | $current_user = wp_get_current_user(); |
474 | 474 | |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | */ |
491 | 491 | private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) { |
492 | 492 | |
493 | - if( empty( $approvedcolumn ) ) { |
|
493 | + if ( empty( $approvedcolumn ) ) { |
|
494 | 494 | $approvedcolumn = self::get_approved_column( $form_id ); |
495 | 495 | } |
496 | 496 | |
@@ -513,12 +513,12 @@ discard block |
||
513 | 513 | $status = GravityView_Entry_Approval_Status::maybe_convert_status( $status ); |
514 | 514 | |
515 | 515 | $new_value = ''; |
516 | - if( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
516 | + if ( GravityView_Entry_Approval_Status::APPROVED === $status ) { |
|
517 | 517 | $new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn ); |
518 | 518 | } |
519 | 519 | |
520 | 520 | //update entry |
521 | - $entry["{$approvedcolumn}"] = $new_value; |
|
521 | + $entry[ "{$approvedcolumn}" ] = $new_value; |
|
522 | 522 | |
523 | 523 | /** |
524 | 524 | * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves |
@@ -549,12 +549,12 @@ discard block |
||
549 | 549 | // If the user has enabled a different value than the label (for some reason), use it. |
550 | 550 | // This is highly unlikely |
551 | 551 | if ( is_array( $field->choices ) && ! empty( $field->choices ) ) { |
552 | - return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text']; |
|
552 | + return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ]; |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | // Otherwise, fall back on the inputs array |
556 | 556 | if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) { |
557 | - return $field->inputs[0]['label']; |
|
557 | + return $field->inputs[ 0 ][ 'label' ]; |
|
558 | 558 | } |
559 | 559 | |
560 | 560 | return null; |
@@ -606,7 +606,7 @@ discard block |
||
606 | 606 | * @since 1.18 Added "unapproved" |
607 | 607 | * @param int $entry_id ID of the Gravity Forms entry |
608 | 608 | */ |
609 | - do_action( 'gravityview/approve_entries/' . $action , $entry_id ); |
|
609 | + do_action( 'gravityview/approve_entries/' . $action, $entry_id ); |
|
610 | 610 | } |
611 | 611 | |
612 | 612 | /** |
@@ -619,11 +619,11 @@ discard block |
||
619 | 619 | */ |
620 | 620 | static public function get_approved_column( $form ) { |
621 | 621 | |
622 | - if( empty( $form ) ) { |
|
622 | + if ( empty( $form ) ) { |
|
623 | 623 | return null; |
624 | 624 | } |
625 | 625 | |
626 | - if( !is_array( $form ) ) { |
|
626 | + if ( ! is_array( $form ) ) { |
|
627 | 627 | $form = GVCommon::get_form( $form ); |
628 | 628 | } |
629 | 629 | |
@@ -633,22 +633,22 @@ discard block |
||
633 | 633 | * @var string $key |
634 | 634 | * @var GF_Field $field |
635 | 635 | */ |
636 | - foreach( $form['fields'] as $key => $field ) { |
|
636 | + foreach ( $form[ 'fields' ] as $key => $field ) { |
|
637 | 637 | |
638 | 638 | $inputs = $field->get_entry_inputs(); |
639 | 639 | |
640 | - if( !empty( $field->gravityview_approved ) ) { |
|
641 | - if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) { |
|
642 | - $approved_column_id = $inputs[0]['id']; |
|
640 | + if ( ! empty( $field->gravityview_approved ) ) { |
|
641 | + if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) { |
|
642 | + $approved_column_id = $inputs[ 0 ][ 'id' ]; |
|
643 | 643 | break; |
644 | 644 | } |
645 | 645 | } |
646 | 646 | |
647 | 647 | // Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work.. |
648 | - if( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
648 | + if ( 'checkbox' === $field->type && ! empty( $inputs ) ) { |
|
649 | 649 | foreach ( $inputs as $input ) { |
650 | - if ( 'approved' === strtolower( $input['label'] ) ) { |
|
651 | - $approved_column_id = $input['id']; |
|
650 | + if ( 'approved' === strtolower( $input[ 'label' ] ) ) { |
|
651 | + $approved_column_id = $input[ 'id' ]; |
|
652 | 652 | break; |
653 | 653 | } |
654 | 654 | } |
@@ -674,7 +674,7 @@ discard block |
||
674 | 674 | |
675 | 675 | $view_keys = array_keys( $gv_data->get_views() ); |
676 | 676 | |
677 | - $view = \GV\View::by_id( $view_keys[0] ); |
|
677 | + $view = \GV\View::by_id( $view_keys[ 0 ] ); |
|
678 | 678 | |
679 | 679 | if ( ! $view->settings->get( 'unapprove_edit' ) ) { |
680 | 680 | return; |
@@ -699,11 +699,11 @@ discard block |
||
699 | 699 | return; |
700 | 700 | } |
701 | 701 | |
702 | - if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
702 | + if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) { |
|
703 | 703 | $approval_status = GravityView_Entry_Approval_Status::UNAPPROVED; |
704 | 704 | } |
705 | 705 | |
706 | - self::update_approved_meta( $entry_id, $approval_status, $form['id'] ); |
|
706 | + self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] ); |
|
707 | 707 | } |
708 | 708 | |
709 | 709 | /** |
@@ -741,9 +741,9 @@ discard block |
||
741 | 741 | $choices = GravityView_Entry_Approval_Status::get_all(); |
742 | 742 | |
743 | 743 | return <<<TEMPLATE |
744 | -<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a> |
|
745 | -<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a> |
|
746 | -<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a> |
|
744 | +<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a> |
|
745 | +<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a> |
|
746 | +<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button" aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a> |
|
747 | 747 | TEMPLATE; |
748 | 748 | } |
749 | 749 | } |
@@ -135,16 +135,16 @@ discard block |
||
135 | 135 | function load() { |
136 | 136 | |
137 | 137 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
138 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
138 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
139 | 139 | |
140 | 140 | // Don't display an embedded form when editing an entry |
141 | 141 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
142 | 142 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
143 | 143 | |
144 | 144 | // Stop Gravity Forms processing what is ours! |
145 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
145 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
146 | 146 | |
147 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
147 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
148 | 148 | |
149 | 149 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
150 | 150 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
156 | 156 | |
157 | 157 | // Add fields expected by GFFormDisplay::validate() |
158 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
158 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
159 | 159 | |
160 | 160 | // Fix multiselect value for GF 2.2 |
161 | 161 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | * @return void |
173 | 173 | */ |
174 | 174 | public function prevent_render_form() { |
175 | - if( $this->is_edit_entry() ) { |
|
176 | - if( 'wp_head' === current_filter() ) { |
|
175 | + if ( $this->is_edit_entry() ) { |
|
176 | + if ( 'wp_head' === current_filter() ) { |
|
177 | 177 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
178 | 178 | } else { |
179 | 179 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -188,14 +188,14 @@ discard block |
||
188 | 188 | */ |
189 | 189 | public function prevent_maybe_process_form() { |
190 | 190 | |
191 | - if( ! $this->is_edit_entry_submission() ) { |
|
191 | + if ( ! $this->is_edit_entry_submission() ) { |
|
192 | 192 | return; |
193 | 193 | } |
194 | 194 | |
195 | 195 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
196 | 196 | |
197 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
198 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
197 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
198 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
199 | 199 | } |
200 | 200 | |
201 | 201 | /** |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function is_edit_entry() { |
206 | 206 | |
207 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
207 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
208 | 208 | |
209 | 209 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
210 | 210 | } |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | * @return boolean |
216 | 216 | */ |
217 | 217 | public function is_edit_entry_submission() { |
218 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
218 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -228,16 +228,16 @@ discard block |
||
228 | 228 | |
229 | 229 | |
230 | 230 | $entries = $gravityview_view->getEntries(); |
231 | - self::$original_entry = $entries[0]; |
|
232 | - $this->entry = $entries[0]; |
|
231 | + self::$original_entry = $entries[ 0 ]; |
|
232 | + $this->entry = $entries[ 0 ]; |
|
233 | 233 | |
234 | 234 | self::$original_form = $gravityview_view->getForm(); |
235 | 235 | $this->form = $gravityview_view->getForm(); |
236 | - $this->form_id = $this->entry['form_id']; |
|
236 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
237 | 237 | $this->view_id = $gravityview_view->getViewId(); |
238 | 238 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
239 | 239 | |
240 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
240 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
241 | 241 | } |
242 | 242 | |
243 | 243 | |
@@ -296,9 +296,9 @@ discard block |
||
296 | 296 | private function print_scripts() { |
297 | 297 | $gravityview_view = GravityView_View::getInstance(); |
298 | 298 | |
299 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
299 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
300 | 300 | |
301 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
301 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
302 | 302 | |
303 | 303 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
304 | 304 | |
@@ -314,19 +314,19 @@ discard block |
||
314 | 314 | */ |
315 | 315 | private function process_save( $gv_data ) { |
316 | 316 | |
317 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
317 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
318 | 318 | return; |
319 | 319 | } |
320 | 320 | |
321 | 321 | // Make sure the entry, view, and form IDs are all correct |
322 | 322 | $valid = $this->verify_nonce(); |
323 | 323 | |
324 | - if ( !$valid ) { |
|
324 | + if ( ! $valid ) { |
|
325 | 325 | gravityview()->log->error( 'Nonce validation failed.' ); |
326 | 326 | return; |
327 | 327 | } |
328 | 328 | |
329 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
329 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
330 | 330 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
331 | 331 | return; |
332 | 332 | } |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | |
338 | 338 | $this->validate(); |
339 | 339 | |
340 | - if( $this->is_valid ) { |
|
340 | + if ( $this->is_valid ) { |
|
341 | 341 | |
342 | 342 | gravityview()->log->debug( 'Submission is valid.' ); |
343 | 343 | |
@@ -349,15 +349,15 @@ discard block |
||
349 | 349 | /** |
350 | 350 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
351 | 351 | */ |
352 | - unset( $_GET['page'] ); |
|
352 | + unset( $_GET[ 'page' ] ); |
|
353 | 353 | |
354 | - $date_created = $this->entry['date_created']; |
|
354 | + $date_created = $this->entry[ 'date_created' ]; |
|
355 | 355 | |
356 | 356 | /** |
357 | 357 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
358 | 358 | * @since 1.17.2 |
359 | 359 | */ |
360 | - unset( $this->entry['date_created'] ); |
|
360 | + unset( $this->entry[ 'date_created' ] ); |
|
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry |
@@ -367,14 +367,14 @@ discard block |
||
367 | 367 | * @param GravityView_Edit_Entry_Render $this This object |
368 | 368 | * @param GravityView_View_Data $gv_data The View data |
369 | 369 | */ |
370 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
370 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
371 | 371 | |
372 | 372 | GFFormsModel::save_lead( $form, $this->entry ); |
373 | 373 | |
374 | 374 | // Delete the values for hidden inputs |
375 | 375 | $this->unset_hidden_field_values(); |
376 | 376 | |
377 | - $this->entry['date_created'] = $date_created; |
|
377 | + $this->entry[ 'date_created' ] = $date_created; |
|
378 | 378 | |
379 | 379 | // Process calculation fields |
380 | 380 | $this->update_calculation_fields(); |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | * @param GravityView_Edit_Entry_Render $this This object |
400 | 400 | * @param GravityView_View_Data $gv_data The View data |
401 | 401 | */ |
402 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
402 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
403 | 403 | |
404 | 404 | } else { |
405 | 405 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -435,10 +435,10 @@ discard block |
||
435 | 435 | |
436 | 436 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
437 | 437 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
438 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
438 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
439 | 439 | } else { |
440 | 440 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
441 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
441 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
442 | 442 | } |
443 | 443 | |
444 | 444 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -456,11 +456,11 @@ discard block |
||
456 | 456 | |
457 | 457 | $empty_value = $field->get_value_save_entry( |
458 | 458 | is_array( $field->get_entry_inputs() ) ? array() : '', |
459 | - $this->form, '', $this->entry['id'], $this->entry |
|
459 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
460 | 460 | ); |
461 | 461 | |
462 | 462 | if ( $field->has_calculation() ) { |
463 | - $this->unset_hidden_calculations[] = $field->id; // Unset |
|
463 | + $this->unset_hidden_calculations[ ] = $field->id; // Unset |
|
464 | 464 | $empty_value = ''; |
465 | 465 | } |
466 | 466 | |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | private function preset_approval_fields() { |
488 | 488 | $has_approved_field = false; |
489 | 489 | |
490 | - foreach ( self::$original_form['fields'] as $field ) { |
|
490 | + foreach ( self::$original_form[ 'fields' ] as $field ) { |
|
491 | 491 | if ( $field->gravityview_approved ) { |
492 | 492 | $has_approved_field = true; |
493 | 493 | break; |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | |
501 | 501 | $is_field_hidden = true; |
502 | 502 | |
503 | - foreach ( $this->form['fields'] as $field ) { |
|
503 | + foreach ( $this->form[ 'fields' ] as $field ) { |
|
504 | 504 | if ( $field->gravityview_approved ) { |
505 | 505 | $is_field_hidden = false; |
506 | 506 | break; |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | */ |
522 | 522 | public function prevent_update_unapproved_meta( $value, $form, $entry ) { |
523 | 523 | remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 ); |
524 | - if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) { |
|
524 | + if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) { |
|
525 | 525 | $value = GravityView_Entry_Approval_Status::UNAPPROVED; |
526 | 526 | $value = apply_filters( 'gravityview/approve_entries/after_submission/default_status', $value ); |
527 | 527 | } |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | } |
584 | 584 | |
585 | 585 | /** No file is being uploaded. */ |
586 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
586 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
587 | 587 | /** So return the original upload */ |
588 | 588 | return $entry[ $input_id ]; |
589 | 589 | } |
@@ -601,11 +601,11 @@ discard block |
||
601 | 601 | * @return mixed |
602 | 602 | */ |
603 | 603 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
604 | - if( ! $this->is_edit_entry() ) { |
|
604 | + if ( ! $this->is_edit_entry() ) { |
|
605 | 605 | return $plupload_init; |
606 | 606 | } |
607 | 607 | |
608 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
608 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
609 | 609 | |
610 | 610 | return $plupload_init; |
611 | 611 | } |
@@ -620,27 +620,27 @@ discard block |
||
620 | 620 | $form = $this->filter_conditional_logic( $this->form ); |
621 | 621 | |
622 | 622 | /** @var GF_Field $field */ |
623 | - foreach( $form['fields'] as $k => &$field ) { |
|
623 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
624 | 624 | |
625 | 625 | /** |
626 | 626 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
627 | 627 | * @since 1.16.3 |
628 | 628 | * @var GF_Field $field |
629 | 629 | */ |
630 | - if( $field->has_calculation() ) { |
|
631 | - unset( $form['fields'][ $k ] ); |
|
630 | + if ( $field->has_calculation() ) { |
|
631 | + unset( $form[ 'fields' ][ $k ] ); |
|
632 | 632 | } |
633 | 633 | |
634 | 634 | $field->adminOnly = false; |
635 | 635 | |
636 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
637 | - foreach( $field->inputs as $key => $input ) { |
|
638 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
636 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
637 | + foreach ( $field->inputs as $key => $input ) { |
|
638 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
639 | 639 | } |
640 | 640 | } |
641 | 641 | } |
642 | 642 | |
643 | - $form['fields'] = array_values( $form['fields'] ); |
|
643 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
644 | 644 | |
645 | 645 | return $form; |
646 | 646 | } |
@@ -652,14 +652,14 @@ discard block |
||
652 | 652 | $update = false; |
653 | 653 | |
654 | 654 | // get the most up to date entry values |
655 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
655 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
656 | 656 | |
657 | 657 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
658 | 658 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
659 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
659 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
660 | 660 | } else { |
661 | 661 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
662 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
662 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
663 | 663 | } |
664 | 664 | |
665 | 665 | |
@@ -676,24 +676,24 @@ discard block |
||
676 | 676 | $inputs = $field->get_entry_inputs(); |
677 | 677 | if ( is_array( $inputs ) ) { |
678 | 678 | foreach ( $inputs as $input ) { |
679 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
679 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
680 | 680 | |
681 | 681 | if ( 'product' === $field->type ) { |
682 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
682 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
683 | 683 | |
684 | 684 | // Only allow quantity to be set if it's allowed to be edited |
685 | 685 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
686 | 686 | } else { // otherwise set to what it previously was |
687 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
687 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
688 | 688 | } |
689 | 689 | } else { |
690 | 690 | // Set to what it previously was if it's not editable |
691 | 691 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
692 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
692 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
693 | 693 | } |
694 | 694 | } |
695 | 695 | |
696 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
696 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
697 | 697 | } |
698 | 698 | } else { |
699 | 699 | // Set to what it previously was if it's not editable |
@@ -733,19 +733,19 @@ discard block |
||
733 | 733 | |
734 | 734 | $input_name = 'input_' . $field_id; |
735 | 735 | |
736 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
736 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
737 | 737 | |
738 | 738 | // We have a new image |
739 | 739 | |
740 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
740 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
741 | 741 | |
742 | 742 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
743 | 743 | $ary = stripslashes_deep( $ary ); |
744 | 744 | $img_url = \GV\Utils::get( $ary, 0 ); |
745 | 745 | |
746 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
747 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
748 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
746 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
747 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
748 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
749 | 749 | |
750 | 750 | $image_meta = array( |
751 | 751 | 'post_excerpt' => $img_caption, |
@@ -754,7 +754,7 @@ discard block |
||
754 | 754 | |
755 | 755 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
756 | 756 | if ( ! empty( $img_title ) ) { |
757 | - $image_meta['post_title'] = $img_title; |
|
757 | + $image_meta[ 'post_title' ] = $img_title; |
|
758 | 758 | } |
759 | 759 | |
760 | 760 | /** |
@@ -812,15 +812,15 @@ discard block |
||
812 | 812 | */ |
813 | 813 | private function maybe_update_post_fields( $form ) { |
814 | 814 | |
815 | - if( empty( $this->entry['post_id'] ) ) { |
|
815 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
816 | 816 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
817 | 817 | return; |
818 | 818 | } |
819 | 819 | |
820 | - $post_id = $this->entry['post_id']; |
|
820 | + $post_id = $this->entry[ 'post_id' ]; |
|
821 | 821 | |
822 | 822 | // Security check |
823 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
823 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
824 | 824 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
825 | 825 | return; |
826 | 826 | } |
@@ -833,25 +833,25 @@ discard block |
||
833 | 833 | |
834 | 834 | $field = RGFormsModel::get_field( $form, $field_id ); |
835 | 835 | |
836 | - if( ! $field ) { |
|
836 | + if ( ! $field ) { |
|
837 | 837 | continue; |
838 | 838 | } |
839 | 839 | |
840 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
840 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
841 | 841 | |
842 | 842 | // Get the value of the field, including $_POSTed value |
843 | 843 | $value = RGFormsModel::get_field_value( $field ); |
844 | 844 | |
845 | 845 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
846 | 846 | $entry_tmp = $this->entry; |
847 | - $entry_tmp["{$field_id}"] = $value; |
|
847 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
848 | 848 | |
849 | - switch( $field->type ) { |
|
849 | + switch ( $field->type ) { |
|
850 | 850 | |
851 | 851 | case 'post_title': |
852 | 852 | $post_title = $value; |
853 | 853 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
854 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
854 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
855 | 855 | } |
856 | 856 | $updated_post->post_title = $post_title; |
857 | 857 | $updated_post->post_name = $post_title; |
@@ -861,7 +861,7 @@ discard block |
||
861 | 861 | case 'post_content': |
862 | 862 | $post_content = $value; |
863 | 863 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
864 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
864 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
865 | 865 | } |
866 | 866 | $updated_post->post_content = $post_content; |
867 | 867 | unset( $post_content ); |
@@ -879,11 +879,11 @@ discard block |
||
879 | 879 | $value = $value[ $field_id ]; |
880 | 880 | } |
881 | 881 | |
882 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
882 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
883 | 883 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
884 | 884 | } |
885 | 885 | |
886 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
886 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
887 | 887 | |
888 | 888 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
889 | 889 | break; |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | } |
896 | 896 | |
897 | 897 | // update entry after |
898 | - $this->entry["{$field_id}"] = $value; |
|
898 | + $this->entry[ "{$field_id}" ] = $value; |
|
899 | 899 | |
900 | 900 | $update_entry = true; |
901 | 901 | |
@@ -904,11 +904,11 @@ discard block |
||
904 | 904 | |
905 | 905 | } |
906 | 906 | |
907 | - if( $update_entry ) { |
|
907 | + if ( $update_entry ) { |
|
908 | 908 | |
909 | 909 | $return_entry = GFAPI::update_entry( $this->entry ); |
910 | 910 | |
911 | - if( is_wp_error( $return_entry ) ) { |
|
911 | + if ( is_wp_error( $return_entry ) ) { |
|
912 | 912 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
913 | 913 | } else { |
914 | 914 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -918,7 +918,7 @@ discard block |
||
918 | 918 | |
919 | 919 | $return_post = wp_update_post( $updated_post, true ); |
920 | 920 | |
921 | - if( is_wp_error( $return_post ) ) { |
|
921 | + if ( is_wp_error( $return_post ) ) { |
|
922 | 922 | $return_post->add_data( $updated_post, '$updated_post' ); |
923 | 923 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
924 | 924 | } else { |
@@ -952,7 +952,7 @@ discard block |
||
952 | 952 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
953 | 953 | |
954 | 954 | // replace conditional shortcodes |
955 | - if( $do_shortcode ) { |
|
955 | + if ( $do_shortcode ) { |
|
956 | 956 | $output = do_shortcode( $output ); |
957 | 957 | } |
958 | 958 | |
@@ -971,19 +971,19 @@ discard block |
||
971 | 971 | */ |
972 | 972 | private function after_update() { |
973 | 973 | |
974 | - do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry ); |
|
975 | - do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry ); |
|
974 | + do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
975 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
976 | 976 | |
977 | 977 | // Re-define the entry now that we've updated it. |
978 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
978 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
979 | 979 | |
980 | 980 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
981 | 981 | |
982 | 982 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
983 | 983 | // We need to clear the cache because Gravity Forms caches the field values, which |
984 | 984 | // we have just updated. |
985 | - foreach ($this->form['fields'] as $key => $field) { |
|
986 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
985 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
986 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
987 | 987 | } |
988 | 988 | } |
989 | 989 | |
@@ -993,11 +993,11 @@ discard block |
||
993 | 993 | * @since develop |
994 | 994 | */ |
995 | 995 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
996 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
996 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
997 | 997 | if ( ! is_wp_error( $feeds ) ) { |
998 | 998 | $registered_feeds = array(); |
999 | 999 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
1000 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1000 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1001 | 1001 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
1002 | 1002 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
1003 | 1003 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -1005,8 +1005,8 @@ discard block |
||
1005 | 1005 | } |
1006 | 1006 | } |
1007 | 1007 | foreach ( $feeds as $feed ) { |
1008 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
1009 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
1008 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
1009 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
1010 | 1010 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
1011 | 1011 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
1012 | 1012 | $entry = $returned_entry; |
@@ -1036,7 +1036,7 @@ discard block |
||
1036 | 1036 | |
1037 | 1037 | <div class="gv-edit-entry-wrapper"><?php |
1038 | 1038 | |
1039 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
1039 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
1040 | 1040 | |
1041 | 1041 | /** |
1042 | 1042 | * Fixes weird wpautop() issue |
@@ -1052,7 +1052,7 @@ discard block |
||
1052 | 1052 | * @param string $edit_entry_title Modify the "Edit Entry" title |
1053 | 1053 | * @param GravityView_Edit_Entry_Render $this This object |
1054 | 1054 | */ |
1055 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
1055 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
1056 | 1056 | |
1057 | 1057 | echo esc_attr( $edit_entry_title ); |
1058 | 1058 | ?></span> |
@@ -1118,18 +1118,18 @@ discard block |
||
1118 | 1118 | */ |
1119 | 1119 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1120 | 1120 | |
1121 | - $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
|
1121 | + $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ]; |
|
1122 | 1122 | } |
1123 | 1123 | |
1124 | 1124 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
1125 | 1125 | |
1126 | - if( ! $this->is_valid ){ |
|
1126 | + if ( ! $this->is_valid ) { |
|
1127 | 1127 | |
1128 | 1128 | // Keeping this compatible with Gravity Forms. |
1129 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
1130 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
1129 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
1130 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
1131 | 1131 | |
1132 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
1132 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
1133 | 1133 | |
1134 | 1134 | } elseif ( false === $this->is_paged_submitted ) { |
1135 | 1135 | // Paged form that hasn't been submitted on the last page yet |
@@ -1142,7 +1142,7 @@ discard block |
||
1142 | 1142 | * @param int $view_id View ID |
1143 | 1143 | * @param array $entry Gravity Forms entry array |
1144 | 1144 | */ |
1145 | - $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry ); |
|
1145 | + $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry ); |
|
1146 | 1146 | |
1147 | 1147 | echo GVCommon::generate_notice( $message ); |
1148 | 1148 | } else { |
@@ -1154,23 +1154,23 @@ discard block |
||
1154 | 1154 | |
1155 | 1155 | case '0': |
1156 | 1156 | $redirect_url = $back_link; |
1157 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1157 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
1158 | 1158 | break; |
1159 | 1159 | |
1160 | 1160 | case '1': |
1161 | 1161 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
1162 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1162 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
1163 | 1163 | break; |
1164 | 1164 | |
1165 | 1165 | case '2': |
1166 | 1166 | $redirect_url = $edit_redirect_url; |
1167 | 1167 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
1168 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1168 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
1169 | 1169 | break; |
1170 | 1170 | |
1171 | 1171 | case '': |
1172 | 1172 | default: |
1173 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1173 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1174 | 1174 | break; |
1175 | 1175 | } |
1176 | 1176 | |
@@ -1186,7 +1186,7 @@ discard block |
||
1186 | 1186 | * @param array $entry Gravity Forms entry array |
1187 | 1187 | * @param string $back_link URL to return to the original entry. @since 1.6 |
1188 | 1188 | */ |
1189 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
1189 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1190 | 1190 | |
1191 | 1191 | echo GVCommon::generate_notice( $message ); |
1192 | 1192 | } |
@@ -1210,8 +1210,8 @@ discard block |
||
1210 | 1210 | */ |
1211 | 1211 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1212 | 1212 | |
1213 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1214 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1213 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1214 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1215 | 1215 | add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
1216 | 1216 | add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
1217 | 1217 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
@@ -1220,14 +1220,14 @@ discard block |
||
1220 | 1220 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1221 | 1221 | |
1222 | 1222 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1223 | - unset( $_GET['page'] ); |
|
1223 | + unset( $_GET[ 'page' ] ); |
|
1224 | 1224 | |
1225 | 1225 | $this->show_next_button = false; |
1226 | 1226 | $this->show_previous_button = false; |
1227 | 1227 | |
1228 | 1228 | // TODO: Verify multiple-page forms |
1229 | 1229 | if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) { |
1230 | - if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) { |
|
1230 | + if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) { |
|
1231 | 1231 | |
1232 | 1232 | $labels = array( |
1233 | 1233 | 'cancel' => __( 'Cancel', 'gravityview' ), |
@@ -1246,16 +1246,16 @@ discard block |
||
1246 | 1246 | */ |
1247 | 1247 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1248 | 1248 | |
1249 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
|
1250 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true; |
|
1249 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form; |
|
1250 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true; |
|
1251 | 1251 | |
1252 | - if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) { |
|
1252 | + if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) { |
|
1253 | 1253 | $page_number++; |
1254 | - } elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) { |
|
1254 | + } elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) { |
|
1255 | 1255 | $page_number--; |
1256 | 1256 | } |
1257 | 1257 | |
1258 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'page_number' ] = $page_number; |
|
1258 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number; |
|
1259 | 1259 | } |
1260 | 1260 | |
1261 | 1261 | if ( ( $page_number = intval( $page_number ) ) < 2 ) { |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | |
1282 | 1282 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1283 | 1283 | |
1284 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1284 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1285 | 1285 | |
1286 | 1286 | ob_get_clean(); |
1287 | 1287 | |
@@ -1309,7 +1309,7 @@ discard block |
||
1309 | 1309 | * @return string |
1310 | 1310 | */ |
1311 | 1311 | public function render_form_buttons() { |
1312 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1312 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1313 | 1313 | } |
1314 | 1314 | |
1315 | 1315 | |
@@ -1328,15 +1328,15 @@ discard block |
||
1328 | 1328 | */ |
1329 | 1329 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1330 | 1330 | |
1331 | - if( $form['id'] != $this->form_id ) { |
|
1331 | + if ( $form[ 'id' ] != $this->form_id ) { |
|
1332 | 1332 | return $form; |
1333 | 1333 | } |
1334 | 1334 | |
1335 | 1335 | // In case we have validated the form, use it to inject the validation results into the form render |
1336 | - if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
1336 | + if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
1337 | 1337 | $form = $this->form_after_validation; |
1338 | 1338 | } else { |
1339 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1339 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1340 | 1340 | } |
1341 | 1341 | |
1342 | 1342 | $form = $this->filter_conditional_logic( $form ); |
@@ -1344,8 +1344,8 @@ discard block |
||
1344 | 1344 | $form = $this->prefill_conditional_logic( $form ); |
1345 | 1345 | |
1346 | 1346 | // for now we don't support Save and Continue feature. |
1347 | - if( ! self::$supports_save_and_continue ) { |
|
1348 | - unset( $form['save'] ); |
|
1347 | + if ( ! self::$supports_save_and_continue ) { |
|
1348 | + unset( $form[ 'save' ] ); |
|
1349 | 1349 | } |
1350 | 1350 | |
1351 | 1351 | $form = $this->unselect_default_values( $form ); |
@@ -1368,31 +1368,31 @@ discard block |
||
1368 | 1368 | */ |
1369 | 1369 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1370 | 1370 | |
1371 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
1371 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
1372 | 1372 | return $field_content; |
1373 | 1373 | } |
1374 | 1374 | |
1375 | 1375 | $message = null; |
1376 | 1376 | |
1377 | 1377 | // First, make sure they have the capability to edit the post. |
1378 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1378 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1379 | 1379 | |
1380 | 1380 | /** |
1381 | 1381 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1382 | 1382 | * @param string $message The existing "You don't have permission..." text |
1383 | 1383 | */ |
1384 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1384 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1385 | 1385 | |
1386 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1386 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1387 | 1387 | /** |
1388 | 1388 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1389 | 1389 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1390 | 1390 | */ |
1391 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1391 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1392 | 1392 | } |
1393 | 1393 | |
1394 | - if( $message ) { |
|
1395 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1394 | + if ( $message ) { |
|
1395 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1396 | 1396 | } |
1397 | 1397 | |
1398 | 1398 | return $field_content; |
@@ -1416,8 +1416,8 @@ discard block |
||
1416 | 1416 | |
1417 | 1417 | // If the form has been submitted, then we don't need to pre-fill the values, |
1418 | 1418 | // Except for fileupload type and when a field input is overridden- run always!! |
1419 | - if( |
|
1420 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1419 | + if ( |
|
1420 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1421 | 1421 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1422 | 1422 | && ! GFCommon::is_product_field( $field->type ) |
1423 | 1423 | || ! empty( $field_content ) |
@@ -1437,7 +1437,7 @@ discard block |
||
1437 | 1437 | $return = null; |
1438 | 1438 | |
1439 | 1439 | /** @var GravityView_Field $gv_field */ |
1440 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1440 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1441 | 1441 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1442 | 1442 | } else { |
1443 | 1443 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1446,7 +1446,7 @@ discard block |
||
1446 | 1446 | // If there was output, it's an error |
1447 | 1447 | $warnings = ob_get_clean(); |
1448 | 1448 | |
1449 | - if( !empty( $warnings ) ) { |
|
1449 | + if ( ! empty( $warnings ) ) { |
|
1450 | 1450 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1451 | 1451 | } |
1452 | 1452 | |
@@ -1471,7 +1471,7 @@ discard block |
||
1471 | 1471 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1472 | 1472 | |
1473 | 1473 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1474 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1474 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1475 | 1475 | |
1476 | 1476 | $field_value = array(); |
1477 | 1477 | |
@@ -1480,10 +1480,10 @@ discard block |
||
1480 | 1480 | |
1481 | 1481 | foreach ( (array)$field->inputs as $input ) { |
1482 | 1482 | |
1483 | - $input_id = strval( $input['id'] ); |
|
1483 | + $input_id = strval( $input[ 'id' ] ); |
|
1484 | 1484 | |
1485 | 1485 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1486 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1486 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1487 | 1487 | $allow_pre_populated = false; |
1488 | 1488 | } |
1489 | 1489 | |
@@ -1491,7 +1491,7 @@ discard block |
||
1491 | 1491 | |
1492 | 1492 | $pre_value = $field->get_value_submission( array(), false ); |
1493 | 1493 | |
1494 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1494 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1495 | 1495 | |
1496 | 1496 | } else { |
1497 | 1497 | |
@@ -1502,13 +1502,13 @@ discard block |
||
1502 | 1502 | |
1503 | 1503 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1504 | 1504 | // or pre-populated value if not empty and set to override saved value |
1505 | - $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1505 | + $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1506 | 1506 | |
1507 | 1507 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1508 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1508 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1509 | 1509 | $categories = array(); |
1510 | 1510 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1511 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1511 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1512 | 1512 | } |
1513 | 1513 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1514 | 1514 | } |
@@ -1536,7 +1536,7 @@ discard block |
||
1536 | 1536 | * @param GF_Field $field Gravity Forms field object |
1537 | 1537 | * @param GravityView_Edit_Entry_Render $this Current object |
1538 | 1538 | */ |
1539 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1539 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1540 | 1540 | |
1541 | 1541 | return $field_value; |
1542 | 1542 | } |
@@ -1553,12 +1553,12 @@ discard block |
||
1553 | 1553 | */ |
1554 | 1554 | public function gform_pre_validation( $form ) { |
1555 | 1555 | |
1556 | - if( ! $this->verify_nonce() ) { |
|
1556 | + if ( ! $this->verify_nonce() ) { |
|
1557 | 1557 | return $form; |
1558 | 1558 | } |
1559 | 1559 | |
1560 | 1560 | // Fix PHP warning regarding undefined index. |
1561 | - foreach ( $form['fields'] as &$field) { |
|
1561 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1562 | 1562 | |
1563 | 1563 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1564 | 1564 | // expects certain field array items to be set. |
@@ -1566,7 +1566,7 @@ discard block |
||
1566 | 1566 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1567 | 1567 | } |
1568 | 1568 | |
1569 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1569 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1570 | 1570 | |
1571 | 1571 | /** |
1572 | 1572 | * 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. |
@@ -1580,26 +1580,26 @@ discard block |
||
1580 | 1580 | // Set the previous value |
1581 | 1581 | $entry = $this->get_entry(); |
1582 | 1582 | |
1583 | - $input_name = 'input_'.$field->id; |
|
1584 | - $form_id = $form['id']; |
|
1583 | + $input_name = 'input_' . $field->id; |
|
1584 | + $form_id = $form[ 'id' ]; |
|
1585 | 1585 | |
1586 | 1586 | $value = NULL; |
1587 | 1587 | |
1588 | 1588 | // Use the previous entry value as the default. |
1589 | - if( isset( $entry[ $field->id ] ) ) { |
|
1589 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1590 | 1590 | $value = $entry[ $field->id ]; |
1591 | 1591 | } |
1592 | 1592 | |
1593 | 1593 | // If this is a single upload file |
1594 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1595 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1596 | - $value = $file_path['url']; |
|
1594 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1595 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1596 | + $value = $file_path[ 'url' ]; |
|
1597 | 1597 | |
1598 | 1598 | } else { |
1599 | 1599 | |
1600 | 1600 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1601 | 1601 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1602 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1602 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1603 | 1603 | |
1604 | 1604 | } |
1605 | 1605 | |
@@ -1607,10 +1607,10 @@ discard block |
||
1607 | 1607 | |
1608 | 1608 | // If there are fresh uploads, process and merge them. |
1609 | 1609 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1610 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1610 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1611 | 1611 | $value = empty( $value ) ? '[]' : $value; |
1612 | 1612 | $value = stripslashes_deep( $value ); |
1613 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1613 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1614 | 1614 | } |
1615 | 1615 | |
1616 | 1616 | } else { |
@@ -1628,8 +1628,8 @@ discard block |
||
1628 | 1628 | |
1629 | 1629 | case 'number': |
1630 | 1630 | // Fix "undefined index" issue at line 1286 in form_display.php |
1631 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1632 | - $_POST['input_'.$field->id ] = NULL; |
|
1631 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1632 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1633 | 1633 | } |
1634 | 1634 | break; |
1635 | 1635 | } |
@@ -1666,7 +1666,7 @@ discard block |
||
1666 | 1666 | * You can enter whatever you want! |
1667 | 1667 | * We try validating, and customize the results using `self::custom_validation()` |
1668 | 1668 | */ |
1669 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1669 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1670 | 1670 | |
1671 | 1671 | // Needed by the validate funtion |
1672 | 1672 | $failed_validation_page = NULL; |
@@ -1674,14 +1674,14 @@ discard block |
||
1674 | 1674 | |
1675 | 1675 | // Prevent entry limit from running when editing an entry, also |
1676 | 1676 | // prevent form scheduling from preventing editing |
1677 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1677 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1678 | 1678 | |
1679 | 1679 | // Hide fields depending on Edit Entry settings |
1680 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1680 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1681 | 1681 | |
1682 | 1682 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1683 | 1683 | |
1684 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1684 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1685 | 1685 | } |
1686 | 1686 | |
1687 | 1687 | |
@@ -1704,7 +1704,7 @@ discard block |
||
1704 | 1704 | |
1705 | 1705 | $gv_valid = true; |
1706 | 1706 | |
1707 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1707 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1708 | 1708 | |
1709 | 1709 | $value = RGFormsModel::get_field_value( $field ); |
1710 | 1710 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1717,22 +1717,22 @@ discard block |
||
1717 | 1717 | case 'post_image': |
1718 | 1718 | |
1719 | 1719 | // in case nothing is uploaded but there are already files saved |
1720 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1720 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1721 | 1721 | $field->failed_validation = false; |
1722 | 1722 | unset( $field->validation_message ); |
1723 | 1723 | } |
1724 | 1724 | |
1725 | 1725 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1726 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1726 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1727 | 1727 | |
1728 | 1728 | $input_name = 'input_' . $field->id; |
1729 | 1729 | //uploaded |
1730 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1730 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1731 | 1731 | |
1732 | 1732 | //existent |
1733 | 1733 | $entry = $this->get_entry(); |
1734 | 1734 | $value = NULL; |
1735 | - if( isset( $entry[ $field->id ] ) ) { |
|
1735 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1736 | 1736 | $value = json_decode( $entry[ $field->id ], true ); |
1737 | 1737 | } |
1738 | 1738 | |
@@ -1740,13 +1740,13 @@ discard block |
||
1740 | 1740 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
1741 | 1741 | ( is_array( $value ) ? count( $value ) : 0 ); |
1742 | 1742 | |
1743 | - if( $count_files > $field->maxFiles ) { |
|
1743 | + if ( $count_files > $field->maxFiles ) { |
|
1744 | 1744 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1745 | 1745 | $field->failed_validation = 1; |
1746 | 1746 | $gv_valid = false; |
1747 | 1747 | |
1748 | 1748 | // in case of error make sure the newest upload files are removed from the upload input |
1749 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1749 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1750 | 1750 | } |
1751 | 1751 | |
1752 | 1752 | } |
@@ -1757,7 +1757,7 @@ discard block |
||
1757 | 1757 | } |
1758 | 1758 | |
1759 | 1759 | // This field has failed validation. |
1760 | - if( !empty( $field->failed_validation ) ) { |
|
1760 | + if ( ! empty( $field->failed_validation ) ) { |
|
1761 | 1761 | |
1762 | 1762 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1763 | 1763 | |
@@ -1775,19 +1775,19 @@ discard block |
||
1775 | 1775 | } |
1776 | 1776 | |
1777 | 1777 | // You can't continue inside a switch, so we do it after. |
1778 | - if( empty( $field->failed_validation ) ) { |
|
1778 | + if ( empty( $field->failed_validation ) ) { |
|
1779 | 1779 | continue; |
1780 | 1780 | } |
1781 | 1781 | |
1782 | 1782 | // checks if the No Duplicates option is not validating entry against itself, since |
1783 | 1783 | // we're editing a stored entry, it would also assume it's a duplicate. |
1784 | - if( !empty( $field->noDuplicates ) ) { |
|
1784 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1785 | 1785 | |
1786 | 1786 | $entry = $this->get_entry(); |
1787 | 1787 | |
1788 | 1788 | // If the value of the entry is the same as the stored value |
1789 | 1789 | // Then we can assume it's not a duplicate, it's the same. |
1790 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1790 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1791 | 1791 | //if value submitted was not changed, then don't validate |
1792 | 1792 | $field->failed_validation = false; |
1793 | 1793 | |
@@ -1800,7 +1800,7 @@ discard block |
||
1800 | 1800 | } |
1801 | 1801 | |
1802 | 1802 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1803 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1803 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1804 | 1804 | unset( $field->validation_message ); |
1805 | 1805 | $field->validation_message = false; |
1806 | 1806 | continue; |
@@ -1812,12 +1812,12 @@ discard block |
||
1812 | 1812 | |
1813 | 1813 | } |
1814 | 1814 | |
1815 | - $validation_results['is_valid'] = $gv_valid; |
|
1815 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1816 | 1816 | |
1817 | 1817 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1818 | 1818 | |
1819 | 1819 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1820 | - $this->form_after_validation = $validation_results['form']; |
|
1820 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1821 | 1821 | |
1822 | 1822 | return $validation_results; |
1823 | 1823 | } |
@@ -1830,7 +1830,7 @@ discard block |
||
1830 | 1830 | */ |
1831 | 1831 | public function get_entry() { |
1832 | 1832 | |
1833 | - if( empty( $this->entry ) ) { |
|
1833 | + if ( empty( $this->entry ) ) { |
|
1834 | 1834 | // Get the database value of the entry that's being edited |
1835 | 1835 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1836 | 1836 | } |
@@ -1862,10 +1862,10 @@ discard block |
||
1862 | 1862 | } |
1863 | 1863 | |
1864 | 1864 | // If edit tab not yet configured, show all fields |
1865 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1865 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1866 | 1866 | |
1867 | 1867 | // Hide fields depending on admin settings |
1868 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1868 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1869 | 1869 | |
1870 | 1870 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1871 | 1871 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1898,7 +1898,7 @@ discard block |
||
1898 | 1898 | */ |
1899 | 1899 | private function filter_fields( $fields, $configured_fields ) { |
1900 | 1900 | |
1901 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1901 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1902 | 1902 | return $fields; |
1903 | 1903 | } |
1904 | 1904 | |
@@ -1915,12 +1915,12 @@ discard block |
||
1915 | 1915 | |
1916 | 1916 | // Remove the fields that have calculation properties and keep them to be used later |
1917 | 1917 | // @since 1.16.2 |
1918 | - if( $field->has_calculation() ) { |
|
1919 | - $this->fields_with_calculation[] = $field; |
|
1918 | + if ( $field->has_calculation() ) { |
|
1919 | + $this->fields_with_calculation[ ] = $field; |
|
1920 | 1920 | // don't remove the calculation fields on form render. |
1921 | 1921 | } |
1922 | 1922 | |
1923 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1923 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1924 | 1924 | unset( $fields[ $key ] ); |
1925 | 1925 | } |
1926 | 1926 | } |
@@ -1938,7 +1938,7 @@ discard block |
||
1938 | 1938 | continue; // Same |
1939 | 1939 | } |
1940 | 1940 | |
1941 | - $out_fields[] = $field; |
|
1941 | + $out_fields[ ] = $field; |
|
1942 | 1942 | } |
1943 | 1943 | |
1944 | 1944 | return array_values( $out_fields ); |
@@ -1949,8 +1949,8 @@ discard block |
||
1949 | 1949 | |
1950 | 1950 | /** @var GF_Field $field */ |
1951 | 1951 | foreach ( $fields as $field ) { |
1952 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1953 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1952 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1953 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1954 | 1954 | break; |
1955 | 1955 | } |
1956 | 1956 | |
@@ -1973,14 +1973,14 @@ discard block |
||
1973 | 1973 | |
1974 | 1974 | $return_field = $field; |
1975 | 1975 | |
1976 | - if( empty( $field_setting['show_label'] ) ) { |
|
1976 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1977 | 1977 | $return_field->label = ''; |
1978 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1979 | - $return_field->label = $field_setting['custom_label']; |
|
1978 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
1979 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
1980 | 1980 | } |
1981 | 1981 | |
1982 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
1983 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
1982 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
1983 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1984 | 1984 | } |
1985 | 1985 | |
1986 | 1986 | /** |
@@ -2018,16 +2018,16 @@ discard block |
||
2018 | 2018 | */ |
2019 | 2019 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
2020 | 2020 | |
2021 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2022 | - foreach( $fields as $k => $field ) { |
|
2023 | - if( $field->adminOnly ) { |
|
2021 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
2022 | + foreach ( $fields as $k => $field ) { |
|
2023 | + if ( $field->adminOnly ) { |
|
2024 | 2024 | unset( $fields[ $k ] ); |
2025 | 2025 | } |
2026 | 2026 | } |
2027 | 2027 | return array_values( $fields ); |
2028 | 2028 | } |
2029 | 2029 | |
2030 | - foreach( $fields as &$field ) { |
|
2030 | + foreach ( $fields as &$field ) { |
|
2031 | 2031 | $field->adminOnly = false; |
2032 | 2032 | } |
2033 | 2033 | |
@@ -2048,7 +2048,7 @@ discard block |
||
2048 | 2048 | */ |
2049 | 2049 | private function unselect_default_values( $form ) { |
2050 | 2050 | |
2051 | - foreach ( $form['fields'] as &$field ) { |
|
2051 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2052 | 2052 | |
2053 | 2053 | if ( empty( $field->choices ) ) { |
2054 | 2054 | continue; |
@@ -2056,7 +2056,7 @@ discard block |
||
2056 | 2056 | |
2057 | 2057 | foreach ( $field->choices as &$choice ) { |
2058 | 2058 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
2059 | - $choice['isSelected'] = false; |
|
2059 | + $choice[ 'isSelected' ] = false; |
|
2060 | 2060 | } |
2061 | 2061 | } |
2062 | 2062 | } |
@@ -2081,22 +2081,22 @@ discard block |
||
2081 | 2081 | */ |
2082 | 2082 | function prefill_conditional_logic( $form ) { |
2083 | 2083 | |
2084 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2084 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2085 | 2085 | return $form; |
2086 | 2086 | } |
2087 | 2087 | |
2088 | 2088 | // Have Conditional Logic pre-fill fields as if the data were default values |
2089 | 2089 | /** @var GF_Field $field */ |
2090 | - foreach ( $form['fields'] as &$field ) { |
|
2090 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2091 | 2091 | |
2092 | - if( 'checkbox' === $field->type ) { |
|
2092 | + if ( 'checkbox' === $field->type ) { |
|
2093 | 2093 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
2094 | - $input_id = $input['id']; |
|
2094 | + $input_id = $input[ 'id' ]; |
|
2095 | 2095 | $choice = $field->choices[ $key ]; |
2096 | 2096 | $value = \GV\Utils::get( $this->entry, $input_id ); |
2097 | 2097 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
2098 | - if( $match ) { |
|
2099 | - $field->choices[ $key ]['isSelected'] = true; |
|
2098 | + if ( $match ) { |
|
2099 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
2100 | 2100 | } |
2101 | 2101 | } |
2102 | 2102 | } else { |
@@ -2104,15 +2104,15 @@ discard block |
||
2104 | 2104 | // We need to run through each field to set the default values |
2105 | 2105 | foreach ( $this->entry as $field_id => $field_value ) { |
2106 | 2106 | |
2107 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2107 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2108 | 2108 | |
2109 | - if( 'list' === $field->type ) { |
|
2109 | + if ( 'list' === $field->type ) { |
|
2110 | 2110 | $list_rows = maybe_unserialize( $field_value ); |
2111 | 2111 | |
2112 | 2112 | $list_field_value = array(); |
2113 | - foreach ( (array) $list_rows as $row ) { |
|
2114 | - foreach ( (array) $row as $column ) { |
|
2115 | - $list_field_value[] = $column; |
|
2113 | + foreach ( (array)$list_rows as $row ) { |
|
2114 | + foreach ( (array)$row as $column ) { |
|
2115 | + $list_field_value[ ] = $column; |
|
2116 | 2116 | } |
2117 | 2117 | } |
2118 | 2118 | |
@@ -2145,32 +2145,32 @@ discard block |
||
2145 | 2145 | * @see https://github.com/gravityview/GravityView/issues/840 |
2146 | 2146 | * @since develop |
2147 | 2147 | */ |
2148 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
2148 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
2149 | 2149 | $editable_ids = array(); |
2150 | - foreach ( $form['fields'] as $field ) { |
|
2151 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
2150 | + foreach ( $form[ 'fields' ] as $field ) { |
|
2151 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
2152 | 2152 | } |
2153 | 2153 | $remove_conditions_rule = array(); |
2154 | - foreach ( $the_form['fields'] as $field ) { |
|
2155 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
2156 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
2157 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
2154 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
2155 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
2156 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
2157 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
2158 | 2158 | /** |
2159 | 2159 | * This conditional field is not editable in this View. |
2160 | 2160 | * We need to remove the rule, but only if it matches. |
2161 | 2161 | */ |
2162 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
2162 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
2163 | 2163 | $value = $_field->get_value_export( $this->entry ); |
2164 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
2165 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
2164 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
2165 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
2166 | 2166 | } else { |
2167 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
2167 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
2168 | 2168 | } |
2169 | 2169 | |
2170 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
2170 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
2171 | 2171 | |
2172 | 2172 | if ( $match ) { |
2173 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
2173 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
2174 | 2174 | } |
2175 | 2175 | } |
2176 | 2176 | } |
@@ -2178,21 +2178,21 @@ discard block |
||
2178 | 2178 | } |
2179 | 2179 | |
2180 | 2180 | if ( $remove_conditions_rule ) { |
2181 | - foreach ( $form['fields'] as &$field ) { |
|
2181 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2182 | 2182 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
2183 | 2183 | |
2184 | 2184 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
2185 | 2185 | |
2186 | - if ( $field['id'] == $rule_field_id ) { |
|
2187 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
2188 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
2186 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
2187 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
2188 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
2189 | 2189 | } |
2190 | 2190 | } |
2191 | 2191 | } |
2192 | 2192 | } |
2193 | 2193 | |
2194 | 2194 | /** Normalize the indices... */ |
2195 | - $form['fields'] = array_values( $form['fields'] ); |
|
2195 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
2196 | 2196 | |
2197 | 2197 | /** |
2198 | 2198 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2202,16 +2202,16 @@ discard block |
||
2202 | 2202 | */ |
2203 | 2203 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
2204 | 2204 | |
2205 | - if( $use_conditional_logic ) { |
|
2205 | + if ( $use_conditional_logic ) { |
|
2206 | 2206 | return $form; |
2207 | 2207 | } |
2208 | 2208 | |
2209 | - foreach( $form['fields'] as &$field ) { |
|
2209 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2210 | 2210 | /* @var GF_Field $field */ |
2211 | 2211 | $field->conditionalLogic = null; |
2212 | 2212 | } |
2213 | 2213 | |
2214 | - unset( $form['button']['conditionalLogic'] ); |
|
2214 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
2215 | 2215 | |
2216 | 2216 | return $form; |
2217 | 2217 | |
@@ -2228,7 +2228,7 @@ discard block |
||
2228 | 2228 | */ |
2229 | 2229 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
2230 | 2230 | |
2231 | - if( ! $this->is_edit_entry() ) { |
|
2231 | + if ( ! $this->is_edit_entry() ) { |
|
2232 | 2232 | return $has_conditional_logic; |
2233 | 2233 | } |
2234 | 2234 | |
@@ -2260,44 +2260,44 @@ discard block |
||
2260 | 2260 | * 2. There are two entries embedded using oEmbed |
2261 | 2261 | * 3. One of the entries has just been saved |
2262 | 2262 | */ |
2263 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
2263 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
2264 | 2264 | |
2265 | 2265 | $error = true; |
2266 | 2266 | |
2267 | 2267 | } |
2268 | 2268 | |
2269 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
2269 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
2270 | 2270 | |
2271 | 2271 | $error = true; |
2272 | 2272 | |
2273 | - } elseif( ! $this->verify_nonce() ) { |
|
2273 | + } elseif ( ! $this->verify_nonce() ) { |
|
2274 | 2274 | |
2275 | 2275 | /** |
2276 | 2276 | * If the Entry is embedded, there may be two entries on the same page. |
2277 | 2277 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
2278 | 2278 | */ |
2279 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2279 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2280 | 2280 | $error = true; |
2281 | 2281 | } else { |
2282 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
2282 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
2283 | 2283 | } |
2284 | 2284 | |
2285 | 2285 | } |
2286 | 2286 | |
2287 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2288 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
2287 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2288 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
2289 | 2289 | } |
2290 | 2290 | |
2291 | - if( $this->entry['status'] === 'trash' ) { |
|
2292 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2291 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
2292 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2293 | 2293 | } |
2294 | 2294 | |
2295 | 2295 | // No errors; everything's fine here! |
2296 | - if( empty( $error ) ) { |
|
2296 | + if ( empty( $error ) ) { |
|
2297 | 2297 | return true; |
2298 | 2298 | } |
2299 | 2299 | |
2300 | - if( $echo && $error !== true ) { |
|
2300 | + if ( $echo && $error !== true ) { |
|
2301 | 2301 | |
2302 | 2302 | $error = esc_html( $error ); |
2303 | 2303 | |
@@ -2305,10 +2305,10 @@ discard block |
||
2305 | 2305 | * @since 1.9 |
2306 | 2306 | */ |
2307 | 2307 | if ( ! empty( $this->entry ) ) { |
2308 | - $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;" ) ); |
|
2308 | + $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;" ) ); |
|
2309 | 2309 | } |
2310 | 2310 | |
2311 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
2311 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2312 | 2312 | } |
2313 | 2313 | |
2314 | 2314 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2328,17 +2328,17 @@ discard block |
||
2328 | 2328 | |
2329 | 2329 | $error = NULL; |
2330 | 2330 | |
2331 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2332 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
2331 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2332 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2333 | 2333 | } |
2334 | 2334 | |
2335 | 2335 | // No errors; everything's fine here! |
2336 | - if( empty( $error ) ) { |
|
2336 | + if ( empty( $error ) ) { |
|
2337 | 2337 | return true; |
2338 | 2338 | } |
2339 | 2339 | |
2340 | - if( $echo ) { |
|
2341 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
2340 | + if ( $echo ) { |
|
2341 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2342 | 2342 | } |
2343 | 2343 | |
2344 | 2344 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2359,14 +2359,14 @@ discard block |
||
2359 | 2359 | private function check_user_cap_edit_field( $field ) { |
2360 | 2360 | |
2361 | 2361 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2362 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2362 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2363 | 2363 | return true; |
2364 | 2364 | } |
2365 | 2365 | |
2366 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2366 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2367 | 2367 | |
2368 | - if( $field_cap ) { |
|
2369 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2368 | + if ( $field_cap ) { |
|
2369 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2370 | 2370 | } |
2371 | 2371 | |
2372 | 2372 | return false; |
@@ -2380,17 +2380,17 @@ discard block |
||
2380 | 2380 | public function verify_nonce() { |
2381 | 2381 | |
2382 | 2382 | // Verify form submitted for editing single |
2383 | - if( $this->is_edit_entry_submission() ) { |
|
2383 | + if ( $this->is_edit_entry_submission() ) { |
|
2384 | 2384 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2385 | 2385 | } |
2386 | 2386 | |
2387 | 2387 | // Verify |
2388 | - else if( ! $this->is_edit_entry() ) { |
|
2388 | + else if ( ! $this->is_edit_entry() ) { |
|
2389 | 2389 | $valid = false; |
2390 | 2390 | } |
2391 | 2391 | |
2392 | 2392 | else { |
2393 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2393 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2394 | 2394 | } |
2395 | 2395 | |
2396 | 2396 | /** |