pro/2024_WEBSITE_fipf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed error with automatically adding _name to option

Browse Source
This commit is contained in:
asus
2024-04-03 14:21:33 +02:00
parent 8ac16dc1f4
commit d2b2967218
2 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/cipf_plugin/php/admin_menu.php
View File

@@ -35,9 +35,10 @@ function add_plugin_content_CIPF() {
* options * options
* *
*/ */
$option_paypal = Plgntls::get_option_safe($option_paypal_object); $option_paypal = Plgntls::get_option_safe($option_paypal_object, true);
$option_payment = Plgntls::get_option_safe($option_payment_object); $option_payment = Plgntls::get_option_safe($option_payment_object, true);
$option_emails = Plgntls::get_option_safe($option_emails_object); //delete_option($option_emails_object['_name']);
$option_emails = Plgntls::get_option_safe($option_emails_object, true);
ob_start(); ob_start();
include(Plgntls::root_path() . '/html/menu/cipf_menu.html'); include(Plgntls::root_path() . '/html/menu/cipf_menu.html');
@@ -171,13 +172,15 @@ function update_emails_settings_option_CIPF($request, $option_name, $option_data
//error_log("option_data bedore: " . json_encode($option_data)); //error_log("option_data bedore: " . json_encode($option_data));
foreach ($option_data as $email_type => $email_options) { foreach ($option_data as $email_type => $email_options) {
//error_log("email_type: " . $email_type); //error_log("email_type: " . $email_type);
if ($email_type === '_name') { // if ($email_type === '_name') {
continue; // continue;
} // }
$ret_email = update_email_by_type_CIPF($email_type, $email_options, $request); // $ret_email = update_email_by_type_CIPF($email_type, $email_options, $request);
if ($ret_email !== false) { // if ($ret_email !== false) {
$option_data[$email_type] = $ret_email; // $option_data[$email_type] = $ret_email;
} // }
$option_data[$email_type] = update_email_by_type_CIPF($email_type, $email_options, $request);
} }
//error_log("option_data after : " . json_encode($option_data)); //error_log("option_data after : " . json_encode($option_data));
@@ -193,9 +196,9 @@ function update_emails_settings_option_CIPF($request, $option_name, $option_data
function update_email_by_type_CIPF($email_type, $email_options, $request) { function update_email_by_type_CIPF($email_type, $email_options, $request) {
Plgntls::debug_infos(); Plgntls::debug_infos();
//error_log("email type: " . $email_type); //error_log("email type: " . $email_type);
if ($email_type === '_name') { //if ($email_type === '_name') {
return false; // return false;
} //}
/* /*
* set notification/confirmation_send to false by default, * set notification/confirmation_send to false by default,

17
plugins/cipf_plugin/plgntls_class.php
View File

@@ -1066,7 +1066,7 @@ class Plgntls {
public static function get_option_safe($option) { public static function get_option_safe($option, $name = false) {
/* /*
* first init option, in case it was not already * first init option, in case it was not already
* it will returns the option name or false * it will returns the option name or false
@@ -1098,11 +1098,20 @@ class Plgntls {
} }
/* /*
* if option is an array and _name is not define, * $name is true,
* add the _name entry to the output, to facilitate the access to the name * add the _name entry to the output,
* it will overwrite any existing _name key
* if option is not an array,
* make it array and put the value into a '_value' key
*
* *
*/ */
if (is_array($ret_option) && !isset($ret_option['_name'])) { if ($name === true) {
if (!is_array($ret_option)) {
$value = $ret_option;
$ret_option = array();
$ret_option['_value'] = $value;
}
$ret_option['_name'] = $option_name; $ret_option['_name'] = $option_name;
} }