|
@@ -115,16 +115,16 @@ discard block |
|
|
block discarded – undo |
|
115
|
115
|
function load() { |
|
116
|
116
|
|
|
117
|
117
|
/** @define "GRAVITYVIEW_DIR" "../../../" */ |
|
118
|
|
- include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
|
118
|
+ include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
119
|
119
|
|
|
120
|
120
|
// Don't display an embedded form when editing an entry |
|
121
|
121
|
add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
|
122
|
122
|
add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
|
123
|
123
|
|
|
124
|
124
|
// Stop Gravity Forms processing what is ours! |
|
125
|
|
- add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
|
125
|
+ add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
126
|
126
|
|
|
127
|
|
- add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
|
127
|
+ add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
128
|
128
|
|
|
129
|
129
|
add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
|
130
|
130
|
|
|
@@ -135,7 +135,7 @@ discard block |
|
|
block discarded – undo |
|
135
|
135
|
add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
|
136
|
136
|
|
|
137
|
137
|
// Add fields expected by GFFormDisplay::validate() |
|
138
|
|
- add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
|
138
|
+ add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
139
|
139
|
|
|
140
|
140
|
// Fix multiselect value for GF 2.2 |
|
141
|
141
|
add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
|
@@ -152,8 +152,8 @@ discard block |
|
|
block discarded – undo |
|
152
|
152
|
* @return void |
|
153
|
153
|
*/ |
|
154
|
154
|
public function prevent_render_form() { |
|
155
|
|
- if( $this->is_edit_entry() ) { |
|
156
|
|
- if( 'wp_head' === current_filter() ) { |
|
|
155
|
+ if ( $this->is_edit_entry() ) { |
|
|
156
|
+ if ( 'wp_head' === current_filter() ) { |
|
157
|
157
|
add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
|
158
|
158
|
} else { |
|
159
|
159
|
remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
|
@@ -168,13 +168,13 @@ discard block |
|
|
block discarded – undo |
|
168
|
168
|
*/ |
|
169
|
169
|
public function prevent_maybe_process_form() { |
|
170
|
170
|
|
|
171
|
|
- if( ! empty( $_POST ) ) { |
|
|
171
|
+ if ( ! empty( $_POST ) ) { |
|
172
|
172
|
gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
173
|
173
|
} |
|
174
|
174
|
|
|
175
|
|
- if( $this->is_edit_entry_submission() ) { |
|
176
|
|
- remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
177
|
|
- remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
|
175
|
+ if ( $this->is_edit_entry_submission() ) { |
|
|
176
|
+ remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
|
177
|
+ remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
178
|
178
|
} |
|
179
|
179
|
} |
|
180
|
180
|
|
|
@@ -184,7 +184,7 @@ discard block |
|
|
block discarded – undo |
|
184
|
184
|
*/ |
|
185
|
185
|
public function is_edit_entry() { |
|
186
|
186
|
|
|
187
|
|
- $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
|
187
|
+ $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
188
|
188
|
|
|
189
|
189
|
return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
|
190
|
190
|
} |
|
@@ -195,7 +195,7 @@ discard block |
|
|
block discarded – undo |
|
195
|
195
|
* @return boolean |
|
196
|
196
|
*/ |
|
197
|
197
|
public function is_edit_entry_submission() { |
|
198
|
|
- return !empty( $_POST[ self::$nonce_field ] ); |
|
|
198
|
+ return ! empty( $_POST[ self::$nonce_field ] ); |
|
199
|
199
|
} |
|
200
|
200
|
|
|
201
|
201
|
/** |
|
@@ -208,8 +208,8 @@ discard block |
|
|
block discarded – undo |
|
208
|
208
|
|
|
209
|
209
|
|
|
210
|
210
|
$entries = $gravityview_view->getEntries(); |
|
211
|
|
- self::$original_entry = $entries[0]; |
|
212
|
|
- $this->entry = $entries[0]; |
|
|
211
|
+ self::$original_entry = $entries[ 0 ]; |
|
|
212
|
+ $this->entry = $entries[ 0 ]; |
|
213
|
213
|
|
|
214
|
214
|
self::$original_form = $gravityview_view->getForm(); |
|
215
|
215
|
$this->form = $gravityview_view->getForm(); |
|
@@ -217,7 +217,7 @@ discard block |
|
|
block discarded – undo |
|
217
|
217
|
$this->view_id = $gravityview_view->getViewId(); |
|
218
|
218
|
$this->post_id = \GV\Utils::get( $post, 'ID', null ); |
|
219
|
219
|
|
|
220
|
|
- self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
|
220
|
+ self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
221
|
221
|
} |
|
222
|
222
|
|
|
223
|
223
|
|
|
@@ -268,9 +268,9 @@ discard block |
|
|
block discarded – undo |
|
268
|
268
|
private function print_scripts() { |
|
269
|
269
|
$gravityview_view = GravityView_View::getInstance(); |
|
270
|
270
|
|
|
271
|
|
- wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
|
271
|
+ wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
272
|
272
|
|
|
273
|
|
- GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
|
273
|
+ GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
274
|
274
|
|
|
275
|
275
|
wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
|
276
|
276
|
|
|
@@ -286,19 +286,19 @@ discard block |
|
|
block discarded – undo |
|
286
|
286
|
*/ |
|
287
|
287
|
private function process_save( $gv_data ) { |
|
288
|
288
|
|
|
289
|
|
- if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
|
289
|
+ if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
290
|
290
|
return; |
|
291
|
291
|
} |
|
292
|
292
|
|
|
293
|
293
|
// Make sure the entry, view, and form IDs are all correct |
|
294
|
294
|
$valid = $this->verify_nonce(); |
|
295
|
295
|
|
|
296
|
|
- if ( !$valid ) { |
|
|
296
|
+ if ( ! $valid ) { |
|
297
|
297
|
gravityview()->log->error( 'Nonce validation failed.' ); |
|
298
|
298
|
return; |
|
299
|
299
|
} |
|
300
|
300
|
|
|
301
|
|
- if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
|
301
|
+ if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
302
|
302
|
gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
|
303
|
303
|
return; |
|
304
|
304
|
} |
|
@@ -309,7 +309,7 @@ discard block |
|
|
block discarded – undo |
|
309
|
309
|
|
|
310
|
310
|
$this->validate(); |
|
311
|
311
|
|
|
312
|
|
- if( $this->is_valid ) { |
|
|
312
|
+ if ( $this->is_valid ) { |
|
313
|
313
|
|
|
314
|
314
|
gravityview()->log->debug( 'Submission is valid.' ); |
|
315
|
315
|
|
|
@@ -321,22 +321,22 @@ discard block |
|
|
block discarded – undo |
|
321
|
321
|
/** |
|
322
|
322
|
* @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
|
323
|
323
|
*/ |
|
324
|
|
- unset( $_GET['page'] ); |
|
|
324
|
+ unset( $_GET[ 'page' ] ); |
|
325
|
325
|
|
|
326
|
|
- $date_created = $this->entry['date_created']; |
|
|
326
|
+ $date_created = $this->entry[ 'date_created' ]; |
|
327
|
327
|
|
|
328
|
328
|
/** |
|
329
|
329
|
* @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
|
330
|
330
|
* @since 1.17.2 |
|
331
|
331
|
*/ |
|
332
|
|
- unset( $this->entry['date_created'] ); |
|
|
332
|
+ unset( $this->entry[ 'date_created' ] ); |
|
333
|
333
|
|
|
334
|
334
|
GFFormsModel::save_lead( $form, $this->entry ); |
|
335
|
335
|
|
|
336
|
336
|
// Delete the values for hidden inputs |
|
337
|
337
|
$this->unset_hidden_field_values(); |
|
338
|
338
|
|
|
339
|
|
- $this->entry['date_created'] = $date_created; |
|
|
339
|
+ $this->entry[ 'date_created' ] = $date_created; |
|
340
|
340
|
|
|
341
|
341
|
// Process calculation fields |
|
342
|
342
|
$this->update_calculation_fields(); |
|
@@ -361,7 +361,7 @@ discard block |
|
|
block discarded – undo |
|
361
|
361
|
* @param GravityView_Edit_Entry_Render $this This object |
|
362
|
362
|
* @param GravityView_View_Data $gv_data The View data |
|
363
|
363
|
*/ |
|
364
|
|
- do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
|
364
|
+ do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
365
|
365
|
|
|
366
|
366
|
} else { |
|
367
|
367
|
gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
|
@@ -389,16 +389,16 @@ discard block |
|
|
block discarded – undo |
|
389
|
389
|
*/ |
|
390
|
390
|
$unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
|
391
|
391
|
|
|
392
|
|
- if( ! $unset_hidden_field_values ) { |
|
|
392
|
+ if ( ! $unset_hidden_field_values ) { |
|
393
|
393
|
return; |
|
394
|
394
|
} |
|
395
|
395
|
|
|
396
|
396
|
if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
|
397
|
397
|
$entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
|
398
|
|
- $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
|
398
|
+ $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
399
|
399
|
} else { |
|
400
|
400
|
$lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
401
|
|
- $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
|
401
|
+ $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
402
|
402
|
} |
|
403
|
403
|
|
|
404
|
404
|
foreach ( $this->entry as $input_id => $field_value ) { |
|
@@ -479,7 +479,7 @@ discard block |
|
|
block discarded – undo |
|
479
|
479
|
} |
|
480
|
480
|
|
|
481
|
481
|
/** No file is being uploaded. */ |
|
482
|
|
- if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
|
482
|
+ if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
483
|
483
|
/** So return the original upload */ |
|
484
|
484
|
return $entry[ $input_id ]; |
|
485
|
485
|
} |
|
@@ -497,11 +497,11 @@ discard block |
|
|
block discarded – undo |
|
497
|
497
|
* @return mixed |
|
498
|
498
|
*/ |
|
499
|
499
|
public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
|
500
|
|
- if( ! $this->is_edit_entry() ) { |
|
|
500
|
+ if ( ! $this->is_edit_entry() ) { |
|
501
|
501
|
return $plupload_init; |
|
502
|
502
|
} |
|
503
|
503
|
|
|
504
|
|
- $plupload_init['gf_vars']['max_files'] = 0; |
|
|
504
|
+ $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
505
|
505
|
|
|
506
|
506
|
return $plupload_init; |
|
507
|
507
|
} |
|
@@ -516,27 +516,27 @@ discard block |
|
|
block discarded – undo |
|
516
|
516
|
$form = $this->form; |
|
517
|
517
|
|
|
518
|
518
|
/** @var GF_Field $field */ |
|
519
|
|
- foreach( $form['fields'] as $k => &$field ) { |
|
|
519
|
+ foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
520
|
520
|
|
|
521
|
521
|
/** |
|
522
|
522
|
* Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
|
523
|
523
|
* @since 1.16.3 |
|
524
|
524
|
* @var GF_Field $field |
|
525
|
525
|
*/ |
|
526
|
|
- if( $field->has_calculation() ) { |
|
527
|
|
- unset( $form['fields'][ $k ] ); |
|
|
526
|
+ if ( $field->has_calculation() ) { |
|
|
527
|
+ unset( $form[ 'fields' ][ $k ] ); |
|
528
|
528
|
} |
|
529
|
529
|
|
|
530
|
530
|
$field->adminOnly = false; |
|
531
|
531
|
|
|
532
|
|
- if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
533
|
|
- foreach( $field->inputs as $key => $input ) { |
|
534
|
|
- $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
|
532
|
+ if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
|
533
|
+ foreach ( $field->inputs as $key => $input ) { |
|
|
534
|
+ $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
535
|
535
|
} |
|
536
|
536
|
} |
|
537
|
537
|
} |
|
538
|
538
|
|
|
539
|
|
- $form['fields'] = array_values( $form['fields'] ); |
|
|
539
|
+ $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
540
|
540
|
|
|
541
|
541
|
return $form; |
|
542
|
542
|
} |
|
@@ -548,14 +548,14 @@ discard block |
|
|
block discarded – undo |
|
548
|
548
|
$update = false; |
|
549
|
549
|
|
|
550
|
550
|
// get the most up to date entry values |
|
551
|
|
- $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
|
551
|
+ $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
552
|
552
|
|
|
553
|
553
|
if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
|
554
|
554
|
$entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
|
555
|
|
- $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, meta_key FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
|
555
|
+ $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, meta_key FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
556
|
556
|
} else { |
|
557
|
557
|
$lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
|
558
|
|
- $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
|
558
|
+ $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
559
|
559
|
} |
|
560
|
560
|
|
|
561
|
561
|
if ( ! empty( $this->fields_with_calculation ) ) { |
|
@@ -564,7 +564,7 @@ discard block |
|
|
block discarded – undo |
|
564
|
564
|
$inputs = $field->get_entry_inputs(); |
|
565
|
565
|
if ( is_array( $inputs ) ) { |
|
566
|
566
|
foreach ( $inputs as $input ) { |
|
567
|
|
- GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
|
567
|
+ GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
568
|
568
|
} |
|
569
|
569
|
} else { |
|
570
|
570
|
GFFormsModel::save_input( $form, $field, $entry, $current_fields, $field->id ); |
|
@@ -586,7 +586,7 @@ discard block |
|
|
block discarded – undo |
|
586
|
586
|
return; |
|
587
|
587
|
} |
|
588
|
588
|
|
|
589
|
|
- $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
|
589
|
+ $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
590
|
590
|
|
|
591
|
591
|
foreach ( array( 'score', 'percent', 'grade', 'is_pass' ) as $meta ) { |
|
592
|
592
|
GFQuiz::get_instance()->update_entry_meta( "gfquiz_$meta", $entry, self::$original_form ); |
|
@@ -616,19 +616,19 @@ discard block |
|
|
block discarded – undo |
|
616
|
616
|
|
|
617
|
617
|
$input_name = 'input_' . $field_id; |
|
618
|
618
|
|
|
619
|
|
- if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
|
619
|
+ if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
620
|
620
|
|
|
621
|
621
|
// We have a new image |
|
622
|
622
|
|
|
623
|
|
- $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
|
623
|
+ $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
624
|
624
|
|
|
625
|
625
|
$ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
|
626
|
626
|
$ary = stripslashes_deep( $ary ); |
|
627
|
627
|
$img_url = \GV\Utils::get( $ary, 0 ); |
|
628
|
628
|
|
|
629
|
|
- $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
630
|
|
- $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
631
|
|
- $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
|
629
|
+ $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
|
630
|
+ $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
|
631
|
+ $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
632
|
632
|
|
|
633
|
633
|
$image_meta = array( |
|
634
|
634
|
'post_excerpt' => $img_caption, |
|
@@ -637,7 +637,7 @@ discard block |
|
|
block discarded – undo |
|
637
|
637
|
|
|
638
|
638
|
//adding title only if it is not empty. It will default to the file name if it is not in the array |
|
639
|
639
|
if ( ! empty( $img_title ) ) { |
|
640
|
|
- $image_meta['post_title'] = $img_title; |
|
|
640
|
+ $image_meta[ 'post_title' ] = $img_title; |
|
641
|
641
|
} |
|
642
|
642
|
|
|
643
|
643
|
/** |
|
@@ -695,15 +695,15 @@ discard block |
|
|
block discarded – undo |
|
695
|
695
|
*/ |
|
696
|
696
|
private function maybe_update_post_fields( $form ) { |
|
697
|
697
|
|
|
698
|
|
- if( empty( $this->entry['post_id'] ) ) { |
|
|
698
|
+ if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
699
|
699
|
gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
700
|
700
|
return; |
|
701
|
701
|
} |
|
702
|
702
|
|
|
703
|
|
- $post_id = $this->entry['post_id']; |
|
|
703
|
+ $post_id = $this->entry[ 'post_id' ]; |
|
704
|
704
|
|
|
705
|
705
|
// Security check |
|
706
|
|
- if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
|
706
|
+ if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
707
|
707
|
gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
|
708
|
708
|
return; |
|
709
|
709
|
} |
|
@@ -716,25 +716,25 @@ discard block |
|
|
block discarded – undo |
|
716
|
716
|
|
|
717
|
717
|
$field = RGFormsModel::get_field( $form, $field_id ); |
|
718
|
718
|
|
|
719
|
|
- if( ! $field ) { |
|
|
719
|
+ if ( ! $field ) { |
|
720
|
720
|
continue; |
|
721
|
721
|
} |
|
722
|
722
|
|
|
723
|
|
- if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
|
723
|
+ if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
724
|
724
|
|
|
725
|
725
|
// Get the value of the field, including $_POSTed value |
|
726
|
726
|
$value = RGFormsModel::get_field_value( $field ); |
|
727
|
727
|
|
|
728
|
728
|
// Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
|
729
|
729
|
$entry_tmp = $this->entry; |
|
730
|
|
- $entry_tmp["{$field_id}"] = $value; |
|
|
730
|
+ $entry_tmp[ "{$field_id}" ] = $value; |
|
731
|
731
|
|
|
732
|
|
- switch( $field->type ) { |
|
|
732
|
+ switch ( $field->type ) { |
|
733
|
733
|
|
|
734
|
734
|
case 'post_title': |
|
735
|
735
|
$post_title = $value; |
|
736
|
736
|
if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
737
|
|
- $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
|
737
|
+ $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
738
|
738
|
} |
|
739
|
739
|
$updated_post->post_title = $post_title; |
|
740
|
740
|
$updated_post->post_name = $post_title; |
|
@@ -744,7 +744,7 @@ discard block |
|
|
block discarded – undo |
|
744
|
744
|
case 'post_content': |
|
745
|
745
|
$post_content = $value; |
|
746
|
746
|
if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
747
|
|
- $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
|
747
|
+ $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
748
|
748
|
} |
|
749
|
749
|
$updated_post->post_content = $post_content; |
|
750
|
750
|
unset( $post_content ); |
|
@@ -762,7 +762,7 @@ discard block |
|
|
block discarded – undo |
|
762
|
762
|
$value = $value[ $field_id ]; |
|
763
|
763
|
} |
|
764
|
764
|
|
|
765
|
|
- if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
|
765
|
+ if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
766
|
766
|
$value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
767
|
767
|
} |
|
768
|
768
|
|
|
@@ -780,7 +780,7 @@ discard block |
|
|
block discarded – undo |
|
780
|
780
|
} |
|
781
|
781
|
|
|
782
|
782
|
// update entry after |
|
783
|
|
- $this->entry["{$field_id}"] = $value; |
|
|
783
|
+ $this->entry[ "{$field_id}" ] = $value; |
|
784
|
784
|
|
|
785
|
785
|
$update_entry = true; |
|
786
|
786
|
|
|
@@ -789,11 +789,11 @@ discard block |
|
|
block discarded – undo |
|
789
|
789
|
|
|
790
|
790
|
} |
|
791
|
791
|
|
|
792
|
|
- if( $update_entry ) { |
|
|
792
|
+ if ( $update_entry ) { |
|
793
|
793
|
|
|
794
|
794
|
$return_entry = GFAPI::update_entry( $this->entry ); |
|
795
|
795
|
|
|
796
|
|
- if( is_wp_error( $return_entry ) ) { |
|
|
796
|
+ if ( is_wp_error( $return_entry ) ) { |
|
797
|
797
|
gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
|
798
|
798
|
} else { |
|
799
|
799
|
gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
|
@@ -803,7 +803,7 @@ discard block |
|
|
block discarded – undo |
|
803
|
803
|
|
|
804
|
804
|
$return_post = wp_update_post( $updated_post, true ); |
|
805
|
805
|
|
|
806
|
|
- if( is_wp_error( $return_post ) ) { |
|
|
806
|
+ if ( is_wp_error( $return_post ) ) { |
|
807
|
807
|
$return_post->add_data( $updated_post, '$updated_post' ); |
|
808
|
808
|
gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
|
809
|
809
|
} else { |
|
@@ -825,7 +825,7 @@ discard block |
|
|
block discarded – undo |
|
825
|
825
|
$input_type = RGFormsModel::get_input_type( $field ); |
|
826
|
826
|
|
|
827
|
827
|
// Only certain custom field types are supported |
|
828
|
|
- switch( $input_type ) { |
|
|
828
|
+ switch ( $input_type ) { |
|
829
|
829
|
case 'fileupload': |
|
830
|
830
|
case 'list': |
|
831
|
831
|
case 'multiselect': |
|
@@ -862,7 +862,7 @@ discard block |
|
|
block discarded – undo |
|
862
|
862
|
$output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
|
863
|
863
|
|
|
864
|
864
|
// replace conditional shortcodes |
|
865
|
|
- if( $do_shortcode ) { |
|
|
865
|
+ if ( $do_shortcode ) { |
|
866
|
866
|
$output = do_shortcode( $output ); |
|
867
|
867
|
} |
|
868
|
868
|
|
|
@@ -881,19 +881,19 @@ discard block |
|
|
block discarded – undo |
|
881
|
881
|
*/ |
|
882
|
882
|
private function after_update() { |
|
883
|
883
|
|
|
884
|
|
- do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
885
|
|
- do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
|
884
|
+ do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
|
885
|
+ do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
886
|
886
|
|
|
887
|
887
|
// Re-define the entry now that we've updated it. |
|
888
|
|
- $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
|
888
|
+ $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
889
|
889
|
|
|
890
|
890
|
$entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
|
891
|
891
|
|
|
892
|
892
|
if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
|
893
|
893
|
// We need to clear the cache because Gravity Forms caches the field values, which |
|
894
|
894
|
// we have just updated. |
|
895
|
|
- foreach ($this->form['fields'] as $key => $field) { |
|
896
|
|
- GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
|
895
|
+ foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
|
896
|
+ GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
897
|
897
|
} |
|
898
|
898
|
} |
|
899
|
899
|
|
|
@@ -912,7 +912,7 @@ discard block |
|
|
block discarded – undo |
|
912
|
912
|
|
|
913
|
913
|
<div class="gv-edit-entry-wrapper"><?php |
|
914
|
914
|
|
|
915
|
|
- $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
|
915
|
+ $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
916
|
916
|
|
|
917
|
917
|
/** |
|
918
|
918
|
* Fixes weird wpautop() issue |
|
@@ -928,7 +928,7 @@ discard block |
|
|
block discarded – undo |
|
928
|
928
|
* @param string $edit_entry_title Modify the "Edit Entry" title |
|
929
|
929
|
* @param GravityView_Edit_Entry_Render $this This object |
|
930
|
930
|
*/ |
|
931
|
|
- $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
|
931
|
+ $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
932
|
932
|
|
|
933
|
933
|
echo esc_attr( $edit_entry_title ); |
|
934
|
934
|
?></span> |
|
@@ -978,13 +978,13 @@ discard block |
|
|
block discarded – undo |
|
978
|
978
|
|
|
979
|
979
|
$back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
|
980
|
980
|
|
|
981
|
|
- if( ! $this->is_valid ){ |
|
|
981
|
+ if ( ! $this->is_valid ) { |
|
982
|
982
|
|
|
983
|
983
|
// Keeping this compatible with Gravity Forms. |
|
984
|
|
- $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
985
|
|
- $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
|
984
|
+ $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
|
985
|
+ $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
986
|
986
|
|
|
987
|
|
- echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
|
987
|
+ echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
988
|
988
|
|
|
989
|
989
|
} else { |
|
990
|
990
|
$view = \GV\View::by_id( $this->view_id ); |
|
@@ -992,15 +992,15 @@ discard block |
|
|
block discarded – undo |
|
992
|
992
|
|
|
993
|
993
|
if ( '0' === $edit_redirect ) { |
|
994
|
994
|
$redirect_url = $back_link; |
|
995
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturning to Entry%s', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
|
995
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturning to Entry%s', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
996
|
996
|
} else if ( '1' === $edit_redirect ) { |
|
997
|
997
|
$redirect_url = $directory_link = GravityView_API::directory_link(); |
|
998
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturning to %s%s', 'gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
|
998
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturning to %s%s', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
999
|
999
|
} else if ( '' == $edit_redirect ) { |
|
1000
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
|
1000
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
1001
|
1001
|
} else { |
|
1002
|
1002
|
$redirect_url = $edit_redirect; |
|
1003
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sRedirecting to %s%s', 'gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect ), '</a>' ); |
|
|
1003
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sRedirecting to %s%s', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', esc_html( $edit_redirect ), '</a>' ); |
|
1004
|
1004
|
} |
|
1005
|
1005
|
|
|
1006
|
1006
|
if ( isset( $redirect_url ) ) { |
|
@@ -1015,7 +1015,7 @@ discard block |
|
|
block discarded – undo |
|
1015
|
1015
|
* @param array $entry Gravity Forms entry array |
|
1016
|
1016
|
* @param string $back_link URL to return to the original entry. @since 1.6 |
|
1017
|
1017
|
*/ |
|
1018
|
|
- $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
|
1018
|
+ $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
1019
|
1019
|
|
|
1020
|
1020
|
echo GVCommon::generate_notice( $message ); |
|
1021
|
1021
|
} |
|
@@ -1039,21 +1039,21 @@ discard block |
|
|
block discarded – undo |
|
1039
|
1039
|
*/ |
|
1040
|
1040
|
do_action( 'gravityview/edit-entry/render/before', $this ); |
|
1041
|
1041
|
|
|
1042
|
|
- add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
1043
|
|
- add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
|
1042
|
+ add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
|
1043
|
+ add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
1044
|
1044
|
add_filter( 'gform_disable_view_counter', '__return_true' ); |
|
1045
|
1045
|
|
|
1046
|
1046
|
add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
|
1047
|
1047
|
add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
|
1048
|
1048
|
|
|
1049
|
1049
|
// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
|
1050
|
|
- unset( $_GET['page'] ); |
|
|
1050
|
+ unset( $_GET[ 'page' ] ); |
|
1051
|
1051
|
|
|
1052
|
1052
|
// TODO: Verify multiple-page forms |
|
1053
|
1053
|
|
|
1054
|
1054
|
ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
|
1055
|
1055
|
|
|
1056
|
|
- $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
|
1056
|
+ $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
1057
|
1057
|
|
|
1058
|
1058
|
ob_get_clean(); |
|
1059
|
1059
|
|
|
@@ -1079,7 +1079,7 @@ discard block |
|
|
block discarded – undo |
|
1079
|
1079
|
* @return string |
|
1080
|
1080
|
*/ |
|
1081
|
1081
|
public function render_form_buttons() { |
|
1082
|
|
- return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
|
1082
|
+ return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
1083
|
1083
|
} |
|
1084
|
1084
|
|
|
1085
|
1085
|
|
|
@@ -1099,10 +1099,10 @@ discard block |
|
|
block discarded – undo |
|
1099
|
1099
|
public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
|
1100
|
1100
|
|
|
1101
|
1101
|
// In case we have validated the form, use it to inject the validation results into the form render |
|
1102
|
|
- if( isset( $this->form_after_validation ) ) { |
|
|
1102
|
+ if ( isset( $this->form_after_validation ) ) { |
|
1103
|
1103
|
$form = $this->form_after_validation; |
|
1104
|
1104
|
} else { |
|
1105
|
|
- $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
|
1105
|
+ $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
1106
|
1106
|
} |
|
1107
|
1107
|
|
|
1108
|
1108
|
$form = $this->filter_conditional_logic( $form ); |
|
@@ -1110,8 +1110,8 @@ discard block |
|
|
block discarded – undo |
|
1110
|
1110
|
$form = $this->prefill_conditional_logic( $form ); |
|
1111
|
1111
|
|
|
1112
|
1112
|
// for now we don't support Save and Continue feature. |
|
1113
|
|
- if( ! self::$supports_save_and_continue ) { |
|
1114
|
|
- unset( $form['save'] ); |
|
|
1113
|
+ if ( ! self::$supports_save_and_continue ) { |
|
|
1114
|
+ unset( $form[ 'save' ] ); |
|
1115
|
1115
|
} |
|
1116
|
1116
|
|
|
1117
|
1117
|
$form = $this->unselect_default_values( $form ); |
|
@@ -1134,31 +1134,31 @@ discard block |
|
|
block discarded – undo |
|
1134
|
1134
|
*/ |
|
1135
|
1135
|
public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
|
1136
|
1136
|
|
|
1137
|
|
- if( ! GFCommon::is_post_field( $field ) ) { |
|
|
1137
|
+ if ( ! GFCommon::is_post_field( $field ) ) { |
|
1138
|
1138
|
return $field_content; |
|
1139
|
1139
|
} |
|
1140
|
1140
|
|
|
1141
|
1141
|
$message = null; |
|
1142
|
1142
|
|
|
1143
|
1143
|
// First, make sure they have the capability to edit the post. |
|
1144
|
|
- if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
|
1144
|
+ if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
1145
|
1145
|
|
|
1146
|
1146
|
/** |
|
1147
|
1147
|
* @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
1148
|
1148
|
* @param string $message The existing "You don't have permission..." text |
|
1149
|
1149
|
*/ |
|
1150
|
|
- $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
|
1150
|
+ $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
1151
|
1151
|
|
|
1152
|
|
- } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
|
1152
|
+ } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
1153
|
1153
|
/** |
|
1154
|
1154
|
* @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
1155
|
1155
|
* @param string $message The existing "This field is not editable; the post no longer exists." text |
|
1156
|
1156
|
*/ |
|
1157
|
|
- $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
|
1157
|
+ $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
1158
|
1158
|
} |
|
1159
|
1159
|
|
|
1160
|
|
- if( $message ) { |
|
1161
|
|
- $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
|
1160
|
+ if ( $message ) { |
|
|
1161
|
+ $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
1162
|
1162
|
} |
|
1163
|
1163
|
|
|
1164
|
1164
|
return $field_content; |
|
@@ -1182,8 +1182,8 @@ discard block |
|
|
block discarded – undo |
|
1182
|
1182
|
|
|
1183
|
1183
|
// If the form has been submitted, then we don't need to pre-fill the values, |
|
1184
|
1184
|
// Except for fileupload type and when a field input is overridden- run always!! |
|
1185
|
|
- if( |
|
1186
|
|
- ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
|
1185
|
+ if ( |
|
|
1186
|
+ ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
1187
|
1187
|
&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
|
1188
|
1188
|
&& ! GFCommon::is_product_field( $field->type ) |
|
1189
|
1189
|
|| ! empty( $field_content ) |
|
@@ -1203,7 +1203,7 @@ discard block |
|
|
block discarded – undo |
|
1203
|
1203
|
$return = null; |
|
1204
|
1204
|
|
|
1205
|
1205
|
/** @var GravityView_Field $gv_field */ |
|
1206
|
|
- if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
|
1206
|
+ if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1207
|
1207
|
$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
|
1208
|
1208
|
} else { |
|
1209
|
1209
|
$return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
@@ -1212,7 +1212,7 @@ discard block |
|
|
block discarded – undo |
|
1212
|
1212
|
// If there was output, it's an error |
|
1213
|
1213
|
$warnings = ob_get_clean(); |
|
1214
|
1214
|
|
|
1215
|
|
- if( !empty( $warnings ) ) { |
|
|
1215
|
+ if ( ! empty( $warnings ) ) { |
|
1216
|
1216
|
gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
1217
|
1217
|
} |
|
1218
|
1218
|
|
|
@@ -1237,7 +1237,7 @@ discard block |
|
|
block discarded – undo |
|
1237
|
1237
|
$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
|
1238
|
1238
|
|
|
1239
|
1239
|
// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
|
1240
|
|
- if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
|
1240
|
+ if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1241
|
1241
|
|
|
1242
|
1242
|
$field_value = array(); |
|
1243
|
1243
|
|
|
@@ -1246,10 +1246,10 @@ discard block |
|
|
block discarded – undo |
|
1246
|
1246
|
|
|
1247
|
1247
|
foreach ( (array)$field->inputs as $input ) { |
|
1248
|
1248
|
|
|
1249
|
|
- $input_id = strval( $input['id'] ); |
|
|
1249
|
+ $input_id = strval( $input[ 'id' ] ); |
|
1250
|
1250
|
|
|
1251
|
1251
|
if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
|
1252
|
|
- $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
|
1252
|
+ $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1253
|
1253
|
$allow_pre_populated = false; |
|
1254
|
1254
|
} |
|
1255
|
1255
|
|
|
@@ -1257,7 +1257,7 @@ discard block |
|
|
block discarded – undo |
|
1257
|
1257
|
|
|
1258
|
1258
|
$pre_value = $field->get_value_submission( array(), false ); |
|
1259
|
1259
|
|
|
1260
|
|
- $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
|
1260
|
+ $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1261
|
1261
|
|
|
1262
|
1262
|
} else { |
|
1263
|
1263
|
|
|
@@ -1268,13 +1268,13 @@ discard block |
|
|
block discarded – undo |
|
1268
|
1268
|
|
|
1269
|
1269
|
// saved field entry value (if empty, fallback to the pre-populated value, if exists) |
|
1270
|
1270
|
// or pre-populated value if not empty and set to override saved value |
|
1271
|
|
- $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; |
|
|
1271
|
+ $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; |
|
1272
|
1272
|
|
|
1273
|
1273
|
// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
|
1274
|
|
- if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
|
1274
|
+ if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1275
|
1275
|
$categories = array(); |
|
1276
|
1276
|
foreach ( explode( ',', $field_value ) as $cat_string ) { |
|
1277
|
|
- $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
|
1277
|
+ $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1278
|
1278
|
} |
|
1279
|
1279
|
$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
|
1280
|
1280
|
} |
|
@@ -1302,7 +1302,7 @@ discard block |
|
|
block discarded – undo |
|
1302
|
1302
|
* @param GF_Field $field Gravity Forms field object |
|
1303
|
1303
|
* @param GravityView_Edit_Entry_Render $this Current object |
|
1304
|
1304
|
*/ |
|
1305
|
|
- $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
|
1305
|
+ $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
1306
|
1306
|
|
|
1307
|
1307
|
return $field_value; |
|
1308
|
1308
|
} |
|
@@ -1319,12 +1319,12 @@ discard block |
|
|
block discarded – undo |
|
1319
|
1319
|
*/ |
|
1320
|
1320
|
public function gform_pre_validation( $form ) { |
|
1321
|
1321
|
|
|
1322
|
|
- if( ! $this->verify_nonce() ) { |
|
|
1322
|
+ if ( ! $this->verify_nonce() ) { |
|
1323
|
1323
|
return $form; |
|
1324
|
1324
|
} |
|
1325
|
1325
|
|
|
1326
|
1326
|
// Fix PHP warning regarding undefined index. |
|
1327
|
|
- foreach ( $form['fields'] as &$field) { |
|
|
1327
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1328
|
1328
|
|
|
1329
|
1329
|
// This is because we're doing admin form pretending to be front-end, so Gravity Forms |
|
1330
|
1330
|
// expects certain field array items to be set. |
|
@@ -1332,7 +1332,7 @@ discard block |
|
|
block discarded – undo |
|
1332
|
1332
|
$field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
1333
|
1333
|
} |
|
1334
|
1334
|
|
|
1335
|
|
- switch( RGFormsModel::get_input_type( $field ) ) { |
|
|
1335
|
+ switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1336
|
1336
|
|
|
1337
|
1337
|
/** |
|
1338
|
1338
|
* 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. |
|
@@ -1346,26 +1346,26 @@ discard block |
|
|
block discarded – undo |
|
1346
|
1346
|
// Set the previous value |
|
1347
|
1347
|
$entry = $this->get_entry(); |
|
1348
|
1348
|
|
|
1349
|
|
- $input_name = 'input_'.$field->id; |
|
1350
|
|
- $form_id = $form['id']; |
|
|
1349
|
+ $input_name = 'input_' . $field->id; |
|
|
1350
|
+ $form_id = $form[ 'id' ]; |
|
1351
|
1351
|
|
|
1352
|
1352
|
$value = NULL; |
|
1353
|
1353
|
|
|
1354
|
1354
|
// Use the previous entry value as the default. |
|
1355
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1355
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1356
|
1356
|
$value = $entry[ $field->id ]; |
|
1357
|
1357
|
} |
|
1358
|
1358
|
|
|
1359
|
1359
|
// If this is a single upload file |
|
1360
|
|
- if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1361
|
|
- $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1362
|
|
- $value = $file_path['url']; |
|
|
1360
|
+ if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
|
1361
|
+ $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
|
1362
|
+ $value = $file_path[ 'url' ]; |
|
1363
|
1363
|
|
|
1364
|
1364
|
} else { |
|
1365
|
1365
|
|
|
1366
|
1366
|
// Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1367
|
1367
|
// Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1368
|
|
- $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
|
1368
|
+ $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1369
|
1369
|
|
|
1370
|
1370
|
} |
|
1371
|
1371
|
|
|
@@ -1373,10 +1373,10 @@ discard block |
|
|
block discarded – undo |
|
1373
|
1373
|
|
|
1374
|
1374
|
// If there are fresh uploads, process and merge them. |
|
1375
|
1375
|
// Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1376
|
|
- if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
|
1376
|
+ if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1377
|
1377
|
$value = empty( $value ) ? '[]' : $value; |
|
1378
|
1378
|
$value = stripslashes_deep( $value ); |
|
1379
|
|
- $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
|
1379
|
+ $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1380
|
1380
|
} |
|
1381
|
1381
|
|
|
1382
|
1382
|
} else { |
|
@@ -1394,8 +1394,8 @@ discard block |
|
|
block discarded – undo |
|
1394
|
1394
|
|
|
1395
|
1395
|
case 'number': |
|
1396
|
1396
|
// Fix "undefined index" issue at line 1286 in form_display.php |
|
1397
|
|
- if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1398
|
|
- $_POST['input_'.$field->id ] = NULL; |
|
|
1397
|
+ if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
|
1398
|
+ $_POST[ 'input_' . $field->id ] = NULL; |
|
1399
|
1399
|
} |
|
1400
|
1400
|
break; |
|
1401
|
1401
|
} |
|
@@ -1432,7 +1432,7 @@ discard block |
|
|
block discarded – undo |
|
1432
|
1432
|
* You can enter whatever you want! |
|
1433
|
1433
|
* We try validating, and customize the results using `self::custom_validation()` |
|
1434
|
1434
|
*/ |
|
1435
|
|
- add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
|
1435
|
+ add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1436
|
1436
|
|
|
1437
|
1437
|
// Needed by the validate funtion |
|
1438
|
1438
|
$failed_validation_page = NULL; |
|
@@ -1440,14 +1440,14 @@ discard block |
|
|
block discarded – undo |
|
1440
|
1440
|
|
|
1441
|
1441
|
// Prevent entry limit from running when editing an entry, also |
|
1442
|
1442
|
// prevent form scheduling from preventing editing |
|
1443
|
|
- unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
|
1443
|
+ unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1444
|
1444
|
|
|
1445
|
1445
|
// Hide fields depending on Edit Entry settings |
|
1446
|
|
- $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
|
1446
|
+ $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1447
|
1447
|
|
|
1448
|
1448
|
$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
|
1449
|
1449
|
|
|
1450
|
|
- remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
|
1450
|
+ remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1451
|
1451
|
} |
|
1452
|
1452
|
|
|
1453
|
1453
|
|
|
@@ -1470,7 +1470,7 @@ discard block |
|
|
block discarded – undo |
|
1470
|
1470
|
|
|
1471
|
1471
|
$gv_valid = true; |
|
1472
|
1472
|
|
|
1473
|
|
- foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
|
1473
|
+ foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1474
|
1474
|
|
|
1475
|
1475
|
$value = RGFormsModel::get_field_value( $field ); |
|
1476
|
1476
|
$field_type = RGFormsModel::get_input_type( $field ); |
|
@@ -1483,35 +1483,35 @@ discard block |
|
|
block discarded – undo |
|
1483
|
1483
|
case 'post_image': |
|
1484
|
1484
|
|
|
1485
|
1485
|
// in case nothing is uploaded but there are already files saved |
|
1486
|
|
- if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
|
1486
|
+ if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1487
|
1487
|
$field->failed_validation = false; |
|
1488
|
1488
|
unset( $field->validation_message ); |
|
1489
|
1489
|
} |
|
1490
|
1490
|
|
|
1491
|
1491
|
// validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1492
|
|
- if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
|
1492
|
+ if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
1493
|
1493
|
|
|
1494
|
1494
|
$input_name = 'input_' . $field->id; |
|
1495
|
1495
|
//uploaded |
|
1496
|
|
- $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
|
1496
|
+ $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1497
|
1497
|
|
|
1498
|
1498
|
//existent |
|
1499
|
1499
|
$entry = $this->get_entry(); |
|
1500
|
1500
|
$value = NULL; |
|
1501
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1501
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1502
|
1502
|
$value = json_decode( $entry[ $field->id ], true ); |
|
1503
|
1503
|
} |
|
1504
|
1504
|
|
|
1505
|
1505
|
// count uploaded files and existent entry files |
|
1506
|
1506
|
$count_files = count( $file_names ) + count( $value ); |
|
1507
|
1507
|
|
|
1508
|
|
- if( $count_files > $field->maxFiles ) { |
|
|
1508
|
+ if ( $count_files > $field->maxFiles ) { |
|
1509
|
1509
|
$field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1510
|
1510
|
$field->failed_validation = 1; |
|
1511
|
1511
|
$gv_valid = false; |
|
1512
|
1512
|
|
|
1513
|
1513
|
// in case of error make sure the newest upload files are removed from the upload input |
|
1514
|
|
- GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
|
1514
|
+ GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1515
|
1515
|
} |
|
1516
|
1516
|
|
|
1517
|
1517
|
} |
|
@@ -1522,7 +1522,7 @@ discard block |
|
|
block discarded – undo |
|
1522
|
1522
|
} |
|
1523
|
1523
|
|
|
1524
|
1524
|
// This field has failed validation. |
|
1525
|
|
- if( !empty( $field->failed_validation ) ) { |
|
|
1525
|
+ if ( ! empty( $field->failed_validation ) ) { |
|
1526
|
1526
|
|
|
1527
|
1527
|
gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
|
1528
|
1528
|
|
|
@@ -1540,19 +1540,19 @@ discard block |
|
|
block discarded – undo |
|
1540
|
1540
|
} |
|
1541
|
1541
|
|
|
1542
|
1542
|
// You can't continue inside a switch, so we do it after. |
|
1543
|
|
- if( empty( $field->failed_validation ) ) { |
|
|
1543
|
+ if ( empty( $field->failed_validation ) ) { |
|
1544
|
1544
|
continue; |
|
1545
|
1545
|
} |
|
1546
|
1546
|
|
|
1547
|
1547
|
// checks if the No Duplicates option is not validating entry against itself, since |
|
1548
|
1548
|
// we're editing a stored entry, it would also assume it's a duplicate. |
|
1549
|
|
- if( !empty( $field->noDuplicates ) ) { |
|
|
1549
|
+ if ( ! empty( $field->noDuplicates ) ) { |
|
1550
|
1550
|
|
|
1551
|
1551
|
$entry = $this->get_entry(); |
|
1552
|
1552
|
|
|
1553
|
1553
|
// If the value of the entry is the same as the stored value |
|
1554
|
1554
|
// Then we can assume it's not a duplicate, it's the same. |
|
1555
|
|
- if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
|
1555
|
+ if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1556
|
1556
|
//if value submitted was not changed, then don't validate |
|
1557
|
1557
|
$field->failed_validation = false; |
|
1558
|
1558
|
|
|
@@ -1565,7 +1565,7 @@ discard block |
|
|
block discarded – undo |
|
1565
|
1565
|
} |
|
1566
|
1566
|
|
|
1567
|
1567
|
// if here then probably we are facing the validation 'At least one field must be filled out' |
|
1568
|
|
- if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
|
1568
|
+ if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1569
|
1569
|
unset( $field->validation_message ); |
|
1570
|
1570
|
$field->validation_message = false; |
|
1571
|
1571
|
continue; |
|
@@ -1577,12 +1577,12 @@ discard block |
|
|
block discarded – undo |
|
1577
|
1577
|
|
|
1578
|
1578
|
} |
|
1579
|
1579
|
|
|
1580
|
|
- $validation_results['is_valid'] = $gv_valid; |
|
|
1580
|
+ $validation_results[ 'is_valid' ] = $gv_valid; |
|
1581
|
1581
|
|
|
1582
|
1582
|
gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
|
1583
|
1583
|
|
|
1584
|
1584
|
// We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
|
1585
|
|
- $this->form_after_validation = $validation_results['form']; |
|
|
1585
|
+ $this->form_after_validation = $validation_results[ 'form' ]; |
|
1586
|
1586
|
|
|
1587
|
1587
|
return $validation_results; |
|
1588
|
1588
|
} |
|
@@ -1595,7 +1595,7 @@ discard block |
|
|
block discarded – undo |
|
1595
|
1595
|
*/ |
|
1596
|
1596
|
public function get_entry() { |
|
1597
|
1597
|
|
|
1598
|
|
- if( empty( $this->entry ) ) { |
|
|
1598
|
+ if ( empty( $this->entry ) ) { |
|
1599
|
1599
|
// Get the database value of the entry that's being edited |
|
1600
|
1600
|
$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
|
1601
|
1601
|
} |
|
@@ -1627,10 +1627,10 @@ discard block |
|
|
block discarded – undo |
|
1627
|
1627
|
} |
|
1628
|
1628
|
|
|
1629
|
1629
|
// If edit tab not yet configured, show all fields |
|
1630
|
|
- $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
|
1630
|
+ $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1631
|
1631
|
|
|
1632
|
1632
|
// Hide fields depending on admin settings |
|
1633
|
|
- $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
|
1633
|
+ $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1634
|
1634
|
|
|
1635
|
1635
|
// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1636
|
1636
|
$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
@@ -1662,7 +1662,7 @@ discard block |
|
|
block discarded – undo |
|
1662
|
1662
|
*/ |
|
1663
|
1663
|
private function filter_fields( $fields, $configured_fields ) { |
|
1664
|
1664
|
|
|
1665
|
|
- if( empty( $fields ) || !is_array( $fields ) ) { |
|
|
1665
|
+ if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1666
|
1666
|
return $fields; |
|
1667
|
1667
|
} |
|
1668
|
1668
|
|
|
@@ -1675,18 +1675,18 @@ discard block |
|
|
block discarded – undo |
|
1675
|
1675
|
|
|
1676
|
1676
|
// Remove the fields that have calculation properties and keep them to be used later |
|
1677
|
1677
|
// @since 1.16.2 |
|
1678
|
|
- if( $field->has_calculation() ) { |
|
1679
|
|
- $this->fields_with_calculation[] = $field; |
|
|
1678
|
+ if ( $field->has_calculation() ) { |
|
|
1679
|
+ $this->fields_with_calculation[ ] = $field; |
|
1680
|
1680
|
// don't remove the calculation fields on form render. |
|
1681
|
1681
|
} |
|
1682
|
1682
|
|
|
1683
|
|
- if( in_array( $field->type, $field_type_blacklist ) ) { |
|
|
1683
|
+ if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1684
|
1684
|
unset( $fields[ $key ] ); |
|
1685
|
1685
|
} |
|
1686
|
1686
|
} |
|
1687
|
1687
|
|
|
1688
|
1688
|
// The Edit tab has not been configured, so we return all fields by default. |
|
1689
|
|
- if( empty( $configured_fields ) ) { |
|
|
1689
|
+ if ( empty( $configured_fields ) ) { |
|
1690
|
1690
|
return array_values( $fields ); |
|
1691
|
1691
|
} |
|
1692
|
1692
|
|
|
@@ -1695,8 +1695,8 @@ discard block |
|
|
block discarded – undo |
|
1695
|
1695
|
|
|
1696
|
1696
|
/** @var GF_Field $field */ |
|
1697
|
1697
|
foreach ( $fields as $field ) { |
|
1698
|
|
- if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1699
|
|
- $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
|
1698
|
+ if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
|
1699
|
+ $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1700
|
1700
|
break; |
|
1701
|
1701
|
} |
|
1702
|
1702
|
|
|
@@ -1719,14 +1719,14 @@ discard block |
|
|
block discarded – undo |
|
1719
|
1719
|
|
|
1720
|
1720
|
$return_field = $field; |
|
1721
|
1721
|
|
|
1722
|
|
- if( empty( $field_setting['show_label'] ) ) { |
|
|
1722
|
+ if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1723
|
1723
|
$return_field->label = ''; |
|
1724
|
|
- } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1725
|
|
- $return_field->label = $field_setting['custom_label']; |
|
|
1724
|
+ } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
|
1725
|
+ $return_field->label = $field_setting[ 'custom_label' ]; |
|
1726
|
1726
|
} |
|
1727
|
1727
|
|
|
1728
|
|
- if( !empty( $field_setting['custom_class'] ) ) { |
|
1729
|
|
- $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
|
1728
|
+ if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
|
1729
|
+ $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1730
|
1730
|
} |
|
1731
|
1731
|
|
|
1732
|
1732
|
/** |
|
@@ -1764,16 +1764,16 @@ discard block |
|
|
block discarded – undo |
|
1764
|
1764
|
*/ |
|
1765
|
1765
|
$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1766
|
1766
|
|
|
1767
|
|
- if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1768
|
|
- foreach( $fields as $k => $field ) { |
|
1769
|
|
- if( $field->adminOnly ) { |
|
|
1767
|
+ if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
|
1768
|
+ foreach ( $fields as $k => $field ) { |
|
|
1769
|
+ if ( $field->adminOnly ) { |
|
1770
|
1770
|
unset( $fields[ $k ] ); |
|
1771
|
1771
|
} |
|
1772
|
1772
|
} |
|
1773
|
1773
|
return array_values( $fields ); |
|
1774
|
1774
|
} |
|
1775
|
1775
|
|
|
1776
|
|
- foreach( $fields as &$field ) { |
|
|
1776
|
+ foreach ( $fields as &$field ) { |
|
1777
|
1777
|
$field->adminOnly = false; |
|
1778
|
1778
|
} |
|
1779
|
1779
|
|
|
@@ -1794,7 +1794,7 @@ discard block |
|
|
block discarded – undo |
|
1794
|
1794
|
*/ |
|
1795
|
1795
|
private function unselect_default_values( $form ) { |
|
1796
|
1796
|
|
|
1797
|
|
- foreach ( $form['fields'] as &$field ) { |
|
|
1797
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1798
|
1798
|
|
|
1799
|
1799
|
if ( empty( $field->choices ) ) { |
|
1800
|
1800
|
continue; |
|
@@ -1802,7 +1802,7 @@ discard block |
|
|
block discarded – undo |
|
1802
|
1802
|
|
|
1803
|
1803
|
foreach ( $field->choices as &$choice ) { |
|
1804
|
1804
|
if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
|
1805
|
|
- $choice['isSelected'] = false; |
|
|
1805
|
+ $choice[ 'isSelected' ] = false; |
|
1806
|
1806
|
} |
|
1807
|
1807
|
} |
|
1808
|
1808
|
} |
|
@@ -1827,22 +1827,22 @@ discard block |
|
|
block discarded – undo |
|
1827
|
1827
|
*/ |
|
1828
|
1828
|
function prefill_conditional_logic( $form ) { |
|
1829
|
1829
|
|
|
1830
|
|
- if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
|
1830
|
+ if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
1831
|
1831
|
return $form; |
|
1832
|
1832
|
} |
|
1833
|
1833
|
|
|
1834
|
1834
|
// Have Conditional Logic pre-fill fields as if the data were default values |
|
1835
|
1835
|
/** @var GF_Field $field */ |
|
1836
|
|
- foreach ( $form['fields'] as &$field ) { |
|
|
1836
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1837
|
1837
|
|
|
1838
|
|
- if( 'checkbox' === $field->type ) { |
|
|
1838
|
+ if ( 'checkbox' === $field->type ) { |
|
1839
|
1839
|
foreach ( $field->get_entry_inputs() as $key => $input ) { |
|
1840
|
|
- $input_id = $input['id']; |
|
|
1840
|
+ $input_id = $input[ 'id' ]; |
|
1841
|
1841
|
$choice = $field->choices[ $key ]; |
|
1842
|
1842
|
$value = \GV\Utils::get( $this->entry, $input_id ); |
|
1843
|
1843
|
$match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
1844
|
|
- if( $match ) { |
|
1845
|
|
- $field->choices[ $key ]['isSelected'] = true; |
|
|
1844
|
+ if ( $match ) { |
|
|
1845
|
+ $field->choices[ $key ][ 'isSelected' ] = true; |
|
1846
|
1846
|
} |
|
1847
|
1847
|
} |
|
1848
|
1848
|
} else { |
|
@@ -1850,15 +1850,15 @@ discard block |
|
|
block discarded – undo |
|
1850
|
1850
|
// We need to run through each field to set the default values |
|
1851
|
1851
|
foreach ( $this->entry as $field_id => $field_value ) { |
|
1852
|
1852
|
|
|
1853
|
|
- if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
|
1853
|
+ if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
1854
|
1854
|
|
|
1855
|
|
- if( 'list' === $field->type ) { |
|
|
1855
|
+ if ( 'list' === $field->type ) { |
|
1856
|
1856
|
$list_rows = maybe_unserialize( $field_value ); |
|
1857
|
1857
|
|
|
1858
|
1858
|
$list_field_value = array(); |
|
1859
|
|
- foreach ( (array) $list_rows as $row ) { |
|
1860
|
|
- foreach ( (array) $row as $column ) { |
|
1861
|
|
- $list_field_value[] = $column; |
|
|
1859
|
+ foreach ( (array)$list_rows as $row ) { |
|
|
1860
|
+ foreach ( (array)$row as $column ) { |
|
|
1861
|
+ $list_field_value[ ] = $column; |
|
1862
|
1862
|
} |
|
1863
|
1863
|
} |
|
1864
|
1864
|
|
|
@@ -1893,16 +1893,16 @@ discard block |
|
|
block discarded – undo |
|
1893
|
1893
|
*/ |
|
1894
|
1894
|
$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
|
1895
|
1895
|
|
|
1896
|
|
- if( $use_conditional_logic ) { |
|
|
1896
|
+ if ( $use_conditional_logic ) { |
|
1897
|
1897
|
return $form; |
|
1898
|
1898
|
} |
|
1899
|
1899
|
|
|
1900
|
|
- foreach( $form['fields'] as &$field ) { |
|
|
1900
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1901
|
1901
|
/* @var GF_Field $field */ |
|
1902
|
1902
|
$field->conditionalLogic = null; |
|
1903
|
1903
|
} |
|
1904
|
1904
|
|
|
1905
|
|
- unset( $form['button']['conditionalLogic'] ); |
|
|
1905
|
+ unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
1906
|
1906
|
|
|
1907
|
1907
|
return $form; |
|
1908
|
1908
|
|
|
@@ -1919,7 +1919,7 @@ discard block |
|
|
block discarded – undo |
|
1919
|
1919
|
*/ |
|
1920
|
1920
|
public function manage_conditional_logic( $has_conditional_logic, $form ) { |
|
1921
|
1921
|
|
|
1922
|
|
- if( ! $this->is_edit_entry() ) { |
|
|
1922
|
+ if ( ! $this->is_edit_entry() ) { |
|
1923
|
1923
|
return $has_conditional_logic; |
|
1924
|
1924
|
} |
|
1925
|
1925
|
|
|
@@ -1951,44 +1951,44 @@ discard block |
|
|
block discarded – undo |
|
1951
|
1951
|
* 2. There are two entries embedded using oEmbed |
|
1952
|
1952
|
* 3. One of the entries has just been saved |
|
1953
|
1953
|
*/ |
|
1954
|
|
- if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
|
1954
|
+ if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
1955
|
1955
|
|
|
1956
|
1956
|
$error = true; |
|
1957
|
1957
|
|
|
1958
|
1958
|
} |
|
1959
|
1959
|
|
|
1960
|
|
- if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
|
1960
|
+ if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
1961
|
1961
|
|
|
1962
|
1962
|
$error = true; |
|
1963
|
1963
|
|
|
1964
|
|
- } elseif( ! $this->verify_nonce() ) { |
|
|
1964
|
+ } elseif ( ! $this->verify_nonce() ) { |
|
1965
|
1965
|
|
|
1966
|
1966
|
/** |
|
1967
|
1967
|
* If the Entry is embedded, there may be two entries on the same page. |
|
1968
|
1968
|
* If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
|
1969
|
1969
|
*/ |
|
1970
|
|
- if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
|
1970
|
+ if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1971
|
1971
|
$error = true; |
|
1972
|
1972
|
} else { |
|
1973
|
|
- $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
|
1973
|
+ $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
1974
|
1974
|
} |
|
1975
|
1975
|
|
|
1976
|
1976
|
} |
|
1977
|
1977
|
|
|
1978
|
|
- if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1979
|
|
- $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
|
1978
|
+ if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
|
1979
|
+ $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
1980
|
1980
|
} |
|
1981
|
1981
|
|
|
1982
|
|
- if( $this->entry['status'] === 'trash' ) { |
|
1983
|
|
- $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
|
1982
|
+ if ( $this->entry[ 'status' ] === 'trash' ) { |
|
|
1983
|
+ $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1984
|
1984
|
} |
|
1985
|
1985
|
|
|
1986
|
1986
|
// No errors; everything's fine here! |
|
1987
|
|
- if( empty( $error ) ) { |
|
|
1987
|
+ if ( empty( $error ) ) { |
|
1988
|
1988
|
return true; |
|
1989
|
1989
|
} |
|
1990
|
1990
|
|
|
1991
|
|
- if( $echo && $error !== true ) { |
|
|
1991
|
+ if ( $echo && $error !== true ) { |
|
1992
|
1992
|
|
|
1993
|
1993
|
$error = esc_html( $error ); |
|
1994
|
1994
|
|
|
@@ -1996,10 +1996,10 @@ discard block |
|
|
block discarded – undo |
|
1996
|
1996
|
* @since 1.9 |
|
1997
|
1997
|
*/ |
|
1998
|
1998
|
if ( ! empty( $this->entry ) ) { |
|
1999
|
|
- $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;" ) ); |
|
|
1999
|
+ $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;" ) ); |
|
2000
|
2000
|
} |
|
2001
|
2001
|
|
|
2002
|
|
- echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
|
2002
|
+ echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
2003
|
2003
|
} |
|
2004
|
2004
|
|
|
2005
|
2005
|
gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
|
@@ -2019,17 +2019,17 @@ discard block |
|
|
block discarded – undo |
|
2019
|
2019
|
|
|
2020
|
2020
|
$error = NULL; |
|
2021
|
2021
|
|
|
2022
|
|
- if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
2023
|
|
- $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
|
2022
|
+ if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
|
2023
|
+ $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
2024
|
2024
|
} |
|
2025
|
2025
|
|
|
2026
|
2026
|
// No errors; everything's fine here! |
|
2027
|
|
- if( empty( $error ) ) { |
|
|
2027
|
+ if ( empty( $error ) ) { |
|
2028
|
2028
|
return true; |
|
2029
|
2029
|
} |
|
2030
|
2030
|
|
|
2031
|
|
- if( $echo ) { |
|
2032
|
|
- echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
|
2031
|
+ if ( $echo ) { |
|
|
2032
|
+ echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
2033
|
2033
|
} |
|
2034
|
2034
|
|
|
2035
|
2035
|
gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
|
@@ -2050,14 +2050,14 @@ discard block |
|
|
block discarded – undo |
|
2050
|
2050
|
private function check_user_cap_edit_field( $field ) { |
|
2051
|
2051
|
|
|
2052
|
2052
|
// If they can edit any entries (as defined in Gravity Forms), we're good. |
|
2053
|
|
- if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
|
2053
|
+ if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
2054
|
2054
|
return true; |
|
2055
|
2055
|
} |
|
2056
|
2056
|
|
|
2057
|
|
- $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
|
2057
|
+ $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
2058
|
2058
|
|
|
2059
|
|
- if( $field_cap ) { |
|
2060
|
|
- return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
|
2059
|
+ if ( $field_cap ) { |
|
|
2060
|
+ return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
2061
|
2061
|
} |
|
2062
|
2062
|
|
|
2063
|
2063
|
return false; |
|
@@ -2071,17 +2071,17 @@ discard block |
|
|
block discarded – undo |
|
2071
|
2071
|
public function verify_nonce() { |
|
2072
|
2072
|
|
|
2073
|
2073
|
// Verify form submitted for editing single |
|
2074
|
|
- if( $this->is_edit_entry_submission() ) { |
|
|
2074
|
+ if ( $this->is_edit_entry_submission() ) { |
|
2075
|
2075
|
$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
|
2076
|
2076
|
} |
|
2077
|
2077
|
|
|
2078
|
2078
|
// Verify |
|
2079
|
|
- else if( ! $this->is_edit_entry() ) { |
|
|
2079
|
+ else if ( ! $this->is_edit_entry() ) { |
|
2080
|
2080
|
$valid = false; |
|
2081
|
2081
|
} |
|
2082
|
2082
|
|
|
2083
|
2083
|
else { |
|
2084
|
|
- $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
|
2084
|
+ $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
2085
|
2085
|
} |
|
2086
|
2086
|
|
|
2087
|
2087
|
/** |