@@ -135,7 +135,7 @@ 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' ) ); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | add_action( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
146 | 146 | add_action( 'admin_init', array( $this, 'prevent_maybe_process_form' ), 8 ); |
147 | 147 | |
148 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
148 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
149 | 149 | |
150 | 150 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
151 | 151 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
157 | 157 | |
158 | 158 | // Add fields expected by GFFormDisplay::validate() |
159 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
159 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
160 | 160 | |
161 | 161 | // Fix multiselect value for GF 2.2 |
162 | 162 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -173,8 +173,8 @@ discard block |
||
173 | 173 | * @return void |
174 | 174 | */ |
175 | 175 | public function prevent_render_form() { |
176 | - if( $this->is_edit_entry() ) { |
|
177 | - if( 'wp_head' === current_filter() ) { |
|
176 | + if ( $this->is_edit_entry() ) { |
|
177 | + if ( 'wp_head' === current_filter() ) { |
|
178 | 178 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
179 | 179 | } else { |
180 | 180 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -189,17 +189,17 @@ discard block |
||
189 | 189 | */ |
190 | 190 | public function prevent_maybe_process_form() { |
191 | 191 | |
192 | - if( ! $this->is_edit_entry_submission() ) { |
|
192 | + if ( ! $this->is_edit_entry_submission() ) { |
|
193 | 193 | return; |
194 | 194 | } |
195 | 195 | |
196 | 196 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
197 | 197 | |
198 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
199 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
198 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
199 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
200 | 200 | |
201 | - remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
202 | - remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
201 | + remove_action( 'admin_init', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
202 | + remove_action( 'admin_init', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | |
211 | 211 | $is_edit_entry = |
212 | 212 | ( GravityView_frontend::is_single_entry() || ( ! empty( gravityview()->request->is_entry() ) ) ) |
213 | - && ( ! empty( $_GET['edit'] ) ); |
|
213 | + && ( ! empty( $_GET[ 'edit' ] ) ); |
|
214 | 214 | |
215 | 215 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
216 | 216 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | * @return boolean |
222 | 222 | */ |
223 | 223 | public function is_edit_entry_submission() { |
224 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
224 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -234,16 +234,16 @@ discard block |
||
234 | 234 | |
235 | 235 | |
236 | 236 | $entries = $gravityview_view->getEntries(); |
237 | - self::$original_entry = $entries[0]; |
|
238 | - $this->entry = $entries[0]; |
|
237 | + self::$original_entry = $entries[ 0 ]; |
|
238 | + $this->entry = $entries[ 0 ]; |
|
239 | 239 | |
240 | 240 | self::$original_form = $gravityview_view->getForm(); |
241 | 241 | $this->form = $gravityview_view->getForm(); |
242 | - $this->form_id = $this->entry['form_id']; |
|
242 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
243 | 243 | $this->view_id = $gravityview_view->getViewId(); |
244 | 244 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
245 | 245 | |
246 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
246 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | |
@@ -302,9 +302,9 @@ discard block |
||
302 | 302 | private function print_scripts() { |
303 | 303 | $gravityview_view = GravityView_View::getInstance(); |
304 | 304 | |
305 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
305 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
306 | 306 | |
307 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
307 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
308 | 308 | |
309 | 309 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
310 | 310 | |
@@ -320,19 +320,19 @@ discard block |
||
320 | 320 | */ |
321 | 321 | private function process_save( $gv_data ) { |
322 | 322 | |
323 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
323 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
324 | 324 | return; |
325 | 325 | } |
326 | 326 | |
327 | 327 | // Make sure the entry, view, and form IDs are all correct |
328 | 328 | $valid = $this->verify_nonce(); |
329 | 329 | |
330 | - if ( !$valid ) { |
|
330 | + if ( ! $valid ) { |
|
331 | 331 | gravityview()->log->error( 'Nonce validation failed.' ); |
332 | 332 | return; |
333 | 333 | } |
334 | 334 | |
335 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
335 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
336 | 336 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
337 | 337 | return; |
338 | 338 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | |
344 | 344 | $this->validate(); |
345 | 345 | |
346 | - if( $this->is_valid ) { |
|
346 | + if ( $this->is_valid ) { |
|
347 | 347 | |
348 | 348 | gravityview()->log->debug( 'Submission is valid.' ); |
349 | 349 | |
@@ -355,15 +355,15 @@ discard block |
||
355 | 355 | /** |
356 | 356 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
357 | 357 | */ |
358 | - unset( $_GET['page'] ); |
|
358 | + unset( $_GET[ 'page' ] ); |
|
359 | 359 | |
360 | - $date_created = $this->entry['date_created']; |
|
360 | + $date_created = $this->entry[ 'date_created' ]; |
|
361 | 361 | |
362 | 362 | /** |
363 | 363 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
364 | 364 | * @since 1.17.2 |
365 | 365 | */ |
366 | - unset( $this->entry['date_created'] ); |
|
366 | + unset( $this->entry[ 'date_created' ] ); |
|
367 | 367 | |
368 | 368 | /** |
369 | 369 | * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry |
@@ -373,14 +373,14 @@ discard block |
||
373 | 373 | * @param GravityView_Edit_Entry_Render $this This object |
374 | 374 | * @param GravityView_View_Data $gv_data The View data |
375 | 375 | */ |
376 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
376 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
377 | 377 | |
378 | 378 | GFFormsModel::save_lead( $form, $this->entry ); |
379 | 379 | |
380 | 380 | // Delete the values for hidden inputs |
381 | 381 | $this->unset_hidden_field_values(); |
382 | 382 | |
383 | - $this->entry['date_created'] = $date_created; |
|
383 | + $this->entry[ 'date_created' ] = $date_created; |
|
384 | 384 | |
385 | 385 | // Process calculation fields |
386 | 386 | $this->update_calculation_fields(); |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | * @param GravityView_Edit_Entry_Render $this This object |
406 | 406 | * @param GravityView_View_Data $gv_data The View data |
407 | 407 | */ |
408 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
408 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
409 | 409 | |
410 | 410 | } else { |
411 | 411 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -441,10 +441,10 @@ discard block |
||
441 | 441 | |
442 | 442 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
443 | 443 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
444 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
444 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
445 | 445 | } else { |
446 | 446 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
447 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
447 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
448 | 448 | } |
449 | 449 | |
450 | 450 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -462,11 +462,11 @@ discard block |
||
462 | 462 | |
463 | 463 | $empty_value = $field->get_value_save_entry( |
464 | 464 | is_array( $field->get_entry_inputs() ) ? array() : '', |
465 | - $this->form, '', $this->entry['id'], $this->entry |
|
465 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
466 | 466 | ); |
467 | 467 | |
468 | 468 | if ( $field->has_calculation() ) { |
469 | - $this->unset_hidden_calculations[] = $field->id; // Unset |
|
469 | + $this->unset_hidden_calculations[ ] = $field->id; // Unset |
|
470 | 470 | $empty_value = ''; |
471 | 471 | } |
472 | 472 | |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | private function preset_approval_fields() { |
496 | 496 | $has_approved_field = false; |
497 | 497 | |
498 | - foreach ( self::$original_form['fields'] as $field ) { |
|
498 | + foreach ( self::$original_form[ 'fields' ] as $field ) { |
|
499 | 499 | if ( $field->gravityview_approved ) { |
500 | 500 | $has_approved_field = true; |
501 | 501 | break; |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | |
509 | 509 | $is_field_hidden = true; |
510 | 510 | |
511 | - foreach ( $this->form['fields'] as $field ) { |
|
511 | + foreach ( $this->form[ 'fields' ] as $field ) { |
|
512 | 512 | if ( $field->gravityview_approved ) { |
513 | 513 | $is_field_hidden = false; |
514 | 514 | break; |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | |
534 | 534 | remove_filter( 'gravityview/approve_entries/update_unapproved_meta', array( $this, 'prevent_update_unapproved_meta' ), 9 ); |
535 | 535 | |
536 | - if ( ! $value = gform_get_meta( $entry['id'], 'is_approved' ) ) { |
|
536 | + if ( ! $value = gform_get_meta( $entry[ 'id' ], 'is_approved' ) ) { |
|
537 | 537 | |
538 | 538 | $value = GravityView_Entry_Approval_Status::UNAPPROVED; |
539 | 539 | |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | } |
599 | 599 | |
600 | 600 | /** No file is being uploaded. */ |
601 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
601 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
602 | 602 | /** So return the original upload, with $value as backup (it can be empty during edit form rendering) */ |
603 | 603 | return rgar( $entry, $input_id, $value ); |
604 | 604 | } |
@@ -616,11 +616,11 @@ discard block |
||
616 | 616 | * @return mixed |
617 | 617 | */ |
618 | 618 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
619 | - if( ! $this->is_edit_entry() ) { |
|
619 | + if ( ! $this->is_edit_entry() ) { |
|
620 | 620 | return $plupload_init; |
621 | 621 | } |
622 | 622 | |
623 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
623 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
624 | 624 | |
625 | 625 | return $plupload_init; |
626 | 626 | } |
@@ -635,27 +635,27 @@ discard block |
||
635 | 635 | $form = $this->filter_conditional_logic( $this->form ); |
636 | 636 | |
637 | 637 | /** @var GF_Field $field */ |
638 | - foreach( $form['fields'] as $k => &$field ) { |
|
638 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
639 | 639 | |
640 | 640 | /** |
641 | 641 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
642 | 642 | * @since 1.16.3 |
643 | 643 | * @var GF_Field $field |
644 | 644 | */ |
645 | - if( $field->has_calculation() ) { |
|
646 | - unset( $form['fields'][ $k ] ); |
|
645 | + if ( $field->has_calculation() ) { |
|
646 | + unset( $form[ 'fields' ][ $k ] ); |
|
647 | 647 | } |
648 | 648 | |
649 | 649 | $field->adminOnly = false; |
650 | 650 | |
651 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
652 | - foreach( $field->inputs as $key => $input ) { |
|
653 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
651 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
652 | + foreach ( $field->inputs as $key => $input ) { |
|
653 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
654 | 654 | } |
655 | 655 | } |
656 | 656 | } |
657 | 657 | |
658 | - $form['fields'] = array_values( $form['fields'] ); |
|
658 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
659 | 659 | |
660 | 660 | return $form; |
661 | 661 | } |
@@ -667,14 +667,14 @@ discard block |
||
667 | 667 | $update = false; |
668 | 668 | |
669 | 669 | // get the most up to date entry values |
670 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
670 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
671 | 671 | |
672 | 672 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
673 | 673 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
674 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
674 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
675 | 675 | } else { |
676 | 676 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
677 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
677 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
678 | 678 | } |
679 | 679 | |
680 | 680 | |
@@ -691,24 +691,24 @@ discard block |
||
691 | 691 | $inputs = $field->get_entry_inputs(); |
692 | 692 | if ( is_array( $inputs ) ) { |
693 | 693 | foreach ( $inputs as $input ) { |
694 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
694 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
695 | 695 | |
696 | 696 | if ( 'product' === $field->type ) { |
697 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
697 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
698 | 698 | |
699 | 699 | // Only allow quantity to be set if it's allowed to be edited |
700 | 700 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
701 | 701 | } else { // otherwise set to what it previously was |
702 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
702 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
703 | 703 | } |
704 | 704 | } else { |
705 | 705 | // Set to what it previously was if it's not editable |
706 | 706 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
707 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
707 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
708 | 708 | } |
709 | 709 | } |
710 | 710 | |
711 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
711 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
712 | 712 | } |
713 | 713 | } else { |
714 | 714 | // Set to what it previously was if it's not editable |
@@ -748,19 +748,19 @@ discard block |
||
748 | 748 | |
749 | 749 | $input_name = 'input_' . $field_id; |
750 | 750 | |
751 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
751 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
752 | 752 | |
753 | 753 | // We have a new image |
754 | 754 | |
755 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
755 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
756 | 756 | |
757 | 757 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
758 | 758 | $ary = stripslashes_deep( $ary ); |
759 | 759 | $img_url = \GV\Utils::get( $ary, 0 ); |
760 | 760 | |
761 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
762 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
763 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
761 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
762 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
763 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
764 | 764 | |
765 | 765 | $image_meta = array( |
766 | 766 | 'post_excerpt' => $img_caption, |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | |
770 | 770 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
771 | 771 | if ( ! empty( $img_title ) ) { |
772 | - $image_meta['post_title'] = $img_title; |
|
772 | + $image_meta[ 'post_title' ] = $img_title; |
|
773 | 773 | } |
774 | 774 | |
775 | 775 | /** |
@@ -827,15 +827,15 @@ discard block |
||
827 | 827 | */ |
828 | 828 | private function maybe_update_post_fields( $form ) { |
829 | 829 | |
830 | - if( empty( $this->entry['post_id'] ) ) { |
|
830 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
831 | 831 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
832 | 832 | return; |
833 | 833 | } |
834 | 834 | |
835 | - $post_id = $this->entry['post_id']; |
|
835 | + $post_id = $this->entry[ 'post_id' ]; |
|
836 | 836 | |
837 | 837 | // Security check |
838 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
838 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
839 | 839 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
840 | 840 | return; |
841 | 841 | } |
@@ -848,25 +848,25 @@ discard block |
||
848 | 848 | |
849 | 849 | $field = RGFormsModel::get_field( $form, $field_id ); |
850 | 850 | |
851 | - if( ! $field ) { |
|
851 | + if ( ! $field ) { |
|
852 | 852 | continue; |
853 | 853 | } |
854 | 854 | |
855 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
855 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
856 | 856 | |
857 | 857 | // Get the value of the field, including $_POSTed value |
858 | 858 | $value = RGFormsModel::get_field_value( $field ); |
859 | 859 | |
860 | 860 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
861 | 861 | $entry_tmp = $this->entry; |
862 | - $entry_tmp["{$field_id}"] = $value; |
|
862 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
863 | 863 | |
864 | - switch( $field->type ) { |
|
864 | + switch ( $field->type ) { |
|
865 | 865 | |
866 | 866 | case 'post_title': |
867 | 867 | $post_title = $value; |
868 | 868 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
869 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
869 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
870 | 870 | } |
871 | 871 | $updated_post->post_title = $post_title; |
872 | 872 | $updated_post->post_name = $post_title; |
@@ -876,7 +876,7 @@ discard block |
||
876 | 876 | case 'post_content': |
877 | 877 | $post_content = $value; |
878 | 878 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
879 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
879 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
880 | 880 | } |
881 | 881 | $updated_post->post_content = $post_content; |
882 | 882 | unset( $post_content ); |
@@ -894,11 +894,11 @@ discard block |
||
894 | 894 | $value = $value[ $field_id ]; |
895 | 895 | } |
896 | 896 | |
897 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
897 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
898 | 898 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
899 | 899 | } |
900 | 900 | |
901 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
901 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
902 | 902 | |
903 | 903 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
904 | 904 | break; |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | } |
911 | 911 | |
912 | 912 | // update entry after |
913 | - $this->entry["{$field_id}"] = $value; |
|
913 | + $this->entry[ "{$field_id}" ] = $value; |
|
914 | 914 | |
915 | 915 | $update_entry = true; |
916 | 916 | |
@@ -919,11 +919,11 @@ discard block |
||
919 | 919 | |
920 | 920 | } |
921 | 921 | |
922 | - if( $update_entry ) { |
|
922 | + if ( $update_entry ) { |
|
923 | 923 | |
924 | 924 | $return_entry = GFAPI::update_entry( $this->entry ); |
925 | 925 | |
926 | - if( is_wp_error( $return_entry ) ) { |
|
926 | + if ( is_wp_error( $return_entry ) ) { |
|
927 | 927 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
928 | 928 | } else { |
929 | 929 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -933,7 +933,7 @@ discard block |
||
933 | 933 | |
934 | 934 | $return_post = wp_update_post( $updated_post, true ); |
935 | 935 | |
936 | - if( is_wp_error( $return_post ) ) { |
|
936 | + if ( is_wp_error( $return_post ) ) { |
|
937 | 937 | $return_post->add_data( $updated_post, '$updated_post' ); |
938 | 938 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
939 | 939 | } else { |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
968 | 968 | |
969 | 969 | // replace conditional shortcodes |
970 | - if( $do_shortcode ) { |
|
970 | + if ( $do_shortcode ) { |
|
971 | 971 | $output = do_shortcode( $output ); |
972 | 972 | } |
973 | 973 | |
@@ -986,19 +986,19 @@ discard block |
||
986 | 986 | */ |
987 | 987 | private function after_update() { |
988 | 988 | |
989 | - do_action( 'gform_after_update_entry', self::$original_form, $this->entry['id'], self::$original_entry ); |
|
990 | - do_action( "gform_after_update_entry_{$this->form['id']}", self::$original_form, $this->entry['id'], self::$original_entry ); |
|
989 | + do_action( 'gform_after_update_entry', self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
990 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", self::$original_form, $this->entry[ 'id' ], self::$original_entry ); |
|
991 | 991 | |
992 | 992 | // Re-define the entry now that we've updated it. |
993 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
993 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
994 | 994 | |
995 | 995 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
996 | 996 | |
997 | 997 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
998 | 998 | // We need to clear the cache because Gravity Forms caches the field values, which |
999 | 999 | // we have just updated. |
1000 | - foreach ($this->form['fields'] as $key => $field) { |
|
1001 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
1000 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
1001 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
1002 | 1002 | } |
1003 | 1003 | } |
1004 | 1004 | |
@@ -1008,11 +1008,11 @@ discard block |
||
1008 | 1008 | * @since develop |
1009 | 1009 | */ |
1010 | 1010 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
1011 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
1011 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
1012 | 1012 | if ( ! is_wp_error( $feeds ) ) { |
1013 | 1013 | $registered_feeds = array(); |
1014 | 1014 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
1015 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1015 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
1016 | 1016 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
1017 | 1017 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
1018 | 1018 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -1020,8 +1020,8 @@ discard block |
||
1020 | 1020 | } |
1021 | 1021 | } |
1022 | 1022 | foreach ( $feeds as $feed ) { |
1023 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
1024 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
1023 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
1024 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
1025 | 1025 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
1026 | 1026 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
1027 | 1027 | $entry = $returned_entry; |
@@ -1048,7 +1048,7 @@ discard block |
||
1048 | 1048 | public function edit_entry_form() { |
1049 | 1049 | |
1050 | 1050 | $locking = new GravityView_Edit_Entry_Locking(); |
1051 | - $locking->maybe_lock_object( $this->entry['id'] ); |
|
1051 | + $locking->maybe_lock_object( $this->entry[ 'id' ] ); |
|
1052 | 1052 | |
1053 | 1053 | ?> |
1054 | 1054 | |
@@ -1060,7 +1060,7 @@ discard block |
||
1060 | 1060 | |
1061 | 1061 | <div class="gv-edit-entry-wrapper"><?php |
1062 | 1062 | |
1063 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
1063 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
1064 | 1064 | |
1065 | 1065 | /** |
1066 | 1066 | * Fixes weird wpautop() issue |
@@ -1076,7 +1076,7 @@ discard block |
||
1076 | 1076 | * @param string $edit_entry_title Modify the "Edit Entry" title |
1077 | 1077 | * @param GravityView_Edit_Entry_Render $this This object |
1078 | 1078 | */ |
1079 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
1079 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
1080 | 1080 | |
1081 | 1081 | echo esc_attr( $edit_entry_title ); |
1082 | 1082 | ?></span> |
@@ -1142,18 +1142,18 @@ discard block |
||
1142 | 1142 | */ |
1143 | 1143 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1144 | 1144 | |
1145 | - $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
|
1145 | + $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ]; |
|
1146 | 1146 | } |
1147 | 1147 | |
1148 | 1148 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
1149 | 1149 | |
1150 | - if( ! $this->is_valid ){ |
|
1150 | + if ( ! $this->is_valid ) { |
|
1151 | 1151 | |
1152 | 1152 | // Keeping this compatible with Gravity Forms. |
1153 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
1154 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
1153 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
1154 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
1155 | 1155 | |
1156 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
1156 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
1157 | 1157 | |
1158 | 1158 | } elseif ( false === $this->is_paged_submitted ) { |
1159 | 1159 | // Paged form that hasn't been submitted on the last page yet |
@@ -1166,7 +1166,7 @@ discard block |
||
1166 | 1166 | * @param int $view_id View ID |
1167 | 1167 | * @param array $entry Gravity Forms entry array |
1168 | 1168 | */ |
1169 | - $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry ); |
|
1169 | + $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry ); |
|
1170 | 1170 | |
1171 | 1171 | echo GVCommon::generate_notice( $message ); |
1172 | 1172 | } else { |
@@ -1178,23 +1178,23 @@ discard block |
||
1178 | 1178 | |
1179 | 1179 | case '0': |
1180 | 1180 | $redirect_url = $back_link; |
1181 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
1181 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
1182 | 1182 | break; |
1183 | 1183 | |
1184 | 1184 | case '1': |
1185 | 1185 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
1186 | - $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>' ); |
|
1186 | + $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>' ); |
|
1187 | 1187 | break; |
1188 | 1188 | |
1189 | 1189 | case '2': |
1190 | 1190 | $redirect_url = $edit_redirect_url; |
1191 | 1191 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
1192 | - $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>' ); |
|
1192 | + $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>' ); |
|
1193 | 1193 | break; |
1194 | 1194 | |
1195 | 1195 | case '': |
1196 | 1196 | default: |
1197 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
1197 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1198 | 1198 | break; |
1199 | 1199 | } |
1200 | 1200 | |
@@ -1210,7 +1210,7 @@ discard block |
||
1210 | 1210 | * @param array $entry Gravity Forms entry array |
1211 | 1211 | * @param string $back_link URL to return to the original entry. @since 1.6 |
1212 | 1212 | */ |
1213 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
1213 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1214 | 1214 | |
1215 | 1215 | echo GVCommon::generate_notice( $message ); |
1216 | 1216 | } |
@@ -1234,8 +1234,8 @@ discard block |
||
1234 | 1234 | */ |
1235 | 1235 | do_action( 'gravityview/edit-entry/render/before', $this ); |
1236 | 1236 | |
1237 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1238 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
1237 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
1238 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1239 | 1239 | add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
1240 | 1240 | add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
1241 | 1241 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
@@ -1244,14 +1244,14 @@ discard block |
||
1244 | 1244 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
1245 | 1245 | |
1246 | 1246 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
1247 | - unset( $_GET['page'] ); |
|
1247 | + unset( $_GET[ 'page' ] ); |
|
1248 | 1248 | |
1249 | 1249 | $this->show_next_button = false; |
1250 | 1250 | $this->show_previous_button = false; |
1251 | 1251 | |
1252 | 1252 | // TODO: Verify multiple-page forms |
1253 | 1253 | if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) { |
1254 | - if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) { |
|
1254 | + if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) { |
|
1255 | 1255 | |
1256 | 1256 | $labels = array( |
1257 | 1257 | 'cancel' => __( 'Cancel', 'gravityview' ), |
@@ -1270,20 +1270,20 @@ discard block |
||
1270 | 1270 | */ |
1271 | 1271 | $labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
1272 | 1272 | |
1273 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
|
1274 | - GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true; |
|
1273 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form; |
|
1274 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true; |
|
1275 | 1275 | |
1276 | - if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) { |
|
1276 | + if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) { |
|
1277 | 1277 | $last_page = \GFFormDisplay::get_max_page_number( $this->form ); |
1278 | 1278 | |
1279 | 1279 | while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
1280 | 1280 | } // Advance to next visible page |
1281 | - } elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) { |
|
1281 | + } elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) { |
|
1282 | 1282 | while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
1283 | 1283 | } // Advance to next visible page |
1284 | 1284 | } |
1285 | 1285 | |
1286 | - GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number; |
|
1286 | + GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number; |
|
1287 | 1287 | } |
1288 | 1288 | |
1289 | 1289 | if ( ( $page_number = intval( $page_number ) ) < 2 ) { |
@@ -1309,7 +1309,7 @@ discard block |
||
1309 | 1309 | |
1310 | 1310 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
1311 | 1311 | |
1312 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
1312 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1313 | 1313 | |
1314 | 1314 | ob_get_clean(); |
1315 | 1315 | |
@@ -1337,7 +1337,7 @@ discard block |
||
1337 | 1337 | * @return string |
1338 | 1338 | */ |
1339 | 1339 | public function render_form_buttons() { |
1340 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
1340 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1341 | 1341 | } |
1342 | 1342 | |
1343 | 1343 | |
@@ -1356,15 +1356,15 @@ discard block |
||
1356 | 1356 | */ |
1357 | 1357 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
1358 | 1358 | |
1359 | - if( $form['id'] != $this->form_id ) { |
|
1359 | + if ( $form[ 'id' ] != $this->form_id ) { |
|
1360 | 1360 | return $form; |
1361 | 1361 | } |
1362 | 1362 | |
1363 | 1363 | // In case we have validated the form, use it to inject the validation results into the form render |
1364 | - if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
1364 | + if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
1365 | 1365 | $form = $this->form_after_validation; |
1366 | 1366 | } else { |
1367 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1367 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1368 | 1368 | } |
1369 | 1369 | |
1370 | 1370 | $form = $this->filter_conditional_logic( $form ); |
@@ -1372,8 +1372,8 @@ discard block |
||
1372 | 1372 | $form = $this->prefill_conditional_logic( $form ); |
1373 | 1373 | |
1374 | 1374 | // for now we don't support Save and Continue feature. |
1375 | - if( ! self::$supports_save_and_continue ) { |
|
1376 | - unset( $form['save'] ); |
|
1375 | + if ( ! self::$supports_save_and_continue ) { |
|
1376 | + unset( $form[ 'save' ] ); |
|
1377 | 1377 | } |
1378 | 1378 | |
1379 | 1379 | $form = $this->unselect_default_values( $form ); |
@@ -1396,31 +1396,31 @@ discard block |
||
1396 | 1396 | */ |
1397 | 1397 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
1398 | 1398 | |
1399 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
1399 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
1400 | 1400 | return $field_content; |
1401 | 1401 | } |
1402 | 1402 | |
1403 | 1403 | $message = null; |
1404 | 1404 | |
1405 | 1405 | // First, make sure they have the capability to edit the post. |
1406 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
1406 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1407 | 1407 | |
1408 | 1408 | /** |
1409 | 1409 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
1410 | 1410 | * @param string $message The existing "You don't have permission..." text |
1411 | 1411 | */ |
1412 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
1412 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1413 | 1413 | |
1414 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
1414 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1415 | 1415 | /** |
1416 | 1416 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
1417 | 1417 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
1418 | 1418 | */ |
1419 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1419 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1420 | 1420 | } |
1421 | 1421 | |
1422 | - if( $message ) { |
|
1423 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1422 | + if ( $message ) { |
|
1423 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1424 | 1424 | } |
1425 | 1425 | |
1426 | 1426 | return $field_content; |
@@ -1444,8 +1444,8 @@ discard block |
||
1444 | 1444 | |
1445 | 1445 | // If the form has been submitted, then we don't need to pre-fill the values, |
1446 | 1446 | // Except for fileupload type and when a field input is overridden- run always!! |
1447 | - if( |
|
1448 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1447 | + if ( |
|
1448 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1449 | 1449 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
1450 | 1450 | && ! GFCommon::is_product_field( $field->type ) |
1451 | 1451 | || ! empty( $field_content ) |
@@ -1465,7 +1465,7 @@ discard block |
||
1465 | 1465 | $return = null; |
1466 | 1466 | |
1467 | 1467 | /** @var GravityView_Field $gv_field */ |
1468 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1468 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1469 | 1469 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
1470 | 1470 | } else { |
1471 | 1471 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1474,7 +1474,7 @@ discard block |
||
1474 | 1474 | // If there was output, it's an error |
1475 | 1475 | $warnings = ob_get_clean(); |
1476 | 1476 | |
1477 | - if( !empty( $warnings ) ) { |
|
1477 | + if ( ! empty( $warnings ) ) { |
|
1478 | 1478 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
1479 | 1479 | } |
1480 | 1480 | |
@@ -1499,7 +1499,7 @@ discard block |
||
1499 | 1499 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
1500 | 1500 | |
1501 | 1501 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
1502 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1502 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1503 | 1503 | |
1504 | 1504 | $field_value = array(); |
1505 | 1505 | |
@@ -1508,10 +1508,10 @@ discard block |
||
1508 | 1508 | |
1509 | 1509 | foreach ( (array)$field->inputs as $input ) { |
1510 | 1510 | |
1511 | - $input_id = strval( $input['id'] ); |
|
1511 | + $input_id = strval( $input[ 'id' ] ); |
|
1512 | 1512 | |
1513 | 1513 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
1514 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1514 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1515 | 1515 | $allow_pre_populated = false; |
1516 | 1516 | } |
1517 | 1517 | |
@@ -1519,7 +1519,7 @@ discard block |
||
1519 | 1519 | |
1520 | 1520 | $pre_value = $field->get_value_submission( array(), false ); |
1521 | 1521 | |
1522 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1522 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1523 | 1523 | |
1524 | 1524 | } else { |
1525 | 1525 | |
@@ -1530,13 +1530,13 @@ discard block |
||
1530 | 1530 | |
1531 | 1531 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
1532 | 1532 | // or pre-populated value if not empty and set to override saved value |
1533 | - $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; |
|
1533 | + $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; |
|
1534 | 1534 | |
1535 | 1535 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
1536 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
1536 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1537 | 1537 | $categories = array(); |
1538 | 1538 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
1539 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
1539 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1540 | 1540 | } |
1541 | 1541 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
1542 | 1542 | } |
@@ -1564,7 +1564,7 @@ discard block |
||
1564 | 1564 | * @param GF_Field $field Gravity Forms field object |
1565 | 1565 | * @param GravityView_Edit_Entry_Render $this Current object |
1566 | 1566 | */ |
1567 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
1567 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1568 | 1568 | |
1569 | 1569 | return $field_value; |
1570 | 1570 | } |
@@ -1581,12 +1581,12 @@ discard block |
||
1581 | 1581 | */ |
1582 | 1582 | public function gform_pre_validation( $form ) { |
1583 | 1583 | |
1584 | - if( ! $this->verify_nonce() ) { |
|
1584 | + if ( ! $this->verify_nonce() ) { |
|
1585 | 1585 | return $form; |
1586 | 1586 | } |
1587 | 1587 | |
1588 | 1588 | // Fix PHP warning regarding undefined index. |
1589 | - foreach ( $form['fields'] as &$field) { |
|
1589 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
1590 | 1590 | |
1591 | 1591 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
1592 | 1592 | // expects certain field array items to be set. |
@@ -1594,7 +1594,7 @@ discard block |
||
1594 | 1594 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
1595 | 1595 | } |
1596 | 1596 | |
1597 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
1597 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1598 | 1598 | |
1599 | 1599 | /** |
1600 | 1600 | * 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. |
@@ -1608,26 +1608,26 @@ discard block |
||
1608 | 1608 | // Set the previous value |
1609 | 1609 | $entry = $this->get_entry(); |
1610 | 1610 | |
1611 | - $input_name = 'input_'.$field->id; |
|
1612 | - $form_id = $form['id']; |
|
1611 | + $input_name = 'input_' . $field->id; |
|
1612 | + $form_id = $form[ 'id' ]; |
|
1613 | 1613 | |
1614 | 1614 | $value = NULL; |
1615 | 1615 | |
1616 | 1616 | // Use the previous entry value as the default. |
1617 | - if( isset( $entry[ $field->id ] ) ) { |
|
1617 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1618 | 1618 | $value = $entry[ $field->id ]; |
1619 | 1619 | } |
1620 | 1620 | |
1621 | 1621 | // If this is a single upload file |
1622 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1623 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1624 | - $value = $file_path['url']; |
|
1622 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
1623 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
1624 | + $value = $file_path[ 'url' ]; |
|
1625 | 1625 | |
1626 | 1626 | } else { |
1627 | 1627 | |
1628 | 1628 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
1629 | 1629 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
1630 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
1630 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1631 | 1631 | |
1632 | 1632 | } |
1633 | 1633 | |
@@ -1635,10 +1635,10 @@ discard block |
||
1635 | 1635 | |
1636 | 1636 | // If there are fresh uploads, process and merge them. |
1637 | 1637 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
1638 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
1638 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1639 | 1639 | $value = empty( $value ) ? '[]' : $value; |
1640 | 1640 | $value = stripslashes_deep( $value ); |
1641 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
1641 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1642 | 1642 | } |
1643 | 1643 | |
1644 | 1644 | } else { |
@@ -1656,8 +1656,8 @@ discard block |
||
1656 | 1656 | |
1657 | 1657 | case 'number': |
1658 | 1658 | // Fix "undefined index" issue at line 1286 in form_display.php |
1659 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1660 | - $_POST['input_'.$field->id ] = NULL; |
|
1659 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
1660 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
1661 | 1661 | } |
1662 | 1662 | break; |
1663 | 1663 | } |
@@ -1694,7 +1694,7 @@ discard block |
||
1694 | 1694 | * You can enter whatever you want! |
1695 | 1695 | * We try validating, and customize the results using `self::custom_validation()` |
1696 | 1696 | */ |
1697 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
1697 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1698 | 1698 | |
1699 | 1699 | // Needed by the validate funtion |
1700 | 1700 | $failed_validation_page = NULL; |
@@ -1702,14 +1702,14 @@ discard block |
||
1702 | 1702 | |
1703 | 1703 | // Prevent entry limit from running when editing an entry, also |
1704 | 1704 | // prevent form scheduling from preventing editing |
1705 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
1705 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1706 | 1706 | |
1707 | 1707 | // Hide fields depending on Edit Entry settings |
1708 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1708 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1709 | 1709 | |
1710 | 1710 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
1711 | 1711 | |
1712 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1712 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1713 | 1713 | } |
1714 | 1714 | |
1715 | 1715 | |
@@ -1732,7 +1732,7 @@ discard block |
||
1732 | 1732 | |
1733 | 1733 | $gv_valid = true; |
1734 | 1734 | |
1735 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
1735 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1736 | 1736 | |
1737 | 1737 | $value = RGFormsModel::get_field_value( $field ); |
1738 | 1738 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1745,22 +1745,22 @@ discard block |
||
1745 | 1745 | case 'post_image': |
1746 | 1746 | |
1747 | 1747 | // in case nothing is uploaded but there are already files saved |
1748 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
1748 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1749 | 1749 | $field->failed_validation = false; |
1750 | 1750 | unset( $field->validation_message ); |
1751 | 1751 | } |
1752 | 1752 | |
1753 | 1753 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
1754 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
1754 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1755 | 1755 | |
1756 | 1756 | $input_name = 'input_' . $field->id; |
1757 | 1757 | //uploaded |
1758 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
1758 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1759 | 1759 | |
1760 | 1760 | //existent |
1761 | 1761 | $entry = $this->get_entry(); |
1762 | 1762 | $value = NULL; |
1763 | - if( isset( $entry[ $field->id ] ) ) { |
|
1763 | + if ( isset( $entry[ $field->id ] ) ) { |
|
1764 | 1764 | $value = json_decode( $entry[ $field->id ], true ); |
1765 | 1765 | } |
1766 | 1766 | |
@@ -1768,13 +1768,13 @@ discard block |
||
1768 | 1768 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
1769 | 1769 | ( is_array( $value ) ? count( $value ) : 0 ); |
1770 | 1770 | |
1771 | - if( $count_files > $field->maxFiles ) { |
|
1771 | + if ( $count_files > $field->maxFiles ) { |
|
1772 | 1772 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
1773 | 1773 | $field->failed_validation = 1; |
1774 | 1774 | $gv_valid = false; |
1775 | 1775 | |
1776 | 1776 | // in case of error make sure the newest upload files are removed from the upload input |
1777 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
1777 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1778 | 1778 | } |
1779 | 1779 | |
1780 | 1780 | } |
@@ -1785,7 +1785,7 @@ discard block |
||
1785 | 1785 | } |
1786 | 1786 | |
1787 | 1787 | // This field has failed validation. |
1788 | - if( !empty( $field->failed_validation ) ) { |
|
1788 | + if ( ! empty( $field->failed_validation ) ) { |
|
1789 | 1789 | |
1790 | 1790 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
1791 | 1791 | |
@@ -1803,19 +1803,19 @@ discard block |
||
1803 | 1803 | } |
1804 | 1804 | |
1805 | 1805 | // You can't continue inside a switch, so we do it after. |
1806 | - if( empty( $field->failed_validation ) ) { |
|
1806 | + if ( empty( $field->failed_validation ) ) { |
|
1807 | 1807 | continue; |
1808 | 1808 | } |
1809 | 1809 | |
1810 | 1810 | // checks if the No Duplicates option is not validating entry against itself, since |
1811 | 1811 | // we're editing a stored entry, it would also assume it's a duplicate. |
1812 | - if( !empty( $field->noDuplicates ) ) { |
|
1812 | + if ( ! empty( $field->noDuplicates ) ) { |
|
1813 | 1813 | |
1814 | 1814 | $entry = $this->get_entry(); |
1815 | 1815 | |
1816 | 1816 | // If the value of the entry is the same as the stored value |
1817 | 1817 | // Then we can assume it's not a duplicate, it's the same. |
1818 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1818 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1819 | 1819 | //if value submitted was not changed, then don't validate |
1820 | 1820 | $field->failed_validation = false; |
1821 | 1821 | |
@@ -1828,7 +1828,7 @@ discard block |
||
1828 | 1828 | } |
1829 | 1829 | |
1830 | 1830 | // if here then probably we are facing the validation 'At least one field must be filled out' |
1831 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1831 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1832 | 1832 | unset( $field->validation_message ); |
1833 | 1833 | $field->validation_message = false; |
1834 | 1834 | continue; |
@@ -1840,12 +1840,12 @@ discard block |
||
1840 | 1840 | |
1841 | 1841 | } |
1842 | 1842 | |
1843 | - $validation_results['is_valid'] = $gv_valid; |
|
1843 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
1844 | 1844 | |
1845 | 1845 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
1846 | 1846 | |
1847 | 1847 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
1848 | - $this->form_after_validation = $validation_results['form']; |
|
1848 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
1849 | 1849 | |
1850 | 1850 | return $validation_results; |
1851 | 1851 | } |
@@ -1858,7 +1858,7 @@ discard block |
||
1858 | 1858 | */ |
1859 | 1859 | public function get_entry() { |
1860 | 1860 | |
1861 | - if( empty( $this->entry ) ) { |
|
1861 | + if ( empty( $this->entry ) ) { |
|
1862 | 1862 | // Get the database value of the entry that's being edited |
1863 | 1863 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
1864 | 1864 | } |
@@ -1890,10 +1890,10 @@ discard block |
||
1890 | 1890 | } |
1891 | 1891 | |
1892 | 1892 | // If edit tab not yet configured, show all fields |
1893 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
1893 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1894 | 1894 | |
1895 | 1895 | // Hide fields depending on admin settings |
1896 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
1896 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1897 | 1897 | |
1898 | 1898 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
1899 | 1899 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1926,7 +1926,7 @@ discard block |
||
1926 | 1926 | */ |
1927 | 1927 | private function filter_fields( $fields, $configured_fields ) { |
1928 | 1928 | |
1929 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
1929 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1930 | 1930 | return $fields; |
1931 | 1931 | } |
1932 | 1932 | |
@@ -1943,12 +1943,12 @@ discard block |
||
1943 | 1943 | |
1944 | 1944 | // Remove the fields that have calculation properties and keep them to be used later |
1945 | 1945 | // @since 1.16.2 |
1946 | - if( $field->has_calculation() ) { |
|
1947 | - $this->fields_with_calculation[] = $field; |
|
1946 | + if ( $field->has_calculation() ) { |
|
1947 | + $this->fields_with_calculation[ ] = $field; |
|
1948 | 1948 | // don't remove the calculation fields on form render. |
1949 | 1949 | } |
1950 | 1950 | |
1951 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
1951 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1952 | 1952 | unset( $fields[ $key ] ); |
1953 | 1953 | } |
1954 | 1954 | } |
@@ -1966,7 +1966,7 @@ discard block |
||
1966 | 1966 | continue; // Same |
1967 | 1967 | } |
1968 | 1968 | |
1969 | - $out_fields[] = $field; |
|
1969 | + $out_fields[ ] = $field; |
|
1970 | 1970 | } |
1971 | 1971 | |
1972 | 1972 | return array_values( $out_fields ); |
@@ -1977,8 +1977,8 @@ discard block |
||
1977 | 1977 | |
1978 | 1978 | /** @var GF_Field $field */ |
1979 | 1979 | foreach ( $fields as $field ) { |
1980 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1981 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
1980 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1981 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1982 | 1982 | break; |
1983 | 1983 | } |
1984 | 1984 | |
@@ -2001,14 +2001,14 @@ discard block |
||
2001 | 2001 | |
2002 | 2002 | $return_field = $field; |
2003 | 2003 | |
2004 | - if( empty( $field_setting['show_label'] ) ) { |
|
2004 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
2005 | 2005 | $return_field->label = ''; |
2006 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
2007 | - $return_field->label = $field_setting['custom_label']; |
|
2006 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
2007 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
2008 | 2008 | } |
2009 | 2009 | |
2010 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
2011 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
2010 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
2011 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
2012 | 2012 | } |
2013 | 2013 | |
2014 | 2014 | /** |
@@ -2046,16 +2046,16 @@ discard block |
||
2046 | 2046 | */ |
2047 | 2047 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
2048 | 2048 | |
2049 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2050 | - foreach( $fields as $k => $field ) { |
|
2051 | - if( $field->adminOnly ) { |
|
2049 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
2050 | + foreach ( $fields as $k => $field ) { |
|
2051 | + if ( $field->adminOnly ) { |
|
2052 | 2052 | unset( $fields[ $k ] ); |
2053 | 2053 | } |
2054 | 2054 | } |
2055 | 2055 | return array_values( $fields ); |
2056 | 2056 | } |
2057 | 2057 | |
2058 | - foreach( $fields as &$field ) { |
|
2058 | + foreach ( $fields as &$field ) { |
|
2059 | 2059 | $field->adminOnly = false; |
2060 | 2060 | } |
2061 | 2061 | |
@@ -2076,7 +2076,7 @@ discard block |
||
2076 | 2076 | */ |
2077 | 2077 | private function unselect_default_values( $form ) { |
2078 | 2078 | |
2079 | - foreach ( $form['fields'] as &$field ) { |
|
2079 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2080 | 2080 | |
2081 | 2081 | if ( empty( $field->choices ) ) { |
2082 | 2082 | continue; |
@@ -2084,7 +2084,7 @@ discard block |
||
2084 | 2084 | |
2085 | 2085 | foreach ( $field->choices as &$choice ) { |
2086 | 2086 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
2087 | - $choice['isSelected'] = false; |
|
2087 | + $choice[ 'isSelected' ] = false; |
|
2088 | 2088 | } |
2089 | 2089 | } |
2090 | 2090 | } |
@@ -2109,22 +2109,22 @@ discard block |
||
2109 | 2109 | */ |
2110 | 2110 | function prefill_conditional_logic( $form ) { |
2111 | 2111 | |
2112 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2112 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2113 | 2113 | return $form; |
2114 | 2114 | } |
2115 | 2115 | |
2116 | 2116 | // Have Conditional Logic pre-fill fields as if the data were default values |
2117 | 2117 | /** @var GF_Field $field */ |
2118 | - foreach ( $form['fields'] as &$field ) { |
|
2118 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2119 | 2119 | |
2120 | - if( 'checkbox' === $field->type ) { |
|
2120 | + if ( 'checkbox' === $field->type ) { |
|
2121 | 2121 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
2122 | - $input_id = $input['id']; |
|
2122 | + $input_id = $input[ 'id' ]; |
|
2123 | 2123 | $choice = $field->choices[ $key ]; |
2124 | 2124 | $value = \GV\Utils::get( $this->entry, $input_id ); |
2125 | 2125 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
2126 | - if( $match ) { |
|
2127 | - $field->choices[ $key ]['isSelected'] = true; |
|
2126 | + if ( $match ) { |
|
2127 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
2128 | 2128 | } |
2129 | 2129 | } |
2130 | 2130 | } else { |
@@ -2132,15 +2132,15 @@ discard block |
||
2132 | 2132 | // We need to run through each field to set the default values |
2133 | 2133 | foreach ( $this->entry as $field_id => $field_value ) { |
2134 | 2134 | |
2135 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2135 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2136 | 2136 | |
2137 | - if( 'list' === $field->type ) { |
|
2137 | + if ( 'list' === $field->type ) { |
|
2138 | 2138 | $list_rows = maybe_unserialize( $field_value ); |
2139 | 2139 | |
2140 | 2140 | $list_field_value = array(); |
2141 | - foreach ( (array) $list_rows as $row ) { |
|
2142 | - foreach ( (array) $row as $column ) { |
|
2143 | - $list_field_value[] = $column; |
|
2141 | + foreach ( (array)$list_rows as $row ) { |
|
2142 | + foreach ( (array)$row as $column ) { |
|
2143 | + $list_field_value[ ] = $column; |
|
2144 | 2144 | } |
2145 | 2145 | } |
2146 | 2146 | |
@@ -2173,32 +2173,32 @@ discard block |
||
2173 | 2173 | * @see https://github.com/gravityview/GravityView/issues/840 |
2174 | 2174 | * @since develop |
2175 | 2175 | */ |
2176 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
2176 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
2177 | 2177 | $editable_ids = array(); |
2178 | - foreach ( $form['fields'] as $field ) { |
|
2179 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
2178 | + foreach ( $form[ 'fields' ] as $field ) { |
|
2179 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
2180 | 2180 | } |
2181 | 2181 | $remove_conditions_rule = array(); |
2182 | - foreach ( $the_form['fields'] as $field ) { |
|
2183 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
2184 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
2185 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
2182 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
2183 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
2184 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
2185 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
2186 | 2186 | /** |
2187 | 2187 | * This conditional field is not editable in this View. |
2188 | 2188 | * We need to remove the rule, but only if it matches. |
2189 | 2189 | */ |
2190 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
2190 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
2191 | 2191 | $value = $_field->get_value_export( $this->entry ); |
2192 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
2193 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
2192 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
2193 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
2194 | 2194 | } else { |
2195 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
2195 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
2196 | 2196 | } |
2197 | 2197 | |
2198 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
2198 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
2199 | 2199 | |
2200 | 2200 | if ( $match ) { |
2201 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
2201 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
2202 | 2202 | } |
2203 | 2203 | } |
2204 | 2204 | } |
@@ -2206,21 +2206,21 @@ discard block |
||
2206 | 2206 | } |
2207 | 2207 | |
2208 | 2208 | if ( $remove_conditions_rule ) { |
2209 | - foreach ( $form['fields'] as &$field ) { |
|
2209 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2210 | 2210 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
2211 | 2211 | |
2212 | 2212 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
2213 | 2213 | |
2214 | - if ( $field['id'] == $rule_field_id ) { |
|
2215 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
2216 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
2214 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
2215 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
2216 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
2217 | 2217 | } |
2218 | 2218 | } |
2219 | 2219 | } |
2220 | 2220 | } |
2221 | 2221 | |
2222 | 2222 | /** Normalize the indices... */ |
2223 | - $form['fields'] = array_values( $form['fields'] ); |
|
2223 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
2224 | 2224 | |
2225 | 2225 | /** |
2226 | 2226 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2230,16 +2230,16 @@ discard block |
||
2230 | 2230 | */ |
2231 | 2231 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
2232 | 2232 | |
2233 | - if( $use_conditional_logic ) { |
|
2233 | + if ( $use_conditional_logic ) { |
|
2234 | 2234 | return $form; |
2235 | 2235 | } |
2236 | 2236 | |
2237 | - foreach( $form['fields'] as &$field ) { |
|
2237 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
2238 | 2238 | /* @var GF_Field $field */ |
2239 | 2239 | $field->conditionalLogic = null; |
2240 | 2240 | } |
2241 | 2241 | |
2242 | - unset( $form['button']['conditionalLogic'] ); |
|
2242 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
2243 | 2243 | |
2244 | 2244 | return $form; |
2245 | 2245 | |
@@ -2256,7 +2256,7 @@ discard block |
||
2256 | 2256 | */ |
2257 | 2257 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
2258 | 2258 | |
2259 | - if( ! $this->is_edit_entry() ) { |
|
2259 | + if ( ! $this->is_edit_entry() ) { |
|
2260 | 2260 | return $has_conditional_logic; |
2261 | 2261 | } |
2262 | 2262 | |
@@ -2288,44 +2288,44 @@ discard block |
||
2288 | 2288 | * 2. There are two entries embedded using oEmbed |
2289 | 2289 | * 3. One of the entries has just been saved |
2290 | 2290 | */ |
2291 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
2291 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
2292 | 2292 | |
2293 | 2293 | $error = true; |
2294 | 2294 | |
2295 | 2295 | } |
2296 | 2296 | |
2297 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
2297 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
2298 | 2298 | |
2299 | 2299 | $error = true; |
2300 | 2300 | |
2301 | - } elseif( ! $this->verify_nonce() ) { |
|
2301 | + } elseif ( ! $this->verify_nonce() ) { |
|
2302 | 2302 | |
2303 | 2303 | /** |
2304 | 2304 | * If the Entry is embedded, there may be two entries on the same page. |
2305 | 2305 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
2306 | 2306 | */ |
2307 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2307 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2308 | 2308 | $error = true; |
2309 | 2309 | } else { |
2310 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
2310 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
2311 | 2311 | } |
2312 | 2312 | |
2313 | 2313 | } |
2314 | 2314 | |
2315 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2316 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
2315 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2316 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
2317 | 2317 | } |
2318 | 2318 | |
2319 | - if( $this->entry['status'] === 'trash' ) { |
|
2320 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2319 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
2320 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2321 | 2321 | } |
2322 | 2322 | |
2323 | 2323 | // No errors; everything's fine here! |
2324 | - if( empty( $error ) ) { |
|
2324 | + if ( empty( $error ) ) { |
|
2325 | 2325 | return true; |
2326 | 2326 | } |
2327 | 2327 | |
2328 | - if( $echo && $error !== true ) { |
|
2328 | + if ( $echo && $error !== true ) { |
|
2329 | 2329 | |
2330 | 2330 | $error = esc_html( $error ); |
2331 | 2331 | |
@@ -2333,10 +2333,10 @@ discard block |
||
2333 | 2333 | * @since 1.9 |
2334 | 2334 | */ |
2335 | 2335 | if ( ! empty( $this->entry ) ) { |
2336 | - $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;" ) ); |
|
2336 | + $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;" ) ); |
|
2337 | 2337 | } |
2338 | 2338 | |
2339 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
2339 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2340 | 2340 | } |
2341 | 2341 | |
2342 | 2342 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2356,17 +2356,17 @@ discard block |
||
2356 | 2356 | |
2357 | 2357 | $error = NULL; |
2358 | 2358 | |
2359 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2360 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
2359 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2360 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2361 | 2361 | } |
2362 | 2362 | |
2363 | 2363 | // No errors; everything's fine here! |
2364 | - if( empty( $error ) ) { |
|
2364 | + if ( empty( $error ) ) { |
|
2365 | 2365 | return true; |
2366 | 2366 | } |
2367 | 2367 | |
2368 | - if( $echo ) { |
|
2369 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
2368 | + if ( $echo ) { |
|
2369 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2370 | 2370 | } |
2371 | 2371 | |
2372 | 2372 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2387,14 +2387,14 @@ discard block |
||
2387 | 2387 | private function check_user_cap_edit_field( $field ) { |
2388 | 2388 | |
2389 | 2389 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
2390 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2390 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2391 | 2391 | return true; |
2392 | 2392 | } |
2393 | 2393 | |
2394 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
2394 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2395 | 2395 | |
2396 | - if( $field_cap ) { |
|
2397 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
2396 | + if ( $field_cap ) { |
|
2397 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2398 | 2398 | } |
2399 | 2399 | |
2400 | 2400 | return false; |
@@ -2408,17 +2408,17 @@ discard block |
||
2408 | 2408 | public function verify_nonce() { |
2409 | 2409 | |
2410 | 2410 | // Verify form submitted for editing single |
2411 | - if( $this->is_edit_entry_submission() ) { |
|
2411 | + if ( $this->is_edit_entry_submission() ) { |
|
2412 | 2412 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
2413 | 2413 | } |
2414 | 2414 | |
2415 | 2415 | // Verify |
2416 | - else if( ! $this->is_edit_entry() ) { |
|
2416 | + else if ( ! $this->is_edit_entry() ) { |
|
2417 | 2417 | $valid = false; |
2418 | 2418 | } |
2419 | 2419 | |
2420 | 2420 | else { |
2421 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
2421 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2422 | 2422 | } |
2423 | 2423 | |
2424 | 2424 | /** |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $supports = array( 'title', 'revisions' ); |
126 | 126 | |
127 | 127 | if ( $is_hierarchical ) { |
128 | - $supports[] = 'page-attributes'; |
|
128 | + $supports[ ] = 'page-attributes'; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -227,11 +227,11 @@ discard block |
||
227 | 227 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
228 | 228 | |
229 | 229 | add_filter( 'query_vars', function( $query_vars ) { |
230 | - $query_vars[] = 'csv'; |
|
230 | + $query_vars[ ] = 'csv'; |
|
231 | 231 | return $query_vars; |
232 | 232 | } ); |
233 | 233 | |
234 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { |
|
234 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { |
|
235 | 235 | call_user_func_array( 'add_rewrite_rule', $rule ); |
236 | 236 | } |
237 | 237 | } |
@@ -308,13 +308,13 @@ discard block |
||
308 | 308 | return $content; |
309 | 309 | } |
310 | 310 | |
311 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
311 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
312 | 312 | |
313 | 313 | /** |
314 | 314 | * Editing a single entry. |
315 | 315 | */ |
316 | 316 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
317 | - if ( $entry['status'] != 'active' ) { |
|
317 | + if ( $entry[ 'status' ] != 'active' ) { |
|
318 | 318 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
319 | 319 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
328 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
328 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
329 | 329 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
330 | 330 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
331 | 331 | } |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | |
349 | 349 | foreach ( $entryset as $e ) { |
350 | 350 | |
351 | - if ( 'active' !== $e['status'] ) { |
|
351 | + if ( 'active' !== $e[ 'status' ] ) { |
|
352 | 352 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
353 | 353 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
354 | 354 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | } |
360 | 360 | |
361 | 361 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
362 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
362 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
363 | 363 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
364 | 364 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
365 | 365 | } |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
535 | 535 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
536 | 536 | |
537 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
537 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
538 | 538 | } |
539 | 539 | |
540 | 540 | return $joins; |
@@ -624,13 +624,13 @@ discard block |
||
624 | 624 | } |
625 | 625 | |
626 | 626 | foreach ( $_fields as $field ) { |
627 | - if ( ! empty( $field['unions'] ) ) { |
|
628 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
627 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
628 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
629 | 629 | if ( ! isset( $unions[ $form_id ] ) ) { |
630 | 630 | $unions[ $form_id ] = array(); |
631 | 631 | } |
632 | 632 | |
633 | - $unions[ $form_id ][ $field['id'] ] = |
|
633 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
634 | 634 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
635 | 635 | } |
636 | 636 | } |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | if ( ! $view->form ) { |
686 | 686 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
687 | 687 | 'view_id' => $view->ID, |
688 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
688 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
689 | 689 | ) ); |
690 | 690 | } |
691 | 691 | |
@@ -924,11 +924,11 @@ discard block |
||
924 | 924 | * Remove multiple sorting before calling legacy filters. |
925 | 925 | * This allows us to fake it till we make it. |
926 | 926 | */ |
927 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
927 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
928 | 928 | $has_multisort = true; |
929 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
930 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
931 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
929 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
930 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
931 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
932 | 932 | } |
933 | 933 | } |
934 | 934 | |
@@ -937,31 +937,30 @@ discard block |
||
937 | 937 | */ |
938 | 938 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
939 | 939 | |
940 | - $parameters['context_view_id'] = $this->ID; |
|
940 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
941 | 941 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
942 | 942 | |
943 | 943 | if ( ! is_array( $parameters ) ) { |
944 | 944 | $parameters = array(); |
945 | 945 | } |
946 | 946 | |
947 | - if ( ! is_array( $parameters['search_criteria'] ) ) { |
|
948 | - $parameters['search_criteria'] = array(); |
|
947 | + if ( ! is_array( $parameters[ 'search_criteria' ] ) ) { |
|
948 | + $parameters[ 'search_criteria' ] = array(); |
|
949 | 949 | } |
950 | 950 | |
951 | - if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) { |
|
952 | - $parameters['search_criteria']['field_filters'] = array(); |
|
951 | + if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) { |
|
952 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = array(); |
|
953 | 953 | } |
954 | 954 | |
955 | 955 | if ( $request instanceof REST\Request ) { |
956 | 956 | $atts = $this->settings->as_atts(); |
957 | 957 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
958 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
958 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
959 | 959 | ) ); |
960 | - $parameters['paging'] = $paging_parameters['paging']; |
|
960 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
961 | 961 | } |
962 | 962 | |
963 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
964 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
963 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / \GV\Utils::get( $parameters, 'paging/page_size', 25 ) ) + 1 ); |
|
965 | 964 | |
966 | 965 | /** |
967 | 966 | * Cleanup duplicate field_filter parameters to simplify the query. |
@@ -969,14 +968,14 @@ discard block |
||
969 | 968 | $unique_field_filters = array(); |
970 | 969 | foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) { |
971 | 970 | if ( 'mode' === $key ) { |
972 | - $unique_field_filters['mode'] = $filter; |
|
971 | + $unique_field_filters[ 'mode' ] = $filter; |
|
973 | 972 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
974 | - $unique_field_filters[] = $filter; |
|
973 | + $unique_field_filters[ ] = $filter; |
|
975 | 974 | } |
976 | 975 | } |
977 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
976 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
978 | 977 | |
979 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
978 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
980 | 979 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
981 | 980 | } |
982 | 981 | |
@@ -985,7 +984,7 @@ discard block |
||
985 | 984 | $query_class = $this->get_query_class(); |
986 | 985 | |
987 | 986 | /** @var \GF_Query $query */ |
988 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) ); |
|
987 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) ); |
|
989 | 988 | |
990 | 989 | /** |
991 | 990 | * Apply multisort. |
@@ -996,15 +995,15 @@ discard block |
||
996 | 995 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
997 | 996 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
998 | 997 | |
999 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
998 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
1000 | 999 | |
1001 | - if( $has_sort_query_param ) { |
|
1002 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
1000 | + if ( $has_sort_query_param ) { |
|
1001 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
1003 | 1002 | } |
1004 | 1003 | |
1005 | 1004 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
1006 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
1007 | - $sort_directions = array_values( $_GET['sort'] ); |
|
1005 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
1006 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
1008 | 1007 | } else { |
1009 | 1008 | $sort_field_ids = $view_setting_sort_field_ids; |
1010 | 1009 | $sort_directions = $view_setting_sort_directions; |
@@ -1012,7 +1011,7 @@ discard block |
||
1012 | 1011 | |
1013 | 1012 | $skip_first = false; |
1014 | 1013 | |
1015 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
1014 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
1016 | 1015 | |
1017 | 1016 | if ( ! $skip_first && ! $has_sort_query_param ) { |
1018 | 1017 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1042,15 +1041,15 @@ discard block |
||
1042 | 1041 | |
1043 | 1042 | $merged_time = false; |
1044 | 1043 | |
1045 | - foreach ( $q['order'] as $oid => $order ) { |
|
1046 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
1047 | - $column = $order[0]; |
|
1048 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
1049 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
1044 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
1045 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
1046 | + $column = $order[ 0 ]; |
|
1047 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
1048 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
1050 | 1049 | $orders[ $oid ] = $order; |
1051 | 1050 | continue; // Need something that resembles a single sort |
1052 | 1051 | } |
1053 | - $column = $order[0]->columns[0]; |
|
1052 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
1054 | 1053 | } |
1055 | 1054 | |
1056 | 1055 | if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1064,7 +1063,7 @@ discard block |
||
1064 | 1063 | |
1065 | 1064 | $orders[ $oid ] = array( |
1066 | 1065 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
1067 | - $order[1] // Mock it! |
|
1066 | + $order[ 1 ] // Mock it! |
|
1068 | 1067 | ); |
1069 | 1068 | |
1070 | 1069 | $merged_time = true; |
@@ -1075,15 +1074,15 @@ discard block |
||
1075 | 1074 | * ORDER again. |
1076 | 1075 | */ |
1077 | 1076 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
1078 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1077 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1079 | 1078 | } |
1080 | 1079 | } |
1081 | 1080 | |
1082 | 1081 | return $sql; |
1083 | 1082 | } ); |
1084 | 1083 | |
1085 | - $query->limit( $parameters['paging']['page_size'] ) |
|
1086 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
1084 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1085 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
1087 | 1086 | |
1088 | 1087 | /** |
1089 | 1088 | * Any joins? |
@@ -1106,7 +1105,7 @@ discard block |
||
1106 | 1105 | |
1107 | 1106 | $query_parameters = $query->_introspect(); |
1108 | 1107 | |
1109 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1108 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1110 | 1109 | } |
1111 | 1110 | |
1112 | 1111 | /** |
@@ -1140,7 +1139,7 @@ discard block |
||
1140 | 1139 | } |
1141 | 1140 | |
1142 | 1141 | $q = $query->_introspect(); |
1143 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
1142 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
1144 | 1143 | |
1145 | 1144 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
1146 | 1145 | |
@@ -1165,7 +1164,7 @@ discard block |
||
1165 | 1164 | |
1166 | 1165 | $query_parameters = $query->_introspect(); |
1167 | 1166 | |
1168 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1167 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1169 | 1168 | } |
1170 | 1169 | } |
1171 | 1170 | |
@@ -1189,7 +1188,7 @@ discard block |
||
1189 | 1188 | $conditions = array(); |
1190 | 1189 | |
1191 | 1190 | foreach ( $condition->expressions as $_condition ) { |
1192 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
1191 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
1193 | 1192 | } |
1194 | 1193 | |
1195 | 1194 | return call_user_func_array( |
@@ -1218,10 +1217,10 @@ discard block |
||
1218 | 1217 | $q = new $query_class( $form_id ); |
1219 | 1218 | |
1220 | 1219 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
1221 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
1220 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
1222 | 1221 | |
1223 | 1222 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
1224 | - foreach ( $query_parameters['order'] as $order ) { |
|
1223 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
1225 | 1224 | list( $column, $_order ) = $order; |
1226 | 1225 | |
1227 | 1226 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1235,15 +1234,15 @@ discard block |
||
1235 | 1234 | |
1236 | 1235 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
1237 | 1236 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1238 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1237 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1239 | 1238 | |
1240 | 1239 | // Record the SQL |
1241 | - $unions_sql[] = array( |
|
1240 | + $unions_sql[ ] = array( |
|
1242 | 1241 | // Remove columns, we'll rebuild them |
1243 | 1242 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
1244 | - 'from' => $sql['from'], |
|
1245 | - 'join' => $sql['join'], |
|
1246 | - 'where' => $sql['where'], |
|
1243 | + 'from' => $sql[ 'from' ], |
|
1244 | + 'join' => $sql[ 'join' ], |
|
1245 | + 'where' => $sql[ 'where' ], |
|
1247 | 1246 | // Remove order and limit |
1248 | 1247 | ); |
1249 | 1248 | |
@@ -1260,11 +1259,11 @@ discard block |
||
1260 | 1259 | |
1261 | 1260 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
1262 | 1261 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1263 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1262 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1264 | 1263 | |
1265 | 1264 | // Remove columns, we'll rebuild them |
1266 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
1267 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
1265 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
1266 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
1268 | 1267 | |
1269 | 1268 | $unions = array(); |
1270 | 1269 | |
@@ -1275,30 +1274,30 @@ discard block |
||
1275 | 1274 | }; |
1276 | 1275 | |
1277 | 1276 | // Add all the order columns into the selects, so we can order by the whole union group |
1278 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
1277 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
1279 | 1278 | |
1280 | 1279 | $columns = array( |
1281 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
1280 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
1282 | 1281 | ); |
1283 | 1282 | |
1284 | 1283 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
1285 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
1284 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
1286 | 1285 | |
1287 | 1286 | // Rewrite the order columns to the shared aliases |
1288 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
1287 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
1289 | 1288 | } |
1290 | 1289 | |
1291 | 1290 | $columns = array_unique( $columns ); |
1292 | 1291 | |
1293 | 1292 | // Add the columns to every UNION |
1294 | 1293 | foreach ( $unions_sql as $union_sql ) { |
1295 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
1296 | - $unions []= implode( ' ', $union_sql ); |
|
1294 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
1295 | + $unions [ ] = implode( ' ', $union_sql ); |
|
1297 | 1296 | } |
1298 | 1297 | |
1299 | 1298 | // Add the columns to the main SELECT, but only grab the entry id column |
1300 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
1301 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
1299 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
1300 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
1302 | 1301 | |
1303 | 1302 | return $sql; |
1304 | 1303 | } ); |
@@ -1343,20 +1342,20 @@ discard block |
||
1343 | 1342 | } ); |
1344 | 1343 | } else { |
1345 | 1344 | $entries = $this->form->entries |
1346 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
1345 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
1347 | 1346 | ->offset( $this->settings->get( 'offset' ) ) |
1348 | - ->limit( $parameters['paging']['page_size'] ) |
|
1347 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1349 | 1348 | ->page( $page ); |
1350 | 1349 | |
1351 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
1350 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
1352 | 1351 | // Pluck off multisort arrays |
1353 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
1352 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
1354 | 1353 | } |
1355 | 1354 | |
1356 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
1355 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
1357 | 1356 | $field = new \GV\Field(); |
1358 | - $field->ID = $parameters['sorting']['key']; |
|
1359 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1357 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
1358 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1360 | 1359 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
1361 | 1360 | } |
1362 | 1361 | } |
@@ -1431,7 +1430,7 @@ discard block |
||
1431 | 1430 | $allowed = $headers = array(); |
1432 | 1431 | |
1433 | 1432 | foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) { |
1434 | - $allowed[] = $field; |
|
1433 | + $allowed[ ] = $field; |
|
1435 | 1434 | } |
1436 | 1435 | |
1437 | 1436 | $renderer = new Field_Renderer(); |
@@ -1453,17 +1452,17 @@ discard block |
||
1453 | 1452 | } ); |
1454 | 1453 | |
1455 | 1454 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
1456 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1455 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1457 | 1456 | } |
1458 | 1457 | |
1459 | 1458 | foreach ( $allowed as $field ) { |
1460 | 1459 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
1461 | 1460 | |
1462 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1461 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1463 | 1462 | |
1464 | 1463 | if ( ! $headers_done ) { |
1465 | 1464 | $label = $field->get_label( $view, $source, $entry ); |
1466 | - $headers[] = $label ? $label : $field->ID; |
|
1465 | + $headers[ ] = $label ? $label : $field->ID; |
|
1467 | 1466 | } |
1468 | 1467 | } |
1469 | 1468 |
@@ -67,20 +67,20 @@ discard block |
||
67 | 67 | $result = array(); |
68 | 68 | if ( ! $lock_holder_user_id ) { |
69 | 69 | $this->set_lock( $object_id ); |
70 | - $result['html'] = __( 'You now have control', 'gravityforms' ); |
|
71 | - $result['status'] = 'lock_obtained'; |
|
70 | + $result[ 'html' ] = __( 'You now have control', 'gravityforms' ); |
|
71 | + $result[ 'status' ] = 'lock_obtained'; |
|
72 | 72 | } else { |
73 | 73 | |
74 | - if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
74 | + if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
75 | 75 | $user = get_userdata( $lock_holder_user_id ); |
76 | - $result['html'] = sprintf( __( 'Your request has been sent to %s.', 'gravityforms' ), $user->display_name ); |
|
76 | + $result[ 'html' ] = sprintf( __( 'Your request has been sent to %s.', 'gravityforms' ), $user->display_name ); |
|
77 | 77 | } else { |
78 | - $result['html'] = __( 'Your request has been sent.', 'gravityforms' ); |
|
78 | + $result[ 'html' ] = __( 'Your request has been sent.', 'gravityforms' ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | $this->update_lock_request_meta( $object_id, $user_id ); |
82 | 82 | |
83 | - $result['status'] = 'lock_requested'; |
|
83 | + $result[ 'status' ] = 'lock_requested'; |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | return $result; |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | return; |
106 | 106 | } |
107 | 107 | |
108 | - $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET['gform_debug'] ) ? '' : '.min'; |
|
108 | + $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET[ 'gform_debug' ] ) ? '' : '.min'; |
|
109 | 109 | $locking_path = GFCommon::get_base_url() . '/includes/locking/'; |
110 | 110 | |
111 | 111 | wp_enqueue_script( 'gforms_locking', $locking_path . "js/locking{$min}.js", array( 'jquery', 'heartbeat' ), GFCommon::$version ); |
@@ -114,20 +114,20 @@ discard block |
||
114 | 114 | $translations = array_map( 'wp_strip_all_tags', $this->get_strings() ); |
115 | 115 | |
116 | 116 | $strings = array( |
117 | - 'noResponse' => $translations['no_response'], |
|
118 | - 'requestAgain' => $translations['request_again'], |
|
119 | - 'requestError' => $translations['request_error'], |
|
120 | - 'gainedControl' => $translations['gained_control'], |
|
121 | - 'rejected' => $translations['request_rejected'], |
|
122 | - 'pending' => $translations['request_pending'], |
|
117 | + 'noResponse' => $translations[ 'no_response' ], |
|
118 | + 'requestAgain' => $translations[ 'request_again' ], |
|
119 | + 'requestError' => $translations[ 'request_error' ], |
|
120 | + 'gainedControl' => $translations[ 'gained_control' ], |
|
121 | + 'rejected' => $translations[ 'request_rejected' ], |
|
122 | + 'pending' => $translations[ 'request_pending' ], |
|
123 | 123 | ); |
124 | 124 | |
125 | - $lock_user_id = $this->check_lock( $entry['id'] ); |
|
125 | + $lock_user_id = $this->check_lock( $entry[ 'id' ] ); |
|
126 | 126 | |
127 | 127 | $vars = array( |
128 | 128 | 'hasLock' => ! $lock_user_id ? 1 : 0, |
129 | 129 | 'lockUI' => $this->get_lock_ui( $lock_user_id ), |
130 | - 'objectID' => $entry['id'], |
|
130 | + 'objectID' => $entry[ 'id' ], |
|
131 | 131 | 'objectType' => 'entry', |
132 | 132 | 'strings' => $strings, |
133 | 133 | ); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $hidden = $locked ? '' : ' hidden'; |
158 | 158 | if ( $locked ) { |
159 | 159 | |
160 | - if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
160 | + if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) { |
|
161 | 161 | $avatar = get_avatar( $user->ID, 64 ); |
162 | 162 | $person_editing_text = $user->display_name; |
163 | 163 | } else { |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | |
265 | 265 | $current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) ); |
266 | 266 | |
267 | - if ( isset( $_GET['get-edit-lock'] ) ) { |
|
267 | + if ( isset( $_GET[ 'get-edit-lock' ] ) ) { |
|
268 | 268 | $this->set_lock( $entry_id ); |
269 | 269 | echo '<script>window.location = ' . json_encode( remove_query_arg( 'get-edit-lock', $current_url ) ) . ';</script>'; |
270 | 270 | exit(); |
271 | - } else if ( isset( $_GET['release-edit-lock'] ) ) { |
|
271 | + } else if ( isset( $_GET[ 'release-edit-lock' ] ) ) { |
|
272 | 272 | $this->delete_lock_meta( $entry_id ); |
273 | 273 | $current_url = remove_query_arg( 'edit', $current_url ); |
274 | 274 | echo '<script>window.location = ' . json_encode( remove_query_arg( 'release-edit-lock', $current_url ) ) . ';</script>'; |