From 10ca070d811104d9e16cbb87403fd8a4021851c6 Mon Sep 17 00:00:00 2001 From: asus Date: Wed, 13 Mar 2024 13:28:14 +0100 Subject: [PATCH] - wip create role at registration - upgraded shortcode user_infos to output acf format --- .../form_builder_patch/form_calculation.php | 9 ++- .../cipf_plugin/php/register_partenaires.php | 72 ++++++++++++++++++- plugins/cipf_plugin/php/user_infos.php | 20 +++++- private | 2 +- 4 files changed, 95 insertions(+), 8 deletions(-) diff --git a/plugins/cipf_plugin/php/form_builder_patch/form_calculation.php b/plugins/cipf_plugin/php/form_builder_patch/form_calculation.php index bfb1407..0a6d8b7 100644 --- a/plugins/cipf_plugin/php/form_builder_patch/form_calculation.php +++ b/plugins/cipf_plugin/php/form_builder_patch/form_calculation.php @@ -1,12 +1,17 @@ diff --git a/plugins/cipf_plugin/php/user_infos.php b/plugins/cipf_plugin/php/user_infos.php index 454e880..d5bb8ad 100644 --- a/plugins/cipf_plugin/php/user_infos.php +++ b/plugins/cipf_plugin/php/user_infos.php @@ -61,7 +61,7 @@ function output_list_front_CIPF($array) { } -function format_user_info_CIPF($output, $query, &$current_user, $user_id) { +function format_user_info_CIPF($query, &$current_user, $user_id) { PLGNTLS_class::debug_infos(); $output_date_format = PLGNTLS_class::USER_INFO_DATE_FORMAT; @@ -88,6 +88,18 @@ function format_user_info_CIPF($output, $query, &$current_user, $user_id) { if ($acf_object !== false) $is_acf = true; + + /* + * if is acf, use the acf return format + * otherwise, use the default wordpress value + * + */ + if ($is_acf) + $output = get_field($query, $acf_id); + else + $output = $current_user->$query; + + /* * check if is date * @@ -98,6 +110,7 @@ function format_user_info_CIPF($output, $query, &$current_user, $user_id) { $is_date = true; } + /* * if is date, transform format * @@ -109,6 +122,7 @@ function format_user_info_CIPF($output, $query, &$current_user, $user_id) { $output = $date->format($output_date_format); } + /* * return the result * @@ -217,8 +231,8 @@ function current_user_infos_CIPF($atts) { $query = $atts; else return ''; - $output = $current_user->$query; - return format_user_info_CIPF($output, $query, $current_user, $user_id); +// $output = $current_user->$query; + return format_user_info_CIPF($query, $current_user, $user_id); } add_shortcode('cipf_user_info', 'current_user_infos_CIPF'); diff --git a/private b/private index a37c901..56b1f35 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit a37c901a74caf6422783fcf73e82242d58978015 +Subproject commit 56b1f351d4983cb88a16ee9e0133b571c1e31505