From 8ac16dc1f47db691c734b0a66798f95f2349ae83 Mon Sep 17 00:00:00 2001
From: asus <asus@example.com>
Date: Wed, 3 Apr 2024 14:07:25 +0200
Subject: [PATCH] fixed error in loop option email with _name

---
 plugins/cipf_plugin/php/admin_menu.php | 12 +++++++++++-
 plugins/cipf_plugin/php/emails.php     |  5 +++--
 plugins/cipf_plugin/plgntls_class.php  |  4 ----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/cipf_plugin/php/admin_menu.php b/plugins/cipf_plugin/php/admin_menu.php
index 0f34967..e4fad7a 100644
--- a/plugins/cipf_plugin/php/admin_menu.php
+++ b/plugins/cipf_plugin/php/admin_menu.php
@@ -171,7 +171,13 @@ function update_emails_settings_option_CIPF($request, $option_name, $option_data
 //error_log("option_data bedore: " . json_encode($option_data));
 	foreach ($option_data as $email_type => $email_options) {
 		//error_log("email_type: " . $email_type);
-		$option_data[$email_type] = update_email_by_type_CIPF($email_type, $email_options, $request);
+		if ($email_type === '_name') {
+			continue;
+		}
+		$ret_email = update_email_by_type_CIPF($email_type, $email_options, $request);
+		if ($ret_email !== false) {
+			$option_data[$email_type] = $ret_email;
+		}
 	}
 //error_log("option_data after : " . json_encode($option_data));
 
@@ -187,6 +193,10 @@ function update_emails_settings_option_CIPF($request, $option_name, $option_data
 function update_email_by_type_CIPF($email_type, $email_options, $request) {
 	Plgntls::debug_infos();
 	//error_log("email type: " . $email_type);
+	if ($email_type === '_name') {
+		return false;
+	}
+
 	/*
 	* set notification/confirmation_send to false by default,
 	* because the request only contains the value 'on' if checked, nothing for false
diff --git a/plugins/cipf_plugin/php/emails.php b/plugins/cipf_plugin/php/emails.php
index ae8b1c7..76d967a 100644
--- a/plugins/cipf_plugin/php/emails.php
+++ b/plugins/cipf_plugin/php/emails.php
@@ -39,6 +39,7 @@ function prepare_emails_CIPF($email_name, $user_id) {
 	}
 	$user = get_user_by('id', $user_id);
 	$user_email = $user->user_email;
+	$headers = array('Content-Type: text/html; charset=UTF-8');
 
 	
 	$emails_option = Plgntls::get_option_safe($emails_option_object);
@@ -57,7 +58,7 @@ function prepare_emails_CIPF($email_name, $user_id) {
 		$tmp_email['to'] = $email['notification_to'];
 		$tmp_email['subject'] = $email['notification_subject'];
 		$tmp_email['message'] = $email['notification_message'];
-		$tmp_email['headers'] = array('Content-Type: text/html; charset=UTF-8');
+		$tmp_email['headers'] = $headers;
 		$emails[] = $tmp_email;
 	}
 	if ($email['confirmation_send']) {
@@ -65,7 +66,7 @@ function prepare_emails_CIPF($email_name, $user_id) {
 		$tmp_email['to'] = $user_email;
 		$tmp_email['subject'] = $email['confirmation_subject'];
 		$tmp_email['message'] = $email['confirmation_message'];
-		$tmp_email['headers'] = array('Content-Type: text/html; charset=UTF-8');
+		$tmp_email['headers'] = $headers;
 		$emails[] = $tmp_email;
 	}
 	return $emails;
diff --git a/plugins/cipf_plugin/plgntls_class.php b/plugins/cipf_plugin/plgntls_class.php
index 4b5eaf3..96ea717 100644
--- a/plugins/cipf_plugin/plgntls_class.php
+++ b/plugins/cipf_plugin/plgntls_class.php
@@ -903,8 +903,6 @@ class Plgntls {
 		*
 		*/
 		self::init_class();
-$toggle_menu = self::$_option_toggle_menu;
-error_log("toggle menu: " . json_encode($toggle_menu));
 
 		if (empty($menu_options)) {
 			return;
@@ -959,7 +957,6 @@ error_log("toggle menu: " . json_encode($toggle_menu));
 	}
 	private static function _toggle_menu($menu_page_title, $menu_title, $menu_capability, $menu_slug, $menu_callback) {
 		$toggle_menu = self::$_option_toggle_menu;
-error_log("toggle menu: " . json_encode($toggle_menu));
 
 		$toggle = self::get_option_safe($toggle_menu);
 
@@ -978,7 +975,6 @@ error_log("toggle menu: " . json_encode($toggle_menu));
 	*/
 	private static function _add_link_to_plugin($links) {
 		$option_toggle = self::$_option_toggle_menu;
-error_log("toggle menu: " . json_encode($option_toggle));
 
 		$toggle = self::get_option_safe($option_toggle);
 		if (false === $toggle) {