|
@@ -112,16 +112,16 @@ discard block |
|
|
block discarded – undo |
|
112
|
112
|
function load() { |
|
113
|
113
|
|
|
114
|
114
|
/** @define "GRAVITYVIEW_DIR" "../../../" */ |
|
115
|
|
- include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
|
115
|
+ include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
116
|
116
|
|
|
117
|
117
|
// Don't display an embedded form when editing an entry |
|
118
|
118
|
add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
|
119
|
119
|
add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
|
120
|
120
|
|
|
121
|
121
|
// Stop Gravity Forms processing what is ours! |
|
122
|
|
- add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
|
122
|
+ add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
123
|
123
|
|
|
124
|
|
- add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
|
124
|
+ add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
125
|
125
|
|
|
126
|
126
|
add_action( 'gravityview_edit_entry', array( $this, 'init' ) ); |
|
127
|
127
|
|
|
@@ -132,7 +132,7 @@ discard block |
|
|
block discarded – undo |
|
132
|
132
|
add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
|
133
|
133
|
|
|
134
|
134
|
// Add fields expected by GFFormDisplay::validate() |
|
135
|
|
- add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
|
135
|
+ add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
136
|
136
|
|
|
137
|
137
|
} |
|
138
|
138
|
|
|
@@ -147,8 +147,8 @@ discard block |
|
|
block discarded – undo |
|
147
|
147
|
* @return void |
|
148
|
148
|
*/ |
|
149
|
149
|
function prevent_render_form() { |
|
150
|
|
- if( $this->is_edit_entry() ) { |
|
151
|
|
- if( 'wp_head' === current_filter() ) { |
|
|
150
|
+ if ( $this->is_edit_entry() ) { |
|
|
151
|
+ if ( 'wp_head' === current_filter() ) { |
|
152
|
152
|
add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
|
153
|
153
|
} else { |
|
154
|
154
|
remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
|
@@ -163,10 +163,10 @@ discard block |
|
|
block discarded – undo |
|
163
|
163
|
*/ |
|
164
|
164
|
function prevent_maybe_process_form() { |
|
165
|
165
|
|
|
166
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
|
166
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
167
|
167
|
|
|
168
|
|
- if( $this->is_edit_entry_submission() && $this->verify_nonce() ) { |
|
169
|
|
- remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
|
168
|
+ if ( $this->is_edit_entry_submission() && $this->verify_nonce() ) { |
|
|
169
|
+ remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
170
|
170
|
} |
|
171
|
171
|
} |
|
172
|
172
|
|
|
@@ -176,7 +176,7 @@ discard block |
|
|
block discarded – undo |
|
176
|
176
|
*/ |
|
177
|
177
|
public function is_edit_entry() { |
|
178
|
178
|
|
|
179
|
|
- $gf_page = function_exists('rgpost') && ( 'entry' === rgget( 'view' ) && isset( $_GET['edit'] ) || rgpost( 'action' ) === 'update' ); |
|
|
179
|
+ $gf_page = function_exists( 'rgpost' ) && ( 'entry' === rgget( 'view' ) && isset( $_GET[ 'edit' ] ) || rgpost( 'action' ) === 'update' ); |
|
180
|
180
|
|
|
181
|
181
|
return $gf_page; |
|
182
|
182
|
} |
|
@@ -187,7 +187,7 @@ discard block |
|
|
block discarded – undo |
|
187
|
187
|
* @return boolean |
|
188
|
188
|
*/ |
|
189
|
189
|
public function is_edit_entry_submission() { |
|
190
|
|
- return !empty( $_POST[ self::$nonce_field ] ); |
|
|
190
|
+ return ! empty( $_POST[ self::$nonce_field ] ); |
|
191
|
191
|
} |
|
192
|
192
|
|
|
193
|
193
|
/** |
|
@@ -198,13 +198,13 @@ discard block |
|
|
block discarded – undo |
|
198
|
198
|
|
|
199
|
199
|
|
|
200
|
200
|
$entries = $gravityview_view->getEntries(); |
|
201
|
|
- $this->entry = $entries[0]; |
|
|
201
|
+ $this->entry = $entries[ 0 ]; |
|
202
|
202
|
|
|
203
|
203
|
$this->original_form = $this->form = $gravityview_view->getForm(); |
|
204
|
204
|
$this->form_id = $gravityview_view->getFormId(); |
|
205
|
205
|
$this->view_id = $gravityview_view->getViewId(); |
|
206
|
206
|
|
|
207
|
|
- self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
|
207
|
+ self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
208
|
208
|
} |
|
209
|
209
|
|
|
210
|
210
|
|
|
@@ -224,12 +224,12 @@ discard block |
|
|
block discarded – undo |
|
224
|
224
|
$this->setup_vars(); |
|
225
|
225
|
|
|
226
|
226
|
// Multiple Views embedded, don't proceed if nonce fails |
|
227
|
|
- if( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET['edit'], self::$nonce_key ) ) { |
|
|
227
|
+ if ( $gv_data->has_multiple_views() && ! wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ) ) { |
|
228
|
228
|
return; |
|
229
|
229
|
} |
|
230
|
230
|
|
|
231
|
231
|
// Sorry, you're not allowed here. |
|
232
|
|
- if( false === $this->user_can_edit_entry( true ) ) { |
|
|
232
|
+ if ( false === $this->user_can_edit_entry( true ) ) { |
|
233
|
233
|
return; |
|
234
|
234
|
} |
|
235
|
235
|
|
|
@@ -249,9 +249,9 @@ discard block |
|
|
block discarded – undo |
|
249
|
249
|
function print_scripts() { |
|
250
|
250
|
$gravityview_view = GravityView_View::getInstance(); |
|
251
|
251
|
|
|
252
|
|
- wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
|
252
|
+ wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
253
|
253
|
|
|
254
|
|
- GFFormDisplay::enqueue_form_scripts($gravityview_view->getForm(), false); |
|
|
254
|
+ GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
255
|
255
|
|
|
256
|
256
|
// Sack is required for images |
|
257
|
257
|
wp_print_scripts( array( 'sack', 'gform_gravityforms' ) ); |
|
@@ -263,32 +263,32 @@ discard block |
|
|
block discarded – undo |
|
263
|
263
|
*/ |
|
264
|
264
|
function process_save() { |
|
265
|
265
|
|
|
266
|
|
- if( empty( $_POST ) ) { |
|
|
266
|
+ if ( empty( $_POST ) ) { |
|
267
|
267
|
return; |
|
268
|
268
|
} |
|
269
|
269
|
|
|
270
|
270
|
// Make sure the entry, view, and form IDs are all correct |
|
271
|
271
|
$valid = $this->verify_nonce(); |
|
272
|
272
|
|
|
273
|
|
- if( !$valid ) { |
|
274
|
|
- do_action('gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
|
273
|
+ if ( ! $valid ) { |
|
|
274
|
+ do_action( 'gravityview_log_error', __METHOD__ . ' Nonce validation failed.' ); |
|
275
|
275
|
return; |
|
276
|
276
|
} |
|
277
|
277
|
|
|
278
|
|
- if( $this->entry['id'] !== $_POST['lid'] ) { |
|
279
|
|
- do_action('gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
|
278
|
+ if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
|
279
|
+ do_action( 'gravityview_log_error', __METHOD__ . ' Entry ID did not match posted entry ID.' ); |
|
280
|
280
|
return; |
|
281
|
281
|
} |
|
282
|
282
|
|
|
283
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
|
283
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
284
|
284
|
|
|
285
|
285
|
$this->process_save_process_files( $this->form_id ); |
|
286
|
286
|
|
|
287
|
287
|
$this->validate(); |
|
288
|
288
|
|
|
289
|
|
- if( $this->is_valid ) { |
|
|
289
|
+ if ( $this->is_valid ) { |
|
290
|
290
|
|
|
291
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' ); |
|
|
291
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[process_save] Submission is valid.' ); |
|
292
|
292
|
|
|
293
|
293
|
/** |
|
294
|
294
|
* @hack This step is needed to unset the adminOnly from form fields, to add the calculation fields |
|
@@ -298,12 +298,12 @@ discard block |
|
|
block discarded – undo |
|
298
|
298
|
/** |
|
299
|
299
|
* @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
|
300
|
300
|
*/ |
|
301
|
|
- unset( $_GET['page'] ); |
|
|
301
|
+ unset( $_GET[ 'page' ] ); |
|
302
|
302
|
|
|
303
|
303
|
GFFormsModel::save_lead( $form, $this->entry ); |
|
304
|
304
|
|
|
305
|
305
|
// If there's a post associated with the entry, process post fields |
|
306
|
|
- if( !empty( $this->entry['post_id'] ) ) { |
|
|
306
|
+ if ( ! empty( $this->entry[ 'post_id' ] ) ) { |
|
307
|
307
|
$this->maybe_update_post_fields( $form ); |
|
308
|
308
|
} |
|
309
|
309
|
|
|
@@ -318,7 +318,7 @@ discard block |
|
|
block discarded – undo |
|
318
|
318
|
* @param array $form Gravity Forms form array |
|
319
|
319
|
* @param string $entry_id Numeric ID of the entry that was updated |
|
320
|
320
|
*/ |
|
321
|
|
- do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'] ); |
|
|
321
|
+ do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ] ); |
|
322
|
322
|
} |
|
323
|
323
|
|
|
324
|
324
|
} // process_save |
|
@@ -352,11 +352,11 @@ discard block |
|
|
block discarded – undo |
|
352
|
352
|
* @return mixed |
|
353
|
353
|
*/ |
|
354
|
354
|
public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
|
355
|
|
- if( ! $this->is_edit_entry() ) { |
|
|
355
|
+ if ( ! $this->is_edit_entry() ) { |
|
356
|
356
|
return $plupload_init; |
|
357
|
357
|
} |
|
358
|
358
|
|
|
359
|
|
- $plupload_init['gf_vars']['max_files'] = 0; |
|
|
359
|
+ $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
360
|
360
|
|
|
361
|
361
|
return $plupload_init; |
|
362
|
362
|
} |
|
@@ -370,19 +370,19 @@ discard block |
|
|
block discarded – undo |
|
370
|
370
|
|
|
371
|
371
|
$form = $this->form; |
|
372
|
372
|
|
|
373
|
|
- foreach( $form['fields'] as $k => &$field ) { |
|
|
373
|
+ foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
374
|
374
|
|
|
375
|
375
|
// Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
|
376
|
376
|
// @since 1.16.3 |
|
377
|
|
- if( $field->has_calculation() ) { |
|
378
|
|
- unset( $form['fields'][ $k ] ); |
|
|
377
|
+ if ( $field->has_calculation() ) { |
|
|
378
|
+ unset( $form[ 'fields' ][ $k ] ); |
|
379
|
379
|
} |
|
380
|
380
|
|
|
381
|
381
|
$field->adminOnly = false; |
|
382
|
382
|
|
|
383
|
|
- if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
384
|
|
- foreach( $field->inputs as $key => $input ) { |
|
385
|
|
- $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
|
383
|
+ if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
|
384
|
+ foreach ( $field->inputs as $key => $input ) { |
|
|
385
|
+ $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
386
|
386
|
} |
|
387
|
387
|
} |
|
388
|
388
|
} |
|
@@ -396,20 +396,20 @@ discard block |
|
|
block discarded – undo |
|
396
|
396
|
$update = false; |
|
397
|
397
|
|
|
398
|
398
|
// get the most up to date entry values |
|
399
|
|
- $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
|
399
|
+ $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
400
|
400
|
|
|
401
|
|
- if( !empty( $this->fields_with_calculation ) ) { |
|
|
401
|
+ if ( ! empty( $this->fields_with_calculation ) ) { |
|
402
|
402
|
$update = true; |
|
403
|
403
|
foreach ( $this->fields_with_calculation as $calc_field ) { |
|
404
|
404
|
$inputs = $calc_field->get_entry_inputs(); |
|
405
|
405
|
if ( is_array( $inputs ) ) { |
|
406
|
406
|
foreach ( $inputs as $input ) { |
|
407
|
|
- $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
408
|
|
- $entry[ strval( $input['id'] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
|
407
|
+ $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
|
408
|
+ $entry[ strval( $input[ 'id' ] ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
409
|
409
|
} |
|
410
|
410
|
} else { |
|
411
|
|
- $input_name = 'input_' . str_replace( '.', '_', $calc_field->id); |
|
412
|
|
- $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry['id'], $entry ); |
|
|
411
|
+ $input_name = 'input_' . str_replace( '.', '_', $calc_field->id ); |
|
|
412
|
+ $entry[ strval( $calc_field->id ) ] = RGFormsModel::prepare_value( $form, $calc_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
413
|
413
|
} |
|
414
|
414
|
} |
|
415
|
415
|
|
|
@@ -419,16 +419,16 @@ discard block |
|
|
block discarded – undo |
|
419
|
419
|
if ( ! empty( $this->total_fields ) ) { |
|
420
|
420
|
$update = true; |
|
421
|
421
|
foreach ( $this->total_fields as $total_field ) { |
|
422
|
|
- $input_name = 'input_' . str_replace( '.', '_', $total_field->id); |
|
423
|
|
- $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry['id'], $entry ); |
|
|
422
|
+ $input_name = 'input_' . str_replace( '.', '_', $total_field->id ); |
|
|
423
|
+ $entry[ strval( $total_field->id ) ] = RGFormsModel::prepare_value( $form, $total_field, '', $input_name, $entry[ 'id' ], $entry ); |
|
424
|
424
|
} |
|
425
|
425
|
} |
|
426
|
426
|
|
|
427
|
|
- if( $update ) { |
|
|
427
|
+ if ( $update ) { |
|
428
|
428
|
|
|
429
|
429
|
$return_entry = GFAPI::update_entry( $entry ); |
|
430
|
430
|
|
|
431
|
|
- if( is_wp_error( $return_entry ) ) { |
|
|
431
|
+ if ( is_wp_error( $return_entry ) ) { |
|
432
|
432
|
do_action( 'gravityview_log_error', 'Updating the entry calculation and total fields failed', $return_entry ); |
|
433
|
433
|
} else { |
|
434
|
434
|
do_action( 'gravityview_log_debug', 'Updating the entry calculation and total fields succeeded' ); |
|
@@ -446,11 +446,11 @@ discard block |
|
|
block discarded – undo |
|
446
|
446
|
*/ |
|
447
|
447
|
function maybe_update_post_fields( $form ) { |
|
448
|
448
|
|
|
449
|
|
- $post_id = $this->entry['post_id']; |
|
|
449
|
+ $post_id = $this->entry[ 'post_id' ]; |
|
450
|
450
|
|
|
451
|
451
|
// Security check |
|
452
|
|
- if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
453
|
|
- do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #'.$post_id ); |
|
|
452
|
+ if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
|
453
|
+ do_action( 'gravityview_log_error', 'The current user does not have the ability to edit Post #' . $post_id ); |
|
454
|
454
|
return; |
|
455
|
455
|
} |
|
456
|
456
|
|
|
@@ -459,7 +459,7 @@ discard block |
|
|
block discarded – undo |
|
459
|
459
|
$updated_post = $original_post = get_post( $post_id ); |
|
460
|
460
|
|
|
461
|
461
|
// get the most up to date entry values |
|
462
|
|
- $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
|
462
|
+ $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
463
|
463
|
|
|
464
|
464
|
foreach ( $entry as $field_id => $value ) { |
|
465
|
465
|
|
|
@@ -467,16 +467,16 @@ discard block |
|
|
block discarded – undo |
|
467
|
467
|
|
|
468
|
468
|
$field = RGFormsModel::get_field( $form, $field_id ); |
|
469
|
469
|
|
|
470
|
|
- if( class_exists('GF_Fields') ) { |
|
|
470
|
+ if ( class_exists( 'GF_Fields' ) ) { |
|
471
|
471
|
$field = GF_Fields::create( $field ); |
|
472
|
472
|
} |
|
473
|
473
|
|
|
474
|
|
- if( GFCommon::is_post_field( $field ) ) { |
|
|
474
|
+ if ( GFCommon::is_post_field( $field ) ) { |
|
475
|
475
|
|
|
476
|
476
|
// Get the value of the field, including $_POSTed value |
|
477
|
477
|
$value = RGFormsModel::get_field_value( $field ); |
|
478
|
478
|
|
|
479
|
|
- switch( $field->type ) { |
|
|
479
|
+ switch ( $field->type ) { |
|
480
|
480
|
|
|
481
|
481
|
case 'post_title': |
|
482
|
482
|
case 'post_content': |
|
@@ -494,14 +494,14 @@ discard block |
|
|
block discarded – undo |
|
494
|
494
|
wp_set_post_categories( $post_id, $categories, false ); |
|
495
|
495
|
|
|
496
|
496
|
// if post_category is type checkbox, then value is an array of inputs |
|
497
|
|
- if( isset( $value[ strval( $field_id ) ] ) ) { |
|
498
|
|
- foreach( $value as $input_id => $val ) { |
|
|
497
|
+ if ( isset( $value[ strval( $field_id ) ] ) ) { |
|
|
498
|
+ foreach ( $value as $input_id => $val ) { |
|
499
|
499
|
$input_name = 'input_' . str_replace( '.', '_', $input_id ); |
|
500
|
|
- $entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry['id'], $entry ); |
|
|
500
|
+ $entry[ strval( $input_id ) ] = RGFormsModel::prepare_value( $form, $field, $val, $input_name, $entry[ 'id' ], $entry ); |
|
501
|
501
|
} |
|
502
|
502
|
} else { |
|
503
|
503
|
$input_name = 'input_' . str_replace( '.', '_', $field_id ); |
|
504
|
|
- $entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], $entry ); |
|
|
504
|
+ $entry[ strval( $field_id ) ] = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], $entry ); |
|
505
|
505
|
} |
|
506
|
506
|
|
|
507
|
507
|
break; |
|
@@ -511,12 +511,12 @@ discard block |
|
|
block discarded – undo |
|
511
|
511
|
$custom_field_name = $field->postCustomFieldName; |
|
512
|
512
|
|
|
513
|
513
|
// Only certain custom field types are supported |
|
514
|
|
- switch( $input_type ) { |
|
|
514
|
+ switch ( $input_type ) { |
|
515
|
515
|
case 'fileupload': |
|
516
|
516
|
/** @noinspection PhpMissingBreakStatementInspection */ |
|
517
|
517
|
case 'list': |
|
518
|
|
- if( ! is_string( $value ) ) { |
|
519
|
|
- $value = function_exists('wp_json_encode') ? wp_json_encode( $value ) : json_encode( $value ); |
|
|
518
|
+ if ( ! is_string( $value ) ) { |
|
|
519
|
+ $value = function_exists( 'wp_json_encode' ) ? wp_json_encode( $value ) : json_encode( $value ); |
|
520
|
520
|
} |
|
521
|
521
|
// break; left intentionally out |
|
522
|
522
|
default: |
|
@@ -529,11 +529,11 @@ discard block |
|
|
block discarded – undo |
|
529
|
529
|
|
|
530
|
530
|
$input_name = 'input_' . $field_id; |
|
531
|
531
|
|
|
532
|
|
- if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
|
532
|
+ if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
533
|
533
|
|
|
534
|
534
|
// We have a new image |
|
535
|
535
|
|
|
536
|
|
- $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
|
536
|
+ $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
537
|
537
|
|
|
538
|
538
|
// is this field set as featured image, if not, leave |
|
539
|
539
|
if ( ! $field->postFeaturedImage ) { |
|
@@ -543,9 +543,9 @@ discard block |
|
|
block discarded – undo |
|
543
|
543
|
$ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
|
544
|
544
|
$img_url = rgar( $ary, 0 ); |
|
545
|
545
|
|
|
546
|
|
- $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
547
|
|
- $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
548
|
|
- $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
|
546
|
+ $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
|
547
|
+ $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
|
548
|
+ $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
549
|
549
|
|
|
550
|
550
|
$image_meta = array( |
|
551
|
551
|
'post_excerpt' => $img_caption, |
|
@@ -554,7 +554,7 @@ discard block |
|
|
block discarded – undo |
|
554
|
554
|
|
|
555
|
555
|
//adding title only if it is not empty. It will default to the file name if it is not in the array |
|
556
|
556
|
if ( ! empty( $img_title ) ) { |
|
557
|
|
- $image_meta['post_title'] = $img_title; |
|
|
557
|
+ $image_meta[ 'post_title' ] = $img_title; |
|
558
|
558
|
} |
|
559
|
559
|
|
|
560
|
560
|
//todo: As soon as \GFFormsModel::media_handle_upload becomes a public method, move this call to \GFFormsModel::media_handle_upload and remove the hack from this class. |
|
@@ -567,7 +567,7 @@ discard block |
|
|
block discarded – undo |
|
567
|
567
|
|
|
568
|
568
|
break; |
|
569
|
569
|
|
|
570
|
|
- } elseif ( !empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
|
570
|
+ } elseif ( ! empty( $_POST[ $input_name ] ) && is_array( $value ) ) { |
|
571
|
571
|
|
|
572
|
572
|
// Same image although the image title, caption or description might have changed |
|
573
|
573
|
|
|
@@ -575,11 +575,11 @@ discard block |
|
|
block discarded – undo |
|
575
|
575
|
$img_url = rgar( $ary, 0 ); |
|
576
|
576
|
|
|
577
|
577
|
// is this really the same image or something went wrong ? |
|
578
|
|
- if( $img_url === $_POST[ $input_name ] ) { |
|
|
578
|
+ if ( $img_url === $_POST[ $input_name ] ) { |
|
579
|
579
|
|
|
580
|
|
- $img_title = isset( $value[ $field_id .'.1' ] ) ? $value[ $field_id .'.1' ] : ''; |
|
581
|
|
- $img_caption = isset( $value[ $field_id .'.4' ] ) ? $value[ $field_id .'.4' ] : ''; |
|
582
|
|
- $img_description = isset( $value[ $field_id .'.7' ] ) ? $value[ $field_id .'.7' ] : ''; |
|
|
580
|
+ $img_title = isset( $value[ $field_id . '.1' ] ) ? $value[ $field_id . '.1' ] : ''; |
|
|
581
|
+ $img_caption = isset( $value[ $field_id . '.4' ] ) ? $value[ $field_id . '.4' ] : ''; |
|
|
582
|
+ $img_description = isset( $value[ $field_id . '.7' ] ) ? $value[ $field_id . '.7' ] : ''; |
|
583
|
583
|
|
|
584
|
584
|
$value = ! empty( $img_url ) ? $img_url . "|:|" . $img_title . "|:|" . $img_caption . "|:|" . $img_description : ''; |
|
585
|
585
|
|
|
@@ -613,12 +613,12 @@ discard block |
|
|
block discarded – undo |
|
613
|
613
|
} |
|
614
|
614
|
|
|
615
|
615
|
//ignore fields that have not changed |
|
616
|
|
- if ( $value === rgget( (string) $field_id, $entry ) ) { |
|
|
616
|
+ if ( $value === rgget( (string)$field_id, $entry ) ) { |
|
617
|
617
|
continue; |
|
618
|
618
|
} |
|
619
|
619
|
|
|
620
|
620
|
// update entry |
|
621
|
|
- if( 'post_category' !== $field->type ) { |
|
|
621
|
+ if ( 'post_category' !== $field->type ) { |
|
622
|
622
|
$entry[ strval( $field_id ) ] = $value; |
|
623
|
623
|
} |
|
624
|
624
|
|
|
@@ -628,25 +628,25 @@ discard block |
|
|
block discarded – undo |
|
628
|
628
|
|
|
629
|
629
|
} |
|
630
|
630
|
|
|
631
|
|
- if( $update_entry ) { |
|
|
631
|
+ if ( $update_entry ) { |
|
632
|
632
|
|
|
633
|
633
|
$return_entry = GFAPI::update_entry( $entry ); |
|
634
|
634
|
|
|
635
|
|
- if( is_wp_error( $return_entry ) ) { |
|
|
635
|
+ if ( is_wp_error( $return_entry ) ) { |
|
636
|
636
|
do_action( 'gravityview_log_error', 'Updating the entry post fields failed', $return_entry ); |
|
637
|
637
|
} else { |
|
638
|
|
- do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #'.$post_id.' succeeded' ); |
|
|
638
|
+ do_action( 'gravityview_log_debug', 'Updating the entry post fields for post #' . $post_id . ' succeeded' ); |
|
639
|
639
|
} |
|
640
|
640
|
|
|
641
|
641
|
} |
|
642
|
642
|
|
|
643
|
643
|
$return_post = wp_update_post( $updated_post, true ); |
|
644
|
644
|
|
|
645
|
|
- if( is_wp_error( $return_post ) ) { |
|
|
645
|
+ if ( is_wp_error( $return_post ) ) { |
|
646
|
646
|
$return_post->add_data( $updated_post, '$updated_post' ); |
|
647
|
647
|
do_action( 'gravityview_log_error', 'Updating the post content failed', $return_post ); |
|
648
|
648
|
} else { |
|
649
|
|
- do_action( 'gravityview_log_debug', 'Updating the post content for post #'.$post_id.' succeeded', $updated_post ); |
|
|
649
|
+ do_action( 'gravityview_log_debug', 'Updating the post content for post #' . $post_id . ' succeeded', $updated_post ); |
|
650
|
650
|
} |
|
651
|
651
|
|
|
652
|
652
|
} |
|
@@ -663,18 +663,18 @@ discard block |
|
|
block discarded – undo |
|
663
|
663
|
*/ |
|
664
|
664
|
function after_update() { |
|
665
|
665
|
|
|
666
|
|
- do_action( 'gform_after_update_entry', $this->form, $this->entry['id'] ); |
|
667
|
|
- do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'] ); |
|
|
666
|
+ do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ] ); |
|
|
667
|
+ do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ] ); |
|
668
|
668
|
|
|
669
|
669
|
// Re-define the entry now that we've updated it. |
|
670
|
|
- $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
|
670
|
+ $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
671
|
671
|
|
|
672
|
672
|
$entry = GFFormsModel::set_entry_meta( $entry, $this->form ); |
|
673
|
673
|
|
|
674
|
674
|
// We need to clear the cache because Gravity Forms caches the field values, which |
|
675
|
675
|
// we have just updated. |
|
676
|
|
- foreach ($this->form['fields'] as $key => $field) { |
|
677
|
|
- GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
|
676
|
+ foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
|
677
|
+ GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
678
|
678
|
} |
|
679
|
679
|
|
|
680
|
680
|
$this->entry = $entry; |
|
@@ -692,7 +692,7 @@ discard block |
|
|
block discarded – undo |
|
692
|
692
|
|
|
693
|
693
|
<div class="gv-edit-entry-wrapper"><?php |
|
694
|
694
|
|
|
695
|
|
- $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
|
695
|
+ $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
696
|
696
|
|
|
697
|
697
|
/** |
|
698
|
698
|
* Fixes weird wpautop() issue |
|
@@ -708,7 +708,7 @@ discard block |
|
|
block discarded – undo |
|
708
|
708
|
* @param string $edit_entry_title Modify the "Edit Entry" title |
|
709
|
709
|
* @param GravityView_Edit_Entry_Render $this This object |
|
710
|
710
|
*/ |
|
711
|
|
- $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
|
711
|
+ $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
712
|
712
|
|
|
713
|
713
|
echo esc_attr( $edit_entry_title ); |
|
714
|
714
|
?></span> |
|
@@ -748,20 +748,20 @@ discard block |
|
|
block discarded – undo |
|
748
|
748
|
*/ |
|
749
|
749
|
private function maybe_print_message() { |
|
750
|
750
|
|
|
751
|
|
- if( rgpost('action') === 'update' ) { |
|
|
751
|
+ if ( rgpost( 'action' ) === 'update' ) { |
|
752
|
752
|
|
|
753
|
753
|
$back_link = esc_url( remove_query_arg( array( 'page', 'view', 'edit' ) ) ); |
|
754
|
754
|
|
|
755
|
|
- if( ! $this->is_valid ){ |
|
|
755
|
+ if ( ! $this->is_valid ) { |
|
756
|
756
|
|
|
757
|
757
|
// Keeping this compatible with Gravity Forms. |
|
758
|
|
- $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
759
|
|
- $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
|
758
|
+ $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
|
759
|
+ $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
760
|
760
|
|
|
761
|
|
- echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
|
761
|
+ echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
762
|
762
|
|
|
763
|
763
|
} else { |
|
764
|
|
- $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. $back_link .'">', '</a>' ); |
|
|
764
|
+ $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . $back_link . '">', '</a>' ); |
|
765
|
765
|
|
|
766
|
766
|
/** |
|
767
|
767
|
* @filter `gravityview/edit_entry/success` Modify the edit entry success message (including the anchor link) |
|
@@ -771,7 +771,7 @@ discard block |
|
|
block discarded – undo |
|
771
|
771
|
* @param array $entry Gravity Forms entry array |
|
772
|
772
|
* @param string $back_link URL to return to the original entry. @since 1.6 |
|
773
|
773
|
*/ |
|
774
|
|
- $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
|
774
|
+ $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
775
|
775
|
|
|
776
|
776
|
echo GVCommon::generate_notice( $message ); |
|
777
|
777
|
} |
|
@@ -788,24 +788,24 @@ discard block |
|
|
block discarded – undo |
|
788
|
788
|
*/ |
|
789
|
789
|
private function render_edit_form() { |
|
790
|
790
|
|
|
791
|
|
- add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
792
|
|
- add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
|
791
|
+ add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
|
792
|
+ add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
793
|
793
|
add_filter( 'gform_disable_view_counter', '__return_true' ); |
|
794
|
794
|
|
|
795
|
795
|
add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
|
796
|
796
|
add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
|
797
|
797
|
|
|
798
|
|
- add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10, 3 ); |
|
|
798
|
+ add_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value' ), 10, 3 ); |
|
799
|
799
|
|
|
800
|
800
|
// We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
|
801
|
|
- unset( $_GET['page'] ); |
|
|
801
|
+ unset( $_GET[ 'page' ] ); |
|
802
|
802
|
|
|
803
|
803
|
// TODO: Verify multiple-page forms |
|
804
|
804
|
// TODO: Product fields are not editable |
|
805
|
805
|
|
|
806
|
|
- $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
|
806
|
+ $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
807
|
807
|
|
|
808
|
|
- remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value'), 10 ); |
|
|
808
|
+ remove_filter( 'gform_field_value', array( $this, 'fix_survey_fields_value' ), 10 ); |
|
809
|
809
|
remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
810
|
810
|
remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
811
|
811
|
remove_filter( 'gform_disable_view_counter', '__return_true' ); |
|
@@ -829,7 +829,7 @@ discard block |
|
|
block discarded – undo |
|
829
|
829
|
*/ |
|
830
|
830
|
function fix_survey_fields_value( $value, $field, $name ) { |
|
831
|
831
|
|
|
832
|
|
- if( 'survey' === $field->type && '' === $value && 'likert' === rgar( $field, 'inputType' ) ) { |
|
|
832
|
+ if ( 'survey' === $field->type && '' === $value && 'likert' === rgar( $field, 'inputType' ) ) { |
|
833
|
833
|
|
|
834
|
834
|
// We need to run through each survey row until we find a match for expected values |
|
835
|
835
|
foreach ( $this->entry as $field_id => $field_value ) { |
|
@@ -838,11 +838,11 @@ discard block |
|
|
block discarded – undo |
|
838
|
838
|
continue; |
|
839
|
839
|
} |
|
840
|
840
|
|
|
841
|
|
- if( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) { |
|
|
841
|
+ if ( rgar( $field, 'gsurveyLikertEnableMultipleRows' ) ) { |
|
842
|
842
|
list( $row_val, $col_val ) = explode( ':', $field_value, 2 ); |
|
843
|
843
|
|
|
844
|
844
|
// If the $name matches the $row_val, we are processing the correct row |
|
845
|
|
- if( $row_val === $name ) { |
|
|
845
|
+ if ( $row_val === $name ) { |
|
846
|
846
|
$value = $field_value; |
|
847
|
847
|
break; |
|
848
|
848
|
} |
|
@@ -863,7 +863,7 @@ discard block |
|
|
block discarded – undo |
|
863
|
863
|
* @return string |
|
864
|
864
|
*/ |
|
865
|
865
|
public function render_form_buttons() { |
|
866
|
|
- return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
|
866
|
+ return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
867
|
867
|
} |
|
868
|
868
|
|
|
869
|
869
|
|
|
@@ -883,17 +883,17 @@ discard block |
|
|
block discarded – undo |
|
883
|
883
|
public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
|
884
|
884
|
|
|
885
|
885
|
// In case we have validated the form, use it to inject the validation results into the form render |
|
886
|
|
- if( isset( $this->form_after_validation ) ) { |
|
|
886
|
+ if ( isset( $this->form_after_validation ) ) { |
|
887
|
887
|
$form = $this->form_after_validation; |
|
888
|
888
|
} else { |
|
889
|
|
- $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
|
889
|
+ $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
890
|
890
|
} |
|
891
|
891
|
|
|
892
|
892
|
$form = $this->filter_conditional_logic( $form ); |
|
893
|
893
|
|
|
894
|
894
|
// for now we don't support Save and Continue feature. |
|
895
|
|
- if( ! self::$supports_save_and_continue ) { |
|
896
|
|
- unset( $form['save'] ); |
|
|
895
|
+ if ( ! self::$supports_save_and_continue ) { |
|
|
896
|
+ unset( $form[ 'save' ] ); |
|
897
|
897
|
} |
|
898
|
898
|
|
|
899
|
899
|
return $form; |
|
@@ -914,29 +914,29 @@ discard block |
|
|
block discarded – undo |
|
914
|
914
|
*/ |
|
915
|
915
|
function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
|
916
|
916
|
|
|
917
|
|
- if( GFCommon::is_post_field( $field ) ) { |
|
|
917
|
+ if ( GFCommon::is_post_field( $field ) ) { |
|
918
|
918
|
|
|
919
|
919
|
$message = null; |
|
920
|
920
|
|
|
921
|
921
|
// First, make sure they have the capability to edit the post. |
|
922
|
|
- if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
|
922
|
+ if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
923
|
923
|
|
|
924
|
924
|
/** |
|
925
|
925
|
* @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
926
|
926
|
* @param string $message The existing "You don't have permission..." text |
|
927
|
927
|
*/ |
|
928
|
|
- $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
|
928
|
+ $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
929
|
929
|
|
|
930
|
|
- } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
|
930
|
+ } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
931
|
931
|
/** |
|
932
|
932
|
* @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
933
|
933
|
* @param string $message The existing "This field is not editable; the post no longer exists." text |
|
934
|
934
|
*/ |
|
935
|
|
- $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
|
935
|
+ $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
936
|
936
|
} |
|
937
|
937
|
|
|
938
|
|
- if( $message ) { |
|
939
|
|
- $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
|
938
|
+ if ( $message ) { |
|
|
939
|
+ $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
940
|
940
|
} |
|
941
|
941
|
} |
|
942
|
942
|
|
|
@@ -961,8 +961,8 @@ discard block |
|
|
block discarded – undo |
|
961
|
961
|
|
|
962
|
962
|
// If the form has been submitted, then we don't need to pre-fill the values, |
|
963
|
963
|
// Except for fileupload type and when a field input is overridden- run always!! |
|
964
|
|
- if( |
|
965
|
|
- ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
|
964
|
+ if ( |
|
|
965
|
+ ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
966
|
966
|
&& false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
|
967
|
967
|
|| ! empty( $field_content ) |
|
968
|
968
|
|| GFCommon::is_product_field( $field->type ) // Prevent product fields from appearing editable |
|
@@ -971,8 +971,8 @@ discard block |
|
|
block discarded – undo |
|
971
|
971
|
} |
|
972
|
972
|
|
|
973
|
973
|
// Turn on Admin-style display for file upload fields only |
|
974
|
|
- if( 'fileupload' === $field->type ) { |
|
975
|
|
- $_GET['page'] = 'gf_entries'; |
|
|
974
|
+ if ( 'fileupload' === $field->type ) { |
|
|
975
|
+ $_GET[ 'page' ] = 'gf_entries'; |
|
976
|
976
|
} |
|
977
|
977
|
|
|
978
|
978
|
// SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
|
@@ -996,7 +996,7 @@ discard block |
|
|
block discarded – undo |
|
996
|
996
|
// Prevent any PHP warnings, like undefined index |
|
997
|
997
|
ob_start(); |
|
998
|
998
|
|
|
999
|
|
- if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
|
999
|
+ if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
1000
|
1000
|
/** @var GF_Field $gv_field */ |
|
1001
|
1001
|
$return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
|
1002
|
1002
|
} else { |
|
@@ -1007,7 +1007,7 @@ discard block |
|
|
block discarded – undo |
|
1007
|
1007
|
// If there was output, it's an error |
|
1008
|
1008
|
$warnings = ob_get_clean(); |
|
1009
|
1009
|
|
|
1010
|
|
- if( !empty( $warnings ) ) { |
|
|
1010
|
+ if ( ! empty( $warnings ) ) { |
|
1011
|
1011
|
do_action( 'gravityview_log_error', __METHOD__ . $warnings, $field_value ); |
|
1012
|
1012
|
} |
|
1013
|
1013
|
|
|
@@ -1016,7 +1016,7 @@ discard block |
|
|
block discarded – undo |
|
1016
|
1016
|
* We need the fileupload html field to render with the proper id |
|
1017
|
1017
|
* ( <li id="field_80_16" ... > ) |
|
1018
|
1018
|
*/ |
|
1019
|
|
- unset( $_GET['page'] ); |
|
|
1019
|
+ unset( $_GET[ 'page' ] ); |
|
1020
|
1020
|
|
|
1021
|
1021
|
return $return; |
|
1022
|
1022
|
} |
|
@@ -1039,7 +1039,7 @@ discard block |
|
|
block discarded – undo |
|
1039
|
1039
|
$override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
|
1040
|
1040
|
|
|
1041
|
1041
|
// We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
|
1042
|
|
- if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
|
1042
|
+ if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
1043
|
1043
|
|
|
1044
|
1044
|
$field_value = array(); |
|
1045
|
1045
|
|
|
@@ -1048,10 +1048,10 @@ discard block |
|
|
block discarded – undo |
|
1048
|
1048
|
|
|
1049
|
1049
|
foreach ( (array)$field->inputs as $input ) { |
|
1050
|
1050
|
|
|
1051
|
|
- $input_id = strval( $input['id'] ); |
|
|
1051
|
+ $input_id = strval( $input[ 'id' ] ); |
|
1052
|
1052
|
|
|
1053
|
1053
|
if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
|
1054
|
|
- $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
|
1054
|
+ $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
1055
|
1055
|
$allow_pre_populated = false; |
|
1056
|
1056
|
} |
|
1057
|
1057
|
|
|
@@ -1059,7 +1059,7 @@ discard block |
|
|
block discarded – undo |
|
1059
|
1059
|
|
|
1060
|
1060
|
$pre_value = $field->get_value_submission( array(), false ); |
|
1061
|
1061
|
|
|
1062
|
|
- $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
|
1062
|
+ $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
1063
|
1063
|
|
|
1064
|
1064
|
} else { |
|
1065
|
1065
|
|
|
@@ -1070,13 +1070,13 @@ discard block |
|
|
block discarded – undo |
|
1070
|
1070
|
|
|
1071
|
1071
|
// saved field entry value (if empty, fallback to the pre-populated value, if exists) |
|
1072
|
1072
|
// or pre-populated value if not empty and set to override saved value |
|
1073
|
|
- $field_value = !gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
|
1073
|
+ $field_value = ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
1074
|
1074
|
|
|
1075
|
1075
|
// in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
|
1076
|
|
- if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
|
1076
|
+ if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
1077
|
1077
|
$categories = array(); |
|
1078
|
1078
|
foreach ( explode( ',', $field_value ) as $cat_string ) { |
|
1079
|
|
- $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
|
1079
|
+ $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
1080
|
1080
|
} |
|
1081
|
1081
|
$field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
|
1082
|
1082
|
} |
|
@@ -1101,12 +1101,12 @@ discard block |
|
|
block discarded – undo |
|
1101
|
1101
|
*/ |
|
1102
|
1102
|
function gform_pre_validation( $form ) { |
|
1103
|
1103
|
|
|
1104
|
|
- if( ! $this->verify_nonce() ) { |
|
|
1104
|
+ if ( ! $this->verify_nonce() ) { |
|
1105
|
1105
|
return $form; |
|
1106
|
1106
|
} |
|
1107
|
1107
|
|
|
1108
|
1108
|
// Fix PHP warning regarding undefined index. |
|
1109
|
|
- foreach ( $form['fields'] as &$field) { |
|
|
1109
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1110
|
1110
|
|
|
1111
|
1111
|
// This is because we're doing admin form pretending to be front-end, so Gravity Forms |
|
1112
|
1112
|
// expects certain field array items to be set. |
|
@@ -1119,7 +1119,7 @@ discard block |
|
|
block discarded – undo |
|
1119
|
1119
|
$field['emailConfirmEnabled'] = ''; |
|
1120
|
1120
|
}*/ |
|
1121
|
1121
|
|
|
1122
|
|
- switch( RGFormsModel::get_input_type( $field ) ) { |
|
|
1122
|
+ switch ( RGFormsModel::get_input_type( $field ) ) { |
|
1123
|
1123
|
|
|
1124
|
1124
|
/** |
|
1125
|
1125
|
* 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. |
|
@@ -1133,37 +1133,37 @@ discard block |
|
|
block discarded – undo |
|
1133
|
1133
|
// Set the previous value |
|
1134
|
1134
|
$entry = $this->get_entry(); |
|
1135
|
1135
|
|
|
1136
|
|
- $input_name = 'input_'.$field->id; |
|
1137
|
|
- $form_id = $form['id']; |
|
|
1136
|
+ $input_name = 'input_' . $field->id; |
|
|
1137
|
+ $form_id = $form[ 'id' ]; |
|
1138
|
1138
|
|
|
1139
|
1139
|
$value = NULL; |
|
1140
|
1140
|
|
|
1141
|
1141
|
// Use the previous entry value as the default. |
|
1142
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1142
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1143
|
1143
|
$value = $entry[ $field->id ]; |
|
1144
|
1144
|
} |
|
1145
|
1145
|
|
|
1146
|
1146
|
// If this is a single upload file |
|
1147
|
|
- if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
1148
|
|
- $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
1149
|
|
- $value = $file_path['url']; |
|
|
1147
|
+ if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
|
1148
|
+ $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
|
1149
|
+ $value = $file_path[ 'url' ]; |
|
1150
|
1150
|
|
|
1151
|
1151
|
} else { |
|
1152
|
1152
|
|
|
1153
|
1153
|
// Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
1154
|
1154
|
// Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
1155
|
|
- $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
|
1155
|
+ $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
1156
|
1156
|
|
|
1157
|
1157
|
} |
|
1158
|
1158
|
|
|
1159
|
|
- if( rgar($field, "multipleFiles") ) { |
|
|
1159
|
+ if ( rgar( $field, "multipleFiles" ) ) { |
|
1160
|
1160
|
|
|
1161
|
1161
|
// If there are fresh uploads, process and merge them. |
|
1162
|
1162
|
// Otherwise, use the passed values, which should be json-encoded array of URLs |
|
1163
|
|
- if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
|
1163
|
+ if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
1164
|
1164
|
$value = empty( $value ) ? '[]' : $value; |
|
1165
|
1165
|
$value = stripslashes_deep( $value ); |
|
1166
|
|
- $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
|
1166
|
+ $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
1167
|
1167
|
} |
|
1168
|
1168
|
|
|
1169
|
1169
|
} else { |
|
@@ -1181,14 +1181,14 @@ discard block |
|
|
block discarded – undo |
|
1181
|
1181
|
|
|
1182
|
1182
|
case 'number': |
|
1183
|
1183
|
// Fix "undefined index" issue at line 1286 in form_display.php |
|
1184
|
|
- if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
1185
|
|
- $_POST['input_'.$field->id ] = NULL; |
|
|
1184
|
+ if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
|
1185
|
+ $_POST[ 'input_' . $field->id ] = NULL; |
|
1186
|
1186
|
} |
|
1187
|
1187
|
break; |
|
1188
|
1188
|
case 'captcha': |
|
1189
|
1189
|
// Fix issue with recaptcha_check_answer() on line 1458 in form_display.php |
|
1190
|
|
- $_POST['recaptcha_challenge_field'] = NULL; |
|
1191
|
|
- $_POST['recaptcha_response_field'] = NULL; |
|
|
1190
|
+ $_POST[ 'recaptcha_challenge_field' ] = NULL; |
|
|
1191
|
+ $_POST[ 'recaptcha_response_field' ] = NULL; |
|
1192
|
1192
|
break; |
|
1193
|
1193
|
} |
|
1194
|
1194
|
|
|
@@ -1224,7 +1224,7 @@ discard block |
|
|
block discarded – undo |
|
1224
|
1224
|
* You can enter whatever you want! |
|
1225
|
1225
|
* We try validating, and customize the results using `self::custom_validation()` |
|
1226
|
1226
|
*/ |
|
1227
|
|
- add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
|
1227
|
+ add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
1228
|
1228
|
|
|
1229
|
1229
|
// Needed by the validate funtion |
|
1230
|
1230
|
$failed_validation_page = NULL; |
|
@@ -1232,14 +1232,14 @@ discard block |
|
|
block discarded – undo |
|
1232
|
1232
|
|
|
1233
|
1233
|
// Prevent entry limit from running when editing an entry, also |
|
1234
|
1234
|
// prevent form scheduling from preventing editing |
|
1235
|
|
- unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
|
1235
|
+ unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
1236
|
1236
|
|
|
1237
|
1237
|
// Hide fields depending on Edit Entry settings |
|
1238
|
|
- $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
|
1238
|
+ $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
1239
|
1239
|
|
|
1240
|
1240
|
$this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
|
1241
|
1241
|
|
|
1242
|
|
- remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
|
1242
|
+ remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
1243
|
1243
|
} |
|
1244
|
1244
|
|
|
1245
|
1245
|
|
|
@@ -1256,13 +1256,13 @@ discard block |
|
|
block discarded – undo |
|
1256
|
1256
|
*/ |
|
1257
|
1257
|
function custom_validation( $validation_results ) { |
|
1258
|
1258
|
|
|
1259
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
|
1259
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results: ', $validation_results ); |
|
1260
|
1260
|
|
|
1261
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
|
1261
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] $_POSTed data (sanitized): ', esc_html( print_r( $_POST, true ) ) ); |
|
1262
|
1262
|
|
|
1263
|
1263
|
$gv_valid = true; |
|
1264
|
1264
|
|
|
1265
|
|
- foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
|
1265
|
+ foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
1266
|
1266
|
|
|
1267
|
1267
|
$value = RGFormsModel::get_field_value( $field ); |
|
1268
|
1268
|
$field_type = RGFormsModel::get_input_type( $field ); |
|
@@ -1275,35 +1275,35 @@ discard block |
|
|
block discarded – undo |
|
1275
|
1275
|
case 'post_image': |
|
1276
|
1276
|
|
|
1277
|
1277
|
// in case nothing is uploaded but there are already files saved |
|
1278
|
|
- if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
|
1278
|
+ if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
1279
|
1279
|
$field->failed_validation = false; |
|
1280
|
1280
|
unset( $field->validation_message ); |
|
1281
|
1281
|
} |
|
1282
|
1282
|
|
|
1283
|
1283
|
// validate if multi file upload reached max number of files [maxFiles] => 2 |
|
1284
|
|
- if( rgobj( $field, 'maxFiles') && rgobj( $field, 'multipleFiles') ) { |
|
|
1284
|
+ if ( rgobj( $field, 'maxFiles' ) && rgobj( $field, 'multipleFiles' ) ) { |
|
1285
|
1285
|
|
|
1286
|
1286
|
$input_name = 'input_' . $field->id; |
|
1287
|
1287
|
//uploaded |
|
1288
|
|
- $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
|
1288
|
+ $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
1289
|
1289
|
|
|
1290
|
1290
|
//existent |
|
1291
|
1291
|
$entry = $this->get_entry(); |
|
1292
|
1292
|
$value = NULL; |
|
1293
|
|
- if( isset( $entry[ $field->id ] ) ) { |
|
|
1293
|
+ if ( isset( $entry[ $field->id ] ) ) { |
|
1294
|
1294
|
$value = json_decode( $entry[ $field->id ], true ); |
|
1295
|
1295
|
} |
|
1296
|
1296
|
|
|
1297
|
1297
|
// count uploaded files and existent entry files |
|
1298
|
1298
|
$count_files = count( $file_names ) + count( $value ); |
|
1299
|
1299
|
|
|
1300
|
|
- if( $count_files > $field->maxFiles ) { |
|
|
1300
|
+ if ( $count_files > $field->maxFiles ) { |
|
1301
|
1301
|
$field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
1302
|
1302
|
$field->failed_validation = 1; |
|
1303
|
1303
|
$gv_valid = false; |
|
1304
|
1304
|
|
|
1305
|
1305
|
// in case of error make sure the newest upload files are removed from the upload input |
|
1306
|
|
- GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
|
1306
|
+ GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
1307
|
1307
|
} |
|
1308
|
1308
|
|
|
1309
|
1309
|
} |
|
@@ -1314,7 +1314,7 @@ discard block |
|
|
block discarded – undo |
|
1314
|
1314
|
} |
|
1315
|
1315
|
|
|
1316
|
1316
|
// This field has failed validation. |
|
1317
|
|
- if( !empty( $field->failed_validation ) ) { |
|
|
1317
|
+ if ( ! empty( $field->failed_validation ) ) { |
|
1318
|
1318
|
|
|
1319
|
1319
|
do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'field' => $field, 'value' => $value ) ); |
|
1320
|
1320
|
|
|
@@ -1332,32 +1332,32 @@ discard block |
|
|
block discarded – undo |
|
1332
|
1332
|
} |
|
1333
|
1333
|
|
|
1334
|
1334
|
// You can't continue inside a switch, so we do it after. |
|
1335
|
|
- if( empty( $field->failed_validation ) ) { |
|
|
1335
|
+ if ( empty( $field->failed_validation ) ) { |
|
1336
|
1336
|
continue; |
|
1337
|
1337
|
} |
|
1338
|
1338
|
|
|
1339
|
1339
|
// checks if the No Duplicates option is not validating entry against itself, since |
|
1340
|
1340
|
// we're editing a stored entry, it would also assume it's a duplicate. |
|
1341
|
|
- if( !empty( $field->noDuplicates ) ) { |
|
|
1341
|
+ if ( ! empty( $field->noDuplicates ) ) { |
|
1342
|
1342
|
|
|
1343
|
1343
|
$entry = $this->get_entry(); |
|
1344
|
1344
|
|
|
1345
|
1345
|
// If the value of the entry is the same as the stored value |
|
1346
|
1346
|
// Then we can assume it's not a duplicate, it's the same. |
|
1347
|
|
- if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
|
1347
|
+ if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
1348
|
1348
|
//if value submitted was not changed, then don't validate |
|
1349
|
1349
|
$field->failed_validation = false; |
|
1350
|
1350
|
|
|
1351
|
1351
|
unset( $field->validation_message ); |
|
1352
|
1352
|
|
|
1353
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
|
1353
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', $entry ); |
|
1354
|
1354
|
|
|
1355
|
1355
|
continue; |
|
1356
|
1356
|
} |
|
1357
|
1357
|
} |
|
1358
|
1358
|
|
|
1359
|
1359
|
// if here then probably we are facing the validation 'At least one field must be filled out' |
|
1360
|
|
- if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
|
1360
|
+ if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
1361
|
1361
|
unset( $field->validation_message ); |
|
1362
|
1362
|
$field->validation_message = false; |
|
1363
|
1363
|
continue; |
|
@@ -1369,12 +1369,12 @@ discard block |
|
|
block discarded – undo |
|
1369
|
1369
|
|
|
1370
|
1370
|
} |
|
1371
|
1371
|
|
|
1372
|
|
- $validation_results['is_valid'] = $gv_valid; |
|
|
1372
|
+ $validation_results[ 'is_valid' ] = $gv_valid; |
|
1373
|
1373
|
|
|
1374
|
|
- do_action('gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
|
1374
|
+ do_action( 'gravityview_log_debug', 'GravityView_Edit_Entry[custom_validation] Validation results.', $validation_results ); |
|
1375
|
1375
|
|
|
1376
|
1376
|
// We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
|
1377
|
|
- $this->form_after_validation = $validation_results['form']; |
|
|
1377
|
+ $this->form_after_validation = $validation_results[ 'form' ]; |
|
1378
|
1378
|
|
|
1379
|
1379
|
return $validation_results; |
|
1380
|
1380
|
} |
|
@@ -1387,7 +1387,7 @@ discard block |
|
|
block discarded – undo |
|
1387
|
1387
|
*/ |
|
1388
|
1388
|
private function get_entry() { |
|
1389
|
1389
|
|
|
1390
|
|
- if( empty( $this->entry ) ) { |
|
|
1390
|
+ if ( empty( $this->entry ) ) { |
|
1391
|
1391
|
// Get the database value of the entry that's being edited |
|
1392
|
1392
|
$this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
|
1393
|
1393
|
} |
|
@@ -1414,7 +1414,7 @@ discard block |
|
|
block discarded – undo |
|
1414
|
1414
|
$properties = GravityView_View_Data::getInstance()->get_fields( $view_id ); |
|
1415
|
1415
|
|
|
1416
|
1416
|
// If edit tab not yet configured, show all fields |
|
1417
|
|
- $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
|
1417
|
+ $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
1418
|
1418
|
|
|
1419
|
1419
|
// Show hidden fields as text fields |
|
1420
|
1420
|
$form = $this->fix_hidden_fields( $form ); |
|
@@ -1423,7 +1423,7 @@ discard block |
|
|
block discarded – undo |
|
1423
|
1423
|
$form = $this->fix_survey_fields( $form ); |
|
1424
|
1424
|
|
|
1425
|
1425
|
// Hide fields depending on admin settings |
|
1426
|
|
- $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
|
1426
|
+ $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
1427
|
1427
|
|
|
1428
|
1428
|
// If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
1429
|
1429
|
$fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
@@ -1443,7 +1443,7 @@ discard block |
|
|
block discarded – undo |
|
1443
|
1443
|
private function fix_survey_fields( $form ) { |
|
1444
|
1444
|
|
|
1445
|
1445
|
/** @var GF_Field $field */ |
|
1446
|
|
- foreach( $form['fields'] as &$field ) { |
|
|
1446
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1447
|
1447
|
$field->allowsPrepopulate = true; |
|
1448
|
1448
|
} |
|
1449
|
1449
|
|
|
@@ -1460,11 +1460,11 @@ discard block |
|
|
block discarded – undo |
|
1460
|
1460
|
private function fix_hidden_fields( $form ) { |
|
1461
|
1461
|
|
|
1462
|
1462
|
/** @var GF_Field $field */ |
|
1463
|
|
- foreach( $form['fields'] as $key => $field ) { |
|
1464
|
|
- if( 'hidden' === $field->type ) { |
|
|
1463
|
+ foreach ( $form[ 'fields' ] as $key => $field ) { |
|
|
1464
|
+ if ( 'hidden' === $field->type ) { |
|
1465
|
1465
|
$text_field = new GF_Field_Text( $field ); |
|
1466
|
1466
|
$text_field->type = 'text'; |
|
1467
|
|
- $form['fields'][ $key ] = $text_field; |
|
|
1467
|
+ $form[ 'fields' ][ $key ] = $text_field; |
|
1468
|
1468
|
} |
|
1469
|
1469
|
} |
|
1470
|
1470
|
|
|
@@ -1485,7 +1485,7 @@ discard block |
|
|
block discarded – undo |
|
1485
|
1485
|
*/ |
|
1486
|
1486
|
private function filter_fields( $fields, $configured_fields ) { |
|
1487
|
1487
|
|
|
1488
|
|
- if( empty( $fields ) || !is_array( $fields ) ) { |
|
|
1488
|
+ if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
1489
|
1489
|
return $fields; |
|
1490
|
1490
|
} |
|
1491
|
1491
|
|
|
@@ -1502,13 +1502,13 @@ discard block |
|
|
block discarded – undo |
|
1502
|
1502
|
*/ |
|
1503
|
1503
|
$hide_product_fields = apply_filters( 'gravityview/edit_entry/hide-product-fields', empty( self::$supports_product_fields ) ); |
|
1504
|
1504
|
|
|
1505
|
|
- if( $hide_product_fields ) { |
|
1506
|
|
- $field_type_blacklist[] = 'option'; |
|
1507
|
|
- $field_type_blacklist[] = 'quantity'; |
|
1508
|
|
- $field_type_blacklist[] = 'product'; |
|
1509
|
|
- $field_type_blacklist[] = 'total'; |
|
1510
|
|
- $field_type_blacklist[] = 'shipping'; |
|
1511
|
|
- $field_type_blacklist[] = 'calculation'; |
|
|
1505
|
+ if ( $hide_product_fields ) { |
|
|
1506
|
+ $field_type_blacklist[ ] = 'option'; |
|
|
1507
|
+ $field_type_blacklist[ ] = 'quantity'; |
|
|
1508
|
+ $field_type_blacklist[ ] = 'product'; |
|
|
1509
|
+ $field_type_blacklist[ ] = 'total'; |
|
|
1510
|
+ $field_type_blacklist[ ] = 'shipping'; |
|
|
1511
|
+ $field_type_blacklist[ ] = 'calculation'; |
|
1512
|
1512
|
} |
|
1513
|
1513
|
|
|
1514
|
1514
|
// First, remove blacklist or calculation fields |
|
@@ -1516,24 +1516,24 @@ discard block |
|
|
block discarded – undo |
|
1516
|
1516
|
|
|
1517
|
1517
|
// Remove the fields that have calculation properties and keep them to be used later |
|
1518
|
1518
|
// @since 1.16.2 |
|
1519
|
|
- if( $field->has_calculation() ) { |
|
1520
|
|
- $this->fields_with_calculation[] = $field; |
|
|
1519
|
+ if ( $field->has_calculation() ) { |
|
|
1520
|
+ $this->fields_with_calculation[ ] = $field; |
|
1521
|
1521
|
// don't remove the calculation fields on form render. |
|
1522
|
1522
|
} |
|
1523
|
1523
|
|
|
1524
|
1524
|
// process total field after all fields have been saved |
|
1525
|
1525
|
if ( $field->type == 'total' ) { |
|
1526
|
|
- $this->total_fields[] = $field; |
|
|
1526
|
+ $this->total_fields[ ] = $field; |
|
1527
|
1527
|
unset( $fields[ $key ] ); |
|
1528
|
1528
|
} |
|
1529
|
1529
|
|
|
1530
|
|
- if( in_array( $field->type, $field_type_blacklist ) ) { |
|
|
1530
|
+ if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
1531
|
1531
|
unset( $fields[ $key ] ); |
|
1532
|
1532
|
} |
|
1533
|
1533
|
} |
|
1534
|
1534
|
|
|
1535
|
1535
|
// The Edit tab has not been configured, so we return all fields by default. |
|
1536
|
|
- if( empty( $configured_fields ) ) { |
|
|
1536
|
+ if ( empty( $configured_fields ) ) { |
|
1537
|
1537
|
return $fields; |
|
1538
|
1538
|
} |
|
1539
|
1539
|
|
|
@@ -1543,8 +1543,8 @@ discard block |
|
|
block discarded – undo |
|
1543
|
1543
|
/** @var GF_Field $field */ |
|
1544
|
1544
|
foreach ( $fields as $field ) { |
|
1545
|
1545
|
|
|
1546
|
|
- if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
1547
|
|
- $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
|
1546
|
+ if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
|
1547
|
+ $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
1548
|
1548
|
break; |
|
1549
|
1549
|
} |
|
1550
|
1550
|
|
|
@@ -1567,14 +1567,14 @@ discard block |
|
|
block discarded – undo |
|
1567
|
1567
|
|
|
1568
|
1568
|
$return_field = $field; |
|
1569
|
1569
|
|
|
1570
|
|
- if( empty( $field_setting['show_label'] ) ) { |
|
|
1570
|
+ if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
1571
|
1571
|
$return_field->label = ''; |
|
1572
|
|
- } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
1573
|
|
- $return_field->label = $field_setting['custom_label']; |
|
|
1572
|
+ } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
|
1573
|
+ $return_field->label = $field_setting[ 'custom_label' ]; |
|
1574
|
1574
|
} |
|
1575
|
1575
|
|
|
1576
|
|
- if( !empty( $field_setting['custom_class'] ) ) { |
|
1577
|
|
- $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
|
1576
|
+ if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
|
1577
|
+ $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
1578
|
1578
|
} |
|
1579
|
1579
|
|
|
1580
|
1580
|
/** |
|
@@ -1612,16 +1612,16 @@ discard block |
|
|
block discarded – undo |
|
1612
|
1612
|
*/ |
|
1613
|
1613
|
$use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
1614
|
1614
|
|
|
1615
|
|
- if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
1616
|
|
- foreach( $fields as $k => $field ) { |
|
1617
|
|
- if( $field->adminOnly ) { |
|
|
1615
|
+ if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
|
1616
|
+ foreach ( $fields as $k => $field ) { |
|
|
1617
|
+ if ( $field->adminOnly ) { |
|
1618
|
1618
|
unset( $fields[ $k ] ); |
|
1619
|
1619
|
} |
|
1620
|
1620
|
} |
|
1621
|
1621
|
return $fields; |
|
1622
|
1622
|
} |
|
1623
|
1623
|
|
|
1624
|
|
- foreach( $fields as &$field ) { |
|
|
1624
|
+ foreach ( $fields as &$field ) { |
|
1625
|
1625
|
$field->adminOnly = false; |
|
1626
|
1626
|
} |
|
1627
|
1627
|
|
|
@@ -1648,16 +1648,16 @@ discard block |
|
|
block discarded – undo |
|
1648
|
1648
|
*/ |
|
1649
|
1649
|
$use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
|
1650
|
1650
|
|
|
1651
|
|
- if( $use_conditional_logic ) { |
|
|
1651
|
+ if ( $use_conditional_logic ) { |
|
1652
|
1652
|
return $form; |
|
1653
|
1653
|
} |
|
1654
|
1654
|
|
|
1655
|
|
- foreach( $form['fields'] as &$field ) { |
|
|
1655
|
+ foreach ( $form[ 'fields' ] as &$field ) { |
|
1656
|
1656
|
/* @var GF_Field $field */ |
|
1657
|
1657
|
$field->conditionalLogic = null; |
|
1658
|
1658
|
} |
|
1659
|
1659
|
|
|
1660
|
|
- unset( $form['button']['conditionalLogic'] ); |
|
|
1660
|
+ unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
1661
|
1661
|
|
|
1662
|
1662
|
return $form; |
|
1663
|
1663
|
|
|
@@ -1674,7 +1674,7 @@ discard block |
|
|
block discarded – undo |
|
1674
|
1674
|
*/ |
|
1675
|
1675
|
function manage_conditional_logic( $has_conditional_logic, $form ) { |
|
1676
|
1676
|
|
|
1677
|
|
- if( ! $this->is_edit_entry() ) { |
|
|
1677
|
+ if ( ! $this->is_edit_entry() ) { |
|
1678
|
1678
|
return $has_conditional_logic; |
|
1679
|
1679
|
} |
|
1680
|
1680
|
|
|
@@ -1705,44 +1705,44 @@ discard block |
|
|
block discarded – undo |
|
1705
|
1705
|
* 2. There are two entries embedded using oEmbed |
|
1706
|
1706
|
* 3. One of the entries has just been saved |
|
1707
|
1707
|
*/ |
|
1708
|
|
- if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
|
1708
|
+ if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
1709
|
1709
|
|
|
1710
|
1710
|
$error = true; |
|
1711
|
1711
|
|
|
1712
|
1712
|
} |
|
1713
|
1713
|
|
|
1714
|
|
- if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
|
1714
|
+ if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
1715
|
1715
|
|
|
1716
|
1716
|
$error = true; |
|
1717
|
1717
|
|
|
1718
|
|
- } elseif( ! $this->verify_nonce() ) { |
|
|
1718
|
+ } elseif ( ! $this->verify_nonce() ) { |
|
1719
|
1719
|
|
|
1720
|
1720
|
/** |
|
1721
|
1721
|
* If the Entry is embedded, there may be two entries on the same page. |
|
1722
|
1722
|
* If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
|
1723
|
1723
|
*/ |
|
1724
|
|
- if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
|
1724
|
+ if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
1725
|
1725
|
$error = true; |
|
1726
|
1726
|
} else { |
|
1727
|
|
- $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
|
1727
|
+ $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
1728
|
1728
|
} |
|
1729
|
1729
|
|
|
1730
|
1730
|
} |
|
1731
|
1731
|
|
|
1732
|
|
- if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
1733
|
|
- $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
|
1732
|
+ if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
|
1733
|
+ $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
1734
|
1734
|
} |
|
1735
|
1735
|
|
|
1736
|
|
- if( $this->entry['status'] === 'trash' ) { |
|
1737
|
|
- $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
|
1736
|
+ if ( $this->entry[ 'status' ] === 'trash' ) { |
|
|
1737
|
+ $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
1738
|
1738
|
} |
|
1739
|
1739
|
|
|
1740
|
1740
|
// No errors; everything's fine here! |
|
1741
|
|
- if( empty( $error ) ) { |
|
|
1741
|
+ if ( empty( $error ) ) { |
|
1742
|
1742
|
return true; |
|
1743
|
1743
|
} |
|
1744
|
1744
|
|
|
1745
|
|
- if( $echo && $error !== true ) { |
|
|
1745
|
+ if ( $echo && $error !== true ) { |
|
1746
|
1746
|
|
|
1747
|
1747
|
$error = esc_html( $error ); |
|
1748
|
1748
|
|
|
@@ -1750,13 +1750,13 @@ discard block |
|
|
block discarded – undo |
|
1750
|
1750
|
* @since 1.9 |
|
1751
|
1751
|
*/ |
|
1752
|
1752
|
if ( ! empty( $this->entry ) ) { |
|
1753
|
|
- $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;" ) ); |
|
|
1753
|
+ $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;" ) ); |
|
1754
|
1754
|
} |
|
1755
|
1755
|
|
|
1756
|
|
- echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
|
1756
|
+ echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
1757
|
1757
|
} |
|
1758
|
1758
|
|
|
1759
|
|
- do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
|
1759
|
+ do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_entry]' . $error ); |
|
1760
|
1760
|
|
|
1761
|
1761
|
return false; |
|
1762
|
1762
|
} |
|
@@ -1773,20 +1773,20 @@ discard block |
|
|
block discarded – undo |
|
1773
|
1773
|
|
|
1774
|
1774
|
$error = NULL; |
|
1775
|
1775
|
|
|
1776
|
|
- if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
1777
|
|
- $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
|
1776
|
+ if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
|
1777
|
+ $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
1778
|
1778
|
} |
|
1779
|
1779
|
|
|
1780
|
1780
|
// No errors; everything's fine here! |
|
1781
|
|
- if( empty( $error ) ) { |
|
|
1781
|
+ if ( empty( $error ) ) { |
|
1782
|
1782
|
return true; |
|
1783
|
1783
|
} |
|
1784
|
1784
|
|
|
1785
|
|
- if( $echo ) { |
|
1786
|
|
- echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
|
1785
|
+ if ( $echo ) { |
|
|
1786
|
+ echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
1787
|
1787
|
} |
|
1788
|
1788
|
|
|
1789
|
|
- do_action('gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
|
1789
|
+ do_action( 'gravityview_log_error', 'GravityView_Edit_Entry[user_can_edit_field]' . $error ); |
|
1790
|
1790
|
|
|
1791
|
1791
|
return false; |
|
1792
|
1792
|
|
|
@@ -1804,15 +1804,15 @@ discard block |
|
|
block discarded – undo |
|
1804
|
1804
|
private function check_user_cap_edit_field( $field ) { |
|
1805
|
1805
|
|
|
1806
|
1806
|
// If they can edit any entries (as defined in Gravity Forms), we're good. |
|
1807
|
|
- if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
|
1807
|
+ if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
1808
|
1808
|
return true; |
|
1809
|
1809
|
} |
|
1810
|
1810
|
|
|
1811
|
|
- $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
|
1811
|
+ $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
1812
|
1812
|
|
|
1813
|
1813
|
// If the field has custom editing capaibilities set, check those |
|
1814
|
|
- if( $field_cap ) { |
|
1815
|
|
- return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
|
1814
|
+ if ( $field_cap ) { |
|
|
1815
|
+ return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
1816
|
1816
|
} |
|
1817
|
1817
|
|
|
1818
|
1818
|
return false; |
|
@@ -1826,17 +1826,17 @@ discard block |
|
|
block discarded – undo |
|
1826
|
1826
|
public function verify_nonce() { |
|
1827
|
1827
|
|
|
1828
|
1828
|
// Verify form submitted for editing single |
|
1829
|
|
- if( $this->is_edit_entry_submission() ) { |
|
|
1829
|
+ if ( $this->is_edit_entry_submission() ) { |
|
1830
|
1830
|
$valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
|
1831
|
1831
|
} |
|
1832
|
1832
|
|
|
1833
|
1833
|
// Verify |
|
1834
|
|
- else if( ! $this->is_edit_entry() ) { |
|
|
1834
|
+ else if ( ! $this->is_edit_entry() ) { |
|
1835
|
1835
|
$valid = false; |
|
1836
|
1836
|
} |
|
1837
|
1837
|
|
|
1838
|
1838
|
else { |
|
1839
|
|
- $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
|
1839
|
+ $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
1840
|
1840
|
} |
|
1841
|
1841
|
|
|
1842
|
1842
|
/** |