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