PluginProbe
MxChat – AI Chatbot & Content Generation for WordPress / 2.5.6
MxChat – AI Chatbot & Content Generation for WordPress v2.5.6
3.2.22 3.2.21 3.2.20 3.2.19 3.2.18 3.2.17 3.2.16 3.2.15 3.2.14 3.2.12 3.2.13 3.2.11 3.2.10 3.2.9 3.2.8 3.2.7 3.2.6 3.2.5 3.2.4 3.2.3 3.2.2 3.2.1 2.0.3 2.0.4 2.0.5 All 153 releases
← All changes | includes/class-mxchat-public.php +205 -439 3.2.202.5.6 View file →
@@ -5,49 +5,93 @@
5 5
6 6 class MxChat_Public {
7 7 private $options;
8 8
9 - // True once any FLOATING instance has rendered on this request via the
10 - // shortcode (or the block wrapping it) — append_chatbot_to_body() then
11 - // yields, so an explicit floating placement never doubles up with the
12 - // Auto-Display instance (plan 95dd1e).
13 - private static $floating_instance_rendered = false;
14 -
15 9 public function __construct() {
16 10 // Simply get the options without defining duplicated defaults
17 11 $this->options = get_option('mxchat_options', array());
18 12 add_shortcode('mxchat_chatbot', array($this, 'render_chatbot_shortcode'));
19 13 add_action('wp_footer', array($this, 'append_chatbot_to_body'));
14 +
15 + // Initialize testing panel for admins
16 + add_action('wp_enqueue_scripts', array($this, 'enqueue_testing_assets'));
17 +
18 + // Add debug hook
19 + add_action('wp_footer', array($this, 'debug_display_logic'));
20 20 }
21 21
22 + /**
23 + * Enqueue testing panel assets for admin users
24 + */
25 + public function enqueue_testing_assets() {
26 + // Only load for admin users or if testing parameter is present
27 + if (current_user_can('administrator') || isset($_GET['mxchat_test'])) {
28 +
29 + // Get plugin URL for assets
30 + $plugin_url = plugin_dir_url(dirname(__FILE__));
31 +
32 + // Enqueue test panel CSS
33 + wp_enqueue_style(
34 + 'mxchat-test-panel',
35 + $plugin_url . 'css/test-panel.css',
36 + array(),
37 + '2.5.2'
38 + );
39 +
40 + // Enqueue test panel JS
41 + wp_enqueue_script(
42 + 'mxchat-test-panel',
43 + $plugin_url . 'js/test-panel.js',
44 + array('jquery'),
45 + '2.5.2',
46 + true
47 + );
48 +
49 + // Pass data to JavaScript
50 + wp_localize_script('mxchat-test-panel', 'mxchatTestData', array(
51 + 'ajaxUrl' => admin_url('admin-ajax.php'),
52 + 'nonce' => wp_create_nonce('mxchat_test_nonce'),
53 + 'isAdmin' => current_user_can('administrator'),
54 + 'testingEnabled' => true
55 + ));
56 +
57 + // Add JavaScript flag to enable testing
58 + add_action('wp_footer', array($this, 'add_testing_flag'));
59 + }
60 + }
61 +
62 + /**
63 + * Add JavaScript flag to enable testing panel
64 + */
65 + public function add_testing_flag() {
66 + echo '<script>window.mxchatTestingEnabled = true;</script>';
67 + }
68 +
69 + /**
70 + * Check if testing mode should be enabled
71 + */
72 + private function is_testing_mode_enabled() {
73 + return (current_user_can('administrator') || isset($_GET['mxchat_test']));
74 + }
75 +
22 76 /**
23 77 * UPDATED: Enhanced should_hide_chatbot method - only blocks auto-append, not shortcodes
24 78 */
25 79 private function should_hide_chatbot($context = 'auto') {
26 80 global $post;
27 -
81 +
28 82 if (!$post) {
29 83 return false;
30 84 }
31 -
85 +
86 + $hide_chatbot = get_post_meta($post->ID, '_mxchat_hide_chatbot', true);
87 +
32 88 // Only hide if it's the auto-append context (floating="yes" from global setting)
33 89 // Allow shortcodes to work regardless of this setting
34 - if ($context === 'auto') {
35 - // Check new visibility field first
36 - $visibility = get_post_meta($post->ID, '_mxchat_page_visibility', true);
37 - if ($visibility === 'hide') {
38 - return true;
39 - }
40 -
41 - // Backward compat: check legacy field if new field not set
42 - if (empty($visibility)) {
43 - $hide_chatbot = get_post_meta($post->ID, '_mxchat_hide_chatbot', true);
44 - if ($hide_chatbot === '1') {
45 - return true;
46 - }
47 - }
90 + if ($context === 'auto' && $hide_chatbot === '1') {
91 + return true;
48 92 }
49 -
93 +
50 94 return false;
51 95 }
52 96
53 97 /**
@@ -62,18 +106,9 @@
62 106 // Check if auto-append chatbot should be hidden on this page
63 107 if ($this->should_hide_chatbot('auto')) {
64 108 return; // Don't show auto-appended chatbot
65 109 }
66 -
67 - // An explicit floating placement (shortcode or the 95dd1e block) already
68 - // rendered during content — appending the auto instance would put two
69 - // floating widgets on the page with colliding element ids. The explicit
70 - // placement wins; content renders before wp_footer, so the flag is set
71 - // by the time this runs.
72 - if (self::$floating_instance_rendered) {
73 - return;
74 - }
75 -
110 +
76 111 // Get the bot that should be displayed using new logic
77 112 $bot_to_show = $this->get_display_bot();
78 113
79 114 // Don't show chatbot if determination is false
@@ -110,22 +145,8 @@
110 145 /**
111 146 * UPDATED: Enhanced shortcode with context-aware hiding
112 147 */
113 148 public function render_chatbot_shortcode($atts) {
114 - // Smart asset loading safety net (plan-915355): if the opt-in enqueue gate
115 - // skipped assets on this request (shortcode invisible to has_shortcode —
116 - // builder-stored content, template files, widget areas), force the FULL
117 - // enqueue now, including the mxchatChat settings payload and the delayed
118 - // loader wiring. The integrator method is idempotent, so this is a no-op
119 - // when assets already went out at wp_enqueue_scripts time.
120 - if (self::is_smart_asset_loading_enabled() && !wp_style_is('mxchat-chat-css', 'enqueued')) {
121 - global $mxchat_integrator;
122 - if (isset($mxchat_integrator) && is_object($mxchat_integrator)
123 - && method_exists($mxchat_integrator, 'mxchat_enqueue_scripts_styles')) {
124 - $mxchat_integrator->mxchat_enqueue_scripts_styles(true);
125 - }
126 - }
127 -
128 149 // UPDATED: Add bot_id parameter support and improve logic
129 150 $attributes = shortcode_atts(array(
130 151 'floating' => 'yes',
131 152 'has_consent' => 'yes',
@@ -134,16 +155,20 @@
134 155
135 156 // Determine which bot to use
136 157 $bot_id = $this->determine_bot_for_shortcode($attributes['bot_id']);
137 158
138 - // A floating shortcode always renders; what it does is suppress the LATER
139 - // auto-append instance (see append_chatbot_to_body), so a page never gets
140 - // two floating widgets. This replaced a dead empty branch here that
141 - // documented the intent but never suppressed anything (plan 95dd1e).
159 + // UPDATED: Only check hiding for floating shortcodes that could conflict with auto-append
160 + // Non-floating shortcodes should always work
142 161 if ($attributes['floating'] === 'yes') {
143 - self::$floating_instance_rendered = true;
162 + // For floating shortcodes, check if auto-append is hidden
163 + // This prevents duplicate floating chatbots
164 + if ($this->should_hide_chatbot('auto') && $this->is_auto_append_enabled()) {
165 + // If auto-append is enabled but hidden on this page,
166 + // allow the floating shortcode to work (user is overriding)
167 + // But if auto-append is disabled globally, also allow shortcode
168 + }
144 169 }
145 -
170 +
146 171 // Non-floating shortcodes (floating="no") should NEVER be blocked by the hide setting
147 172 // This allows embedded chatbots even when floating is hidden
148 173
149 174 $is_floating = $attributes['floating'] === 'yes';
@@ -174,14 +199,9 @@
174 199 $custom_send_image = isset($theme_options['custom_send_button_image']) ? esc_url($theme_options['custom_send_button_image']) : '';
175 200 $send_width = isset($theme_options['send_button_width']) ? intval($theme_options['send_button_width']) : 24;
176 201 $send_height = isset($theme_options['send_button_height']) ? intval($theme_options['send_button_height']) : 24;
177 202 $send_rotation = isset($theme_options['send_button_rotation']) ? intval($theme_options['send_button_rotation']) : 0;
178 -
179 - // Check if an AI theme is active (global or bot-specific) - if so, skip inline color styles
180 - $ai_theme_active = !empty($theme_options['active_ai_theme_css']);
181 - $bot_has_theme = isset($theme_options['bot_theme_assignments'][$bot_id]);
182 - $skip_inline_colors = $ai_theme_active || $bot_has_theme;
183 -
203 +
184 204 // UPDATED: Use current_options instead of $this->options throughout
185 205 $bg_color = $current_options['chatbot_background_color'] ?? '#fff';
186 206 $user_message_bg_color = $current_options['user_message_bg_color'] ?? '#fff';
187 207 $user_message_font_color = $current_options['user_message_font_color'] ?? '#212121';
@@ -195,15 +215,15 @@
195 215 $icon_color = $current_options['icon_color'] ?? '#fff';
196 216 $chat_input_font_color = $current_options['chat_input_font_color'] ?? '#212121';
197 217 $close_button_color = $current_options['close_button_color'] ?? '#fff';
198 218 $chatbot_bg_color = $current_options['chatbot_bg_color'] ?? '#fff';
199 - $pre_chat_message = isset($current_options['pre_chat_message']) ? sanitize_textarea_field(trim($current_options['pre_chat_message'])) : '';
219 + $pre_chat_message = isset($current_options['pre_chat_message']) ? sanitize_text_field(trim($current_options['pre_chat_message'])) : '';
200 220 $user_id = sanitize_key($this->mxchat_get_user_identifier());
201 221 $email_state = $this->determine_email_collection_state();
202 222 $show_email_form = $email_state['show_email_form'];
203 223 $user_email = $email_state['user_email'] ?? '';
204 224 $user_name = $email_state['user_name'] ?? '';
205 - // Pre-chat dismissal now handled client-side via localStorage (zero server load)
225 + $transient_key = 'mxchat_pre_chat_message_dismissed_' . $user_id;
206 226 $input_copy = isset($current_options['input_copy']) ? esc_attr($current_options['input_copy']) : esc_attr__('How can I assist?', 'mxchat');
207 227 $rate_limit_message = isset($current_options['rate_limit_message']) ? esc_attr($current_options['rate_limit_message']) : esc_attr__('Rate limit exceeded. Please try again later.', 'mxchat');
208 228 $mode_indicator_bg_color = $current_options['mode_indicator_bg_color'] ?? '#212121';
209 229 $mode_indicator_font_color = $current_options['mode_indicator_font_color'] ?? '#fff';
@@ -217,10 +237,9 @@
217 237 $popular_question_3 = isset($current_options['popular_question_3']) ? esc_html($current_options['popular_question_3']) : '';
218 238 $additional_questions = isset($current_options['additional_popular_questions']) ? $current_options['additional_popular_questions'] : [];
219 239 $custom_icon = isset($current_options['custom_icon']) ? esc_url($current_options['custom_icon']) : '';
220 240 $title_icon = isset($current_options['title_icon']) ? esc_url($current_options['title_icon']) : '';
221 - // AI agent text - if explicitly set to empty string, hide the indicator entirely
222 - $ai_agent_text = isset($current_options['ai_agent_text']) ? $current_options['ai_agent_text'] : __('AI Agent', 'mxchat');
241 + $ai_agent_text = isset($current_options['ai_agent_text']) ? esc_html($current_options['ai_agent_text']) : esc_html__('AI Agent', 'mxchat');
223 242
224 243 $live_agent_message_bg_color = $current_options['live_agent_message_bg_color'] ?? '#212121';
225 244 $live_agent_message_font_color = $current_options['live_agent_message_font_color'] ?? '#fff';
226 245 $enable_email_block = isset($current_options['enable_email_block']) &&
@@ -226,110 +245,67 @@
226 245 $enable_email_block = isset($current_options['enable_email_block']) &&
227 246 ($current_options['enable_email_block'] === '1' || $current_options['enable_email_block'] === 'on');
228 247
229 248 // Add name field variables
230 - $enable_name_field = isset($current_options['enable_name_field']) &&
249 + $enable_name_field = isset($current_options['enable_name_field']) &&
231 250 ($current_options['enable_name_field'] === '1' || $current_options['enable_name_field'] === 'on');
232 - $name_field_placeholder = isset($current_options['name_field_placeholder']) ?
233 - esc_attr($current_options['name_field_placeholder']) :
251 + $name_field_placeholder = isset($current_options['name_field_placeholder']) ?
252 + esc_attr($current_options['name_field_placeholder']) :
234 253 esc_attr__('Enter your name', 'mxchat');
235 254
236 - // Consent checkbox (b062c4). Default OFF — with the toggle off this block
237 - // renders nothing and the form markup is byte-identical to before.
238 - $enable_consent_checkbox = isset($current_options['enable_consent_checkbox']) &&
239 - ($current_options['enable_consent_checkbox'] === '1' || $current_options['enable_consent_checkbox'] === 'on');
240 - $consent_checkbox_required = isset($current_options['consent_checkbox_required']) &&
241 - ($current_options['consent_checkbox_required'] === '1' || $current_options['consent_checkbox_required'] === 'on');
242 - // Owner content, kses'd through the shared allowlist at render time as well
243 - // as save time — the render is the security boundary the spec names.
244 - $consent_checkbox_label = MxChat_Utils::sanitize_consent_label(
245 - isset($current_options['consent_checkbox_label']) && $current_options['consent_checkbox_label'] !== ''
246 - ? $current_options['consent_checkbox_label']
247 - : __('I agree to the Privacy Policy.', 'mxchat')
248 - );
249 -
250 255 ob_start();
251 256
252 257 // Check if floating attribute is set to 'yes' and wrap accordingly
253 258 if ($is_floating) {
254 - echo '<div id="floating-chatbot-' . esc_attr($bot_id) . '" class="floating-chatbot ' . $initial_visibility . $additional_class . '">';
259 + echo '<div id="floating-chatbot" class="' . $initial_visibility . $additional_class . '">';
255 260 }
256 261
257 262 // Add bot_id to the chatbot wrapper as a data attribute
258 - // data-nosnippet: keep the chat widget's UI copy (greeting, title, quick-question
259 - // prompts, privacy notice) out of Google search snippets. This wrapper renders in both
260 - // floating and inline/shortcode modes, so it covers all in-panel copy in one place.
261 - echo '<div id="mxchat-chatbot-wrapper-' . esc_attr($bot_id) . '" class="mxchat-chatbot-wrapper" data-nosnippet data-bot-id="' . esc_attr($bot_id) . '">';
263 + echo '<div id="mxchat-chatbot-wrapper" data-bot-id="' . esc_attr($bot_id) . '">';
262 264
263 - echo ' <div class="chatbot-top-bar" id="exit-chat-button-' . esc_attr($bot_id) . '"' . ($skip_inline_colors ? '' : ' style="background: ' . esc_attr($top_bar_bg_color) . ';"') . '>';
265 + echo ' <div class="chatbot-top-bar" id="exit-chat-button" style="background: ' . esc_attr($top_bar_bg_color) . ';">';
264 266 echo ' <div class="chatbot-title-container">';
265 267 echo ' <div class="chatbot-title-group">';
266 268 if (!empty($title_icon)) {
267 269 echo ' <img src="' . esc_url($title_icon) . '" alt="" class="chatbot-title-icon">';
268 270 }
269 - echo ' <p class="chatbot-title"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($close_button_color) . ';"') . '>' . esc_html($top_bar_title) . '</p>';
271 + echo ' <p class="chatbot-title" style="color: ' . esc_attr($close_button_color) . ';">' . esc_html($top_bar_title) . '</p>';
270 272 echo ' </div>';
271 - // Only show mode indicator if ai_agent_text is not empty
272 - if (!empty(trim($ai_agent_text))) {
273 - echo '<span class="chat-mode-indicator" id="chat-mode-indicator-' . esc_attr($bot_id) . '" data-ai-text="' . esc_attr($ai_agent_text) . '"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($mode_indicator_font_color) . '; background-color: ' . esc_attr($mode_indicator_bg_color) . ';"') . '>' . esc_html($ai_agent_text) . '</span>';
274 - }
273 + echo '<span class="chat-mode-indicator" id="chat-mode-indicator" data-ai-text="' . $ai_agent_text . '" style="color: ' . esc_attr($mode_indicator_font_color) . '; background-color: ' . esc_attr($mode_indicator_bg_color) . ';">' . $ai_agent_text . '</span>';
275 274 echo ' </div>';
276 - // Overflow menu (3-dot) trigger + dropdown container.
277 - // Sibling of .exit-chat, rendered to its left. JS hides the trigger
278 - // if no menu items are enabled; outer click + Escape close the menu.
279 - echo ' <div class="mxchat-header-menu-wrap" data-bot-id="' . esc_attr($bot_id) . '"' . ($skip_inline_colors ? '' : ' style="--mxchat-menu-bg: ' . esc_attr($bot_message_bg_color) . '; --mxchat-menu-fg: ' . esc_attr($bot_message_font_color) . ';"') . '>';
280 - echo ' <button class="mxchat-header-btn mxchat-menu-trigger" type="button" aria-haspopup="menu" aria-expanded="false" aria-label="' . esc_attr__('More options', 'mxchat') . '"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($close_button_color) . ';"') . '>';
281 - echo ' <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true">';
282 - echo ' <circle cx="12" cy="5" r="2"/><circle cx="12" cy="12" r="2"/><circle cx="12" cy="19" r="2"/>';
283 - echo ' </svg>';
284 - echo ' </button>';
285 - echo ' <div class="mxchat-header-menu" role="menu" aria-hidden="true" hidden></div>';
286 - echo ' </div>';
287 - echo ' <button class="exit-chat" type="button" aria-label="' . esc_attr__('Close', 'mxchat') . '"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($close_button_color) . ';"') . '>';
288 - echo ' <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" id="ic-close" aria-hidden="true">';
289 - echo ' <line x1="6" y1="6" x2="18" y2="18"></line>';
290 - echo ' <line x1="18" y1="6" x2="6" y2="18"></line>';
275 + echo ' <button class="exit-chat" type="button" aria-label="' . esc_attr__('Minimize', 'mxchat') . '" style="color: ' . esc_attr($close_button_color) . ';">';
276 + echo ' <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" id="ic-minimize" style="fill: ' . esc_attr($close_button_color) . ';">';
277 + echo ' <path d="M0 0h24v24H0z" fill="none"></path>';
278 + echo ' <path d="M11.67 3.87L9.9 2.1 0 12l9.9 9.9 1.77-1.77L3.54 12z"></path>';
291 279 echo ' </svg>';
292 - echo ' <span>' . esc_html__('Close', 'mxchat') . '</span>';
280 + echo ' <span>' . esc_html__('Minimize', 'mxchat') . '</span>';
293 281 echo ' </button>';
294 282 echo ' </div>';
295 -
283 +
296 284 // 3b) Main chatbot container
297 - echo ' <div id="mxchat-chatbot-' . esc_attr($bot_id) . '" class="mxchat-chatbot"' . ($skip_inline_colors ? '' : ' style="background-color: ' . esc_attr($chatbot_bg_color) . ';"') . '>';
285 + echo ' <div id="mxchat-chatbot" style="background-color: ' . esc_attr($chatbot_bg_color) . ';">';
298 286
299 287 if ($enable_email_block) {
300 - echo '<div id="email-blocker-' . esc_attr($bot_id) . '" class="email-blocker" style="' . ($show_email_form ? '' : 'display: none;') . '">';
288 + echo '<div id="email-blocker" class="email-blocker" style="' . ($show_email_form ? '' : 'display: none;') . '">';
301 289 echo ' <div class="email-blocker-header">';
302 -
290 +
303 291 $header_html = isset($current_options['email_blocker_header_content'])
304 292 ? $current_options['email_blocker_header_content']
305 293 : '';
306 294 echo wp_kses_post($header_html);
307 -
295 +
308 296 echo ' </div>';
309 - echo ' <form id="email-collection-form-' . esc_attr($bot_id) . '" class="email-collection-form" method="POST" action="">';
310 -
297 + echo ' <form id="email-collection-form" method="POST" action="">';
298 +
311 299 // Add name field if enabled
312 300 if ($enable_name_field) {
313 - echo ' <label for="user-name-' . esc_attr($bot_id) . '" class="sr-only mxchat-name-label">' . esc_html__('Name', 'mxchat') . '</label>';
314 - echo ' <input type="text" id="user-name-' . esc_attr($bot_id) . '" name="user_name" class="mxchat-name-input" required placeholder="' . $name_field_placeholder . '" />';
301 + echo ' <label for="user-name" class="sr-only mxchat-name-label">' . esc_html__('Name', 'mxchat') . '</label>';
302 + echo ' <input type="text" id="user-name" name="user_name" class="mxchat-name-input" required placeholder="' . $name_field_placeholder . '" />';
315 303 }
316 -
317 - echo ' <label for="user-email-' . esc_attr($bot_id) . '" class="sr-only">' . esc_html__('Email Address', 'mxchat') . '</label>';
318 - echo ' <input type="email" id="user-email-' . esc_attr($bot_id) . '" name="user_email" class="mxchat-email-input" required placeholder="' . esc_attr__('Enter your email address', 'mxchat') . '" />';
319 -
320 - // Consent checkbox row (b062c4). The native required attribute
321 - // is UX only — the save endpoint re-enforces it server-side.
322 - // Clicking an anchor inside the label activates the link, not
323 - // the checkbox (interactive descendants skip label activation).
324 - if ($enable_consent_checkbox) {
325 - echo ' <div class="mxchat-consent-row">';
326 - echo ' <input type="checkbox" id="user-consent-' . esc_attr($bot_id) . '" name="user_consent" value="1" class="mxchat-consent-checkbox"' . ($consent_checkbox_required ? ' required' : '') . ' />';
327 - echo ' <label for="user-consent-' . esc_attr($bot_id) . '" class="mxchat-consent-label">' . $consent_checkbox_label . '</label>';
328 - echo ' </div>';
329 - }
330 -
331 - echo '<button type="submit" id="email-submit-button-' . esc_attr($bot_id) . '" class="email-submit-button">';
304 +
305 + echo ' <label for="user-email" class="sr-only">' . esc_html__('Email Address', 'mxchat') . '</label>';
306 + echo ' <input type="email" id="user-email" name="user_email" required placeholder="' . esc_attr__('Enter your email address', 'mxchat') . '" />';
307 + echo '<button type="submit" id="email-submit-button">';
332 308 $button_text = isset($current_options['email_blocker_button_text'])
333 309 ? $current_options['email_blocker_button_text']
334 310 : esc_html__('Start Chat', 'mxchat');
335 311 echo esc_html($button_text);
@@ -337,25 +313,13 @@
337 313 echo ' </form>';
338 314 echo '</div>';
339 315 }
340 316
341 - echo ' <div id="mxchat-init-loader-' . esc_attr($bot_id) . '" class="mxchat-init-loader" style="display:none;">';
342 - echo ' <div class="mxchat-init-loader-dots">';
343 - echo ' <span class="dot"></span><span class="dot"></span><span class="dot"></span>';
344 - echo ' </div>';
345 - echo ' </div>';
346 -
347 - echo ' <div id="chat-container-' . esc_attr($bot_id) . '" class="chat-container" style="' . ($enable_email_block && $show_email_form ? 'display: none;' : '') . '">';
348 - // role="log" + polite live region: new messages are announced to
349 - // screen readers explicitly, so the arrival signal no longer rides
350 - // the post-reply input autofocus (suppressed on touch — plan 03799f).
351 - // additions-only + non-atomic, with aria-busy held on the streaming
352 - // bubble until [DONE] (chat-script.js) so a streamed reply is
353 - // announced once, complete — not per token (WCAG 4.1.3, plan 67f126).
354 - echo ' <div id="chat-box-' . esc_attr($bot_id) . '" class="chat-box" role="log" aria-live="polite" aria-atomic="false" aria-relevant="additions text" aria-label="' . esc_attr__('Chat messages', 'mxchat') . '">';
355 - echo ' <div class="bot-message"' . ($skip_inline_colors ? '' : ' style="background: ' . esc_attr($bot_message_bg_color) . ';"') . '>';
356 - echo ' <div dir="auto"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($bot_message_font_color) . ';"') . '>';
357 - echo wp_kses_post($intro_message);
317 + echo ' <div id="chat-container" style="' . ($enable_email_block && $show_email_form ? 'display: none;' : '') . '">';
318 + echo ' <div id="chat-box">';
319 + echo ' <div class="bot-message" style="background: ' . esc_attr($bot_message_bg_color) . ';">';
320 + echo ' <div dir="auto" style="color: ' . esc_attr($bot_message_font_color) . ';">';
321 + echo wp_kses_post($intro_message);
358 322 echo ' </div>';
359 323 echo ' </div>';
360 324 echo ' </div>'; // end #chat-box
361 325
@@ -360,21 +324,21 @@
360 324 echo ' </div>'; // end #chat-box
361 325
362 326
363 327 // Replace the existing popular questions section with this:
364 - echo ' <div id="mxchat-popular-questions-' . esc_attr($bot_id) . '" class="mxchat-popular-questions">';
328 + echo ' <div id="mxchat-popular-questions">';
365 329 echo ' <div class="mxchat-popular-questions-container">';
366 330
367 331 // Collapse button (down arrow) - shows when open, centered at top
368 332 echo ' <button class="questions-collapse-btn" aria-label="' . esc_attr__('Hide Quick Questions', 'mxchat') . '">';
369 - echo ' <svg width="25" height="25" viewBox="0 0 24 24" fill="none"' . ($skip_inline_colors ? '' : ' stroke="' . esc_attr($quick_questions_toggle_color) . '"') . ' stroke-width="2">';
333 + echo ' <svg width="25" height="25" viewBox="0 0 24 24" fill="none" stroke="' . esc_attr($quick_questions_toggle_color) . '" stroke-width="2">';
370 334 echo ' <polyline points="6,9 12,15 18,9"></polyline>';
371 335 echo ' </svg>';
372 336 echo ' </button>';
373 -
337 +
374 338 // Expand button (up arrow) - shows when collapsed
375 339 echo ' <button class="questions-toggle-btn" aria-label="' . esc_attr__('Show Quick Questions', 'mxchat') . '">';
376 - echo ' <svg width="25" height="25" viewBox="0 0 24 24" fill="none"' . ($skip_inline_colors ? '' : ' stroke="' . esc_attr($quick_questions_toggle_color) . '"') . ' stroke-width="2">';
340 + echo ' <svg width="25" height="25" viewBox="0 0 24 24" fill="none" stroke="' . esc_attr($quick_questions_toggle_color) . '" stroke-width="2">';
377 341 echo ' <polyline points="18,15 12,9 6,15"></polyline>';
378 342 echo ' </svg>';
379 343 echo ' </button>';
380 344
@@ -398,35 +362,15 @@
398 362
399 363 echo ' </div>';
400 364 echo ' </div>';
401 365
402 - echo ' <div id="input-container-' . esc_attr($bot_id) . '" class="input-container">';
403 - // Max input length (plan a3fae2 part C) — global core setting, 0 = unlimited.
404 - // Hard-caps typing/paste client-side; the chat handler enforces it server-side too.
405 - $mxchat_max_input_length = isset($this->options['max_input_length']) ? intval($this->options['max_input_length']) : 0;
406 - $mxchat_maxlength_attr = $mxchat_max_input_length > 0 ? ' maxlength="' . esc_attr($mxchat_max_input_length) . '"' : '';
407 - // Visually-hidden label = the input's accessible name (WCAG 3.3.2,
408 - // plan 67f126). The placeholder stays as visible prompt copy but
409 - // cannot be the name — it vanishes on the first keystroke.
410 - echo ' <label for="chat-input-' . esc_attr($bot_id) . '" class="sr-only">' . esc_html__('Type your message', 'mxchat') . '</label>';
411 - echo ' <textarea id="chat-input-' . esc_attr($bot_id) . '" class="chat-input" dir="auto"' . $mxchat_maxlength_attr . ' placeholder="' . esc_attr($input_copy) . '"' . ($skip_inline_colors ? '' : ' style="color: ' . esc_attr($chat_input_font_color) . ';"') . '></textarea>';
412 - // Language-neutral character counter (plan 7091a2). Numbers only — no
413 - // translatable strings — so it reads correctly on every-language install.
414 - // Only rendered when a cap is set; hidden until ~80% of the cap, then
415 - // ramps neutral -> amber -> red. Decorative (aria-hidden); the textarea's
416 - // maxlength carries the real semantics for assistive tech.
417 - if ($mxchat_max_input_length > 0) {
418 - echo ' <div id="mxchat-char-counter-' . esc_attr($bot_id) . '" class="mxchat-char-counter" aria-hidden="true"><span class="mxchat-char-counter-current">0</span><span class="mxchat-char-counter-sep">/</span><span class="mxchat-char-counter-max">' . esc_html($mxchat_max_input_length) . '</span></div>';
419 - }
420 - echo ' <button id="send-button-' . esc_attr($bot_id) . '" class="send-button" aria-label="' . esc_attr__('Send message', 'mxchat') . '">';
366 + echo ' <div id="input-container">';
367 + echo ' <textarea id="chat-input" dir="auto" placeholder="' . esc_attr($input_copy) . '" style="color: ' . esc_attr($chat_input_font_color) . ';"></textarea>';
368 + echo ' <button id="send-button">';
421 369 if (!empty($custom_send_image)) {
422 370 echo ' <img src="' . esc_url($custom_send_image) . '" alt="' . esc_attr__('Send', 'mxchat') . '" style="width: ' . intval($send_width) . 'px; height: ' . intval($send_height) . 'px; transform: rotate(' . intval($send_rotation) . 'deg);" />';
423 371 } else {
424 - $send_svg_style = 'width: ' . intval($send_width) . 'px; height: ' . intval($send_height) . 'px; transform: rotate(' . intval($send_rotation) . 'deg);';
425 - if (!$skip_inline_colors) {
426 - $send_svg_style = 'fill: ' . esc_attr($send_button_font_color) . '; ' . $send_svg_style;
427 - }
428 - echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="' . $send_svg_style . '">';
372 + echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" style="fill: ' . esc_attr($send_button_font_color) . '; width: ' . intval($send_width) . 'px; height: ' . intval($send_height) . 'px; transform: rotate(' . intval($send_rotation) . 'deg);">';
429 373 echo ' <path d="M498.1 5.6c10.1 7 15.4 19.1 13.5 31.2l-64 416c-1.5 9.7-7.4 18.2-16 23s-18.9 5.4-28 1.6L284 427.7l-68.5 74.1c-8.9 9.7-22.9 12.9-35.2 8.1S160 493.2 160 480V396.4c0-4 1.5-7.8 4.2-10.7L331.8 202.8c5.8-6.3 5.6-16-.4-22s-15.7-6.4-22-.7L106 360.8 17.7 316.6C7.1 311.3 .3 300.7 0 288.9s5.9-22.8 16.1-28.7l448-256c10.7-6.1 23.9-5.5 34 1.4z"></path>';
430 374 echo ' </svg>';
431 375 }
432 376 echo ' </button>';
@@ -436,10 +380,10 @@
436 380
437 381 // PDF Upload Button - wrapped in conditional using current_options
438 382 $show_pdf_button = isset($current_options['show_pdf_upload_button']) ? $current_options['show_pdf_upload_button'] : 'on';
439 383 if ($show_pdf_button === 'on') {
440 - echo ' <input type="file" id="pdf-upload-' . esc_attr($bot_id) . '" class="pdf-upload" accept=".pdf" style="display: none;">';
441 - echo ' <button id="pdf-upload-btn-' . esc_attr($bot_id) . '" class="toolbar-btn pdf-upload-btn" title="' . esc_attr__('Upload PDF', 'mxchat') . '">';
384 + echo ' <input type="file" id="pdf-upload" accept=".pdf" style="display: none;">';
385 + echo ' <button id="pdf-upload-btn" class="toolbar-btn" title="' . esc_attr__('Upload PDF', 'mxchat') . '">';
442 386 echo ' <!-- Icon from Font Awesome Free: https://fontawesome.com/license/free -->';
443 387 echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" stroke="currentColor">';
444 388 echo ' <path d="M64 464l48 0 0 48-48 0c-35.3 0-64-28.7-64-64L0 64C0 28.7 28.7 0 64 0L229.5 0c17 0 33.3 6.7 45.3 18.7l90.5 90.5c12 12 18.7 28.3 18.7 45.3L384 304l-48 0 0-144-80 0c-17.7 0-32-14.3-32-32l0-80L64 48c-8.8 0-16 7.2-16 16l0 384c0 8.8 7.2 16 16 16zM176 352l32 0c30.9 0 56 25.1 56 56s-25.1 56-56 56l-16 0 0 32c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-48 0-80c0-8.8 7.2-16 16-16zm32 80c13.3 0 24-10.7 24-24s-10.7-24-24-24l-16 0 0 48 16 0zm96-80l32 0c26.5 0 48 21.5 48 48l0 64c0 26.5-21.5 48-48 48l-32 0c-8.8 0-16-7.2-16-16l0-128c0-8.8 7.2-16 16-16zm32 128c8.8 0 16-7.2 16-16l0-64c0-8.8-7.2-16-16-16l-16 0 0 96 16 0zm80-112c0-8.8 7.2-16 16-16l48 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 32 32 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-32 0 0 48c0 8.8-7.2 16-16 16s-16-7.2-16-16l0-64 0-64z"></path>';
445 389 echo ' </svg>';
@@ -448,19 +392,19 @@
448 392
449 393 // Word Upload Button - wrapped in conditional using current_options
450 394 $show_word_button = isset($current_options['show_word_upload_button']) ? $current_options['show_word_upload_button'] : 'on';
451 395 if ($show_word_button === 'on') {
452 - echo ' <input type="file" id="word-upload-' . esc_attr($bot_id) . '" class="word-upload" accept=".docx" style="display: none;">';
453 - echo ' <button id="word-upload-btn-' . esc_attr($bot_id) . '" class="toolbar-btn word-upload-btn" title="' . esc_attr__('Upload Word Document', 'mxchat') . '">';
396 + echo ' <input type="file" id="word-upload" accept=".docx" style="display: none;">';
397 + echo ' <button id="word-upload-btn" class="toolbar-btn" title="' . esc_attr__('Upload Word Document', 'mxchat') . '">';
454 398 echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" stroke="currentColor">';
455 399 echo ' <path d="M48 448L48 64c0-8.8 7.2-16 16-16l160 0 0 80c0 17.7 14.3 32 32 32l80 0 0 288c0 8.8-7.2 16-16 16L64 464c-8.8 0-16-7.2-16-16zM64 0C28.7 0 0 28.7 0 64L0 448c0 35.3 28.7 64 64 64l256 0c35.3 0 64-28.7 64-64l0-293.5c0-17-6.7-33.3-18.7-45.3L274.7 18.7C262.7 6.7 246.5 0 229.5 0L64 0zm55 241.1c-3.8-12.7-17.2-19.9-29.9-16.1s-19.9 17.2-16.1 29.9l48 160c3 10.2 12.4 17.1 23 17.1s19.9-7 23-17.1l25-83.4 25 83.4c3 10.2 12.4 17.1 23 17.1s19.9-7 23-17.1l48-160c3.8-12.7-3.4-26.1-16.1-29.9s-26.1 3.4-29.9 16.1l-25 83.4-25-83.4c-3-10.2-12.4-17.1-23-17.1s-19.9 7-23 17.1l-25 83.4-25-83.4z"/></svg>';
456 400 echo ' </button>';
457 401 }
458 402
459 - // File containers
460 - echo ' <div id="active-pdf-container-' . esc_attr($bot_id) . '" class="active-pdf-container" style="display: none;">';
461 - echo ' <span id="active-pdf-name-' . esc_attr($bot_id) . '" class="active-pdf-name"></span>';
462 - echo ' <button id="remove-pdf-btn-' . esc_attr($bot_id) . '" class="remove-pdf-btn" title="' . esc_attr__('Remove PDF', 'mxchat') . '">';
403 + // File containers (unchanged)
404 + echo ' <div id="active-pdf-container" class="active-pdf-container" style="display: none;">';
405 + echo ' <span id="active-pdf-name" class="active-pdf-name"></span>';
406 + echo ' <button id="remove-pdf-btn" class="remove-pdf-btn" title="' . esc_attr__('Remove PDF', 'mxchat') . '">';
463 407 echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="none" stroke="currentColor" stroke-width="2">';
464 408 echo ' <line x1="18" y1="6" x2="6" y2="18"></line>';
465 409 echo ' <line x1="6" y1="6" x2="18" y2="18"></line>';
466 410 echo ' </svg>';
@@ -465,12 +409,12 @@
465 409 echo ' <line x1="6" y1="6" x2="18" y2="18"></line>';
466 410 echo ' </svg>';
467 411 echo ' </button>';
468 412 echo ' </div>';
469 -
470 - echo ' <div id="active-word-container-' . esc_attr($bot_id) . '" class="active-word-container" style="display: none;">';
471 - echo ' <span id="active-word-name-' . esc_attr($bot_id) . '" class="active-word-name"></span>';
472 - echo ' <button id="remove-word-btn-' . esc_attr($bot_id) . '" class="remove-word-btn" title="' . esc_attr__('Remove Word Document', 'mxchat') . '">';
413 +
414 + echo ' <div id="active-word-container" class="active-pdf-container" style="display: none;">';
415 + echo ' <span id="active-word-name" class="active-pdf-name"></span>';
416 + echo ' <button id="remove-word-btn" class="remove-pdf-btn" title="' . esc_attr__('Remove Word Document', 'mxchat') . '">';
473 417 echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="12" height="12" fill="none" stroke="currentColor" stroke-width="2">';
474 418 echo ' <line x1="18" y1="6" x2="6" y2="18"></line>';
475 419 echo ' <line x1="6" y1="6" x2="18" y2="18"></line>';
476 420 echo ' </svg>';
@@ -476,11 +420,11 @@
476 420 echo ' </svg>';
477 421 echo ' </button>';
478 422 echo ' </div>';
479 423
480 - // Perplexity Button
424 + // Perplexity Button (unchanged except for the conditional)
481 425 if (apply_filters('mxchat_perplexity_should_show_logo', true)) {
482 - echo ' <button id="perplexity-search-btn-' . esc_attr($bot_id) . '" class="toolbar-btn perplexity-search-btn" title="' . esc_attr__('Search with Perplexity', 'mxchat-perplexity') . '">';
426 + echo ' <button id="perplexity-search-btn" class="toolbar-btn" title="' . esc_attr__('Search with Perplexity', 'mxchat-perplexity') . '">';
483 427 echo ' <svg fill="currentColor" height="1em" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg">';
484 428 echo ' <path d="M19.785 0v7.272H22.5V17.62h-2.935V24l-7.037-6.194v6.145h-1.091v-6.152L4.392 24v-6.465H1.5V7.188h2.884V0l7.053 6.494V.19h1.09v6.49L19.786 0zm-7.257 9.044v7.319l5.946 5.234V14.44l-5.946-5.397zm-1.099-.08l-5.946 5.398v7.235l5.946-5.234V8.965zm8.136 7.58h1.844V8.349H13.46l6.105 5.54v2.655zm-8.982-8.28H2.59v8.195h1.8v-2.576l6.192-5.62zM5.475 2.476v4.71h5.115l-5.115-4.71zm13.219 0l-5.115 4.71h5.115v-4.71z"></path>';
485 429 echo ' </svg>';
486 430 echo ' </button>';
@@ -487,10 +431,10 @@
487 431 }
488 432
489 433
490 434 // Image Analysis Button - hidden by default, controlled by MxChat Vision add-on
491 - echo ' <input type="file" id="image-upload-' . esc_attr($bot_id) . '" class="image-upload" accept="image/*" style="display: none;" multiple>';
492 - echo ' <button id="image-upload-btn-' . esc_attr($bot_id) . '" class="toolbar-btn image-upload-btn" title="' . esc_attr__('Upload Image for Analysis', 'mxchat') . '" style="display: none;">';
435 + echo ' <input type="file" id="image-upload" accept="image/*" style="display: none;" multiple>';
436 + echo ' <button id="image-upload-btn" class="toolbar-btn" title="' . esc_attr__('Upload Image for Analysis', 'mxchat') . '" style="display: none;">';
493 437 echo ' <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="fill: none !important;">';
494 438 echo ' <path d="M14.5 4h-5L7 7H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-3l-2.5-3z" style="fill: none !important;"/>';
495 439 echo ' <circle cx="12" cy="13" r="3" style="fill: none !important;"/>';
496 440 echo ' </svg>';
@@ -513,31 +457,22 @@
513 457
514 458 if ($is_floating) {
515 459 echo '</div>';
516 460
517 - if (!empty($pre_chat_message)) {
518 - // Rendered hidden by default — JS checkPreChatDismissal() handles show/hide via localStorage
519 - // data-nosnippet: the pre-chat teaser bubble is a sibling outside
520 - // .mxchat-chatbot-wrapper, so it needs its own marker to stay out of snippets.
521 - echo '<div id="pre-chat-message-' . esc_attr($bot_id) . '" class="pre-chat-message" data-nosnippet style="display:none;">';
522 - echo nl2br(esc_html($pre_chat_message));
461 + if (!empty($pre_chat_message) && !get_transient($transient_key)) {
462 + echo '<div id="pre-chat-message">';
463 + echo esc_html($pre_chat_message);
523 464 echo '<button class="close-pre-chat-message" aria-label="' . esc_attr__('Close', 'mxchat') . '">&times;</button>';
524 465 echo '</div>';
525 466 }
526 -
527 - $is_initially_hidden = (strpos($visibility_class, 'hidden') !== false);
528 - $aria_expanded = $is_initially_hidden ? 'false' : 'true';
529 - echo '<div class="floating-chatbot-button ' . esc_attr($visibility_class) . '" id="floating-chatbot-button-' . esc_attr($bot_id) . '" role="button" tabindex="0" aria-label="' . esc_attr__('Open chat', 'mxchat') . '" aria-expanded="' . esc_attr($aria_expanded) . '" aria-controls="floating-chatbot-' . esc_attr($bot_id) . '"' . ($skip_inline_colors ? '' : ' style="background: ' . esc_attr($chatbot_background_color) . '; color: ' . esc_attr($send_button_font_color) . ';"') . '>';
530 - echo '<div id="chat-notification-badge-' . esc_attr($bot_id) . '" class="chat-notification-badge" style="display: none; position: absolute; top: -8px; right: -8px; background-color: #ff4444; color: white; border-radius: 50%; padding: 4px 8px; font-size: 12px; font-weight: bold; z-index: 10001;">1</div>';
531 -
467 +
468 + echo '<div class="' . esc_attr($visibility_class) . '" id="floating-chatbot-button" style="background: ' . esc_attr($chatbot_background_color) . '; color: ' . esc_attr($send_button_font_color) . ';">';
469 + echo '<div id="chat-notification-badge" class="chat-notification-badge" style="display: none; position: absolute; top: -8px; right: -8px; background-color: #ff4444; color: white; border-radius: 50%; padding: 4px 8px; font-size: 12px; font-weight: bold; z-index: 10001;">1</div>';
470 +
532 471 if (!empty($custom_icon)) {
533 472 echo '<img src="' . $custom_icon . '" alt="' . esc_attr__('Chatbot Icon', 'mxchat') . '" style="height: 48px; width: 48px; object-fit: contain;" />';
534 473 } else {
535 - $widget_icon_style = 'height: 48px; width: 48px;';
536 - if (!$skip_inline_colors) {
537 - $widget_icon_style .= ' fill: ' . esc_attr($icon_color) . ';';
538 - }
539 - echo '<svg id="widget_icon_10" style="' . $widget_icon_style . '" viewBox="0 0 1120 1120" fill="none" xmlns="http://www.w3.org/2000/svg">';
474 + echo '<svg id="widget_icon_10" style="height: 48px; width: 48px; fill: ' . esc_attr($icon_color) . '" viewBox="0 0 1120 1120" fill="none" xmlns="http://www.w3.org/2000/svg">';
540 475 echo ' <path fill-rule="evenodd" clip-rule="evenodd" d="M252 434C252 372.144 302.144 322 364 322H770C831.856 322 882 372.144 882 434V614.459L804.595 585.816C802.551 585.06 800.94 583.449 800.184 581.405L763.003 480.924C760.597 474.424 751.403 474.424 748.997 480.924L711.816 581.405C711.06 583.449 709.449 585.06 707.405 585.816L606.924 622.997C600.424 625.403 600.424 634.597 606.924 637.003L707.405 674.184C709.449 674.94 711.06 676.551 711.816 678.595L740.459 756H629.927C629.648 756.476 629.337 756.945 628.993 757.404L578.197 825.082C572.597 832.543 561.403 832.543 555.803 825.082L505.007 757.404C504.663 756.945 504.352 756.476 504.073 756H364C302.144 756 252 705.856 252 644V434ZM633.501 471.462C632.299 468.212 627.701 468.212 626.499 471.462L619.252 491.046C618.874 492.068 618.068 492.874 617.046 493.252L597.462 500.499C594.212 501.701 594.212 506.299 597.462 507.501L617.046 514.748C618.068 515.126 618.874 515.932 619.252 516.954L626.499 536.538C627.701 539.788 632.299 539.788 633.501 536.538L640.748 516.954C641.126 515.932 641.932 515.126 642.954 514.748L662.538 507.501C665.788 506.299 665.788 501.701 662.538 500.499L642.954 493.252C641.932 492.874 641.126 492.068 640.748 491.046L633.501 471.462Z" ></path>';
541 476 echo ' <path d="M771.545 755.99C832.175 755.17 881.17 706.175 881.99 645.545L804.595 674.184C802.551 674.94 800.94 676.551 800.184 678.595L771.545 755.99Z" ></path>';
542 477 echo '</svg>';
543 478 }
@@ -586,9 +521,12 @@
586 521 }
587 522
588 523
589 524 private function determine_email_collection_state() {
590 - // Logged-in users skip the email form
525 + // Get session ID
526 + $session_id = 'mxchat_chat_' . wp_generate_uuid4(); // You'll need to use your actual session generation logic
527 +
528 + // Check if user is logged in first
591 529 if (is_user_logged_in()) {
592 530 $current_user = wp_get_current_user();
593 531 return [
594 532 'show_email_form' => false,
@@ -595,16 +533,26 @@
595 533 'user_email' => $current_user->user_email,
596 534 'user_name' => $current_user->display_name ?: $current_user->first_name ?: ''
597 535 ];
598 536 }
599 -
600 - // For guests, default to showing the email form.
601 - // The session-based check happens client-side via AJAX since the
602 - // session ID lives in the browser cookie/localStorage.
537 +
538 + // Check stored email for session
539 + $stored_email = get_option("mxchat_email_{$session_id}", '');
540 + $stored_name = get_option("mxchat_name_{$session_id}", '');
541 +
542 + // Check if name is required
543 + $name_field_enabled = isset($this->options['enable_name_field']) &&
544 + ($this->options['enable_name_field'] === '1' || $this->options['enable_name_field'] === 'on');
545 +
546 + $has_required_info = !empty($stored_email);
547 + if ($name_field_enabled) {
548 + $has_required_info = $has_required_info && !empty($stored_name);
549 + }
550 +
603 551 return [
604 - 'show_email_form' => true,
605 - 'user_email' => '',
606 - 'user_name' => ''
552 + 'show_email_form' => !$has_required_info,
553 + 'user_email' => $stored_email,
554 + 'user_name' => $stored_name
607 555 ];
608 556 }
609 557
610 558
@@ -611,73 +559,32 @@
611 559 /**
612 560 * NEW: Determine if and which chatbot should be displayed
613 561 */
614 562 private function get_display_bot() {
615 - // Delegates to the static so the enqueue-time gate (smart asset loading,
616 - // plan-915355) and this render-time decision share ONE code path and can
617 - // never disagree. The static reads mxchat_options fresh — same row this
618 - // instance loaded at construct.
619 - return self::compute_display_bot();
620 -}
621 -
622 -/**
623 - * Static single source of truth for the display decision (plan-915355).
624 - * Combines the per-page meta box, the append_to_body global toggle, and the
625 - * post-type include/exclude mode. Returns a bot id ('default' or specific)
626 - * when the auto-append widget will render on the current request, false when
627 - * it won't. Static (not a second instance) deliberately: MxChat_Public's
628 - * constructor registers a wp_footer action, so constructing a throwaway
629 - * instance would double-append the widget.
630 - */
631 -public static function compute_display_bot() {
632 - // The Elementor builder canvas is not a chat surface (plan 95dd1e part 2):
633 - // its preview iframe is a real front-end page load, so without this guard
634 - // the Auto-Display instance renders LIVE inside the canvas — front-end
635 - // chat scripts firing in the editor, able to start a session for the
636 - // person editing. Returning false here suppresses both the wp_footer
637 - // auto-append and the asset enqueue gate for preview requests only; the
638 - // placement widget's own canvas rendering is a static placeholder anyway.
639 - if (did_action('elementor/loaded')
640 - && class_exists('\Elementor\Plugin')
641 - && isset(\Elementor\Plugin::$instance->preview)
642 - && \Elementor\Plugin::$instance->preview
643 - && \Elementor\Plugin::$instance->preview->is_preview_mode()) {
644 - return false;
645 - }
646 -
647 - $options = get_option('mxchat_options', array());
648 - if (!is_array($options)) {
649 - $options = array();
650 - }
651 -
652 563 // Get page-specific settings from meta box
653 - $page_setting = self::get_page_bot_setting();
654 -
655 - $global_autoshow = isset($options['append_to_body']) && $options['append_to_body'] === 'on';
656 - $global_default_bot = isset($options['default_bot']) ? $options['default_bot'] : 'default';
657 -
564 + $page_setting = $this->get_page_bot_setting();
565 +
566 + // Get global settings - FIXED: Check for 'on' instead of 'on'
567 + $global_autoshow = isset($this->options['append_to_body']) && $this->options['append_to_body'] === 'on';
568 + $global_default_bot = isset($this->options['default_bot']) ? $this->options['default_bot'] : 'default';
569 +
658 570 // If page specifically hides chatbot, don't show anything
659 571 if ($page_setting && $page_setting['action'] === 'hide') {
660 572 return false;
661 573 }
662 -
574 +
663 575 // If page specifies a specific bot, use that
664 576 if ($page_setting && $page_setting['action'] === 'show') {
665 577 return $page_setting['bot_id'];
666 578 }
667 -
579 +
668 580 // Page setting is 'global' or no page setting exists
669 581 // Check global auto-show setting
670 582 if ($global_autoshow) {
671 - // Check post type visibility settings
672 - if (!self::should_show_on_current_post_type()) {
673 - return false;
674 - }
675 -
676 583 // Global auto-show is enabled, return the default bot
677 584 return $global_default_bot;
678 585 }
679 -
586 +
680 587 // Global auto-show is disabled and no page-specific bot selected
681 588 // Don't show chatbot (user should use shortcodes)
682 589 return false;
683 590 }
@@ -682,191 +589,31 @@
682 589 return false;
683 590 }
684 591
685 592 /**
686 - * Smart asset loading opt-in (plan-915355). Standalone option — deliberately
687 - * NOT a mxchat_options key, so it can never be stripped by mxchat_sanitize().
688 - * Default off: enqueue behavior is byte-identical to before until an owner
689 - * turns the toggle on.
593 + * NEW: Get page-specific bot setting
690 594 */
691 -public static function is_smart_asset_loading_enabled() {
692 - return get_option('mxchat_smart_asset_loading', 'off') === 'on';
693 -}
694 -
695 -/**
696 - * Will the chat widget render on the current request? (plan-915355)
697 - *
698 - * True when the auto-append decision resolves to a bot, OR the singular
699 - * post's content contains the [mxchat_chatbot] shortcode (first-chance
700 - * detection so shortcode pages keep head-loaded CSS — no FOUC). Computed
701 - * once per request and cached, so the wp_enqueue_scripts gate and any
702 - * add-on consulting this later in the same request always get one answer.
703 - *
704 - * Filter `mxchat_should_load_assets` is the force-load escape hatch for
705 - * headless/builder/custom-JS setups whose shortcode placement is invisible
706 - * to has_shortcode (builder-stored content, template files, widget areas).
707 - * Note the render-time safety net in render_chatbot_shortcode() still
708 - * force-loads assets whenever the shortcode actually renders — the filter
709 - * is only needed where even that net can't fire (e.g. markup assembled
710 - * outside WP rendering).
711 - */
712 -public static function should_load_assets() {
713 - static $cached = null;
714 - if ($cached !== null) {
715 - return $cached;
716 - }
717 -
718 - // Never gate admin/ajax requests — this decision is for front-end enqueues only.
719 - if (is_admin()) {
720 - $cached = true;
721 - return $cached;
722 - }
723 -
724 - $display_bot = self::compute_display_bot();
725 - $has_shortcode = false;
726 -
727 - if ($display_bot === false && is_singular()) {
728 - $post = get_post();
729 - if ($post && has_shortcode((string) $post->post_content, 'mxchat_chatbot')) {
730 - $has_shortcode = true;
731 - }
732 - // The mxchat/chatbot block (plan-95dd1e) stores a block comment, not
733 - // shortcode text, so has_shortcode can't see it — first-chance detect
734 - // it here for the same no-FOUC reason. The render-time safety net in
735 - // render_chatbot_shortcode() still covers template/widget placements.
736 - if ($post && !$has_shortcode && function_exists('has_block')
737 - && has_block('mxchat/chatbot', $post)) {
738 - $has_shortcode = true;
739 - }
740 - }
741 -
742 - $should = ($display_bot !== false) || $has_shortcode;
743 -
744 - $cached = (bool) apply_filters('mxchat_should_load_assets', $should, array(
745 - 'display_bot' => $display_bot,
746 - 'has_shortcode' => $has_shortcode,
747 - 'post_id' => get_the_ID(),
748 - ));
749 -
750 - return $cached;
751 -}
752 -
753 -/**
754 - * Check if chatbot should be shown on the current post type
755 - */
756 -private static function should_show_on_current_post_type() {
757 - $options = get_option('mxchat_options', array());
758 - if (!is_array($options)) {
759 - $options = array();
760 - }
761 - // Get visibility settings
762 - $mode = isset($options['post_type_visibility_mode']) ? $options['post_type_visibility_mode'] : 'all';
763 - $list = isset($options['post_type_visibility_list']) ? $options['post_type_visibility_list'] : array();
764 -
765 - // Ensure list is an array
766 - if (!is_array($list)) {
767 - $list = array();
768 - }
769 -
770 - // If mode is 'all', show on all post types
771 - if ($mode === 'all') {
772 - return true;
773 - }
774 -
775 - // Get current post type
776 - $current_post_type = self::get_current_post_type();
777 -
778 - // If we can't determine post type, default to showing
779 - if (empty($current_post_type)) {
780 - return true;
781 - }
782 -
783 - // Check based on mode
784 - if ($mode === 'include') {
785 - // Only show on selected post types
786 - return in_array($current_post_type, $list);
787 - } elseif ($mode === 'exclude') {
788 - // Hide on selected post types
789 - return !in_array($current_post_type, $list);
790 - }
791 -
792 - // Default to showing
793 - return true;
794 -}
795 -
796 -/**
797 - * Get the current post type
798 - */
799 -private static function get_current_post_type() {
800 - // Try to get from queried object first
801 - $queried_object = get_queried_object();
802 -
803 - if ($queried_object instanceof WP_Post) {
804 - return $queried_object->post_type;
805 - }
806 -
807 - // Try get_post_type()
808 - $post_type = get_post_type();
809 - if ($post_type) {
810 - return $post_type;
811 - }
812 -
813 - // Check if we're on an archive
814 - if (is_post_type_archive()) {
815 - return get_query_var('post_type');
816 - }
817 -
818 - // Check common archive types
819 - if (is_home() || is_single()) {
820 - return 'post';
821 - }
822 -
823 - if (is_page()) {
824 - return 'page';
825 - }
826 -
827 - return '';
828 -}
829 -
830 -/**
831 - * Get page-specific bot setting using new visibility field with backward compat
832 - */
833 -private static function get_page_bot_setting($post_id = null) {
595 +private function get_page_bot_setting($post_id = null) {
834 596 if (!$post_id) {
835 597 $post_id = get_the_ID();
836 598 }
837 -
599 +
838 600 if (!$post_id) {
839 601 return null;
840 602 }
841 -
842 - // Check new visibility field first
843 - $visibility = get_post_meta($post_id, '_mxchat_page_visibility', true);
844 -
845 - if ($visibility === 'hide') {
603 +
604 + // Check if chatbot is hidden on this page
605 + $hide_chatbot = get_post_meta($post_id, '_mxchat_hide_chatbot', true);
606 + if ($hide_chatbot === '1') {
846 607 return array('action' => 'hide');
847 608 }
848 -
849 - if ($visibility === 'show') {
850 - $selected_bot = get_post_meta($post_id, '_mxchat_selected_bot', true);
851 - $bot_id = !empty($selected_bot) ? $selected_bot : 'default';
852 - return array('action' => 'show', 'bot_id' => $bot_id);
853 - }
854 -
855 - // Backward compat: check legacy hide checkbox if no new field set
856 - if (empty($visibility)) {
857 - $hide_chatbot = get_post_meta($post_id, '_mxchat_hide_chatbot', true);
858 - if ($hide_chatbot === '1') {
859 - return array('action' => 'hide');
860 - }
861 - }
862 -
863 - // Check if specific bot is selected (legacy path)
609 +
610 + // Check if specific bot is selected
864 611 $selected_bot = get_post_meta($post_id, '_mxchat_selected_bot', true);
865 612 if (!empty($selected_bot)) {
866 613 return array('action' => 'show', 'bot_id' => $selected_bot);
867 614 }
868 -
615 +
869 616 // Use global setting
870 617 return array('action' => 'global');
871 618 }
872 619
@@ -879,9 +626,9 @@
879 626 return $shortcode_bot_id;
880 627 }
881 628
882 629 // No bot_id in shortcode, check page setting
883 - $page_setting = self::get_page_bot_setting();
630 + $page_setting = $this->get_page_bot_setting();
884 631 if ($page_setting && $page_setting['action'] === 'show') {
885 632 return $page_setting['bot_id'];
886 633 }
887 634
@@ -898,8 +645,27 @@
898 645
899 646 /**
900 647 * UPDATED: Debug function with new context info
901 648 */
649 +public function debug_display_logic() {
650 + if (current_user_can('manage_options') && isset($_GET['mxchat_debug'])) {
651 + $bot_to_show = $this->get_display_bot();
652 + $page_setting = $this->get_page_bot_setting();
653 + $global_autoshow = isset($this->options['append_to_body']) && $this->options['append_to_body'] === 'on';
654 + $hide_auto = $this->should_hide_chatbot('auto');
655 +
656 + echo '<div style="position: fixed; top: 50px; right: 20px; background: white; border: 2px solid red; padding: 10px; z-index: 9999; max-width: 300px; font-size: 12px;">';
657 + echo '<h4 style="margin: 0 0 10px 0;">MxChat Debug Info</h4>';
658 + echo '<p><strong>Raw append_to_body value:</strong> "' . ($this->options['append_to_body'] ?? 'NOT SET') . '"</p>';
659 + echo '<p><strong>Page Setting:</strong><br><pre>' . print_r($page_setting, true) . '</pre></p>';
660 + echo '<p><strong>Global Auto-show:</strong> ' . ($global_autoshow ? 'ON' : 'OFF') . '</p>';
661 + echo '<p><strong>Hide Auto-Append:</strong> ' . ($hide_auto ? 'YES' : 'NO') . '</p>';
662 + echo '<p><strong>Bot to Show:</strong> ' . ($bot_to_show === false ? 'NONE' : $bot_to_show) . '</p>';
663 + echo '<p><strong>Shortcodes:</strong> floating="no" always works</p>';
664 + echo '<p><small>Add ?mxchat_debug=1 to URL to see this</small></p>';
665 + echo '</div>';
666 + }
667 +}
902 668
903 669 /**
904 670 * NEW: Helper method to get available bots (for admin notices, etc.)
905 671 */