|
@@ -135,7 +135,7 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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
|
|
- self::$original_form = GFAPI::get_form( $this->entry['form_id'] ); |
|
|
240
|
+ self::$original_form = GFAPI::get_form( $this->entry[ 'form_id' ] ); |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 before the entry has been updated using Edit Entry |
|
@@ -373,14 +373,14 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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; |
|
@@ -1049,9 +1049,9 @@ discard block |
|
|
block discarded – undo |
|
1049
|
1049
|
|
|
1050
|
1050
|
$view = \GV\View::by_id( $this->view_id ); |
|
1051
|
1051
|
|
|
1052
|
|
- if( $view->settings->get( 'edit_locking' ) ) { |
|
|
1052
|
+ if ( $view->settings->get( 'edit_locking' ) ) { |
|
1053
|
1053
|
$locking = new GravityView_Edit_Entry_Locking(); |
|
1054
|
|
- $locking->maybe_lock_object( $this->entry['id'] ); |
|
|
1054
|
+ $locking->maybe_lock_object( $this->entry[ 'id' ] ); |
|
1055
|
1055
|
} |
|
1056
|
1056
|
|
|
1057
|
1057
|
?> |
|
@@ -1064,7 +1064,7 @@ discard block |
|
|
block discarded – undo |
|
1064
|
1064
|
|
|
1065
|
1065
|
<div class="gv-edit-entry-wrapper"><?php |
|
1066
|
1066
|
|
|
1067
|
|
- $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
|
1067
|
+ $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
1068
|
1068
|
|
|
1069
|
1069
|
/** |
|
1070
|
1070
|
* Fixes weird wpautop() issue |
|
@@ -1080,7 +1080,7 @@ discard block |
|
|
block discarded – undo |
|
1080
|
1080
|
* @param string $edit_entry_title Modify the "Edit Entry" title |
|
1081
|
1081
|
* @param GravityView_Edit_Entry_Render $this This object |
|
1082
|
1082
|
*/ |
|
1083
|
|
- $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
|
1083
|
+ $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
1084
|
1084
|
|
|
1085
|
1085
|
echo esc_attr( $edit_entry_title ); |
|
1086
|
1086
|
?></span> |
|
@@ -1146,18 +1146,18 @@ discard block |
|
|
block discarded – undo |
|
1146
|
1146
|
*/ |
|
1147
|
1147
|
$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
|
1148
|
1148
|
|
|
1149
|
|
- $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels['submit']; |
|
|
1149
|
+ $this->is_paged_submitted = \GV\Utils::_POST( 'save' ) === $labels[ 'submit' ]; |
|
1150
|
1150
|
} |
|
1151
|
1151
|
|
|
1152
|
1152
|
$back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
|
1153
|
1153
|
|
|
1154
|
|
- if( ! $this->is_valid ){ |
|
|
1154
|
+ if ( ! $this->is_valid ) { |
|
1155
|
1155
|
|
|
1156
|
1156
|
// Keeping this compatible with Gravity Forms. |
|
1157
|
|
- $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
1158
|
|
- $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
|
1157
|
+ $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
|
1158
|
+ $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
1159
|
1159
|
|
|
1160
|
|
- echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
|
1160
|
+ echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
1161
|
1161
|
|
|
1162
|
1162
|
} elseif ( false === $this->is_paged_submitted ) { |
|
1163
|
1163
|
// Paged form that hasn't been submitted on the last page yet |
|
@@ -1170,7 +1170,7 @@ discard block |
|
|
block discarded – undo |
|
1170
|
1170
|
* @param int $view_id View ID |
|
1171
|
1171
|
* @param array $entry Gravity Forms entry array |
|
1172
|
1172
|
*/ |
|
1173
|
|
- $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message , $this->view_id, $this->entry ); |
|
|
1173
|
+ $message = apply_filters( 'gravityview/edit_entry/page/success', $entry_updated_message, $this->view_id, $this->entry ); |
|
1174
|
1174
|
|
|
1175
|
1175
|
echo GVCommon::generate_notice( $message ); |
|
1176
|
1176
|
} else { |
|
@@ -1182,23 +1182,23 @@ discard block |
|
|
block discarded – undo |
|
1182
|
1182
|
|
|
1183
|
1183
|
case '0': |
|
1184
|
1184
|
$redirect_url = $back_link; |
|
1185
|
|
- $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
|
1185
|
+ $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
1186
|
1186
|
break; |
|
1187
|
1187
|
|
|
1188
|
1188
|
case '1': |
|
1189
|
1189
|
$redirect_url = $directory_link = GravityView_API::directory_link(); |
|
1190
|
|
- $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>' ); |
|
|
1190
|
+ $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>' ); |
|
1191
|
1191
|
break; |
|
1192
|
1192
|
|
|
1193
|
1193
|
case '2': |
|
1194
|
1194
|
$redirect_url = $edit_redirect_url; |
|
1195
|
1195
|
$redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
1196
|
|
- $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>' ); |
|
|
1196
|
+ $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>' ); |
|
1197
|
1197
|
break; |
|
1198
|
1198
|
|
|
1199
|
1199
|
case '': |
|
1200
|
1200
|
default: |
|
1201
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
|
1201
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1202
|
1202
|
break; |
|
1203
|
1203
|
} |
|
1204
|
1204
|
|
|
@@ -1214,7 +1214,7 @@ discard block |
|
|
block discarded – undo |
|
1214
|
1214
|
* @param array $entry Gravity Forms entry array |
|
1215
|
1215
|
* @param string $back_link URL to return to the original entry. @since 1.6 |
|
1216
|
1216
|
*/ |
|
1217
|
|
- $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
|
1217
|
+ $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1218
|
1218
|
|
|
1219
|
1219
|
echo GVCommon::generate_notice( $message ); |
|
1220
|
1220
|
} |
|
@@ -1238,8 +1238,8 @@ discard block |
|
|
block discarded – undo |
|
1238
|
1238
|
*/ |
|
1239
|
1239
|
do_action( 'gravityview/edit-entry/render/before', $this ); |
|
1240
|
1240
|
|
|
1241
|
|
- add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1242
|
|
- add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
|
1241
|
+ add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
|
1242
|
+ add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1243
|
1243
|
add_filter( 'gform_next_button', array( $this, 'render_form_buttons' ) ); |
|
1244
|
1244
|
add_filter( 'gform_previous_button', array( $this, 'render_form_buttons' ) ); |
|
1245
|
1245
|
add_filter( 'gform_disable_view_counter', '__return_true' ); |
|
@@ -1248,14 +1248,14 @@ discard block |
|
|
block discarded – undo |
|
1248
|
1248
|
add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
|
1249
|
1249
|
|
|
1250
|
1250
|
// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
|
1251
|
|
- unset( $_GET['page'] ); |
|
|
1251
|
+ unset( $_GET[ 'page' ] ); |
|
1252
|
1252
|
|
|
1253
|
1253
|
$this->show_next_button = false; |
|
1254
|
1254
|
$this->show_previous_button = false; |
|
1255
|
1255
|
|
|
1256
|
1256
|
// TODO: Verify multiple-page forms |
|
1257
|
1257
|
if ( GFCommon::has_pages( $this->form ) && apply_filters( 'gravityview/features/paged-edit', false ) ) { |
|
1258
|
|
- if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form['id'], 0 ) ) ) { |
|
|
1258
|
+ if ( intval( $page_number = \GV\Utils::_POST( 'gform_source_page_number_' . $this->form[ 'id' ], 0 ) ) ) { |
|
1259
|
1259
|
|
|
1260
|
1260
|
$labels = array( |
|
1261
|
1261
|
'cancel' => __( 'Cancel', 'gravityview' ), |
|
@@ -1274,20 +1274,20 @@ discard block |
|
|
block discarded – undo |
|
1274
|
1274
|
*/ |
|
1275
|
1275
|
$labels = apply_filters( 'gravityview/edit_entry/button_labels', $labels, $this->form, $this->entry, $this->view_id ); |
|
1276
|
1276
|
|
|
1277
|
|
- GFFormDisplay::$submission[ $this->form['id'] ][ 'form' ] = $this->form; |
|
1278
|
|
- GFFormDisplay::$submission[ $this->form['id'] ][ 'is_valid' ] = true; |
|
|
1277
|
+ GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'form' ] = $this->form; |
|
|
1278
|
+ GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'is_valid' ] = true; |
|
1279
|
1279
|
|
|
1280
|
|
- if ( \GV\Utils::_POST( 'save' ) === $labels['next'] ) { |
|
|
1280
|
+ if ( \GV\Utils::_POST( 'save' ) === $labels[ 'next' ] ) { |
|
1281
|
1281
|
$last_page = \GFFormDisplay::get_max_page_number( $this->form ); |
|
1282
|
1282
|
|
|
1283
|
1283
|
while ( ++$page_number < $last_page && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
|
1284
|
1284
|
} // Advance to next visible page |
|
1285
|
|
- } elseif ( \GV\Utils::_POST( 'save' ) === $labels['previous'] ) { |
|
|
1285
|
+ } elseif ( \GV\Utils::_POST( 'save' ) === $labels[ 'previous' ] ) { |
|
1286
|
1286
|
while ( --$page_number > 1 && RGFormsModel::is_page_hidden( $this->form, $page_number, \GV\Utils::_POST( 'gform_field_values' ) ) ) { |
|
1287
|
1287
|
} // Advance to next visible page |
|
1288
|
1288
|
} |
|
1289
|
1289
|
|
|
1290
|
|
- GFFormDisplay::$submission[ $this->form['id'] ]['page_number'] = $page_number; |
|
|
1290
|
+ GFFormDisplay::$submission[ $this->form[ 'id' ] ][ 'page_number' ] = $page_number; |
|
1291
|
1291
|
} |
|
1292
|
1292
|
|
|
1293
|
1293
|
if ( ( $page_number = intval( $page_number ) ) < 2 ) { |
|
@@ -1313,7 +1313,7 @@ discard block |
|
|
block discarded – undo |
|
1313
|
1313
|
|
|
1314
|
1314
|
ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
|
1315
|
1315
|
|
|
1316
|
|
- $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
|
1316
|
+ $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1317
|
1317
|
|
|
1318
|
1318
|
ob_get_clean(); |
|
1319
|
1319
|
|
|
@@ -1341,7 +1341,7 @@ discard block |
|
|
block discarded – undo |
|
1341
|
1341
|
* @return string |
|
1342
|
1342
|
*/ |
|
1343
|
1343
|
public function render_form_buttons() { |
|
1344
|
|
- return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
|
1344
|
+ return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1345
|
1345
|
} |
|
1346
|
1346
|
|
|
1347
|
1347
|
|
|
@@ -1360,15 +1360,15 @@ discard block |
|
|
block discarded – undo |
|
1360
|
1360
|
*/ |
|
1361
|
1361
|
public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
|
1362
|
1362
|
|
|
1363
|
|
- if( $form['id'] != $this->form_id ) { |
|
|
1363
|
+ if ( $form[ 'id' ] != $this->form_id ) { |
|
1364
|
1364
|
return $form; |
|
1365
|
1365
|
} |
|
1366
|
1366
|
|
|
1367
|
1367
|
// In case we have validated the form, use it to inject the validation results into the form render |
|
1368
|
|
- if( isset( $this->form_after_validation ) && $this->form_after_validation['id'] === $form['id'] ) { |
|
|
1368
|
+ if ( isset( $this->form_after_validation ) && $this->form_after_validation[ 'id' ] === $form[ 'id' ] ) { |
|
1369
|
1369
|
$form = $this->form_after_validation; |
|
1370
|
1370
|
} else { |
|
1371
|
|
- $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
|
1371
|
+ $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1372
|
1372
|
} |
|
1373
|
1373
|
|
|
1374
|
1374
|
$form = $this->filter_conditional_logic( $form ); |
|
@@ -1376,8 +1376,8 @@ discard block |
|
|
block discarded – undo |
|
1376
|
1376
|
$form = $this->prefill_conditional_logic( $form ); |
|
1377
|
1377
|
|
|
1378
|
1378
|
// for now we don't support Save and Continue feature. |
|
1379
|
|
- if( ! self::$supports_save_and_continue ) { |
|
1380
|
|
- unset( $form['save'] ); |
|
|
1379
|
+ if ( ! self::$supports_save_and_continue ) { |
|
|
1380
|
+ unset( $form[ 'save' ] ); |
|
1381
|
1381
|
} |
|
1382
|
1382
|
|
|
1383
|
1383
|
$form = $this->unselect_default_values( $form ); |
|
@@ -1400,31 +1400,31 @@ discard block |
|
|
block discarded – undo |
|
1400
|
1400
|
*/ |
|
1401
|
1401
|
public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
|
1402
|
1402
|
|
|
1403
|
|
- if( ! GFCommon::is_post_field( $field ) ) { |
|
|
1403
|
+ if ( ! GFCommon::is_post_field( $field ) ) { |
|
1404
|
1404
|
return $field_content; |
|
1405
|
1405
|
} |
|
1406
|
1406
|
|
|
1407
|
1407
|
$message = null; |
|
1408
|
1408
|
|
|
1409
|
1409
|
// First, make sure they have the capability to edit the post. |
|
1410
|
|
- if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
|
1410
|
+ if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1411
|
1411
|
|
|
1412
|
1412
|
/** |
|
1413
|
1413
|
* @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1414
|
1414
|
* @param string $message The existing "You don't have permission..." text |
|
1415
|
1415
|
*/ |
|
1416
|
|
- $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
|
1416
|
+ $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1417
|
1417
|
|
|
1418
|
|
- } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
|
1418
|
+ } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1419
|
1419
|
/** |
|
1420
|
1420
|
* @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1421
|
1421
|
* @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1422
|
1422
|
*/ |
|
1423
|
|
- $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
|
1423
|
+ $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1424
|
1424
|
} |
|
1425
|
1425
|
|
|
1426
|
|
- if( $message ) { |
|
1427
|
|
- $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
|
1426
|
+ if ( $message ) { |
|
|
1427
|
+ $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1428
|
1428
|
} |
|
1429
|
1429
|
|
|
1430
|
1430
|
return $field_content; |
|
@@ -1448,8 +1448,8 @@ discard block |
|
|
block discarded – undo |
|
1448
|
1448
|
|
|
1449
|
1449
|
// If the form has been submitted, then we don't need to pre-fill the values, |
|
1450
|
1450
|
// Except for fileupload type and when a field input is overridden- run always!! |
|
1451
|
|
- if( |
|
1452
|
|
- ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
|
1451
|
+ if ( |
|
|
1452
|
+ ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1453
|
1453
|
&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
|
1454
|
1454
|
&& ! GFCommon::is_product_field( $field->type ) |
|
1455
|
1455
|
|| ! empty( $field_content ) |
|
@@ -1469,7 +1469,7 @@ discard block |
|
|
block discarded – undo |
|
1469
|
1469
|
$return = null; |
|
1470
|
1470
|
|
|
1471
|
1471
|
/** @var GravityView_Field $gv_field */ |
|
1472
|
|
- if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
|
1472
|
+ if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1473
|
1473
|
$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
|
1474
|
1474
|
} else { |
|
1475
|
1475
|
$return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
@@ -1478,7 +1478,7 @@ discard block |
|
|
block discarded – undo |
|
1478
|
1478
|
// If there was output, it's an error |
|
1479
|
1479
|
$warnings = ob_get_clean(); |
|
1480
|
1480
|
|
|
1481
|
|
- if( !empty( $warnings ) ) { |
|
|
1481
|
+ if ( ! empty( $warnings ) ) { |
|
1482
|
1482
|
gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1483
|
1483
|
} |
|
1484
|
1484
|
|
|
@@ -1503,7 +1503,7 @@ discard block |
|
|
block discarded – undo |
|
1503
|
1503
|
$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
|
1504
|
1504
|
|
|
1505
|
1505
|
// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
|
1506
|
|
- if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
|
1506
|
+ if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1507
|
1507
|
|
|
1508
|
1508
|
$field_value = array(); |
|
1509
|
1509
|
|
|
@@ -1512,10 +1512,10 @@ discard block |
|
|
block discarded – undo |
|
1512
|
1512
|
|
|
1513
|
1513
|
foreach ( (array)$field->inputs as $input ) { |
|
1514
|
1514
|
|
|
1515
|
|
- $input_id = strval( $input['id'] ); |
|
|
1515
|
+ $input_id = strval( $input[ 'id' ] ); |
|
1516
|
1516
|
|
|
1517
|
1517
|
if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
|
1518
|
|
- $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
|
1518
|
+ $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1519
|
1519
|
$allow_pre_populated = false; |
|
1520
|
1520
|
} |
|
1521
|
1521
|
|
|
@@ -1523,7 +1523,7 @@ discard block |
|
|
block discarded – undo |
|
1523
|
1523
|
|
|
1524
|
1524
|
$pre_value = $field->get_value_submission( array(), false ); |
|
1525
|
1525
|
|
|
1526
|
|
- $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
|
1526
|
+ $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1527
|
1527
|
|
|
1528
|
1528
|
} else { |
|
1529
|
1529
|
|
|
@@ -1534,13 +1534,13 @@ discard block |
|
|
block discarded – undo |
|
1534
|
1534
|
|
|
1535
|
1535
|
// saved field entry value (if empty, fallback to the pre-populated value, if exists) |
|
1536
|
1536
|
// or pre-populated value if not empty and set to override saved value |
|
1537
|
|
- $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; |
|
|
1537
|
+ $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; |
|
1538
|
1538
|
|
|
1539
|
1539
|
// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
|
1540
|
|
- if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
|
1540
|
+ if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1541
|
1541
|
$categories = array(); |
|
1542
|
1542
|
foreach ( explode( ',', $field_value ) as $cat_string ) { |
|
1543
|
|
- $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
|
1543
|
+ $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1544
|
1544
|
} |
|
1545
|
1545
|
$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
|
1546
|
1546
|
} |
|
@@ -1568,7 +1568,7 @@ discard block |
|
|
block discarded – undo |
|
1568
|
1568
|
* @param GF_Field $field Gravity Forms field object |
|
1569
|
1569
|
* @param GravityView_Edit_Entry_Render $this Current object |
|
1570
|
1570
|
*/ |
|
1571
|
|
- $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
|
1571
|
+ $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1572
|
1572
|
|
|
1573
|
1573
|
return $field_value; |
|
1574
|
1574
|
} |
|
@@ -1585,12 +1585,12 @@ discard block |
|
|
block discarded – undo |
|
1585
|
1585
|
*/ |
|
1586
|
1586
|
public function gform_pre_validation( $form ) { |
|
1587
|
1587
|
|
|
1588
|
|
- if( ! $this->verify_nonce() ) { |
|
|
1588
|
+ if ( ! $this->verify_nonce() ) { |
|
1589
|
1589
|
return $form; |
|
1590
|
1590
|
} |
|
1591
|
1591
|
|
|
1592
|
1592
|
// Fix PHP warning regarding undefined index. |
|
1593
|
|
- foreach ( $form['fields'] as &$field) { |
|
|
1593
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1594
|
1594
|
|
|
1595
|
1595
|
// This is because we're doing admin form pretending to be front-end, so Gravity Forms |
|
1596
|
1596
|
// expects certain field array items to be set. |
|
@@ -1598,7 +1598,7 @@ discard block |
|
|
block discarded – undo |
|
1598
|
1598
|
$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1599
|
1599
|
} |
|
1600
|
1600
|
|
|
1601
|
|
- switch( RGFormsModel::get_input_type( $field ) ) { |
|
|
1601
|
+ switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1602
|
1602
|
|
|
1603
|
1603
|
/** |
|
1604
|
1604
|
* 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. |
|
@@ -1612,26 +1612,26 @@ discard block |
|
|
block discarded – undo |
|
1612
|
1612
|
// Set the previous value |
|
1613
|
1613
|
$entry = $this->get_entry(); |
|
1614
|
1614
|
|
|
1615
|
|
- $input_name = 'input_'.$field->id; |
|
1616
|
|
- $form_id = $form['id']; |
|
|
1615
|
+ $input_name = 'input_' . $field->id; |
|
|
1616
|
+ $form_id = $form[ 'id' ]; |
|
1617
|
1617
|
|
|
1618
|
1618
|
$value = NULL; |
|
1619
|
1619
|
|
|
1620
|
1620
|
// Use the previous entry value as the default. |
|
1621
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1621
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1622
|
1622
|
$value = $entry[ $field->id ]; |
|
1623
|
1623
|
} |
|
1624
|
1624
|
|
|
1625
|
1625
|
// If this is a single upload file |
|
1626
|
|
- if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1627
|
|
- $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1628
|
|
- $value = $file_path['url']; |
|
|
1626
|
+ if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
|
1627
|
+ $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
|
1628
|
+ $value = $file_path[ 'url' ]; |
|
1629
|
1629
|
|
|
1630
|
1630
|
} else { |
|
1631
|
1631
|
|
|
1632
|
1632
|
// Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1633
|
1633
|
// Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1634
|
|
- $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
|
1634
|
+ $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1635
|
1635
|
|
|
1636
|
1636
|
} |
|
1637
|
1637
|
|
|
@@ -1639,10 +1639,10 @@ discard block |
|
|
block discarded – undo |
|
1639
|
1639
|
|
|
1640
|
1640
|
// If there are fresh uploads, process and merge them. |
|
1641
|
1641
|
// Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1642
|
|
- if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
|
1642
|
+ if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1643
|
1643
|
$value = empty( $value ) ? '[]' : $value; |
|
1644
|
1644
|
$value = stripslashes_deep( $value ); |
|
1645
|
|
- $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
|
1645
|
+ $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1646
|
1646
|
} |
|
1647
|
1647
|
|
|
1648
|
1648
|
} else { |
|
@@ -1660,8 +1660,8 @@ discard block |
|
|
block discarded – undo |
|
1660
|
1660
|
|
|
1661
|
1661
|
case 'number': |
|
1662
|
1662
|
// Fix "undefined index" issue at line 1286 in form_display.php |
|
1663
|
|
- if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1664
|
|
- $_POST['input_'.$field->id ] = NULL; |
|
|
1663
|
+ if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
|
1664
|
+ $_POST[ 'input_' . $field->id ] = NULL; |
|
1665
|
1665
|
} |
|
1666
|
1666
|
break; |
|
1667
|
1667
|
} |
|
@@ -1698,7 +1698,7 @@ discard block |
|
|
block discarded – undo |
|
1698
|
1698
|
* You can enter whatever you want! |
|
1699
|
1699
|
* We try validating, and customize the results using `self::custom_validation()` |
|
1700
|
1700
|
*/ |
|
1701
|
|
- add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
|
1701
|
+ add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1702
|
1702
|
|
|
1703
|
1703
|
// Needed by the validate funtion |
|
1704
|
1704
|
$failed_validation_page = NULL; |
|
@@ -1706,14 +1706,14 @@ discard block |
|
|
block discarded – undo |
|
1706
|
1706
|
|
|
1707
|
1707
|
// Prevent entry limit from running when editing an entry, also |
|
1708
|
1708
|
// prevent form scheduling from preventing editing |
|
1709
|
|
- unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
|
1709
|
+ unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1710
|
1710
|
|
|
1711
|
1711
|
// Hide fields depending on Edit Entry settings |
|
1712
|
|
- $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
|
1712
|
+ $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1713
|
1713
|
|
|
1714
|
1714
|
$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
|
1715
|
1715
|
|
|
1716
|
|
- remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
|
1716
|
+ remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1717
|
1717
|
} |
|
1718
|
1718
|
|
|
1719
|
1719
|
|
|
@@ -1736,7 +1736,7 @@ discard block |
|
|
block discarded – undo |
|
1736
|
1736
|
|
|
1737
|
1737
|
$gv_valid = true; |
|
1738
|
1738
|
|
|
1739
|
|
- foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
|
1739
|
+ foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1740
|
1740
|
|
|
1741
|
1741
|
$value = RGFormsModel::get_field_value( $field ); |
|
1742
|
1742
|
$field_type = RGFormsModel::get_input_type( $field ); |
|
@@ -1749,22 +1749,22 @@ discard block |
|
|
block discarded – undo |
|
1749
|
1749
|
case 'post_image': |
|
1750
|
1750
|
|
|
1751
|
1751
|
// in case nothing is uploaded but there are already files saved |
|
1752
|
|
- if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
|
1752
|
+ if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1753
|
1753
|
$field->failed_validation = false; |
|
1754
|
1754
|
unset( $field->validation_message ); |
|
1755
|
1755
|
} |
|
1756
|
1756
|
|
|
1757
|
1757
|
// validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1758
|
|
- if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
|
1758
|
+ if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1759
|
1759
|
|
|
1760
|
1760
|
$input_name = 'input_' . $field->id; |
|
1761
|
1761
|
//uploaded |
|
1762
|
|
- $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
|
1762
|
+ $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1763
|
1763
|
|
|
1764
|
1764
|
//existent |
|
1765
|
1765
|
$entry = $this->get_entry(); |
|
1766
|
1766
|
$value = NULL; |
|
1767
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1767
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1768
|
1768
|
$value = json_decode( $entry[ $field->id ], true ); |
|
1769
|
1769
|
} |
|
1770
|
1770
|
|
|
@@ -1772,13 +1772,13 @@ discard block |
|
|
block discarded – undo |
|
1772
|
1772
|
$count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
|
1773
|
1773
|
( is_array( $value ) ? count( $value ) : 0 ); |
|
1774
|
1774
|
|
|
1775
|
|
- if( $count_files > $field->maxFiles ) { |
|
|
1775
|
+ if ( $count_files > $field->maxFiles ) { |
|
1776
|
1776
|
$field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1777
|
1777
|
$field->failed_validation = 1; |
|
1778
|
1778
|
$gv_valid = false; |
|
1779
|
1779
|
|
|
1780
|
1780
|
// in case of error make sure the newest upload files are removed from the upload input |
|
1781
|
|
- GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
|
1781
|
+ GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1782
|
1782
|
} |
|
1783
|
1783
|
|
|
1784
|
1784
|
} |
|
@@ -1789,7 +1789,7 @@ discard block |
|
|
block discarded – undo |
|
1789
|
1789
|
} |
|
1790
|
1790
|
|
|
1791
|
1791
|
// This field has failed validation. |
|
1792
|
|
- if( !empty( $field->failed_validation ) ) { |
|
|
1792
|
+ if ( ! empty( $field->failed_validation ) ) { |
|
1793
|
1793
|
|
|
1794
|
1794
|
gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
|
1795
|
1795
|
|
|
@@ -1807,19 +1807,19 @@ discard block |
|
|
block discarded – undo |
|
1807
|
1807
|
} |
|
1808
|
1808
|
|
|
1809
|
1809
|
// You can't continue inside a switch, so we do it after. |
|
1810
|
|
- if( empty( $field->failed_validation ) ) { |
|
|
1810
|
+ if ( empty( $field->failed_validation ) ) { |
|
1811
|
1811
|
continue; |
|
1812
|
1812
|
} |
|
1813
|
1813
|
|
|
1814
|
1814
|
// checks if the No Duplicates option is not validating entry against itself, since |
|
1815
|
1815
|
// we're editing a stored entry, it would also assume it's a duplicate. |
|
1816
|
|
- if( !empty( $field->noDuplicates ) ) { |
|
|
1816
|
+ if ( ! empty( $field->noDuplicates ) ) { |
|
1817
|
1817
|
|
|
1818
|
1818
|
$entry = $this->get_entry(); |
|
1819
|
1819
|
|
|
1820
|
1820
|
// If the value of the entry is the same as the stored value |
|
1821
|
1821
|
// Then we can assume it's not a duplicate, it's the same. |
|
1822
|
|
- if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
|
1822
|
+ if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1823
|
1823
|
//if value submitted was not changed, then don't validate |
|
1824
|
1824
|
$field->failed_validation = false; |
|
1825
|
1825
|
|
|
@@ -1832,7 +1832,7 @@ discard block |
|
|
block discarded – undo |
|
1832
|
1832
|
} |
|
1833
|
1833
|
|
|
1834
|
1834
|
// if here then probably we are facing the validation 'At least one field must be filled out' |
|
1835
|
|
- if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
|
1835
|
+ if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1836
|
1836
|
unset( $field->validation_message ); |
|
1837
|
1837
|
$field->validation_message = false; |
|
1838
|
1838
|
continue; |
|
@@ -1844,12 +1844,12 @@ discard block |
|
|
block discarded – undo |
|
1844
|
1844
|
|
|
1845
|
1845
|
} |
|
1846
|
1846
|
|
|
1847
|
|
- $validation_results['is_valid'] = $gv_valid; |
|
|
1847
|
+ $validation_results[ 'is_valid' ] = $gv_valid; |
|
1848
|
1848
|
|
|
1849
|
1849
|
gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
|
1850
|
1850
|
|
|
1851
|
1851
|
// We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
|
1852
|
|
- $this->form_after_validation = $validation_results['form']; |
|
|
1852
|
+ $this->form_after_validation = $validation_results[ 'form' ]; |
|
1853
|
1853
|
|
|
1854
|
1854
|
return $validation_results; |
|
1855
|
1855
|
} |
|
@@ -1862,7 +1862,7 @@ discard block |
|
|
block discarded – undo |
|
1862
|
1862
|
*/ |
|
1863
|
1863
|
public function get_entry() { |
|
1864
|
1864
|
|
|
1865
|
|
- if( empty( $this->entry ) ) { |
|
|
1865
|
+ if ( empty( $this->entry ) ) { |
|
1866
|
1866
|
// Get the database value of the entry that's being edited |
|
1867
|
1867
|
$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
|
1868
|
1868
|
} |
|
@@ -1894,10 +1894,10 @@ discard block |
|
|
block discarded – undo |
|
1894
|
1894
|
} |
|
1895
|
1895
|
|
|
1896
|
1896
|
// If edit tab not yet configured, show all fields |
|
1897
|
|
- $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
|
1897
|
+ $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1898
|
1898
|
|
|
1899
|
1899
|
// Hide fields depending on admin settings |
|
1900
|
|
- $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
|
1900
|
+ $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1901
|
1901
|
|
|
1902
|
1902
|
// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1903
|
1903
|
$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
@@ -1930,7 +1930,7 @@ discard block |
|
|
block discarded – undo |
|
1930
|
1930
|
*/ |
|
1931
|
1931
|
private function filter_fields( $fields, $configured_fields ) { |
|
1932
|
1932
|
|
|
1933
|
|
- if( empty( $fields ) || !is_array( $fields ) ) { |
|
|
1933
|
+ if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1934
|
1934
|
return $fields; |
|
1935
|
1935
|
} |
|
1936
|
1936
|
|
|
@@ -1947,12 +1947,12 @@ discard block |
|
|
block discarded – undo |
|
1947
|
1947
|
|
|
1948
|
1948
|
// Remove the fields that have calculation properties and keep them to be used later |
|
1949
|
1949
|
// @since 1.16.2 |
|
1950
|
|
- if( $field->has_calculation() ) { |
|
1951
|
|
- $this->fields_with_calculation[] = $field; |
|
|
1950
|
+ if ( $field->has_calculation() ) { |
|
|
1951
|
+ $this->fields_with_calculation[ ] = $field; |
|
1952
|
1952
|
// don't remove the calculation fields on form render. |
|
1953
|
1953
|
} |
|
1954
|
1954
|
|
|
1955
|
|
- if( in_array( $field->type, $field_type_blacklist ) ) { |
|
|
1955
|
+ if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1956
|
1956
|
unset( $fields[ $key ] ); |
|
1957
|
1957
|
} |
|
1958
|
1958
|
} |
|
@@ -1982,7 +1982,7 @@ discard block |
|
|
block discarded – undo |
|
1982
|
1982
|
continue; // Never include when no fields are configured |
|
1983
|
1983
|
} |
|
1984
|
1984
|
|
|
1985
|
|
- $out_fields[] = $field; |
|
|
1985
|
+ $out_fields[ ] = $field; |
|
1986
|
1986
|
} |
|
1987
|
1987
|
|
|
1988
|
1988
|
return array_values( $out_fields ); |
|
@@ -1993,8 +1993,8 @@ discard block |
|
|
block discarded – undo |
|
1993
|
1993
|
|
|
1994
|
1994
|
/** @var GF_Field $field */ |
|
1995
|
1995
|
foreach ( $fields as $field ) { |
|
1996
|
|
- if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1997
|
|
- $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
|
1996
|
+ if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
|
1997
|
+ $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1998
|
1998
|
break; |
|
1999
|
1999
|
} |
|
2000
|
2000
|
|
|
@@ -2017,14 +2017,14 @@ discard block |
|
|
block discarded – undo |
|
2017
|
2017
|
|
|
2018
|
2018
|
$return_field = $field; |
|
2019
|
2019
|
|
|
2020
|
|
- if( empty( $field_setting['show_label'] ) ) { |
|
|
2020
|
+ if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
2021
|
2021
|
$return_field->label = ''; |
|
2022
|
|
- } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
2023
|
|
- $return_field->label = $field_setting['custom_label']; |
|
|
2022
|
+ } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
|
2023
|
+ $return_field->label = $field_setting[ 'custom_label' ]; |
|
2024
|
2024
|
} |
|
2025
|
2025
|
|
|
2026
|
|
- if( !empty( $field_setting['custom_class'] ) ) { |
|
2027
|
|
- $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
|
2026
|
+ if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
|
2027
|
+ $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
2028
|
2028
|
} |
|
2029
|
2029
|
|
|
2030
|
2030
|
/** |
|
@@ -2062,16 +2062,16 @@ discard block |
|
|
block discarded – undo |
|
2062
|
2062
|
*/ |
|
2063
|
2063
|
$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
2064
|
2064
|
|
|
2065
|
|
- if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
2066
|
|
- foreach( $fields as $k => $field ) { |
|
2067
|
|
- if( $field->adminOnly ) { |
|
|
2065
|
+ if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
|
2066
|
+ foreach ( $fields as $k => $field ) { |
|
|
2067
|
+ if ( $field->adminOnly ) { |
|
2068
|
2068
|
unset( $fields[ $k ] ); |
|
2069
|
2069
|
} |
|
2070
|
2070
|
} |
|
2071
|
2071
|
return array_values( $fields ); |
|
2072
|
2072
|
} |
|
2073
|
2073
|
|
|
2074
|
|
- foreach( $fields as &$field ) { |
|
|
2074
|
+ foreach ( $fields as &$field ) { |
|
2075
|
2075
|
$field->adminOnly = false; |
|
2076
|
2076
|
} |
|
2077
|
2077
|
|
|
@@ -2092,7 +2092,7 @@ discard block |
|
|
block discarded – undo |
|
2092
|
2092
|
*/ |
|
2093
|
2093
|
private function unselect_default_values( $form ) { |
|
2094
|
2094
|
|
|
2095
|
|
- foreach ( $form['fields'] as &$field ) { |
|
|
2095
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
2096
|
2096
|
|
|
2097
|
2097
|
if ( empty( $field->choices ) ) { |
|
2098
|
2098
|
continue; |
|
@@ -2100,7 +2100,7 @@ discard block |
|
|
block discarded – undo |
|
2100
|
2100
|
|
|
2101
|
2101
|
foreach ( $field->choices as &$choice ) { |
|
2102
|
2102
|
if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
|
2103
|
|
- $choice['isSelected'] = false; |
|
|
2103
|
+ $choice[ 'isSelected' ] = false; |
|
2104
|
2104
|
} |
|
2105
|
2105
|
} |
|
2106
|
2106
|
} |
|
@@ -2125,22 +2125,22 @@ discard block |
|
|
block discarded – undo |
|
2125
|
2125
|
*/ |
|
2126
|
2126
|
function prefill_conditional_logic( $form ) { |
|
2127
|
2127
|
|
|
2128
|
|
- if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
|
2128
|
+ if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
2129
|
2129
|
return $form; |
|
2130
|
2130
|
} |
|
2131
|
2131
|
|
|
2132
|
2132
|
// Have Conditional Logic pre-fill fields as if the data were default values |
|
2133
|
2133
|
/** @var GF_Field $field */ |
|
2134
|
|
- foreach ( $form['fields'] as &$field ) { |
|
|
2134
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
2135
|
2135
|
|
|
2136
|
|
- if( 'checkbox' === $field->type ) { |
|
|
2136
|
+ if ( 'checkbox' === $field->type ) { |
|
2137
|
2137
|
foreach ( $field->get_entry_inputs() as $key => $input ) { |
|
2138
|
|
- $input_id = $input['id']; |
|
|
2138
|
+ $input_id = $input[ 'id' ]; |
|
2139
|
2139
|
$choice = $field->choices[ $key ]; |
|
2140
|
2140
|
$value = \GV\Utils::get( $this->entry, $input_id ); |
|
2141
|
2141
|
$match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
2142
|
|
- if( $match ) { |
|
2143
|
|
- $field->choices[ $key ]['isSelected'] = true; |
|
|
2142
|
+ if ( $match ) { |
|
|
2143
|
+ $field->choices[ $key ][ 'isSelected' ] = true; |
|
2144
|
2144
|
} |
|
2145
|
2145
|
} |
|
2146
|
2146
|
} else { |
|
@@ -2148,15 +2148,15 @@ discard block |
|
|
block discarded – undo |
|
2148
|
2148
|
// We need to run through each field to set the default values |
|
2149
|
2149
|
foreach ( $this->entry as $field_id => $field_value ) { |
|
2150
|
2150
|
|
|
2151
|
|
- if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
|
2151
|
+ if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
2152
|
2152
|
|
|
2153
|
|
- if( 'list' === $field->type ) { |
|
|
2153
|
+ if ( 'list' === $field->type ) { |
|
2154
|
2154
|
$list_rows = maybe_unserialize( $field_value ); |
|
2155
|
2155
|
|
|
2156
|
2156
|
$list_field_value = array(); |
|
2157
|
|
- foreach ( (array) $list_rows as $row ) { |
|
2158
|
|
- foreach ( (array) $row as $column ) { |
|
2159
|
|
- $list_field_value[] = $column; |
|
|
2157
|
+ foreach ( (array)$list_rows as $row ) { |
|
|
2158
|
+ foreach ( (array)$row as $column ) { |
|
|
2159
|
+ $list_field_value[ ] = $column; |
|
2160
|
2160
|
} |
|
2161
|
2161
|
} |
|
2162
|
2162
|
|
|
@@ -2189,32 +2189,32 @@ discard block |
|
|
block discarded – undo |
|
2189
|
2189
|
* @see https://github.com/gravityview/GravityView/issues/840 |
|
2190
|
2190
|
* @since develop |
|
2191
|
2191
|
*/ |
|
2192
|
|
- $the_form = GFAPI::get_form( $form['id'] ); |
|
|
2192
|
+ $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
2193
|
2193
|
$editable_ids = array(); |
|
2194
|
|
- foreach ( $form['fields'] as $field ) { |
|
2195
|
|
- $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
|
2194
|
+ foreach ( $form[ 'fields' ] as $field ) { |
|
|
2195
|
+ $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
2196
|
2196
|
} |
|
2197
|
2197
|
$remove_conditions_rule = array(); |
|
2198
|
|
- foreach ( $the_form['fields'] as $field ) { |
|
2199
|
|
- if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
2200
|
|
- foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
2201
|
|
- if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
|
2198
|
+ foreach ( $the_form[ 'fields' ] as $field ) { |
|
|
2199
|
+ if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
|
2200
|
+ foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
|
2201
|
+ if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
2202
|
2202
|
/** |
|
2203
|
2203
|
* This conditional field is not editable in this View. |
|
2204
|
2204
|
* We need to remove the rule, but only if it matches. |
|
2205
|
2205
|
*/ |
|
2206
|
|
- if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
|
2206
|
+ if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
2207
|
2207
|
$value = $_field->get_value_export( $this->entry ); |
|
2208
|
|
- } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
2209
|
|
- $value = $this->entry[ $rule['fieldId'] ]; |
|
|
2208
|
+ } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
|
2209
|
+ $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
2210
|
2210
|
} else { |
|
2211
|
|
- $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
|
2211
|
+ $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
2212
|
2212
|
} |
|
2213
|
2213
|
|
|
2214
|
|
- $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
|
2214
|
+ $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
2215
|
2215
|
|
|
2216
|
2216
|
if ( $match ) { |
|
2217
|
|
- $remove_conditions_rule[] = array( $field['id'], $i ); |
|
|
2217
|
+ $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
2218
|
2218
|
} |
|
2219
|
2219
|
} |
|
2220
|
2220
|
} |
|
@@ -2222,21 +2222,21 @@ discard block |
|
|
block discarded – undo |
|
2222
|
2222
|
} |
|
2223
|
2223
|
|
|
2224
|
2224
|
if ( $remove_conditions_rule ) { |
|
2225
|
|
- foreach ( $form['fields'] as &$field ) { |
|
|
2225
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
2226
|
2226
|
foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
|
2227
|
2227
|
|
|
2228
|
2228
|
list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
|
2229
|
2229
|
|
|
2230
|
|
- if ( $field['id'] == $rule_field_id ) { |
|
2231
|
|
- unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
2232
|
|
- gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
|
2230
|
+ if ( $field[ 'id' ] == $rule_field_id ) { |
|
|
2231
|
+ unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
|
2232
|
+ gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
2233
|
2233
|
} |
|
2234
|
2234
|
} |
|
2235
|
2235
|
} |
|
2236
|
2236
|
} |
|
2237
|
2237
|
|
|
2238
|
2238
|
/** Normalize the indices... */ |
|
2239
|
|
- $form['fields'] = array_values( $form['fields'] ); |
|
|
2239
|
+ $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
2240
|
2240
|
|
|
2241
|
2241
|
/** |
|
2242
|
2242
|
* @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
|
@@ -2246,16 +2246,16 @@ discard block |
|
|
block discarded – undo |
|
2246
|
2246
|
*/ |
|
2247
|
2247
|
$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
|
2248
|
2248
|
|
|
2249
|
|
- if( $use_conditional_logic ) { |
|
|
2249
|
+ if ( $use_conditional_logic ) { |
|
2250
|
2250
|
return $form; |
|
2251
|
2251
|
} |
|
2252
|
2252
|
|
|
2253
|
|
- foreach( $form['fields'] as &$field ) { |
|
|
2253
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
2254
|
2254
|
/* @var GF_Field $field */ |
|
2255
|
2255
|
$field->conditionalLogic = null; |
|
2256
|
2256
|
} |
|
2257
|
2257
|
|
|
2258
|
|
- unset( $form['button']['conditionalLogic'] ); |
|
|
2258
|
+ unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
2259
|
2259
|
|
|
2260
|
2260
|
return $form; |
|
2261
|
2261
|
|
|
@@ -2272,7 +2272,7 @@ discard block |
|
|
block discarded – undo |
|
2272
|
2272
|
*/ |
|
2273
|
2273
|
public function manage_conditional_logic( $has_conditional_logic, $form ) { |
|
2274
|
2274
|
|
|
2275
|
|
- if( ! $this->is_edit_entry() ) { |
|
|
2275
|
+ if ( ! $this->is_edit_entry() ) { |
|
2276
|
2276
|
return $has_conditional_logic; |
|
2277
|
2277
|
} |
|
2278
|
2278
|
|
|
@@ -2304,44 +2304,44 @@ discard block |
|
|
block discarded – undo |
|
2304
|
2304
|
* 2. There are two entries embedded using oEmbed |
|
2305
|
2305
|
* 3. One of the entries has just been saved |
|
2306
|
2306
|
*/ |
|
2307
|
|
- if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
|
2307
|
+ if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
2308
|
2308
|
|
|
2309
|
2309
|
$error = true; |
|
2310
|
2310
|
|
|
2311
|
2311
|
} |
|
2312
|
2312
|
|
|
2313
|
|
- if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
|
2313
|
+ if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
2314
|
2314
|
|
|
2315
|
2315
|
$error = true; |
|
2316
|
2316
|
|
|
2317
|
|
- } elseif( ! $this->verify_nonce() ) { |
|
|
2317
|
+ } elseif ( ! $this->verify_nonce() ) { |
|
2318
|
2318
|
|
|
2319
|
2319
|
/** |
|
2320
|
2320
|
* If the Entry is embedded, there may be two entries on the same page. |
|
2321
|
2321
|
* If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
|
2322
|
2322
|
*/ |
|
2323
|
|
- if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
|
2323
|
+ if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
2324
|
2324
|
$error = true; |
|
2325
|
2325
|
} else { |
|
2326
|
|
- $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
|
2326
|
+ $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
2327
|
2327
|
} |
|
2328
|
2328
|
|
|
2329
|
2329
|
} |
|
2330
|
2330
|
|
|
2331
|
|
- if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
2332
|
|
- $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
|
2331
|
+ if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
|
2332
|
+ $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
2333
|
2333
|
} |
|
2334
|
2334
|
|
|
2335
|
|
- if( $this->entry['status'] === 'trash' ) { |
|
2336
|
|
- $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
|
2335
|
+ if ( $this->entry[ 'status' ] === 'trash' ) { |
|
|
2336
|
+ $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
2337
|
2337
|
} |
|
2338
|
2338
|
|
|
2339
|
2339
|
// No errors; everything's fine here! |
|
2340
|
|
- if( empty( $error ) ) { |
|
|
2340
|
+ if ( empty( $error ) ) { |
|
2341
|
2341
|
return true; |
|
2342
|
2342
|
} |
|
2343
|
2343
|
|
|
2344
|
|
- if( $echo && $error !== true ) { |
|
|
2344
|
+ if ( $echo && $error !== true ) { |
|
2345
|
2345
|
|
|
2346
|
2346
|
$error = esc_html( $error ); |
|
2347
|
2347
|
|
|
@@ -2349,10 +2349,10 @@ discard block |
|
|
block discarded – undo |
|
2349
|
2349
|
* @since 1.9 |
|
2350
|
2350
|
*/ |
|
2351
|
2351
|
if ( ! empty( $this->entry ) ) { |
|
2352
|
|
- $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;" ) ); |
|
|
2352
|
+ $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;" ) ); |
|
2353
|
2353
|
} |
|
2354
|
2354
|
|
|
2355
|
|
- echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
|
2355
|
+ echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2356
|
2356
|
} |
|
2357
|
2357
|
|
|
2358
|
2358
|
gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
|
@@ -2372,17 +2372,17 @@ discard block |
|
|
block discarded – undo |
|
2372
|
2372
|
|
|
2373
|
2373
|
$error = NULL; |
|
2374
|
2374
|
|
|
2375
|
|
- if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2376
|
|
- $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
|
2375
|
+ if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
|
2376
|
+ $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2377
|
2377
|
} |
|
2378
|
2378
|
|
|
2379
|
2379
|
// No errors; everything's fine here! |
|
2380
|
|
- if( empty( $error ) ) { |
|
|
2380
|
+ if ( empty( $error ) ) { |
|
2381
|
2381
|
return true; |
|
2382
|
2382
|
} |
|
2383
|
2383
|
|
|
2384
|
|
- if( $echo ) { |
|
2385
|
|
- echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
|
2384
|
+ if ( $echo ) { |
|
|
2385
|
+ echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2386
|
2386
|
} |
|
2387
|
2387
|
|
|
2388
|
2388
|
gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
|
@@ -2403,14 +2403,14 @@ discard block |
|
|
block discarded – undo |
|
2403
|
2403
|
private function check_user_cap_edit_field( $field ) { |
|
2404
|
2404
|
|
|
2405
|
2405
|
// If they can edit any entries (as defined in Gravity Forms), we're good. |
|
2406
|
|
- if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
|
2406
|
+ if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2407
|
2407
|
return true; |
|
2408
|
2408
|
} |
|
2409
|
2409
|
|
|
2410
|
|
- $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
|
2410
|
+ $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2411
|
2411
|
|
|
2412
|
|
- if( $field_cap ) { |
|
2413
|
|
- return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
|
2412
|
+ if ( $field_cap ) { |
|
|
2413
|
+ return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2414
|
2414
|
} |
|
2415
|
2415
|
|
|
2416
|
2416
|
return false; |
|
@@ -2424,17 +2424,17 @@ discard block |
|
|
block discarded – undo |
|
2424
|
2424
|
public function verify_nonce() { |
|
2425
|
2425
|
|
|
2426
|
2426
|
// Verify form submitted for editing single |
|
2427
|
|
- if( $this->is_edit_entry_submission() ) { |
|
|
2427
|
+ if ( $this->is_edit_entry_submission() ) { |
|
2428
|
2428
|
$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
|
2429
|
2429
|
} |
|
2430
|
2430
|
|
|
2431
|
2431
|
// Verify |
|
2432
|
|
- else if( ! $this->is_edit_entry() ) { |
|
|
2432
|
+ else if ( ! $this->is_edit_entry() ) { |
|
2433
|
2433
|
$valid = false; |
|
2434
|
2434
|
} |
|
2435
|
2435
|
|
|
2436
|
2436
|
else { |
|
2437
|
|
- $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
|
2437
|
+ $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2438
|
2438
|
} |
|
2439
|
2439
|
|
|
2440
|
2440
|
/** |