| @@ -46,9 +46,23 @@ | ||
| 46 | 46 | // Accordion / Section helpers |
| 47 | 47 | // ──────────────────────────────────────────────────────────────── |
| 48 | 48 | |
| 49 | 49 | public function get_accordion_sections_config() { |
| 50 | - return array( | |
| 50 | + // Consent switch for writing into other SEO plugins. Loaded here rather | |
| 51 | + // than through the committed classmap so a stale autoload map can never | |
| 52 | + // make the switch — and with it the user's only way to stop those | |
| 53 | + // writes — silently disappear from the page. | |
| 54 | + require_once plugin_dir_path(dirname(__FILE__)) . 'admin/class-metasync-seo-sync-settings.php'; | |
| 55 | + | |
| 56 | + $sections = array( | |
| 57 | + 'analytics' => array( | |
| 58 | + 'title' => 'Usage Data & Product Improvement', | |
| 59 | + 'description' => 'Choose whether to share limited usage data to help improve MetaSync', | |
| 60 | + 'icon' => 'chart-bar', | |
| 61 | + 'priority' => 70, | |
| 62 | + 'default_open' => false, | |
| 63 | + 'render_callback' => array($this, 'render_analytics_section'), | |
| 64 | + ), | |
| 51 | 65 | 'connection' => array( |
| 52 | 66 | 'title' => 'Connection & Authentication', |
| 53 | 67 | 'description' => 'Manage your API connection and authentication settings', |
| 54 | 68 | 'icon' => 'admin-network', |
| @@ -68,9 +82,9 @@ | ||
| 68 | 82 | 'fields' => array( |
| 69 | 83 | 'otto_pixel_uuid', |
| 70 | 84 | 'otto_disable_on_loggedin', |
| 71 | 85 | 'otto_disable_preview_button', |
| 72 | - 'otto_wp_rocket_compat', | |
| 86 | + 'seo_priority', | |
| 73 | 87 | ) |
| 74 | 88 | ), |
| 75 | 89 | 'edge_cache' => array( |
| 76 | 90 | 'title' => 'Edge Cache / CDN', |
| @@ -79,8 +93,16 @@ | ||
| 79 | 93 | 'priority' => 22, |
| 80 | 94 | 'default_open' => false, |
| 81 | 95 | 'render_callback' => array('Metasync_Edge_Cache_Settings', 'render'), |
| 82 | 96 | ), |
| 97 | + 'seo_plugin_sync' => array( | |
| 98 | + 'title' => 'Sync to Other SEO Plugins', | |
| 99 | + 'description' => 'Control whether ' . Metasync::get_whitelabel_otto_name() . '\'s SEO values are written into Yoast, Rank Math or All in One SEO', | |
| 100 | + 'icon' => 'update', | |
| 101 | + 'priority' => 23, | |
| 102 | + 'default_open' => false, | |
| 103 | + 'render_callback' => array('Metasync_Seo_Sync_Settings', 'render'), | |
| 104 | + ), | |
| 83 | 105 | 'bot_detection' => array( |
| 84 | 106 | 'title' => 'Bot Detection & Filtering', |
| 85 | 107 | 'description' => 'Manage bot traffic and reduce unnecessary API calls', |
| 86 | 108 | 'icon' => 'filter', |
| @@ -92,16 +114,8 @@ | ||
| 92 | 114 | 'otto_bot_blacklist', |
| 93 | 115 | 'otto_bot_statistics_link' |
| 94 | 116 | ) |
| 95 | 117 | ), |
| 96 | - 'breadcrumbs' => array( | |
| 97 | - 'title' => 'Breadcrumbs', | |
| 98 | - 'description' => 'Configure breadcrumb navigation display', | |
| 99 | - 'icon' => 'format-links', | |
| 100 | - 'priority' => 35, | |
| 101 | - 'default_open' => false, | |
| 102 | - 'render_callback' => array($this, 'render_breadcrumbs_section') | |
| 103 | - ), | |
| 104 | 118 | 'open_graph' => array( |
| 105 | 119 | 'title' => 'Open Graph', |
| 106 | 120 | 'description' => 'Control which Open Graph and article meta tags are output', |
| 107 | 121 | 'icon' => 'share', |
| @@ -128,8 +142,10 @@ | ||
| 128 | 142 | 'disable_redirection_metabox', |
| 129 | 143 | 'disable_canonical_metabox', |
| 130 | 144 | 'disable_social_opengraph_metabox', |
| 131 | 145 | 'disable_schema_markup_metabox', |
| 146 | + 'disable_language_alternates_metabox', | |
| 147 | + 'disable_seo_metabox', | |
| 132 | 148 | 'open_external_links' |
| 133 | 149 | ) |
| 134 | 150 | ), |
| 135 | 151 | 'user_management' => array( |
| @@ -169,13 +185,22 @@ | ||
| 169 | 185 | 'fields' => array( |
| 170 | 186 | 'permalink_structure', |
| 171 | 187 | 'hide_dashboard_framework', |
| 172 | 188 | 'show_admin_bar_status', |
| 173 | - 'enable_auto_updates', | |
| 174 | 189 | 'import_external_data' |
| 175 | 190 | ) |
| 176 | 191 | ) |
| 177 | 192 | ); |
| 193 | + | |
| 194 | + // Hidden only when there is nothing to say: no SEO plugin installed, the | |
| 195 | + // switch off, and no saved originals. It is never hidden by the | |
| 196 | + // access-control or whitelabel flags that can conceal Advanced Settings | |
| 197 | + // — a switch that rewrites another plugin's data must stay reachable. | |
| 198 | + if (!Metasync_Seo_Sync_Settings::should_display()) { | |
| 199 | + unset($sections['seo_plugin_sync']); | |
| 200 | + } | |
| 201 | + | |
| 202 | + return $sections; | |
| 178 | 203 | } |
| 179 | 204 | |
| 180 | 205 | public function get_advanced_accordion_config() { |
| 181 | 206 | $config = array(); |
| @@ -200,8 +225,17 @@ | ||
| 200 | 225 | 'default_open' => false, |
| 201 | 226 | 'render_callback' => array($this->admin_instance, 'render_debug_mode_section') |
| 202 | 227 | ); |
| 203 | 228 | |
| 229 | + $config['headless_mode'] = array( | |
| 230 | + 'title' => 'Headless Mode', | |
| 231 | + 'description' => 'Connect WordPress content to a separate public frontend', | |
| 232 | + 'icon' => 'admin-site-alt3', | |
| 233 | + 'priority' => 29, | |
| 234 | + 'default_open' => false, | |
| 235 | + 'render_callback' => array(Metasync_Settings_Registration::instance(), 'render_headless_mode_section') | |
| 236 | + ); | |
| 237 | + | |
| 204 | 238 | $config['error_logs'] = array( |
| 205 | 239 | 'title' => 'Error Logs', |
| 206 | 240 | 'description' => 'View and manage error logs to troubleshoot issues', |
| 207 | 241 | 'icon' => 'warning', |
| @@ -274,9 +308,9 @@ | ||
| 274 | 308 | $content_state = $is_open ? 'open' : 'closed'; |
| 275 | 309 | |
| 276 | 310 | echo '<div class="metasync-accordion-section" data-section="' . esc_attr($section_key) . '">'; |
| 277 | 311 | |
| 278 | - echo '<div class="metasync-accordion-header" role="button" tabindex="0" aria-expanded="' . $aria_expanded . '" aria-controls="' . $section_id . '">'; | |
| 312 | + echo '<div class="metasync-accordion-header" role="button" tabindex="0" aria-expanded="' . esc_attr($aria_expanded) . '" aria-controls="' . esc_attr($section_id) . '">'; | |
| 279 | 313 | echo '<div class="metasync-accordion-title">'; |
| 280 | 314 | echo '<span class="metasync-accordion-icon"><span class="dashicons dashicons-' . esc_attr($section_data['icon']) . '"></span></span>'; |
| 281 | 315 | echo '<div class="metasync-accordion-text">'; |
| 282 | 316 | echo '<h3>' . esc_html($section_data['title']) . '</h3>'; |
| @@ -287,9 +321,9 @@ | ||
| 287 | 321 | echo '<span class="toggle-icon">▼</span>'; |
| 288 | 322 | echo '</button>'; |
| 289 | 323 | echo '</div>'; |
| 290 | 324 | |
| 291 | - echo '<div class="metasync-accordion-content" id="' . $section_id . '" data-state="' . $content_state . '">'; | |
| 325 | + echo '<div class="metasync-accordion-content" id="' . esc_attr($section_id) . '" data-state="' . esc_attr($content_state) . '">'; | |
| 292 | 326 | |
| 293 | 327 | if (isset($section_data['render_callback']) && is_callable($section_data['render_callback'])) { |
| 294 | 328 | call_user_func($section_data['render_callback']); |
| 295 | 329 | } |
| @@ -311,14 +345,15 @@ | ||
| 311 | 345 | </h4> |
| 312 | 346 | <p style="color: var(--dashboard-text-secondary); margin: 0 0 12px 0;">This action will permanently delete:</p> |
| 313 | 347 | <ul style="color: var(--dashboard-text-secondary); margin: 0 0 12px 20px; line-height: 1.8;"> |
| 314 | 348 | <li>All API keys and authentication tokens</li> |
| 315 | - <li>White label branding settings</li> | |
| 316 | 349 | <li>Plugin configuration and preferences</li> |
| 317 | 350 | <li>Instant indexing settings</li> |
| 351 | + <li>Media optimization settings and cache</li> | |
| 352 | + <li>Code minification settings</li> | |
| 318 | 353 | <li>All cached data and crawl information</li> |
| 319 | 354 | </ul> |
| 320 | - <p style="color: var(--dashboard-warning, #f59e0b); margin: 0; font-weight: 600;">You will need to reconfigure the plugin completely after this reset.</p> | |
| 355 | + <p style="color: var(--dashboard-warning, #f59e0b); margin: 0; font-weight: 600;">You will need to reconfigure the plugin's operational settings after this reset.</p> | |
| 321 | 356 | </div> |
| 322 | 357 | <form method="post" action="" onsubmit="return confirmClearSettings(event)"> |
| 323 | 358 | <?php wp_nonce_field('metasync_clear_all_settings_nonce', 'clear_all_settings_nonce'); ?> |
| 324 | 359 | <input type="hidden" name="clear_all_settings" value="yes" /> |
| @@ -326,8 +361,31 @@ | ||
| 326 | 361 | <span class="dashicons dashicons-trash" style="margin-top:3px;font-size:15px;width:15px;height:15px;"></span> Clear All Settings |
| 327 | 362 | </button> |
| 328 | 363 | </form> |
| 329 | 364 | </div> |
| 365 | + <div style="background: var(--dashboard-card-bg); padding: 20px; border-radius: 8px; margin-top: 20px;"> | |
| 366 | + <h4 style="color: var(--dashboard-text-primary, #1e1e1e); margin: 0 0 12px 0; display: flex; align-items: center; gap: 8px;"> | |
| 367 | + <span class="dashicons dashicons-universal-access-alt" style="font-size:18px;width:18px;height:18px;"></span> | |
| 368 | + <span>Delete data on uninstall</span> | |
| 369 | + </h4> | |
| 370 | + <p style="color: var(--dashboard-text-secondary); margin: 0 0 12px 0;"> | |
| 371 | + By default, deleting the plugin keeps your data: sitemap and redirection settings, per-post SEO values, and the plugin's database tables stay in place in case you reinstall. Enable this to also remove all of that when the plugin itself is deleted from the Plugins screen. | |
| 372 | + </p> | |
| 373 | + <p style="color: var(--dashboard-text-secondary); margin: 0 0 12px 0;"> | |
| 374 | + The Google service account and the IndexNow API key are always deleted on uninstall, regardless of this setting. | |
| 375 | + </p> | |
| 376 | + <form method="post" action=""> | |
| 377 | + <?php wp_nonce_field('metasync_uninstall_data_toggle_nonce', 'uninstall_data_toggle_nonce'); ?> | |
| 378 | + <input type="hidden" name="metasync_uninstall_data_toggle_form" value="1" /> | |
| 379 | + <label style="color: var(--dashboard-text-primary, #1e1e1e); display: flex; align-items: center; gap: 8px; margin: 0 0 12px 0; cursor: pointer;"> | |
| 380 | + <input type="checkbox" name="metasync_delete_data_on_uninstall" value="yes" <?php checked(get_option('metasync_delete_data_on_uninstall', 'no'), 'yes'); ?> /> | |
| 381 | + Delete all plugin data (tables, settings, per-post SEO values, logs) when the plugin is uninstalled | |
| 382 | + </label> | |
| 383 | + <button type="submit" class="button button-secondary"> | |
| 384 | + Save Uninstall Setting | |
| 385 | + </button> | |
| 386 | + </form> | |
| 387 | + </div> | |
| 330 | 388 | <script> |
| 331 | 389 | function confirmClearSettings(event) { |
| 332 | 390 | event.preventDefault(); |
| 333 | 391 | |
| @@ -335,9 +393,9 @@ | ||
| 335 | 393 | if (!firstConfirm) { |
| 336 | 394 | return false; |
| 337 | 395 | } |
| 338 | 396 | |
| 339 | - var secondConfirm = confirm("🚨 FINAL WARNING 🚨\n\nThis will delete:\n• All API keys and authentication tokens\n• White label branding settings\n• Plugin configuration and preferences\n• Instant indexing settings\n• All cached data\n\nYou will need to reconfigure the entire plugin from scratch.\n\nType 'DELETE' in the next prompt to confirm."); | |
| 397 | + var secondConfirm = confirm("🚨 FINAL WARNING 🚨\n\nThis will delete:\n• All API keys and authentication tokens\n• Plugin configuration and preferences\n• Instant indexing settings\n• Media optimization settings and cache\n• Code minification settings\n• All cached data\n\nYou will need to reconfigure the plugin's operational settings from scratch.\n\nType 'DELETE' in the next prompt to confirm."); | |
| 340 | 398 | if (!secondConfirm) { |
| 341 | 399 | return false; |
| 342 | 400 | } |
| 343 | 401 | |
| @@ -358,14 +416,18 @@ | ||
| 358 | 416 | if (!function_exists('google_index_direct')) { |
| 359 | 417 | if (file_exists(plugin_dir_path(dirname(__FILE__)) . 'google-index/google-index-init.php')) { |
| 360 | 418 | require_once plugin_dir_path(dirname(__FILE__)) . 'google-index/google-index-init.php'; |
| 361 | 419 | } else { |
| 362 | - error_log('MetaSync Google Index: google-index-init.php not found at ' . plugin_dir_path(dirname(__FILE__)) . 'google-index/google-index-init.php'); | |
| 420 | + error_log('MetaSync Google Index: google-index-init.php not found at ' . plugin_dir_path(dirname(__FILE__)) . 'google-index/google-index-init.php'); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log -- genuine failure path, bounded, no secrets | |
| 363 | 421 | return; |
| 364 | 422 | } |
| 365 | 423 | } |
| 366 | 424 | |
| 367 | 425 | $google_index = google_index_direct(); |
| 426 | + if (!$google_index) { | |
| 427 | + // Nothing to render against, and calling through would be fatal. | |
| 428 | + return; | |
| 429 | + } | |
| 368 | 430 | $service_info = $google_index->get_service_account_info(); |
| 369 | 431 | $is_configured = !isset($service_info['error']); |
| 370 | 432 | |
| 371 | 433 | $saved_json_display = $is_configured ? $google_index->get_redacted_config_json() : ''; |
| @@ -442,8 +504,9 @@ | ||
| 442 | 504 | <table class="form-table" style="margin-top: 0;"> |
| 443 | 505 | <tr> |
| 444 | 506 | <th scope="row" style="width: 200px; padding-top: 15px;"> |
| 445 | 507 | <label for="metasync_bing_api_key_inline">IndexNow API Key <span style="color: #d63638;">*</span></label> |
| 508 | + <?php Metasync::render_tooltip_icon('metasync_bing_api_key_inline', 'This key lets Bing trust indexing requests from your site. Click \'Generate Random API Key\' if you don\'t have one — the plugin publishes the matching verification file automatically, no manual upload needed.'); ?> | |
| 446 | 509 | </th> |
| 447 | 510 | <td style="padding-top: 15px;"> |
| 448 | 511 | <input type="text" |
| 449 | 512 | name="metasync_bing_api_key_inline" |
| @@ -643,9 +706,9 @@ | ||
| 643 | 706 | <p style="color: var(--dashboard-text-secondary); margin: 0 0 20px 0;"> |
| 644 | 707 | Select which user roles can see and access this plugin's menu, settings, and options in the WordPress admin area. |
| 645 | 708 | </p> |
| 646 | 709 | |
| 647 | - <form method="post" action="<?php echo admin_url('admin.php?page=' . Metasync_Admin::$page_slug . '&tab=advanced'); ?>" id="plugin-access-roles-form"> | |
| 710 | + <form method="post" action="<?php echo esc_url(admin_url('admin.php?page=' . Metasync_Admin::$page_slug . '&tab=advanced')); ?>" id="plugin-access-roles-form"> | |
| 648 | 711 | <?php wp_nonce_field('metasync_plugin_access_roles_nonce', 'plugin_access_roles_nonce'); ?> |
| 649 | 712 | <input type="hidden" name="save_plugin_access_roles" value="yes" /> |
| 650 | 713 | |
| 651 | 714 | <div class="metasync-role-selector-container" style="background: var(--dashboard-card-bg-alt, rgba(255,255,255,0.05)); border: 1px solid var(--dashboard-border); border-radius: 8px; padding: 16px; max-height: 300px; overflow-y: auto;"> |
| @@ -737,8 +800,9 @@ | ||
| 737 | 800 | 'max_memory_limit' => 256, |
| 738 | 801 | 'log_batch_size' => 1000, |
| 739 | 802 | 'action_scheduler_batches' => 1, |
| 740 | 803 | 'otto_rate_limit' => 10, |
| 804 | + 'otto_cache_ttl' => 30, | |
| 741 | 805 | 'queue_cleanup_days' => 31 |
| 742 | 806 | ); |
| 743 | 807 | } |
| 744 | 808 | |
| @@ -762,9 +826,9 @@ | ||
| 762 | 826 | |
| 763 | 827 | public function can_change_memory_limit() { |
| 764 | 828 | $current_limit = ini_get('memory_limit'); |
| 765 | 829 | |
| 766 | - $test_result = @ini_set('memory_limit', $current_limit); | |
| 830 | + $test_result = @ini_set('memory_limit', $current_limit); // phpcs:ignore Squiz.PHP.DiscouragedFunctions.Discouraged -- runtime PHP setting with no WordPress API | |
| 767 | 831 | |
| 768 | 832 | return $test_result !== false; |
| 769 | 833 | } |
| 770 | 834 | |
| @@ -770,37 +834,47 @@ | ||
| 770 | 834 | |
| 771 | 835 | public function get_server_limits() { |
| 772 | 836 | $max_execution_time = ini_get('max_execution_time'); |
| 773 | 837 | $memory_limit = ini_get('memory_limit'); |
| 774 | - | |
| 838 | + | |
| 839 | + // Prefer the server-configured value: WordPress (wp_raise_memory_limit) | |
| 840 | + // or this plugin (apply_memory_limit) may have already changed the | |
| 841 | + // runtime limit via ini_set, so ini_get no longer reflects the server | |
| 842 | + // configuration. get_cfg_var reads the php.ini value untouched. | |
| 843 | + $config_memory_limit = get_cfg_var('memory_limit'); | |
| 844 | + if ($config_memory_limit !== false && $config_memory_limit !== '') { | |
| 845 | + $memory_limit = $config_memory_limit; | |
| 846 | + } | |
| 847 | + | |
| 775 | 848 | $memory_limit_mb = $this->parse_memory_limit_to_mb($memory_limit); |
| 776 | - | |
| 777 | - $wp_memory_limit = null; | |
| 778 | - if (defined('WP_MAX_MEMORY_LIMIT')) { | |
| 779 | - $wp_memory_limit = WP_MAX_MEMORY_LIMIT; | |
| 780 | - } elseif (defined('WP_MEMORY_LIMIT')) { | |
| 781 | - $wp_memory_limit = WP_MEMORY_LIMIT; | |
| 782 | - } | |
| 783 | - $wp_memory_limit_mb = $wp_memory_limit ? $this->parse_memory_limit_to_mb($wp_memory_limit) : null; | |
| 784 | - | |
| 785 | - $actual_php_limit_mb = $memory_limit_mb; | |
| 786 | - if ($wp_memory_limit_mb && $wp_memory_limit_mb >= 256) { | |
| 787 | - $actual_php_limit_mb = 128; | |
| 788 | - } | |
| 789 | - | |
| 849 | + | |
| 790 | 850 | $can_change_memory = $this->can_change_memory_limit(); |
| 791 | - | |
| 792 | - $memory_limit_display = $actual_php_limit_mb == -1 ? 'Unlimited' : $actual_php_limit_mb . ' MB'; | |
| 793 | - | |
| 851 | + | |
| 852 | + $memory_limit_display = $memory_limit_mb == -1 ? 'Unlimited' : $memory_limit_mb . ' MB'; | |
| 853 | + | |
| 794 | 854 | return array( |
| 795 | 855 | 'max_execution_time' => $max_execution_time == -1 ? 'Unlimited' : $max_execution_time . ' seconds', |
| 796 | 856 | 'memory_limit' => $memory_limit_display, |
| 797 | 857 | 'max_execution_time_raw' => $max_execution_time, |
| 798 | - 'memory_limit_raw' => $actual_php_limit_mb, | |
| 858 | + 'memory_limit_raw' => $memory_limit_mb, | |
| 799 | 859 | 'can_change_memory' => $can_change_memory |
| 800 | 860 | ); |
| 801 | 861 | } |
| 802 | 862 | |
| 863 | + /** | |
| 864 | + * Allowed range for the Max Memory Limit setting: 64 MB up to the | |
| 865 | + * server-configured memory limit (null max when the server is unlimited). | |
| 866 | + */ | |
| 867 | + public function get_memory_limit_allowed_range() { | |
| 868 | + $server_limits = $this->get_server_limits(); | |
| 869 | + $max = $server_limits['memory_limit_raw'] == -1 ? null : max(64, (int) $server_limits['memory_limit_raw']); | |
| 870 | + | |
| 871 | + return array( | |
| 872 | + 'min' => 64, | |
| 873 | + 'max' => $max | |
| 874 | + ); | |
| 875 | + } | |
| 876 | + | |
| 803 | 877 | public function apply_memory_limit() { |
| 804 | 878 | if (!$this->can_change_memory_limit()) { |
| 805 | 879 | return false; |
| 806 | 880 | } |
| @@ -806,9 +880,9 @@ | ||
| 806 | 880 | } |
| 807 | 881 | |
| 808 | 882 | $memory_limit_mb = $this->get_execution_setting('max_memory_limit'); |
| 809 | 883 | |
| 810 | - $result = @ini_set('memory_limit', $memory_limit_mb . 'M'); | |
| 884 | + $result = @ini_set('memory_limit', $memory_limit_mb . 'M'); // phpcs:ignore Squiz.PHP.DiscouragedFunctions.Discouraged -- runtime PHP setting with no WordPress API | |
| 811 | 885 | |
| 812 | 886 | return $result !== false; |
| 813 | 887 | } |
| 814 | 888 | |
| @@ -837,11 +911,12 @@ | ||
| 837 | 911 | |
| 838 | 912 | public function render_execution_settings_section() { |
| 839 | 913 | $settings = $this->get_all_execution_settings(); |
| 840 | 914 | $server_limits = $this->get_server_limits(); |
| 915 | + $memory_range = $this->get_memory_limit_allowed_range(); | |
| 841 | 916 | |
| 842 | 917 | $warnings = array(); |
| 843 | - if ($server_limits['max_execution_time_raw'] != -1 && $settings['max_execution_time'] > $server_limits['max_execution_time_raw']) { | |
| 918 | + if ((int)$server_limits['max_execution_time_raw'] !== -1 && (int)$settings['max_execution_time'] > (int)$server_limits['max_execution_time_raw']) { | |
| 844 | 919 | $warnings['max_execution_time'] = true; |
| 845 | 920 | } |
| 846 | 921 | if ($server_limits['memory_limit_raw'] != -1 && $settings['max_memory_limit'] > $server_limits['memory_limit_raw']) { |
| 847 | 922 | $warnings['max_memory_limit'] = true; |
| @@ -857,16 +932,18 @@ | ||
| 857 | 932 | |
| 858 | 933 | <!-- Execution & Memory Section --> |
| 859 | 934 | <div style="background: var(--dashboard-card-bg-alt, rgba(255,255,255,0.05)); border: 1px solid var(--dashboard-border); border-radius: 8px; padding: 20px; margin-bottom: 20px;"> |
| 860 | 935 | <h3 style="color: var(--dashboard-text-primary); margin: 0 0 16px 0; font-size: 16px; font-weight: 600;">Execution & Memory</h3> |
| 861 | - | |
| 862 | - <div style="margin-bottom: 20px;"> | |
| 936 | + | |
| 937 | + <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 24px;"> | |
| 938 | + <div> | |
| 863 | 939 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 864 | 940 | Max Execution Time: |
| 941 | + <?php Metasync::render_tooltip_icon('max_execution_time', 'How many seconds a single plugin operation (like a bulk sync or scan) is allowed to run before PHP stops it. Raise this only if you see timeout errors, and only up to what your host allows.'); ?> | |
| 865 | 942 | </label> |
| 866 | 943 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 867 | - <input type="number" | |
| 868 | - id="max_execution_time" | |
| 944 | + <input type="number" | |
| 945 | + id="max_execution_time" | |
| 869 | 946 | name="max_execution_time" |
| 870 | 947 | value="<?php echo esc_attr($settings['max_execution_time']); ?>" |
| 871 | 948 | min="1" |
| 872 | 949 | max="300" |
| @@ -892,16 +969,17 @@ | ||
| 892 | 969 | |
| 893 | 970 | <div> |
| 894 | 971 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 895 | 972 | Max Memory Limit: |
| 973 | + <?php Metasync::render_tooltip_icon('max_memory_limit', 'How much memory (RAM) the plugin is allowed to use for a single operation before PHP stops it. Raise this only if you see "out of memory" errors, and only up to what your host allows.'); ?> | |
| 896 | 974 | </label> |
| 897 | 975 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 898 | - <input type="number" | |
| 899 | - id="max_memory_limit" | |
| 976 | + <input type="number" | |
| 977 | + id="max_memory_limit" | |
| 900 | 978 | name="max_memory_limit" |
| 901 | 979 | value="<?php echo esc_attr($settings['max_memory_limit']); ?>" |
| 902 | - min="64" | |
| 903 | - max="512" | |
| 980 | + min="<?php echo esc_attr($memory_range['min']); ?>" | |
| 981 | + <?php if ($memory_range['max'] !== null): ?>max="<?php echo esc_attr($memory_range['max']); ?>"<?php endif; ?> | |
| 904 | 982 | <?php if (!$server_limits['can_change_memory']): ?> |
| 905 | 983 | readonly |
| 906 | 984 | disabled |
| 907 | 985 | <?php endif; ?> |
| @@ -909,9 +987,9 @@ | ||
| 909 | 987 | style="width: 100px; padding: 8px; border: 1px solid var(--dashboard-border); border-radius: 6px; background: <?php echo $server_limits['can_change_memory'] ? 'var(--dashboard-card-bg)' : 'rgba(128, 128, 128, 0.1)'; ?>; color: <?php echo $server_limits['can_change_memory'] ? 'var(--dashboard-text-primary)' : 'var(--dashboard-text-secondary)'; ?>; cursor: <?php echo $server_limits['can_change_memory'] ? 'text' : 'not-allowed'; ?>;" /> |
| 910 | 988 | <span style="color: var(--dashboard-text-secondary);">MB</span> |
| 911 | 989 | </div> |
| 912 | 990 | <p style="color: var(--dashboard-text-secondary); font-size: 12px; margin: 4px 0 0 0;"> |
| 913 | - Server Limit: <?php echo esc_html($server_limits['memory_limit']); ?> | |
| 991 | + Server Limit: <?php echo esc_html($server_limits['memory_limit']); ?> · Allowed: <?php echo $memory_range['max'] !== null ? esc_html($memory_range['min'] . '–' . $memory_range['max'] . ' MB') : esc_html($memory_range['min'] . ' MB or higher'); ?> | |
| 914 | 992 | </p> |
| 915 | 993 | <?php if (!$server_limits['can_change_memory']): ?> |
| 916 | 994 | <p style="color: #f59e0b; font-size: 12px; margin: 4px 0 0 0; display: flex; align-items: center; gap: 4px;"> |
| 917 | 995 | <span class="dashicons dashicons-lock" style="font-size:14px;width:14px;height:14px;color:#f59e0b;"></span> |
| @@ -930,21 +1008,24 @@ | ||
| 930 | 1008 | </script> |
| 931 | 1009 | <?php endif; ?> |
| 932 | 1010 | <?php endif; ?> |
| 933 | 1011 | </div> |
| 1012 | + </div> | |
| 934 | 1013 | </div> |
| 935 | - | |
| 1014 | + | |
| 936 | 1015 | <!-- Batch Processing Section --> |
| 937 | 1016 | <div style="background: var(--dashboard-card-bg-alt, rgba(255,255,255,0.05)); border: 1px solid var(--dashboard-border); border-radius: 8px; padding: 20px; margin-bottom: 20px;"> |
| 938 | 1017 | <h3 style="color: var(--dashboard-text-primary); margin: 0 0 16px 0; font-size: 16px; font-weight: 600;">Batch Processing</h3> |
| 939 | - | |
| 940 | - <div style="margin-bottom: 20px;"> | |
| 1018 | + | |
| 1019 | + <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 24px;"> | |
| 1020 | + <div> | |
| 941 | 1021 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 942 | 1022 | Log Processing Batch Size: |
| 1023 | + <?php Metasync::render_tooltip_icon('log_batch_size', 'How many log lines the plugin processes at once when scanning its own logs. Lower it if this causes slowdowns on smaller hosting plans; most sites can leave the default.'); ?> | |
| 943 | 1024 | </label> |
| 944 | 1025 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 945 | - <input type="number" | |
| 946 | - id="log_batch_size" | |
| 1026 | + <input type="number" | |
| 1027 | + id="log_batch_size" | |
| 947 | 1028 | name="log_batch_size" |
| 948 | 1029 | value="<?php echo esc_attr($settings['log_batch_size']); ?>" |
| 949 | 1030 | min="100" |
| 950 | 1031 | max="5000" |
| @@ -956,8 +1037,9 @@ | ||
| 956 | 1037 | |
| 957 | 1038 | <div> |
| 958 | 1039 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 959 | 1040 | Action Scheduler Concurrent Batches: |
| 1041 | + <?php Metasync::render_tooltip_icon('action_scheduler_batches', 'How many background sync jobs the plugin is allowed to run at the same time. Higher values finish syncing faster but use more server resources at once — lower this if your site slows down during syncs.'); ?> | |
| 960 | 1042 | </label> |
| 961 | 1043 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 962 | 1044 | <input type="number" |
| 963 | 1045 | id="action_scheduler_batches" |
| @@ -972,17 +1054,20 @@ | ||
| 972 | 1054 | <span class="dashicons dashicons-warning" style="font-size:14px;width:14px;height:14px;color:#f59e0b;"></span> |
| 973 | 1055 | <span>Higher values increase server load</span> |
| 974 | 1056 | </p> |
| 975 | 1057 | </div> |
| 1058 | + </div> | |
| 976 | 1059 | </div> |
| 977 | - | |
| 1060 | + | |
| 978 | 1061 | <!-- API Rate Limiting Section --> |
| 979 | 1062 | <div style="background: var(--dashboard-card-bg-alt, rgba(255,255,255,0.05)); border: 1px solid var(--dashboard-border); border-radius: 8px; padding: 20px; margin-bottom: 20px;"> |
| 980 | 1063 | <h3 style="color: var(--dashboard-text-primary); margin: 0 0 16px 0; font-size: 16px; font-weight: 600;">API Rate Limiting</h3> |
| 981 | - | |
| 982 | - <div style="margin-bottom: 20px;"> | |
| 1064 | + | |
| 1065 | + <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 24px;"> | |
| 1066 | + <div> | |
| 983 | 1067 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 984 | - OTTO API Calls Per Minute: | |
| 1068 | + <?php echo esc_html(Metasync::get_whitelabel_otto_name()); ?> API Calls Per Minute: | |
| 1069 | + <?php Metasync::render_tooltip_icon('otto_rate_limit', 'The maximum number of requests per minute the plugin will send to ' . Metasync::get_whitelabel_otto_name() . '\'s servers. Lower it if you\'re seeing rate-limit errors; most sites can leave the default.'); ?> | |
| 985 | 1070 | </label> |
| 986 | 1071 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 987 | 1072 | <input type="number" |
| 988 | 1073 | id="otto_rate_limit" |
| @@ -997,8 +1082,9 @@ | ||
| 997 | 1082 | |
| 998 | 1083 | <div> |
| 999 | 1084 | <label style="display: block; color: var(--dashboard-text-primary); margin-bottom: 8px; font-weight: 500;"> |
| 1000 | 1085 | Queue Auto-Cleanup: |
| 1086 | + <?php Metasync::render_tooltip_icon('queue_cleanup_days', 'How many days a completed background job is kept before the plugin automatically deletes its record. Lower it to save database space; raise it if you need to look back further when troubleshooting.'); ?> | |
| 1001 | 1087 | </label> |
| 1002 | 1088 | <div style="display: flex; align-items: center; gap: 10px;"> |
| 1003 | 1089 | <input type="number" |
| 1004 | 1090 | id="queue_cleanup_days" |
| @@ -1010,10 +1096,11 @@ | ||
| 1010 | 1096 | style="width: 100px; padding: 8px; border: 1px solid var(--dashboard-border); border-radius: 6px; background: var(--dashboard-card-bg); color: var(--dashboard-text-primary);" /> |
| 1011 | 1097 | <span style="color: var(--dashboard-text-secondary);">days</span> |
| 1012 | 1098 | </div> |
| 1013 | 1099 | </div> |
| 1100 | + </div> | |
| 1014 | 1101 | </div> |
| 1015 | - | |
| 1102 | + | |
| 1016 | 1103 | <!-- Save Button --> |
| 1017 | 1104 | <div style="margin-top: 20px;"> |
| 1018 | 1105 | <button type="submit" |
| 1019 | 1106 | id="metasync-execution-settings-save-btn" |
| @@ -1028,232 +1115,15 @@ | ||
| 1028 | 1115 | <div id="metasync-execution-settings-message" style="display: none; margin-top: 16px; padding: 12px; border-radius: 6px;"></div> |
| 1029 | 1116 | </form> |
| 1030 | 1117 | </div> |
| 1031 | 1118 | |
| 1032 | - <script> | |
| 1033 | - jQuery(document).ready(function($) { | |
| 1034 | - var $form = $('#metasync-execution-settings-form'); | |
| 1035 | - var $saveBtn = $('#metasync-execution-settings-save-btn'); | |
| 1036 | - var $message = $('#metasync-execution-settings-message'); | |
| 1037 | - | |
| 1038 | - var serverMaxExecTime = <?php echo $server_limits['max_execution_time_raw'] == -1 ? 'Infinity' : $server_limits['max_execution_time_raw']; ?>; | |
| 1039 | - var serverMaxMemory = <?php echo $server_limits['memory_limit_raw'] == -1 ? 'Infinity' : $server_limits['memory_limit_raw']; ?>; | |
| 1040 | - var canChangeMemory = <?php echo $server_limits['can_change_memory'] ? 'true' : 'false'; ?>; | |
| 1041 | - | |
| 1042 | - function checkServerLimits() { | |
| 1043 | - var maxExecTime = parseInt($('#max_execution_time').val()) || 0; | |
| 1044 | - var maxMemory = parseInt($('#max_memory_limit').val()) || 0; | |
| 1045 | - | |
| 1046 | - if (serverMaxExecTime !== Infinity && maxExecTime > serverMaxExecTime) { | |
| 1047 | - $('#max_execution_time_warning').show(); | |
| 1048 | - } else { | |
| 1049 | - $('#max_execution_time_warning').hide(); | |
| 1050 | - } | |
| 1051 | - | |
| 1052 | - if (canChangeMemory && serverMaxMemory !== Infinity && maxMemory > serverMaxMemory) { | |
| 1053 | - $('#max_memory_limit_warning').show(); | |
| 1054 | - } else { | |
| 1055 | - $('#max_memory_limit_warning').hide(); | |
| 1056 | - } | |
| 1057 | - } | |
| 1058 | - | |
| 1059 | - $('#max_execution_time, #max_memory_limit').on('input change', function() { | |
| 1060 | - checkServerLimits(); | |
| 1061 | - $(this).css('border-color', 'var(--dashboard-border)'); | |
| 1062 | - }); | |
| 1063 | - | |
| 1064 | - function highlightInvalidField($field, isValid) { | |
| 1065 | - if (isValid) { | |
| 1066 | - $field.css({ | |
| 1067 | - 'border-color': 'var(--dashboard-border)', | |
| 1068 | - 'box-shadow': 'none' | |
| 1069 | - }); | |
| 1070 | - } else { | |
| 1071 | - $field.css({ | |
| 1072 | - 'border-color': '#ef4444', | |
| 1073 | - 'box-shadow': '0 0 0 3px rgba(239, 68, 68, 0.1)' | |
| 1074 | - }); | |
| 1075 | - } | |
| 1076 | - } | |
| 1077 | - | |
| 1078 | - $('#max_execution_time').on('blur', function() { | |
| 1079 | - var value = parseInt($(this).val()) || 0; | |
| 1080 | - var isValid = value >= 1 && value <= 300 && (serverMaxExecTime === Infinity || value <= serverMaxExecTime); | |
| 1081 | - highlightInvalidField($(this), isValid); | |
| 1082 | - }); | |
| 1083 | - | |
| 1084 | - $('#max_memory_limit').on('blur', function() { | |
| 1085 | - if (!canChangeMemory) return; | |
| 1086 | - var value = parseInt($(this).val()) || 0; | |
| 1087 | - var isValid = value >= 64 && value <= 512 && (serverMaxMemory === Infinity || value <= serverMaxMemory); | |
| 1088 | - highlightInvalidField($(this), isValid); | |
| 1089 | - }); | |
| 1090 | - | |
| 1091 | - checkServerLimits(); | |
| 1092 | - | |
| 1093 | - $form.on('submit', function(e) { | |
| 1094 | - e.preventDefault(); | |
| 1095 | - | |
| 1096 | - var formData = { | |
| 1097 | - action: 'metasync_save_execution_settings', | |
| 1098 | - execution_settings_nonce: $('#execution_settings_nonce').val(), | |
| 1099 | - max_execution_time: $('#max_execution_time').val(), | |
| 1100 | - max_memory_limit: $('#max_memory_limit').val(), | |
| 1101 | - log_batch_size: $('#log_batch_size').val(), | |
| 1102 | - action_scheduler_batches: $('#action_scheduler_batches').val(), | |
| 1103 | - otto_rate_limit: $('#otto_rate_limit').val(), | |
| 1104 | - queue_cleanup_days: $('#queue_cleanup_days').val() | |
| 1105 | - }; | |
| 1106 | - | |
| 1107 | - $('input[type="number"]').css({ | |
| 1108 | - 'border-color': 'var(--dashboard-border)', | |
| 1109 | - 'box-shadow': 'none' | |
| 1110 | - }); | |
| 1111 | - | |
| 1112 | - var hasError = false; | |
| 1113 | - var errorField = null; | |
| 1114 | - | |
| 1115 | - if (formData.max_execution_time < 1 || formData.max_execution_time > 300) { | |
| 1116 | - showMessage('Max Execution Time must be between 1 and 300 seconds.', 'error'); | |
| 1117 | - highlightInvalidField($('#max_execution_time'), false); | |
| 1118 | - errorField = $('#max_execution_time'); | |
| 1119 | - hasError = true; | |
| 1120 | - } else if (serverMaxExecTime !== Infinity && formData.max_execution_time > serverMaxExecTime) { | |
| 1121 | - showMessage('Max Execution Time exceeds server limit of ' + serverMaxExecTime + ' seconds. Please reduce the value.', 'error'); | |
| 1122 | - highlightInvalidField($('#max_execution_time'), false); | |
| 1123 | - errorField = $('#max_execution_time'); | |
| 1124 | - hasError = true; | |
| 1125 | - } | |
| 1126 | - | |
| 1127 | - if (canChangeMemory) { | |
| 1128 | - if (formData.max_memory_limit < 64 || formData.max_memory_limit > 512) { | |
| 1129 | - showMessage('Max Memory Limit must be between 64 and 512 MB.', 'error'); | |
| 1130 | - highlightInvalidField($('#max_memory_limit'), false); | |
| 1131 | - if (!hasError) { | |
| 1132 | - errorField = $('#max_memory_limit'); | |
| 1133 | - hasError = true; | |
| 1134 | - } | |
| 1135 | - } else if (serverMaxMemory !== Infinity && formData.max_memory_limit > serverMaxMemory) { | |
| 1136 | - showMessage('Max Memory Limit exceeds server limit of ' + serverMaxMemory + ' MB. Please reduce the value.', 'error'); | |
| 1137 | - highlightInvalidField($('#max_memory_limit'), false); | |
| 1138 | - if (!hasError) { | |
| 1139 | - errorField = $('#max_memory_limit'); | |
| 1140 | - hasError = true; | |
| 1141 | - } | |
| 1142 | - } | |
| 1143 | - } | |
| 1144 | - | |
| 1145 | - if (formData.log_batch_size < 100 || formData.log_batch_size > 5000) { | |
| 1146 | - showMessage('Log Batch Size must be between 100 and 5000 lines.', 'error'); | |
| 1147 | - highlightInvalidField($('#log_batch_size'), false); | |
| 1148 | - if (!hasError) { | |
| 1149 | - errorField = $('#log_batch_size'); | |
| 1150 | - hasError = true; | |
| 1151 | - } | |
| 1152 | - } | |
| 1153 | - if (formData.action_scheduler_batches < 1 || formData.action_scheduler_batches > 10) { | |
| 1154 | - showMessage('Action Scheduler Batches must be between 1 and 10.', 'error'); | |
| 1155 | - highlightInvalidField($('#action_scheduler_batches'), false); | |
| 1156 | - if (!hasError) { | |
| 1157 | - errorField = $('#action_scheduler_batches'); | |
| 1158 | - hasError = true; | |
| 1159 | - } | |
| 1160 | - } | |
| 1161 | - if (formData.otto_rate_limit < 1 || formData.otto_rate_limit > 60) { | |
| 1162 | - showMessage('OTTO Rate Limit must be between 1 and 60 calls per minute.', 'error'); | |
| 1163 | - highlightInvalidField($('#otto_rate_limit'), false); | |
| 1164 | - if (!hasError) { | |
| 1165 | - errorField = $('#otto_rate_limit'); | |
| 1166 | - hasError = true; | |
| 1167 | - } | |
| 1168 | - } | |
| 1169 | - if (formData.queue_cleanup_days < 7 || formData.queue_cleanup_days > 90) { | |
| 1170 | - showMessage('Queue Cleanup Days must be between 7 and 90 days.', 'error'); | |
| 1171 | - highlightInvalidField($('#queue_cleanup_days'), false); | |
| 1172 | - if (!hasError) { | |
| 1173 | - errorField = $('#queue_cleanup_days'); | |
| 1174 | - hasError = true; | |
| 1175 | - } | |
| 1176 | - } | |
| 1177 | - | |
| 1178 | - if (hasError) { | |
| 1179 | - if (errorField) { | |
| 1180 | - errorField.focus(); | |
| 1181 | - $('html, body').animate({ | |
| 1182 | - scrollTop: errorField.offset().top - 100 | |
| 1183 | - }, 300); | |
| 1184 | - } | |
| 1185 | - return; | |
| 1186 | - } | |
| 1187 | - | |
| 1188 | - $saveBtn.prop('disabled', true); | |
| 1189 | - $saveBtn.find('.save-text').text('Saving...'); | |
| 1190 | - $saveBtn.find('.save-spinner').show(); | |
| 1191 | - $message.hide(); | |
| 1192 | - | |
| 1193 | - $.ajax({ | |
| 1194 | - url: ajaxurl, | |
| 1195 | - type: 'POST', | |
| 1196 | - data: formData, | |
| 1197 | - success: function(response) { | |
| 1198 | - if (response.success) { | |
| 1199 | - showMessage(response.data.message || 'Settings saved successfully!', 'success'); | |
| 1200 | - $saveBtn.prop('disabled', false); | |
| 1201 | - $saveBtn.find('.save-text').text('Save Settings'); | |
| 1202 | - $saveBtn.find('.save-spinner').hide(); | |
| 1203 | - setTimeout(function() { | |
| 1204 | - checkServerLimits(); | |
| 1205 | - }, 100); | |
| 1206 | - $('html, body').animate({ | |
| 1207 | - scrollTop: $form.offset().top - 100 | |
| 1208 | - }, 300); | |
| 1209 | - } else { | |
| 1210 | - showMessage(response.data.message || 'Error saving settings.', 'error'); | |
| 1211 | - $saveBtn.prop('disabled', false); | |
| 1212 | - $saveBtn.find('.save-text').text('Save Settings'); | |
| 1213 | - $saveBtn.find('.save-spinner').hide(); | |
| 1214 | - $('html, body').animate({ | |
| 1215 | - scrollTop: $message.offset().top - 100 | |
| 1216 | - }, 300); | |
| 1217 | - } | |
| 1218 | - }, | |
| 1219 | - error: function() { | |
| 1220 | - showMessage('An error occurred while saving settings. Please try again.', 'error'); | |
| 1221 | - $saveBtn.prop('disabled', false); | |
| 1222 | - $saveBtn.find('.save-text').text('Save Settings'); | |
| 1223 | - $saveBtn.find('.save-spinner').hide(); | |
| 1224 | - $('html, body').animate({ | |
| 1225 | - scrollTop: $message.offset().top - 100 | |
| 1226 | - }, 300); | |
| 1227 | - } | |
| 1228 | - }); | |
| 1229 | - }); | |
| 1230 | - | |
| 1231 | - function showMessage(text, type) { | |
| 1232 | - $message.removeClass('notice-success notice-error') | |
| 1233 | - .addClass('notice-' + type) | |
| 1234 | - .css({ | |
| 1235 | - 'background': type === 'success' ? 'rgba(34, 197, 94, 0.1)' : 'rgba(239, 68, 68, 0.1)', | |
| 1236 | - 'border': '1px solid ' + (type === 'success' ? 'rgba(34, 197, 94, 0.3)' : 'rgba(239, 68, 68, 0.3)'), | |
| 1237 | - 'color': type === 'success' ? '#22c55e' : '#ef4444', | |
| 1238 | - 'padding': '12px 16px', | |
| 1239 | - 'border-radius': '6px', | |
| 1240 | - 'font-size': '14px', | |
| 1241 | - 'line-height': '1.5', | |
| 1242 | - 'display': 'block' | |
| 1243 | - }) | |
| 1244 | - .html('<strong style="margin-right: 8px;">' + (type === 'success' ? '✓' : '✗') + '</strong>' + text) | |
| 1245 | - .show(); | |
| 1246 | - | |
| 1247 | - if (type === 'success') { | |
| 1248 | - setTimeout(function() { | |
| 1249 | - $message.fadeOut(300); | |
| 1250 | - }, 5000); | |
| 1251 | - } | |
| 1252 | - } | |
| 1253 | - }); | |
| 1254 | - </script> | |
| 1255 | 1119 | <?php |
| 1120 | + // Real-time validation and AJAX save for this form live in | |
| 1121 | + // admin/js/metasync-execution-settings.js (enqueued on this page). | |
| 1122 | + // The previous inline duplicate was removed to avoid a double-bound | |
| 1123 | + // submit handler that fired the save request twice. | |
| 1124 | + ?> | |
| 1125 | + <?php | |
| 1256 | 1126 | } |
| 1257 | 1127 | |
| 1258 | 1128 | public function get_field_tooltips() { |
| 1259 | 1129 | $plugin_name = Metasync::get_effective_plugin_name(); |
| @@ -1259,36 +1129,73 @@ | ||
| 1259 | 1129 | $plugin_name = Metasync::get_effective_plugin_name(); |
| 1260 | 1130 | $otto_name = Metasync::get_whitelabel_otto_name(); |
| 1261 | 1131 | |
| 1262 | 1132 | return array( |
| 1263 | - 'searchatlas_api_key' => sprintf('Connect your WordPress site to your %s dashboard to retrieve your API key and OTTO UUID. This does not create a WordPress login session.', $plugin_name), | |
| 1133 | + 'searchatlas_api_key' => sprintf('Connect your WordPress site to your %1$s dashboard to retrieve your API key and %2$s UUID. This does not create a WordPress login session.', $plugin_name, $otto_name), | |
| 1264 | 1134 | 'apikey' => sprintf('Auto-generated authentication token used for secure API communication between your WordPress site and %s services. You can refresh this token if needed for security purposes.', $plugin_name), |
| 1265 | 1135 | 'otto_pixel_uuid' => sprintf('Your unique %s tracking pixel identifier. This UUID is used to track %s modifications and analytics on your website pages.', $otto_name, $otto_name), |
| 1266 | 1136 | 'otto_disable_on_loggedin' => sprintf('Disable %s modifications when you are logged in to WordPress. This allows you to see and edit the original content without %s\'s enhancements during editing sessions.', $otto_name, $otto_name), |
| 1267 | 1137 | 'otto_disable_preview_button' => sprintf('Hide the %s frontend toolbar that displays the status indicator, preview button, and debug button. Enable this for a cleaner frontend experience.', $otto_name), |
| 1138 | + 'seo_priority' => sprintf('Choose which value appears first on a page when both your custom SEO value (title, description or focus keyword, edited on the post/page screen) and an approved %s suggestion are available. This changes what visitors see; it does not delete or overwrite saved values.', $otto_name), | |
| 1268 | 1139 | 'otto_wp_rocket_compat' => sprintf('WP Rocket Compatibility Mode: Controls how %s interacts with WP Rocket. "Auto" (recommended) allows both to work together by avoiding DONOTCACHEPAGE constant unless necessary for Brizy pages or SG Optimizer conflicts. This ensures WP Rocket\'s JavaScript delay and optimization features continue working.', $otto_name), |
| 1140 | + 'otto_sg_optimizer_compat' => sprintf('SiteGround Optimizer Compatibility Mode: Controls how %s renders on SiteGround hosting. "Auto" (recommended) uses the internal HTTP fetch, which protects themes that defer inline CSS to the footer (e.g. Divi). "Buffer Mode" renders in-process with no internal fetch — faster on sites whose pages can never be host-cached, for example when a plugin starts a PHP session on every request (BookingPress sessions are removed automatically, so this does not apply to them).', $otto_name), | |
| 1141 | + 'bookingpress_session_compat' => 'BookingPress Session Compatibility: Controls whether MetaSync removes the PHP session BookingPress starts on every public page, so hosts such as SiteGround can page-cache the site again.', | |
| 1269 | 1142 | 'otto_disable_for_bots' => sprintf('Enable bot detection to automatically skip %s processing for search engine crawlers, SEO tools, and other bots. This reduces unnecessary API calls and improves performance.', $otto_name), |
| 1270 | 1143 | 'otto_bot_whitelist' => sprintf('Enter bot names or user-agent patterns (one per line) that should always be processed by %s, even when "Disable for Bots" is enabled. For example: Googlebot, Bingbot. This allows you to ensure specific search engines always see your optimized content.', $otto_name), |
| 1271 | 1144 | 'otto_bot_blacklist' => sprintf('Enter bot names or user-agent patterns (one per line) that should always be blocked from %s processing, regardless of other settings. For example: BadBot, MaliciousCrawler. Use this to exclude problematic crawlers or unwanted traffic sources.', $otto_name), |
| 1272 | 1145 | 'otto_bot_statistics_link' => 'View detailed bot detection statistics including total hits, API calls saved, breakdown by bot type, and unique bot entries with hit counts.', |
| 1273 | - 'disable_common_robots_metabox' => 'Hide the Common Robots meta box from post and page edit screens. This removes the robots meta tag controls (index/noindex, follow/nofollow) from the editor interface.', | |
| 1274 | - 'disable_advance_robots_metabox' => 'Hide the Advanced Robots meta box from post and page edit screens. This removes advanced robots directives like max-snippet, max-image-preview, and max-video-preview settings.', | |
| 1275 | - 'disable_redirection_metabox' => 'Hide the Redirection meta box from post and page edit screens. This removes the URL redirect configuration options from the editor interface.', | |
| 1276 | - 'disable_canonical_metabox' => 'Hide the Canonical URL meta box from post and page edit screens. This removes the canonical URL override field from the editor interface.', | |
| 1277 | - 'disable_social_opengraph_metabox' => 'Hide the Social Media & Open Graph meta box from post and page edit screens. This removes Facebook, Twitter, and other social media meta tag controls from the editor.', | |
| 1278 | - 'disable_schema_markup_metabox' => 'Hide the Schema Markup meta box from post and page edit screens. This removes the structured data (Article, FAQ, Product, Recipe, etc.) configuration from the editor interface.', | |
| 1279 | - 'open_external_links' => 'Automatically add target="_blank" attribute to external links appearing in your posts, pages, and other post types when rendered by Otto.', | |
| 1146 | + 'disable_common_robots_metabox' => sprintf('Hide the Common Robots meta box and stop %1$s emitting index/noindex and follow/nofollow directives on the front end. %1$s also stops overriding WordPress core or another SEO plugin\'s robots tag. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1147 | + 'disable_advance_robots_metabox' => sprintf('Hide the Advanced Robots meta box and stop %1$s emitting max-snippet, max-image-preview and max-video-preview directives, including the site-wide advanced defaults. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1148 | + 'disable_redirection_metabox' => 'Hide the Redirection meta box and stop redirects configured through it from running. Rules added by hand on the Redirections screen keep working. Saved redirects are kept and resume if you re-enable this.', | |
| 1149 | + 'disable_canonical_metabox' => sprintf('Hide the Canonical meta box and stop %1$s emitting or overriding the canonical URL on every render path. WordPress core and third-party canonicals are left in place. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1150 | + 'disable_social_opengraph_metabox' => sprintf('Hide the Social Media & Open Graph meta box and stop %1$s emitting any Open Graph, Twitter or article tags. Tags from another SEO plugin are left in place. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1151 | + 'disable_schema_markup_metabox' => sprintf('Hide the Schema Markup meta box and stop %1$s emitting any JSON-LD, including the site-wide Local SEO markup and OTTO structured data. Breadcrumb markup has its own setting. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1152 | + 'disable_language_alternates_metabox' => sprintf('Hide the Language Alternates (hreflang) panel in the block editor and stop %1$s emitting any hreflang tags on the front end, including the auto-detected WPML entries. While disabled, %1$s does not manage or override this data — another SEO plugin, or WPML itself, is free to handle it. Saved values are kept and restored if you re-enable this.', Metasync::get_effective_plugin_name('MetaSync')), | |
| 1153 | + 'disable_seo_metabox' => 'Hide the SEO Title & Meta Description meta box from post and page edit screens. This removes the Classic editor SEO fields (the Gutenberg sidebar is unaffected).', | |
| 1154 | + 'open_external_links' => sprintf('Automatically add target="_blank" attribute to external links appearing in your posts, pages, and other post types when rendered by %s.', $otto_name), | |
| 1280 | 1155 | 'content_genius_sync_roles' => 'Select which WordPress user roles should be synchronized with Content Genius. This determines which users will have their profiles and permissions synced for content collaboration.', |
| 1281 | 1156 | 'permalink_structure' => sprintf('Displays your current WordPress permalink structure. %s works best with pretty permalinks (not "Plain"). If you see a warning, visit Settings > Permalinks to change your structure.', $plugin_name), |
| 1282 | 1157 | 'hide_dashboard_framework' => sprintf('Hide the main %s dashboard from the WordPress admin menu. This is useful if you want to reduce menu clutter but still keep the plugin active.', $plugin_name), |
| 1283 | 1158 | 'show_admin_bar_status' => sprintf('Display the %s status indicator in the WordPress admin bar at the top of your screen. This provides quick visibility of plugin status and key metrics.', $plugin_name), |
| 1284 | - 'enable_auto_updates' => sprintf('Allow WordPress to automatically update the %s plugin when new versions are released. Recommended for security patches, but you may prefer manual updates for major versions.', $plugin_name), | |
| 1285 | 1159 | 'import_external_data' => sprintf('Import your existing SEO settings and metadata from other popular SEO plugins like Yoast, Rank Math, or All in One SEO. This makes migration to %s seamless without losing your SEO data.', $plugin_name), |
| 1286 | - 'import_seo_metadata' => 'Migrate your existing SEO titles and meta descriptions from Yoast, Rank Math, or All in One SEO. This one-click import preserves your search rankings by copying your optimized meta data to MetaSync, even if the source plugin is deactivated.', | |
| 1287 | - 'default_page_builder' => 'Choose how Content Genius stores synced articles. "Gutenberg" works with all themes and page builders. Selecting a specific builder converts content to that builder\'s widget format, which inherits the builder\'s global typography and layout styles.' | |
| 1160 | + 'import_seo_metadata' => sprintf('Migrate your existing SEO titles and meta descriptions from Yoast, Rank Math, or All in One SEO. This one-click import preserves your search rankings by copying your optimized meta data to %s, even if the source plugin is deactivated.', $plugin_name), | |
| 1161 | + 'default_page_builder' => 'Choose how Content Genius stores synced articles. "Gutenberg" works with all themes and page builders. Selecting a specific builder converts content to that builder\'s widget format, which inherits the builder\'s global typography and layout styles.', | |
| 1162 | + 'og_image_dimensions' => 'Adds your share image\'s width, height, and file type to the Open Graph tags so Facebook, LinkedIn, and others render your preview instantly at the right size instead of guessing. Leave on unless another plugin already outputs these.', | |
| 1163 | + 'article_timestamps' => 'Tells social platforms and search engines when each post was first published and last updated, so shares and rich results show accurate dates. Safe to leave enabled.', | |
| 1164 | + 'article_author' => 'Adds a link to the author\'s profile or archive page to each post\'s social tags, so shared articles can show author attribution. You can override the author URL per-post. Turn off if you\'d rather not expose author pages.', | |
| 1165 | + 'article_section' => 'Labels each post with its main topic (its primary category) in the social tags, helping platforms categorize your content. Falls back to the first category if no primary one is set.', | |
| 1166 | + 'article_tags' => 'Adds each of your WordPress post tags as a separate social "tag" so platforms understand the topics a post covers. Turn off if you don\'t want your tags exposed in share metadata.', | |
| 1167 | + 'twitter_image_alt' => 'Adds descriptive alt text to the image shown when your page is shared on X/Twitter, improving accessibility for screen-reader users. Uses your saved alt text or the image\'s own alt attribute.' | |
| 1288 | 1168 | ); |
| 1289 | 1169 | } |
| 1290 | 1170 | |
| 1171 | + public function render_analytics_section() { | |
| 1172 | + $enabled = get_option('metasync_analytics_opt_in', 'no') === 'yes'; | |
| 1173 | + $plugin_name = Metasync::get_effective_plugin_name(); | |
| 1174 | + /* translators: %s: Plugin name. */ | |
| 1175 | + $heading = sprintf(__('Help improve %s', 'metasync'), $plugin_name); | |
| 1176 | + /* translators: %s: Plugin name. */ | |
| 1177 | + $intro = sprintf(__('Allow %s to collect limited usage analytics. This helps us understand which features are used, improve the product, and identify problems.', 'metasync'), $plugin_name); | |
| 1178 | + /* translators: %s: Plugin name. */ | |
| 1179 | + $toggle_label = sprintf(__('Share usage data with %s', 'metasync'), $plugin_name); | |
| 1180 | + ?> | |
| 1181 | + <div class="metasync-analytics-consent-card"> | |
| 1182 | + <div class="metasync-analytics-consent-copy"> | |
| 1183 | + <h3><?php echo esc_html($heading); ?></h3> | |
| 1184 | + <p><?php echo esc_html($intro); ?></p> | |
| 1185 | + <p class="description"><?php esc_html_e('We collect limited technical information such as your site URL, plugin version, WordPress and PHP versions, user role, and feature usage. We do not collect passwords, API keys, customer content, names, or email addresses.', 'metasync'); ?></p> | |
| 1186 | + </div> | |
| 1187 | + <label class="metasync-consent-switch" for="metasync_analytics_opt_in"> | |
| 1188 | + <input type="hidden" name="metasync_analytics_opt_in" value="no" /> | |
| 1189 | + <input type="checkbox" id="metasync_analytics_opt_in" name="metasync_analytics_opt_in" value="yes" <?php checked($enabled); ?> /> | |
| 1190 | + <span class="metasync-consent-slider" aria-hidden="true"></span> | |
| 1191 | + <span class="screen-reader-text"><?php echo esc_html($toggle_label); ?></span> | |
| 1192 | + </label> | |
| 1193 | + <span class="metasync-consent-status" aria-live="polite" data-enabled-label="<?php esc_attr_e('Enabled', 'metasync'); ?>" data-disabled-label="<?php esc_attr_e('Off', 'metasync'); ?>"><?php echo $enabled ? esc_html__('Enabled', 'metasync') : esc_html__('Off', 'metasync'); ?></span> | |
| 1194 | + </div> | |
| 1195 | + <?php | |
| 1196 | + } | |
| 1197 | + | |
| 1291 | 1198 | public function get_field_section($field_id) { |
| 1292 | 1199 | $sections = $this->get_accordion_sections_config(); |
| 1293 | 1200 | |
| 1294 | 1201 | foreach ($sections as $section_key => $section_data) { |
| @@ -1322,9 +1229,9 @@ | ||
| 1322 | 1229 | $content_state = $is_open ? 'open' : 'closed'; |
| 1323 | 1230 | |
| 1324 | 1231 | echo '<div class="metasync-accordion-section" data-section="' . esc_attr($section_key) . '">'; |
| 1325 | 1232 | |
| 1326 | - echo '<div class="metasync-accordion-header" role="button" tabindex="0" aria-expanded="' . $aria_expanded . '" aria-controls="' . $section_id . '">'; | |
| 1233 | + echo '<div class="metasync-accordion-header" role="button" tabindex="0" aria-expanded="' . esc_attr($aria_expanded) . '" aria-controls="' . esc_attr($section_id) . '">'; | |
| 1327 | 1234 | echo '<div class="metasync-accordion-title">'; |
| 1328 | 1235 | echo '<span class="metasync-accordion-icon"><span class="dashicons dashicons-' . esc_attr($section_data['icon']) . '"></span></span>'; |
| 1329 | 1236 | echo '<div class="metasync-accordion-text">'; |
| 1330 | 1237 | echo '<h3>' . esc_html($section_data['title']) . '</h3>'; |
| @@ -1335,9 +1242,9 @@ | ||
| 1335 | 1242 | echo '<span class="toggle-icon">▼</span>'; |
| 1336 | 1243 | echo '</button>'; |
| 1337 | 1244 | echo '</div>'; |
| 1338 | 1245 | |
| 1339 | - echo '<div class="metasync-accordion-content" id="' . $section_id . '" data-state="' . $content_state . '">'; | |
| 1246 | + echo '<div class="metasync-accordion-content" id="' . esc_attr($section_id) . '" data-state="' . esc_attr($content_state) . '">'; | |
| 1340 | 1247 | |
| 1341 | 1248 | if (isset($section_data['render_callback']) && is_callable($section_data['render_callback'])) { |
| 1342 | 1249 | call_user_func($section_data['render_callback']); |
| 1343 | 1250 | } elseif (isset($section_data['fields']) && is_array($section_data['fields'])) { |
| @@ -1352,9 +1259,9 @@ | ||
| 1352 | 1259 | echo '<tr>'; |
| 1353 | 1260 | echo '<th scope="row">'; |
| 1354 | 1261 | if (!empty($field['title'])) { |
| 1355 | 1262 | echo '<div class="metasync-field-label-wrapper">'; |
| 1356 | - echo '<label for="' . esc_attr($field['id']) . '">' . $field['title'] . '</label>'; | |
| 1263 | + echo '<label for="' . esc_attr($field['id']) . '">' . esc_html($field['title']) . '</label>'; | |
| 1357 | 1264 | |
| 1358 | 1265 | if (isset($tooltips[$field_id])) { |
| 1359 | 1266 | echo '<button type="button" class="metasync-tooltip-trigger" data-tooltip-id="' . esc_attr($field_id) . '" aria-label="More information">'; |
| 1360 | 1267 | echo '<svg class="metasync-info-icon" 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">'; |
| @@ -1400,13 +1307,22 @@ | ||
| 1400 | 1307 | return; |
| 1401 | 1308 | } |
| 1402 | 1309 | |
| 1403 | 1310 | echo '<table class="form-table" role="presentation">'; |
| 1311 | + $llms_tooltips = array( | |
| 1312 | + 'llms_txt_enabled' => 'Publishes a file at yoursite.com/llms.txt listing your key pages so AI assistants like ChatGPT and Perplexity can find and cite your content. Safe to leave off if you don\'t want AI crawlers guided to your pages.', | |
| 1313 | + 'llms_full_enabled' => 'Also publishes a larger file with the full text of your posts (not just links). This exposes complete article content and can be large — keep the post limit low on smaller hosting plans.', | |
| 1314 | + ); | |
| 1404 | 1315 | foreach ($wp_settings_fields[$page][$section] as $field) { |
| 1405 | 1316 | echo '<tr>'; |
| 1406 | 1317 | echo '<th scope="row">'; |
| 1407 | 1318 | if (!empty($field['title'])) { |
| 1408 | - echo '<label for="' . esc_attr($field['id']) . '">' . $field['title'] . '</label>'; | |
| 1319 | + echo '<div class="metasync-field-label-wrapper">'; | |
| 1320 | + echo '<label for="' . esc_attr($field['id']) . '">' . esc_html($field['title']) . '</label>'; | |
| 1321 | + if (isset($llms_tooltips[$field['id']])) { | |
| 1322 | + Metasync::render_tooltip_icon($field['id'], $llms_tooltips[$field['id']]); | |
| 1323 | + } | |
| 1324 | + echo '</div>'; | |
| 1409 | 1325 | } |
| 1410 | 1326 | echo '</th>'; |
| 1411 | 1327 | echo '<td>'; |
| 1412 | 1328 | call_user_func($field['callback'], $field['args']); |
| @@ -1456,31 +1372,32 @@ | ||
| 1456 | 1372 | $display_value = $current_token; |
| 1457 | 1373 | $status_message = 'Plugin Auth Token is active and ready for authentication.'; |
| 1458 | 1374 | $refresh_help = 'Click refresh to generate a new token and update the heartbeat API.'; |
| 1459 | 1375 | } else { |
| 1460 | - $display_value = 'Auto-generated when connecting to ' . esc_html(Metasync::get_effective_plugin_name()); | |
| 1461 | - $status_message = 'Plugin Auth Token will be automatically generated when you click "Connect to ' . esc_html(Metasync::get_effective_plugin_name()) . '".'; | |
| 1376 | + $display_value = 'Auto-generated when connecting to ' . Metasync::get_effective_plugin_name(); | |
| 1377 | + $status_message = 'Plugin Auth Token will be automatically generated when you click "Connect to ' . Metasync::get_effective_plugin_name() . '".'; | |
| 1462 | 1378 | $refresh_help = 'You can also manually generate a token by clicking refresh.'; |
| 1463 | 1379 | } |
| 1464 | 1380 | |
| 1381 | + printf('<div class="metasync-auth-token-row">'); | |
| 1465 | 1382 | printf( |
| 1466 | - '<input type="text" id="apikey" name="' . Metasync_Admin::option_key . '[general][apikey]" value="%s" size="40" readonly="readonly" /> ', | |
| 1383 | + '<input type="text" id="apikey" name="' . esc_attr(Metasync_Admin::option_key) . '[general][apikey]" value="%s" size="40" class="regular-text" readonly="readonly" />', | |
| 1467 | 1384 | esc_attr($display_value) |
| 1468 | 1385 | ); |
| 1469 | - | |
| 1470 | - printf('<button type="button" id="refresh-plugin-auth-token" class="button button-secondary" style="margin-left: 10px;"><span class="dashicons dashicons-controls-repeat" style="margin-top:3px;font-size:15px;width:15px;height:15px;"></span> Refresh Token</button>'); | |
| 1471 | - printf('<p class="description">%s %s</p>', $status_message, $refresh_help); | |
| 1386 | + printf('<button type="button" id="refresh-plugin-auth-token" class="button button-secondary metasync-refresh-token-btn"><span class="dashicons dashicons-controls-repeat"></span> Refresh Token</button>'); | |
| 1387 | + printf('</div>'); | |
| 1388 | + printf('<p class="description">%s %s</p>', esc_html($status_message), esc_html($refresh_help)); | |
| 1472 | 1389 | } |
| 1473 | 1390 | |
| 1474 | 1391 | public function linkgraph_token_callback() |
| 1475 | 1392 | { |
| 1476 | 1393 | printf( |
| 1477 | - '<input type="text" id="linkgraph_token" name="' . Metasync_Admin::option_key . '[general][linkgraph_token]" value="%s" size="25" readonly="readonly" />', | |
| 1394 | + '<input type="text" id="linkgraph_token" name="' . esc_attr(Metasync_Admin::option_key) . '[general][linkgraph_token]" value="%s" size="25" readonly="readonly" />', | |
| 1478 | 1395 | isset(Metasync::get_option('general')['linkgraph_token']) ? esc_attr(Metasync::get_option('general')['linkgraph_token']) : '' |
| 1479 | 1396 | ); |
| 1480 | 1397 | |
| 1481 | 1398 | printf( |
| 1482 | - '<input type="text" id="linkgraph_customer_id" name="' . Metasync_Admin::option_key . '[general][linkgraph_customer_id]" value="%s" size="25" readonly="readonly" />', | |
| 1399 | + '<input type="text" id="linkgraph_customer_id" name="' . esc_attr(Metasync_Admin::option_key) . '[general][linkgraph_customer_id]" value="%s" size="25" readonly="readonly" />', | |
| 1483 | 1400 | isset(Metasync::get_option('general')['linkgraph_customer_id']) ? esc_attr(Metasync::get_option('general')['linkgraph_customer_id']) : '' |
| 1484 | 1401 | ); |
| 1485 | 1402 | |
| 1486 | 1403 | ?> |
| @@ -1496,10 +1413,16 @@ | ||
| 1496 | 1413 | { |
| 1497 | 1414 | if(empty($datetime)){ |
| 1498 | 1415 | return ""; |
| 1499 | 1416 | } |
| 1500 | - $now = new DateTime; | |
| 1501 | - $ago = new DateTime($datetime); | |
| 1417 | + # Stored timestamps use current_time('mysql') which is the WP site's | |
| 1418 | + # local timezone (no offset marker on the string). Constructing | |
| 1419 | + # DateTime without a timezone would default to UTC and produce a | |
| 1420 | + # bogus diff equal to the WP timezone offset (QA: "4 hours ago" | |
| 1421 | + # after a 4-minute sync on non-UTC sites). | |
| 1422 | + $wp_tz = function_exists('wp_timezone') ? wp_timezone() : new DateTimeZone('UTC'); | |
| 1423 | + $now = new DateTime('now', $wp_tz); | |
| 1424 | + $ago = new DateTime($datetime, $wp_tz); | |
| 1502 | 1425 | |
| 1503 | 1426 | $diff = $now->diff($ago); |
| 1504 | 1427 | |
| 1505 | 1428 | $string = [ |
| @@ -1524,12 +1447,26 @@ | ||
| 1524 | 1447 | } |
| 1525 | 1448 | |
| 1526 | 1449 | public function searchatlas_api_key_callback() |
| 1527 | 1450 | { |
| 1528 | - $current_api_key = isset(Metasync::get_option('general')['searchatlas_api_key']) ? esc_attr(Metasync::get_option('general')['searchatlas_api_key']) : ''; | |
| 1451 | + // Whether a key is stored at rest (encrypted or legacy plaintext). | |
| 1452 | + $stored_api_key = Metasync::get_option('general')['searchatlas_api_key'] ?? ''; | |
| 1453 | + $has_api_key = ($stored_api_key !== ''); | |
| 1454 | + | |
| 1455 | + // Decrypted key for masking only. Never rendered in cleartext. | |
| 1456 | + // false => an encrypted key exists but cannot be decrypted (salts changed). | |
| 1457 | + $decrypted_api_key = Metasync::get_searchatlas_api_key(); | |
| 1458 | + $decrypt_failed = ($decrypted_api_key === false); | |
| 1459 | + | |
| 1460 | + // Build a masked representation: bullets + last 4 chars. The cleartext | |
| 1461 | + // key is never emitted into the page. | |
| 1462 | + $masked_api_key = ''; | |
| 1463 | + if (!$decrypt_failed && $decrypted_api_key !== '') { | |
| 1464 | + $masked_api_key = str_repeat('*', 8) . substr($decrypted_api_key, -4); | |
| 1465 | + } | |
| 1466 | + | |
| 1529 | 1467 | $otto_uuid = isset(Metasync::get_option('general')['otto_pixel_uuid']) ? Metasync::get_option('general')['otto_pixel_uuid'] : ''; |
| 1530 | - | |
| 1531 | - $has_api_key = !empty($current_api_key); | |
| 1468 | + | |
| 1532 | 1469 | $has_otto_uuid = !empty($otto_uuid); |
| 1533 | 1470 | |
| 1534 | 1471 | $is_fully_connected = $this->admin_instance->is_heartbeat_connected(); |
| 1535 | 1472 | |
| @@ -1583,11 +1520,11 @@ | ||
| 1583 | 1520 | printf('<div style="padding: 10px 0; color: #666; font-size: 13px; line-height: 1.5;">'); |
| 1584 | 1521 | printf('• Make sure you have a %s account before connecting<br/>', esc_html(Metasync::get_effective_plugin_name())); |
| 1585 | 1522 | printf('• The authentication window will open in a popup - please allow popups<br/>'); |
| 1586 | 1523 | printf('• The process typically takes 15-30 seconds to complete<br/>'); |
| 1587 | - printf('• Your API key will be automatically filled in the field below<br/>'); | |
| 1524 | + printf('• Your API key will be stored securely and shown masked below<br/>'); | |
| 1588 | 1525 | printf('• If you encounter issues, try disabling ad blockers temporarily<br/>'); |
| 1589 | - printf('• Contact <a href="mailto:%s">%s</a> if you need assistance', Metasync::SUPPORT_EMAIL, Metasync::SUPPORT_EMAIL); | |
| 1526 | + printf('• Contact <a href="mailto:%s">%s</a> if you need assistance', esc_attr(Metasync::SUPPORT_EMAIL), esc_html(Metasync::SUPPORT_EMAIL)); | |
| 1590 | 1527 | printf('</div>'); |
| 1591 | 1528 | printf('</details>'); |
| 1592 | 1529 | printf('</div>'); |
| 1593 | 1530 | |
| @@ -1602,30 +1539,42 @@ | ||
| 1602 | 1539 | printf('<span style="color: #ff8c00; margin-left: 10px; font-weight: normal;">Partial Connection (Missing %s UUID)</span>', esc_html(Metasync::get_whitelabel_otto_name())); |
| 1603 | 1540 | } |
| 1604 | 1541 | printf('</label>'); |
| 1605 | 1542 | |
| 1543 | + // Read-only masked display. The API key is managed via one-click | |
| 1544 | + // authentication only; the cleartext key is never rendered into the | |
| 1545 | + // page HTML (View Source / DOM). No form input is emitted, so saving | |
| 1546 | + // settings cannot overwrite or expose the stored key. | |
| 1547 | + $display_has_key = (!$decrypt_failed && $masked_api_key !== '') ? '1' : '0'; | |
| 1606 | 1548 | printf( |
| 1607 | - '<input type="text" id="searchatlas-api-key" name="' . Metasync_Admin::option_key . '[general][searchatlas_api_key]" value="%s" size="40" class="regular-text" placeholder="Your API key will appear here after authentication" />', | |
| 1608 | - $current_api_key | |
| 1549 | + '<div id="searchatlas-api-key-display" class="metasync-api-key-masked" data-has-key="%s" style="display:inline-flex; align-items:center; min-width:320px; height:42px; padding:0 14px; font-family:monospace; font-size:15px; letter-spacing:4px; background:var(--dashboard-input-bg, #22272e); border:1px solid var(--dashboard-border, #3a424d); border-radius:6px; color:var(--dashboard-text-primary, #e6e8eb); cursor:default; user-select:none;">', | |
| 1550 | + esc_attr($display_has_key) | |
| 1609 | 1551 | ); |
| 1610 | - | |
| 1552 | + if ($decrypt_failed) { | |
| 1553 | + printf('<em style="color:#b32d2e; font-family:sans-serif; letter-spacing:normal; font-style:normal; font-size:14px;">Stored API key could not be read. Please re-authenticate above.</em>'); | |
| 1554 | + } elseif ($masked_api_key !== '') { | |
| 1555 | + echo esc_html($masked_api_key); | |
| 1556 | + } else { | |
| 1557 | + printf('<em style="color:#646970;">Not configured</em>'); | |
| 1558 | + } | |
| 1559 | + printf('</div>'); | |
| 1560 | + | |
| 1611 | 1561 | printf('<p class="description" style="margin-top: 8px;">'); |
| 1612 | - if ($is_fully_connected) { | |
| 1613 | - printf('Your %s API key for secure communication with the platform. Use the authentication button above to refresh or change accounts.', esc_html(Metasync::get_effective_plugin_name())); | |
| 1562 | + if ($decrypt_failed) { | |
| 1563 | + printf('Your stored API key could not be decrypted (your site security keys may have changed). Please re-authenticate above to reconnect.'); | |
| 1564 | + } elseif ($is_fully_connected) { | |
| 1565 | + printf('Your %s API key is stored securely and used for communication with the platform. Use the authentication button above to refresh or change accounts.', esc_html(Metasync::get_effective_plugin_name())); | |
| 1614 | 1566 | } elseif ($has_api_key && !$has_otto_uuid) { |
| 1615 | 1567 | printf('Your API key is configured but %s UUID is missing. Re-authenticate above to complete the setup and enable dashboard access.', esc_html(Metasync::get_whitelabel_otto_name())); |
| 1616 | 1568 | } else { |
| 1617 | - printf('This field will be automatically populated when you authenticate using the button above. You can also manually enter your API key if you have one.'); | |
| 1569 | + printf('Use the authentication button above to securely connect your account. Your API key is stored encrypted and shown masked here.'); | |
| 1618 | 1570 | } |
| 1619 | 1571 | printf('</p>'); |
| 1620 | 1572 | |
| 1621 | - ?> | |
| 1622 | - <p class="description" style="margin-top: 10px; padding: 8px 12px; background: #fff9e6; border-left: 3px solid #f0b849; border-radius: 4px; font-size: 12px;"> | |
| 1623 | - <strong>Manual Authentication:</strong> If you manually enter your <?php echo esc_html(Metasync::get_effective_plugin_name()); ?> API Key and OTTO UUID, you also consent to the same AI-powered automation permissions described above. | |
| 1624 | - </p> | |
| 1625 | - <?php | |
| 1573 | + printf('</div>'); | |
| 1626 | 1574 | |
| 1627 | - printf('</div>'); | |
| 1575 | + // The OTTO Pixel UUID is shown once, by the read-only Settings-API | |
| 1576 | + // field in the OTTO Server-Side Rendering section; do not repeat it here. | |
| 1628 | 1577 | |
| 1629 | 1578 | if( isset(Metasync::get_option('general')['searchatlas_api_key'])&&Metasync::get_option('general')['searchatlas_api_key']!=''){ |
| 1630 | 1579 | $timestamp = @Metasync::get_option('general')['send_auth_token_timestamp']; |
| 1631 | 1580 | printf( |
| @@ -1630,9 +1579,9 @@ | ||
| 1630 | 1579 | $timestamp = @Metasync::get_option('general')['send_auth_token_timestamp']; |
| 1631 | 1580 | printf( |
| 1632 | 1581 | '<p id="sendAuthTokenTimestamp" class="descriptionValue">%s (%s)</p>', |
| 1633 | 1582 | esc_attr($timestamp), |
| 1634 | - $this->time_elapsed_string($timestamp) | |
| 1583 | + esc_html($this->time_elapsed_string($timestamp)) | |
| 1635 | 1584 | ); |
| 1636 | 1585 | |
| 1637 | 1586 | |
| 1638 | 1587 | } |
| @@ -1640,9 +1589,9 @@ | ||
| 1640 | 1589 | |
| 1641 | 1590 | public function bing_site_verification_callback() |
| 1642 | 1591 | { |
| 1643 | 1592 | printf( |
| 1644 | - '<input type="text" id="bing_site_verification" name="' . Metasync_Admin::option_key . '[searchengines][bing_site_verification]" value="%s" size="50" />', | |
| 1593 | + '<input type="text" id="bing_site_verification" name="' . esc_attr(Metasync_Admin::option_key) . '[searchengines][bing_site_verification]" value="%s" size="50" />', | |
| 1645 | 1594 | isset(Metasync::get_option('searchengines')['bing_site_verification']) ? esc_attr(Metasync::get_option('searchengines')['bing_site_verification']) : '' |
| 1646 | 1595 | ); |
| 1647 | 1596 | |
| 1648 | 1597 | printf(' <br> <span class="description"> Enter Bing Webmaster Tools verification code: </span> '); |
| @@ -1651,9 +1600,9 @@ | ||
| 1651 | 1600 | |
| 1652 | 1601 | public function yandex_site_verification_callback() |
| 1653 | 1602 | { |
| 1654 | 1603 | printf( |
| 1655 | - '<input type="text" id="yandex_site_verification" name="' . Metasync_Admin::option_key . '[searchengines][yandex_site_verification]" value="%s" size="50" />', | |
| 1604 | + '<input type="text" id="yandex_site_verification" name="' . esc_attr(Metasync_Admin::option_key) . '[searchengines][yandex_site_verification]" value="%s" size="50" />', | |
| 1656 | 1605 | isset(Metasync::get_option('searchengines')['yandex_site_verification']) ? esc_attr(Metasync::get_option('searchengines')['yandex_site_verification']) : '' |
| 1657 | 1606 | ); |
| 1658 | 1607 | |
| 1659 | 1608 | printf(' <br> <span class="description"> Enter Yandex verification code: </span>'); |
| @@ -1662,9 +1611,9 @@ | ||
| 1662 | 1611 | |
| 1663 | 1612 | public function google_site_verification_callback() |
| 1664 | 1613 | { |
| 1665 | 1614 | printf( |
| 1666 | - '<input type="text" id="google_site_verification" name="' . Metasync_Admin::option_key . '[searchengines][google_site_verification]" value="%s" size="50" />', | |
| 1615 | + '<input type="text" id="google_site_verification" name="' . esc_attr(Metasync_Admin::option_key) . '[searchengines][google_site_verification]" value="%s" size="50" />', | |
| 1667 | 1616 | isset(Metasync::get_option('searchengines')['google_site_verification']) ? esc_attr(Metasync::get_option('searchengines')['google_site_verification']) : '' |
| 1668 | 1617 | ); |
| 1669 | 1618 | |
| 1670 | 1619 | printf(' <br> <span class="description"> Enter Google Search Console verification code: </span>'); |
| @@ -1673,9 +1622,9 @@ | ||
| 1673 | 1622 | |
| 1674 | 1623 | public function pinterest_site_verification_callback() |
| 1675 | 1624 | { |
| 1676 | 1625 | printf( |
| 1677 | - '<input type="text" id="pinterest_site_verification" name="' . Metasync_Admin::option_key . '[searchengines][pinterest_site_verification]" value="%s" size="50" />', | |
| 1626 | + '<input type="text" id="pinterest_site_verification" name="' . esc_attr(Metasync_Admin::option_key) . '[searchengines][pinterest_site_verification]" value="%s" size="50" />', | |
| 1678 | 1627 | isset(Metasync::get_option('searchengines')['pinterest_site_verification']) ? esc_attr(Metasync::get_option('searchengines')['pinterest_site_verification']) : '' |
| 1679 | 1628 | ); |
| 1680 | 1629 | |
| 1681 | 1630 | printf(' <br> <span class="description"> Enter Pinterest verification code: </span>'); |
| @@ -1684,15 +1633,21 @@ | ||
| 1684 | 1633 | |
| 1685 | 1634 | public function local_seo_person_organization_callback() |
| 1686 | 1635 | { |
| 1687 | 1636 | $person_organization = Metasync::get_option('localseo')['local_seo_person_organization'] ?? ''; |
| 1637 | + $valid_person_organizations = array('Person', 'Organization'); | |
| 1688 | 1638 | ?> |
| 1689 | - <select id="local_seo_person_organization" name="<?php echo esc_attr(Metasync_Admin::option_key . '[localseo][local_seo_person_organization]') ?>"> | |
| 1690 | - <?php | |
| 1691 | - printf('<option value="Person" %s >Person</option>', selected('Person', esc_attr($person_organization))); | |
| 1692 | - printf('<option value="Organization" %s >Organization</option>', selected('Organization', esc_attr($person_organization))); | |
| 1693 | - ?> | |
| 1694 | - </select> | |
| 1639 | + <div class="metasync-type-select-wrap"> | |
| 1640 | + <select id="local_seo_person_organization" name="<?php echo esc_attr(Metasync_Admin::option_key . '[localseo][local_seo_person_organization]') ?>"> | |
| 1641 | + <?php | |
| 1642 | + if (!in_array($person_organization, $valid_person_organizations, true)) { | |
| 1643 | + printf('<option value="0" selected="selected">Select Type</option>'); | |
| 1644 | + } | |
| 1645 | + printf('<option value="Person" %s >Person</option>', selected('Person', esc_attr($person_organization))); | |
| 1646 | + printf('<option value="Organization" %s >Organization</option>', selected('Organization', esc_attr($person_organization))); | |
| 1647 | + ?> | |
| 1648 | + </select> | |
| 1649 | + </div> | |
| 1695 | 1650 | <?php |
| 1696 | 1651 | printf(' <br> <span class="description"> Choose whether the site represents a person or an organization. </span>'); |
| 1697 | 1652 | } |
| 1698 | 1653 | |
| @@ -1698,10 +1653,10 @@ | ||
| 1698 | 1653 | |
| 1699 | 1654 | public function local_seo_name_callback() |
| 1700 | 1655 | { |
| 1701 | 1656 | printf( |
| 1702 | - '<input type="text" id="local_seo_name" name="' . Metasync_Admin::option_key . '[localseo][local_seo_name]" value="%s" size="50" />', | |
| 1703 | - isset(Metasync::get_option('localseo')['local_seo_name']) ? esc_attr(Metasync::get_option('localseo')['local_seo_name']) : get_bloginfo() | |
| 1657 | + '<input type="text" id="local_seo_name" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_name]" value="%s" size="50" />', | |
| 1658 | + isset(Metasync::get_option('localseo')['local_seo_name']) ? esc_attr(Metasync::get_option('localseo')['local_seo_name']) : esc_attr(get_bloginfo()) | |
| 1704 | 1659 | ); |
| 1705 | 1660 | |
| 1706 | 1661 | printf(' <br> <span class="description"> Your name or company name </span>'); |
| 1707 | 1662 | } |
| @@ -1709,31 +1664,82 @@ | ||
| 1709 | 1664 | public function local_seo_logo_callback() |
| 1710 | 1665 | { |
| 1711 | 1666 | $local_seo_logo = Metasync::get_option('localseo')['local_seo_logo'] ?? ''; |
| 1712 | 1667 | |
| 1668 | + // Rows saved by the legacy sanitizer hold the corrupted form of | |
| 1669 | + // an attachment ID ("http://45589"). Repair it before anything reads | |
| 1670 | + // the value — both so the preview resolves and so the hidden input | |
| 1671 | + // re-submits the recovered ID instead of the corrupted string, which | |
| 1672 | + // would otherwise survive every subsequent Save Settings. | |
| 1673 | + $local_seo_logo = metasync_repair_scheme_prefixed_media_id($local_seo_logo); | |
| 1674 | + | |
| 1713 | 1675 | printf( |
| 1714 | - '<input type="hidden" id="local_seo_logo" name="' . Metasync_Admin::option_key . '[localseo][local_seo_logo]" value="%s" size="50" />', | |
| 1715 | - isset(Metasync::get_option('localseo')['local_seo_logo']) ? esc_attr(Metasync::get_option('localseo')['local_seo_logo']) : '' | |
| 1676 | + '<input type="hidden" id="local_seo_logo" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_logo]" value="%s" size="50" />', | |
| 1677 | + esc_attr((string) $local_seo_logo) | |
| 1716 | 1678 | ); |
| 1717 | 1679 | |
| 1718 | - printf(' <br> <input class="button-secondary" type="button" id="logo_upload_button" value="Add or Upload File">'); | |
| 1680 | + printf(' <br> <input class="button-secondary no-loading" type="button" id="logo_upload_button" value="Add or Upload File">'); | |
| 1719 | 1681 | |
| 1720 | 1682 | printf(' <br><br> <span class="description bold"> Min Size: 160Χ90px, Max Size: 1920X1080px. </span> <br> <span class="description"> A squared image is preferred by the search engines. </span> <br><br> '); |
| 1721 | 1683 | |
| 1722 | - printf('<img src="%s" id="local_seo_business_logo" width="300">', wp_get_attachment_image_src($local_seo_logo, 'medium')[0] ?? ''); | |
| 1684 | + printf('<span class="metasync-logo-preview-wrap">'); | |
| 1723 | 1685 | |
| 1724 | - $button_type = 'hidden'; | |
| 1725 | - if ($local_seo_logo) { | |
| 1726 | - $button_type = 'button'; | |
| 1686 | + // The stored value may be an attachment ID or a raw URL, so resolve | |
| 1687 | + // both the way the front-end schema output already does. Anything that | |
| 1688 | + // resolves to nothing — a deleted attachment, a legacy value mangled by | |
| 1689 | + // an earlier save — must render no preview at all, rather than an empty | |
| 1690 | + // src next to an orphaned remove button. | |
| 1691 | + $logo_url = $this->resolve_media_url($local_seo_logo, 'medium'); | |
| 1692 | + | |
| 1693 | + printf( | |
| 1694 | + '<img src="%s" id="local_seo_business_logo" width="300"%s>', | |
| 1695 | + esc_url($logo_url), | |
| 1696 | + $logo_url ? '' : ' style="display:none"' | |
| 1697 | + ); | |
| 1698 | + | |
| 1699 | + $button_type = $logo_url ? 'button' : 'hidden'; | |
| 1700 | + printf('<input type="%s" class="button-secondary no-loading metasync-logo-remove-btn" id="local_seo_logo_close_btn" value="X">', esc_attr($button_type)); | |
| 1701 | + printf('</span>'); | |
| 1702 | + } | |
| 1703 | + | |
| 1704 | + /** | |
| 1705 | + * Resolve a stored media setting to a displayable URL. | |
| 1706 | + * | |
| 1707 | + * These settings accept either a media-library attachment ID or a raw URL; | |
| 1708 | + * returns an empty string when the value resolves to neither, so callers | |
| 1709 | + * can distinguish "no image" from "image we could not resolve". | |
| 1710 | + * | |
| 1711 | + * @param mixed $value Attachment ID or URL as stored in the options. | |
| 1712 | + * @param string $size Registered image size to request for an attachment. | |
| 1713 | + * @return string Resolved URL, or '' when there is nothing to show. | |
| 1714 | + */ | |
| 1715 | + private function resolve_media_url($value, $size = 'medium') | |
| 1716 | + { | |
| 1717 | + if (empty($value)) { | |
| 1718 | + return ''; | |
| 1727 | 1719 | } |
| 1728 | - printf('<input type="%s" class="button-secondary" id="local_seo_logo_close_btn" value="X">', $button_type); | |
| 1720 | + | |
| 1721 | + // A row saved by the legacy sanitizer stores a corrupted attachment ID ("http://45589"), | |
| 1722 | + // which is neither resolvable as an ID nor a usable image URL. | |
| 1723 | + $value = metasync_repair_scheme_prefixed_media_id($value); | |
| 1724 | + | |
| 1725 | + if (empty($value)) { | |
| 1726 | + return ''; | |
| 1727 | + } | |
| 1728 | + | |
| 1729 | + if (is_numeric($value)) { | |
| 1730 | + $url = wp_get_attachment_image_url((int) $value, $size); | |
| 1731 | + return $url ? $url : ''; | |
| 1732 | + } | |
| 1733 | + | |
| 1734 | + return (string) $value; | |
| 1729 | 1735 | } |
| 1730 | 1736 | |
| 1731 | 1737 | public function local_seo_url_callback() |
| 1732 | 1738 | { |
| 1733 | 1739 | printf( |
| 1734 | - '<input type="text" id="local_seo_url" name="' . Metasync_Admin::option_key . '[localseo][local_seo_url]" value="%s" size="50" />', | |
| 1735 | - isset(Metasync::get_option('localseo')['local_seo_url']) ? esc_attr(Metasync::get_option('localseo')['local_seo_url']) : home_url() | |
| 1740 | + '<input type="text" id="local_seo_url" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_url]" value="%s" size="50" />', | |
| 1741 | + isset(Metasync::get_option('localseo')['local_seo_url']) ? esc_attr(Metasync::get_option('localseo')['local_seo_url']) : esc_attr(home_url()) | |
| 1736 | 1742 | ); |
| 1737 | 1743 | |
| 1738 | 1744 | printf(' <br> <span class="description"> URL of the item. </span>'); |
| 1739 | 1745 | } |
| @@ -1740,9 +1746,9 @@ | ||
| 1740 | 1746 | |
| 1741 | 1747 | public function local_seo_email_callback() |
| 1742 | 1748 | { |
| 1743 | 1749 | printf( |
| 1744 | - '<input type="text" id="local_seo_email" name="' . Metasync_Admin::option_key . '[localseo][local_seo_email]" value="%s" size="50" />', | |
| 1750 | + '<input type="text" id="local_seo_email" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_email]" value="%s" size="50" />', | |
| 1745 | 1751 | isset(Metasync::get_option('localseo')['local_seo_email']) ? esc_attr(Metasync::get_option('localseo')['local_seo_email']) : '' |
| 1746 | 1752 | ); |
| 1747 | 1753 | |
| 1748 | 1754 | printf(' <br> <span class="description"> Search engines display your email address. </span>'); |
| @@ -1750,9 +1756,9 @@ | ||
| 1750 | 1756 | |
| 1751 | 1757 | public function local_seo_phone_callback() |
| 1752 | 1758 | { |
| 1753 | 1759 | printf( |
| 1754 | - '<input type="text" id="local_seo_phone" name="' . Metasync_Admin::option_key . '[localseo][local_seo_phone]" value="%s" size="50" />', | |
| 1760 | + '<input type="text" id="local_seo_phone" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_phone]" value="%s" size="50" />', | |
| 1755 | 1761 | isset(Metasync::get_option('localseo')['local_seo_phone']) ? esc_attr(Metasync::get_option('localseo')['local_seo_phone']) : '' |
| 1756 | 1762 | ); |
| 1757 | 1763 | |
| 1758 | 1764 | printf(' <br> <span class="description"> Search engines may prominently display your contact phone number for mobile users. </span>'); |
| @@ -1760,29 +1766,29 @@ | ||
| 1760 | 1766 | |
| 1761 | 1767 | public function local_seo_address_callback() |
| 1762 | 1768 | { |
| 1763 | 1769 | printf( |
| 1764 | - '<input type="text" id="local_seo_address_street" name="' . Metasync_Admin::option_key . '[localseo][address][street]" value="%s" size="50" placeholder="Street Address"/> <br>', | |
| 1770 | + '<input type="text" id="local_seo_address_street" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][address][street]" value="%s" size="50" placeholder="Street Address"/> <br>', | |
| 1765 | 1771 | isset(Metasync::get_option('localseo')['address']['street']) ? esc_attr(Metasync::get_option('localseo')['address']['street']) : '' |
| 1766 | 1772 | ); |
| 1767 | 1773 | |
| 1768 | 1774 | printf( |
| 1769 | - '<input type="text" id="local_seo_address_locality" name="' . Metasync_Admin::option_key . '[localseo][address][locality]" value="%s" size="50" placeholder="Locality"/> <br>', | |
| 1775 | + '<input type="text" id="local_seo_address_locality" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][address][locality]" value="%s" size="50" placeholder="Locality"/> <br>', | |
| 1770 | 1776 | isset(Metasync::get_option('localseo')['address']['locality']) ? esc_attr(Metasync::get_option('localseo')['address']['locality']) : '' |
| 1771 | 1777 | ); |
| 1772 | 1778 | |
| 1773 | 1779 | printf( |
| 1774 | - '<input type="text" id="local_seo_address_region" name="' . Metasync_Admin::option_key . '[localseo][address][region]" value="%s" size="50" placeholder="Region"/> <br>', | |
| 1780 | + '<input type="text" id="local_seo_address_region" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][address][region]" value="%s" size="50" placeholder="Region"/> <br>', | |
| 1775 | 1781 | isset(Metasync::get_option('localseo')['address']['region']) ? esc_attr(Metasync::get_option('localseo')['address']['region']) : '' |
| 1776 | 1782 | ); |
| 1777 | 1783 | |
| 1778 | 1784 | printf( |
| 1779 | - '<input type="text" id="local_seo_address_postalcode" name="' . Metasync_Admin::option_key . '[localseo][address][postalcode]" value="%s" size="50" placeholder="Postal Code"/> <br>', | |
| 1785 | + '<input type="text" id="local_seo_address_postalcode" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][address][postalcode]" value="%s" size="50" placeholder="Postal Code"/> <br>', | |
| 1780 | 1786 | isset(Metasync::get_option('localseo')['address']['postalcode']) ? esc_attr(Metasync::get_option('localseo')['address']['postalcode']) : '' |
| 1781 | 1787 | ); |
| 1782 | 1788 | |
| 1783 | 1789 | printf( |
| 1784 | - '<input type="text" id="local_seo_address_country" name="' . Metasync_Admin::option_key . '[localseo][address][country]" value="%s" size="50" placeholder="Country"/> <br>', | |
| 1790 | + '<input type="text" id="local_seo_address_country" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][address][country]" value="%s" size="50" placeholder="Country"/> <br>', | |
| 1785 | 1791 | isset(Metasync::get_option('localseo')['address']['country']) ? esc_attr(Metasync::get_option('localseo')['address']['country']) : '' |
| 1786 | 1792 | ); |
| 1787 | 1793 | } |
| 1788 | 1794 | |
| @@ -1797,9 +1803,9 @@ | ||
| 1797 | 1803 | <select name="<?php echo esc_attr(Metasync_Admin::option_key . '[localseo][local_seo_business_type]') ?>"> |
| 1798 | 1804 | <option value='0'>Select Business Type</option> |
| 1799 | 1805 | <?php |
| 1800 | 1806 | foreach ($types as $type) { |
| 1801 | - printf('<option value="%s" %s >%s</option>', $type, selected($type, esc_attr($business_type)), $type); | |
| 1807 | + printf('<option value="%s" %s >%s</option>', esc_attr($type), selected($type, $business_type, false), esc_html($type)); | |
| 1802 | 1808 | } |
| 1803 | 1809 | ?> |
| 1804 | 1810 | </select> |
| 1805 | 1811 | <?php |
| @@ -1823,9 +1829,9 @@ | ||
| 1823 | 1829 | <li> |
| 1824 | 1830 | <select name="<?php echo esc_attr(Metasync_Admin::option_key . '[localseo][days][]') ?>"> |
| 1825 | 1831 | <?php |
| 1826 | 1832 | foreach ($days_name as $name) { |
| 1827 | - printf('<option value="%s" %s >%s</option>', $name, selected(esc_attr($name), esc_attr($day_name)), esc_attr($name)); | |
| 1833 | + printf('<option value="%s" %s >%s</option>', esc_attr($name), selected($name, $day_name, false), esc_html($name)); | |
| 1828 | 1834 | } |
| 1829 | 1835 | ?> |
| 1830 | 1836 | </select> |
| 1831 | 1837 | <input type="text" name="<?php echo esc_attr(Metasync_Admin::option_key . '[localseo][times][]') ?>" value="<?php echo esc_attr($day_time) ?>"> |
| @@ -1904,9 +1910,9 @@ | ||
| 1904 | 1910 | |
| 1905 | 1911 | public function local_seo_price_range_callback() |
| 1906 | 1912 | { |
| 1907 | 1913 | printf( |
| 1908 | - '<input type="text" id="local_seo_price_range" name="' . Metasync_Admin::option_key . '[localseo][local_seo_price_range]" value="%s" size="50" />', | |
| 1914 | + '<input type="text" id="local_seo_price_range" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_price_range]" value="%s" size="50" />', | |
| 1909 | 1915 | isset(Metasync::get_option('localseo')['local_seo_price_range']) ? esc_attr(Metasync::get_option('localseo')['local_seo_price_range']) : '' |
| 1910 | 1916 | ); |
| 1911 | 1917 | printf(' <br> <span class="description"> The price range of the business, for example $$$. </span>'); |
| 1912 | 1918 | } |
| @@ -1919,9 +1925,9 @@ | ||
| 1919 | 1925 | <?php |
| 1920 | 1926 | $about_page = Metasync::get_option('localseo')['local_seo_about_page'] ?? ''; |
| 1921 | 1927 | $pages = get_pages(); |
| 1922 | 1928 | foreach ($pages as $page) { |
| 1923 | - printf('<option value="%s" %s >%s</option>', $page->ID, selected($page->ID, esc_attr($about_page)), $page->post_title); | |
| 1929 | + printf('<option value="%s" %s >%s</option>', absint($page->ID), selected($page->ID, $about_page, false), esc_html($page->post_title)); | |
| 1924 | 1930 | } |
| 1925 | 1931 | ?> |
| 1926 | 1932 | </select> |
| 1927 | 1933 | <?php |
| @@ -1936,9 +1942,9 @@ | ||
| 1936 | 1942 | <?php |
| 1937 | 1943 | $contact_page = Metasync::get_option('localseo')['local_seo_contact_page'] ?? ''; |
| 1938 | 1944 | $pages = get_pages(); |
| 1939 | 1945 | foreach ($pages as $page) { |
| 1940 | - printf('<option value="%s" %s >%s</option>', $page->ID, selected($page->ID, esc_attr($contact_page)), $page->post_title); | |
| 1946 | + printf('<option value="%s" %s >%s</option>', absint($page->ID), selected($page->ID, $contact_page, false), esc_html($page->post_title)); | |
| 1941 | 1947 | } |
| 1942 | 1948 | ?> |
| 1943 | 1949 | </select> |
| 1944 | 1950 | <?php |
| @@ -1947,9 +1953,9 @@ | ||
| 1947 | 1953 | |
| 1948 | 1954 | public function local_seo_map_key_callback() |
| 1949 | 1955 | { |
| 1950 | 1956 | printf( |
| 1951 | - '<input type="text" id="local_seo_map_key" name="' . Metasync_Admin::option_key . '[localseo][local_seo_map_key]" value="%s" size="50" />', | |
| 1957 | + '<input type="text" id="local_seo_map_key" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_map_key]" value="%s" size="50" />', | |
| 1952 | 1958 | isset(Metasync::get_option('localseo')['local_seo_map_key']) ? esc_attr(Metasync::get_option('localseo')['local_seo_map_key']) : '' |
| 1953 | 1959 | ); |
| 1954 | 1960 | |
| 1955 | 1961 | printf(' <br> <span class="description"> An API Key is required to display embedded Google Maps on your site. </span>'); |
| @@ -1957,9 +1963,9 @@ | ||
| 1957 | 1963 | |
| 1958 | 1964 | public function local_seo_geo_coordinates_callback() |
| 1959 | 1965 | { |
| 1960 | 1966 | printf( |
| 1961 | - '<input type="text" id="local_seo_geo_coordinates" name="' . Metasync_Admin::option_key . '[localseo][local_seo_geo_coordinates]" value="%s" size="50" />', | |
| 1967 | + '<input type="text" id="local_seo_geo_coordinates" name="' . esc_attr(Metasync_Admin::option_key) . '[localseo][local_seo_geo_coordinates]" value="%s" size="50" />', | |
| 1962 | 1968 | isset(Metasync::get_option('localseo')['local_seo_geo_coordinates']) ? esc_attr(Metasync::get_option('localseo')['local_seo_geo_coordinates']) : '' |
| 1963 | 1969 | ); |
| 1964 | 1970 | |
| 1965 | 1971 | printf(' <br> <span class="description"> Latitude and longitude values separated by comma. </span>'); |
| @@ -1967,9 +1973,9 @@ | ||
| 1967 | 1973 | |
| 1968 | 1974 | public function header_snippets_callback() |
| 1969 | 1975 | { |
| 1970 | 1976 | printf( |
| 1971 | - '<textarea class="wide-text" id="header_snippets" rows="8" name="' . Metasync_Admin::option_key . '[codesnippets][header_snippet]" >%s</textarea>', | |
| 1977 | + '<textarea class="wide-text" id="header_snippets" rows="8" name="' . esc_attr(Metasync_Admin::option_key) . '[codesnippets][header_snippet]" >%s</textarea>', | |
| 1972 | 1978 | isset(Metasync::get_option('codesnippets')['header_snippet']) ? esc_attr(Metasync::get_option('codesnippets')['header_snippet']) : '' |
| 1973 | 1979 | ); |
| 1974 | 1980 | } |
| 1975 | 1981 | |
| @@ -1975,163 +1981,13 @@ | ||
| 1975 | 1981 | |
| 1976 | 1982 | public function footer_snippets_callback() |
| 1977 | 1983 | { |
| 1978 | 1984 | printf( |
| 1979 | - '<textarea class="wide-text" id="footer_snippets" rows="8" name="' . Metasync_Admin::option_key . '[codesnippets][footer_snippet]" >%s</textarea>', | |
| 1985 | + '<textarea class="wide-text" id="footer_snippets" rows="8" name="' . esc_attr(Metasync_Admin::option_key) . '[codesnippets][footer_snippet]" >%s</textarea>', | |
| 1980 | 1986 | isset(Metasync::get_option('codesnippets')['footer_snippet']) ? esc_attr(Metasync::get_option('codesnippets')['footer_snippet']) : '' |
| 1981 | 1987 | ); |
| 1982 | 1988 | } |
| 1983 | 1989 | |
| 1984 | - public function no_index_posts_callback() | |
| 1985 | - { | |
| 1986 | - printf( | |
| 1987 | - '<input type="checkbox" id="no_index_posts" name="' . Metasync_Admin::option_key . '[optimal_settings][no_index_posts]" value="true" %s />', | |
| 1988 | - isset(Metasync::get_option('optimal_settings')['no_index_posts']) && Metasync::get_option('optimal_settings')['no_index_posts'] == 'true' ? 'checked' : '' | |
| 1989 | - ); | |
| 1990 | - | |
| 1991 | - printf(' <br> <span class="description"> Setting empty archives to <code>noindex</code> is useful for avoiding indexation of thin content pages and dilution of page rank. As soon as a post is added, the page is updated to index. </span>'); | |
| 1992 | - } | |
| 1993 | - | |
| 1994 | - public function no_follow_links_callback() | |
| 1995 | - { | |
| 1996 | - printf( | |
| 1997 | - '<input type="checkbox" id="no_follow_links" name="' . Metasync_Admin::option_key . '[optimal_settings][no_follow_links]" value="true" %s />', | |
| 1998 | - isset(Metasync::get_option('optimal_settings')['no_follow_links']) && Metasync::get_option('optimal_settings')['no_follow_links'] == 'true' ? 'checked' : '' | |
| 1999 | - ); | |
| 2000 | - | |
| 2001 | - printf(' <br> <span class="description"> Automatically add <code>rel="nofollow"</code> attribute to external links appearing in your posts, pages, and other post types. The attribute is dynamically applied when the url is displayed</span>'); | |
| 2002 | - } | |
| 2003 | - | |
| 2004 | - public function open_external_links_callback() | |
| 2005 | - { | |
| 2006 | - printf( | |
| 2007 | - '<input type="checkbox" id="open_external_links" name="' . Metasync_Admin::option_key . '[optimal_settings][open_external_links]" value="true" %s />', | |
| 2008 | - isset(Metasync::get_option('optimal_settings')['open_external_links']) && Metasync::get_option('optimal_settings')['open_external_links'] == 'true' ? 'checked' : '' | |
| 2009 | - ); | |
| 2010 | - | |
| 2011 | - printf(' <br> <span class="description"> Automatically add <code>target="_blank"</code> attribute to external links appearing in your posts, pages, and other post types. The attribute is applied when the url is displayed.</span>'); | |
| 2012 | - } | |
| 2013 | - | |
| 2014 | - public function add_alt_image_tags_callback() | |
| 2015 | - { | |
| 2016 | - printf( | |
| 2017 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[optimal_settings][add_alt_image_tags]" value="true" %s />', | |
| 2018 | - isset(Metasync::get_option('optimal_settings')['add_alt_image_tags']) && Metasync::get_option('optimal_settings')['add_alt_image_tags'] == 'true' ? 'checked' : '' | |
| 2019 | - ); | |
| 2020 | - | |
| 2021 | - printf(' <br> <span class="description"> Automatically add <code>alt</code> attribute to Image Tags appearing in your posts, pages, and other post types. The attribute is applied when the content is displayed.</span>'); | |
| 2022 | - } | |
| 2023 | - | |
| 2024 | - public function add_title_image_tags_callback() | |
| 2025 | - { | |
| 2026 | - printf( | |
| 2027 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[optimal_settings][add_title_image_tags]" value="true" %s />', | |
| 2028 | - isset(Metasync::get_option('optimal_settings')['add_title_image_tags']) && Metasync::get_option('optimal_settings')['add_title_image_tags'] == 'true' ? 'checked' : '' | |
| 2029 | - ); | |
| 2030 | - | |
| 2031 | - printf(' <br> <span class="description"> Automatically add <code>title</code> attribute to Image Tags appearing in your posts, pages, and other post types. The attribute is applied when the content is displayed.</span>'); | |
| 2032 | - } | |
| 2033 | - | |
| 2034 | - public function site_type_callback() | |
| 2035 | - { | |
| 2036 | - | |
| 2037 | - $site_type = Metasync::get_option('optimal_settings')['site_info']['type'] ?? ''; | |
| 2038 | - | |
| 2039 | - $types = [ | |
| 2040 | - ['name' => 'Personal Blog', 'value' => 'blog'], | |
| 2041 | - ['name' => 'Community Blog/News Site', 'value' => 'news'], | |
| 2042 | - ['name' => 'Personal Portfolio', 'value' => 'portfolio'], | |
| 2043 | - ['name' => 'Small Business Site', 'value' => 'business'], | |
| 2044 | - ['name' => 'Webshop', 'value' => 'webshop'], | |
| 2045 | - ['name' => 'Other Personal Website', 'value' => 'otherpersonal'], | |
| 2046 | - ['name' => 'Other Business Website', 'value' => 'otherbusiness'], | |
| 2047 | - ]; | |
| 2048 | - | |
| 2049 | - ?> | |
| 2050 | - <select name="<?php echo esc_attr(Metasync_Admin::option_key . '[optimal_settings][site_info][type]') ?>" id="site_info_type"> | |
| 2051 | - <?php | |
| 2052 | - foreach ($types as $type) { | |
| 2053 | - printf('<option value="%s" %s >%s</option>', esc_attr($type['value']), selected(esc_attr($type['value']), esc_attr($site_type)), ($type['name'])); | |
| 2054 | - } | |
| 2055 | - ?> | |
| 2056 | - </select> | |
| 2057 | - <?php | |
| 2058 | - | |
| 2059 | - } | |
| 2060 | - | |
| 2061 | - public function site_business_type_callback() | |
| 2062 | - { | |
| 2063 | - | |
| 2064 | - $business_type = Metasync::get_option('optimal_settings')['site_info']['business_type'] ?? ''; | |
| 2065 | - | |
| 2066 | - $types = self::get_business_types(); | |
| 2067 | - sort($types); | |
| 2068 | - | |
| 2069 | - ?> | |
| 2070 | - <select name="<?php echo esc_attr(Metasync_Admin::option_key . '[optimal_settings][site_info][business_type]') ?>"> | |
| 2071 | - <option value='0'>Select Business Type</option> | |
| 2072 | - <?php | |
| 2073 | - foreach ($types as $type) { | |
| 2074 | - printf('<option value="%s" %s >%s</option>', esc_attr($type), selected(esc_attr($type), esc_attr($business_type)), esc_attr($type)); | |
| 2075 | - } | |
| 2076 | - ?> | |
| 2077 | - </select> | |
| 2078 | - <?php | |
| 2079 | - } | |
| 2080 | - | |
| 2081 | - public function site_company_name_callback() | |
| 2082 | - { | |
| 2083 | - | |
| 2084 | - $company_name = Metasync::get_option('optimal_settings')['site_info']['company_name'] ?? get_bloginfo('name'); | |
| 2085 | - | |
| 2086 | - printf( | |
| 2087 | - '<input type="text" name="' . Metasync_Admin::option_key . '[optimal_settings][site_info][company_name]" value="%s" size="50" />', | |
| 2088 | - $company_name ? $company_name : get_bloginfo('name') | |
| 2089 | - ); | |
| 2090 | - } | |
| 2091 | - | |
| 2092 | - public function site_google_logo_callback() | |
| 2093 | - { | |
| 2094 | - | |
| 2095 | - $google_logo = Metasync::get_option('optimal_settings')['site_info']['google_logo'] ?? ''; | |
| 2096 | - | |
| 2097 | - printf( | |
| 2098 | - '<input type="hidden" id="site_google_logo" name="' . Metasync_Admin::option_key . '[optimal_settings][site_info][google_logo]" value="%s" size="50" />', | |
| 2099 | - $google_logo | |
| 2100 | - ); | |
| 2101 | - | |
| 2102 | - printf(' <br> <input class="button-secondary" type="button" id="google_logo_btn" value="Add or Upload File">'); | |
| 2103 | - printf(' <br><br> <span class="description bold"> Min Size: 160X90px, Max Size: 1920X1080px. </span> <br> <span class="description"> A squared image is preferred by the search engines. </span> <br><br> '); | |
| 2104 | - printf('<img src="%s" id="site_google_logo_img" width="300">', wp_get_attachment_image_src($google_logo, 'medium')[0] ?? ''); | |
| 2105 | - | |
| 2106 | - $button_type = 'hidden'; | |
| 2107 | - if ($google_logo) { | |
| 2108 | - $button_type = 'button'; | |
| 2109 | - } | |
| 2110 | - printf('<input type="%s" class="button-secondary" id="site_google_logo_close_btn" value="X">', $button_type); | |
| 2111 | - } | |
| 2112 | - | |
| 2113 | - public function site_social_share_image_callback() | |
| 2114 | - { | |
| 2115 | - | |
| 2116 | - $social_share_image = Metasync::get_option('optimal_settings')['site_info']['social_share_image'] ?? ''; | |
| 2117 | - | |
| 2118 | - printf( | |
| 2119 | - '<input type="hidden" id="site_social_share_image" name="' . Metasync_Admin::option_key . '[optimal_settings][site_info][social_share_image]" value="%s" size="50" />', | |
| 2120 | - $social_share_image | |
| 2121 | - ); | |
| 2122 | - | |
| 2123 | - printf(' <br> <input class="button-secondary" type="button" id="social_share_image_btn" value="Add or Upload File">'); | |
| 2124 | - printf(' <br><br> <span class="description bold"> The recommended image size is 1200 x 630 pixels. </span> <br> <span class="description"> When a featured image or an OpenGraph Image is not set for individual posts/pages/CPTs, this image will be used as a fallback thumbnail when your post is shared on Facebook. </span> <br><br> '); | |
| 2125 | - printf('<img src="%s" id="site_social_share_img" width="300">', wp_get_attachment_image_src($social_share_image, 'medium')[0] ?? ''); | |
| 2126 | - | |
| 2127 | - $button_type = 'hidden'; | |
| 2128 | - if ($social_share_image) { | |
| 2129 | - $button_type = 'button'; | |
| 2130 | - } | |
| 2131 | - printf('<input type="%s" class="button-secondary" id="site_social_image_close_btn" value="X">', $button_type); | |
| 2132 | - } | |
| 2133 | - | |
| 2134 | 1990 | public function common_robot_meta_tags_callback() |
| 2135 | 1991 | { |
| 2136 | 1992 | $common_robots_meta = Metasync::get_option('common_robots_meta') ?? Metasync::get_option('common_robots_mata') ?? ''; |
| 2137 | 1993 | |
| @@ -2137,16 +1993,8 @@ | ||
| 2137 | 1993 | |
| 2138 | 1994 | ?> |
| 2139 | 1995 | <ul class="checkbox-list"> |
| 2140 | 1996 | <li> |
| 2141 | - <input type="checkbox" name="<?php echo esc_attr(Metasync_Admin::option_key . '[common_robots_meta][index]') ?>" id="robots_common1" value="index" <?php isset($common_robots_meta['index']) ? checked('index', $common_robots_meta['index']) : '' ?>> | |
| 2142 | - <label for="robots_common1">Index </br> | |
| 2143 | - <span class="description"> | |
| 2144 | - <span>Search engines to index and show these pages in the search results.</span> | |
| 2145 | - </span> | |
| 2146 | - </label> | |
| 2147 | - </li> | |
| 2148 | - <li> | |
| 2149 | 1997 | <input type="checkbox" name="<?php echo esc_attr(Metasync_Admin::option_key . '[common_robots_meta][noindex]') ?>" id="robots_common2" value="noindex" <?php isset($common_robots_meta['noindex']) ? checked('noindex', $common_robots_meta['noindex']) : '' ?>> |
| 2150 | 1998 | <label for="robots_common2">No Index </br> |
| 2151 | 1999 | <span class="description"> |
| 2152 | 2000 | <span>Search engines not indexed and displayed this pages in search engine results</span> |
| @@ -2272,9 +2120,9 @@ | ||
| 2272 | 2120 | |
| 2273 | 2121 | public function global_open_graph_meta_callback() |
| 2274 | 2122 | { |
| 2275 | 2123 | printf( |
| 2276 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][open_graph_meta_tags]" value="true" %s />', | |
| 2124 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][open_graph_meta_tags]" value="true" %s />', | |
| 2277 | 2125 | isset(Metasync::get_option('common_meta_settings')['open_graph_meta_tags']) && Metasync::get_option('common_meta_settings')['open_graph_meta_tags'] == 'true' ? 'checked' : '' |
| 2278 | 2126 | ); |
| 2279 | 2127 | printf(' <br> <span class="description"> Automatically add the Open Graph meta tags in a page or post.</span>'); |
| 2280 | 2128 | } |
| @@ -2281,9 +2129,9 @@ | ||
| 2281 | 2129 | |
| 2282 | 2130 | public function global_facebook_meta_callback() |
| 2283 | 2131 | { |
| 2284 | 2132 | printf( |
| 2285 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][facebook_meta_tags]" value="true" %s />', | |
| 2133 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][facebook_meta_tags]" value="true" %s />', | |
| 2286 | 2134 | isset(Metasync::get_option('common_meta_settings')['facebook_meta_tags']) && Metasync::get_option('common_meta_settings')['facebook_meta_tags'] == 'true' ? 'checked' : '' |
| 2287 | 2135 | ); |
| 2288 | 2136 | printf(' <br> <span class="description"> Automatically add the Facebook meta tags in a page or post.</span>'); |
| 2289 | 2137 | } |
| @@ -2290,9 +2138,9 @@ | ||
| 2290 | 2138 | |
| 2291 | 2139 | public function global_twitter_meta_callback() |
| 2292 | 2140 | { |
| 2293 | 2141 | printf( |
| 2294 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][twitter_meta_tags]" value="true" %s />', | |
| 2142 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][twitter_meta_tags]" value="true" %s />', | |
| 2295 | 2143 | isset(Metasync::get_option('common_meta_settings')['twitter_meta_tags']) && Metasync::get_option('common_meta_settings')['twitter_meta_tags'] == 'true' ? 'checked' : '' |
| 2296 | 2144 | ); |
| 2297 | 2145 | printf(' <br> <span class="description"> Automatically add the Twitter meta tags in a page or post.</span>'); |
| 2298 | 2146 | } |
| @@ -2300,9 +2148,9 @@ | ||
| 2300 | 2148 | public function og_image_dimensions_callback() |
| 2301 | 2149 | { |
| 2302 | 2150 | $val = Metasync::get_option('common_meta_settings')['og_image_dimensions'] ?? 'true'; |
| 2303 | 2151 | printf( |
| 2304 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][og_image_dimensions]" value="true" %s />', | |
| 2152 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][og_image_dimensions]" value="true" %s />', | |
| 2305 | 2153 | $val === 'true' ? 'checked' : '' |
| 2306 | 2154 | ); |
| 2307 | 2155 | printf('<span class="description"> Output og:image:width, og:image:height, and og:image:type when OG image metadata is available.</span>'); |
| 2308 | 2156 | } |
| @@ -2310,9 +2158,9 @@ | ||
| 2310 | 2158 | public function article_timestamps_callback() |
| 2311 | 2159 | { |
| 2312 | 2160 | $val = Metasync::get_option('common_meta_settings')['article_timestamps'] ?? 'true'; |
| 2313 | 2161 | printf( |
| 2314 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][article_timestamps]" value="true" %s />', | |
| 2162 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][article_timestamps]" value="true" %s />', | |
| 2315 | 2163 | $val === 'true' ? 'checked' : '' |
| 2316 | 2164 | ); |
| 2317 | 2165 | printf('<span class="description"> Output article:published_time and article:modified_time from the post publish and modified dates (ISO 8601).</span>'); |
| 2318 | 2166 | } |
| @@ -2320,9 +2168,9 @@ | ||
| 2320 | 2168 | public function article_author_callback() |
| 2321 | 2169 | { |
| 2322 | 2170 | $val = Metasync::get_option('common_meta_settings')['article_author'] ?? 'true'; |
| 2323 | 2171 | printf( |
| 2324 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][article_author]" value="true" %s />', | |
| 2172 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][article_author]" value="true" %s />', | |
| 2325 | 2173 | $val === 'true' ? 'checked' : '' |
| 2326 | 2174 | ); |
| 2327 | 2175 | printf('<span class="description"> Output article:author using the post author website URL or archive URL (overridable per-post via _metasync_og_article_author meta).</span>'); |
| 2328 | 2176 | } |
| @@ -2330,9 +2178,9 @@ | ||
| 2330 | 2178 | public function article_section_callback() |
| 2331 | 2179 | { |
| 2332 | 2180 | $val = Metasync::get_option('common_meta_settings')['article_section'] ?? 'true'; |
| 2333 | 2181 | printf( |
| 2334 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][article_section]" value="true" %s />', | |
| 2182 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][article_section]" value="true" %s />', | |
| 2335 | 2183 | $val === 'true' ? 'checked' : '' |
| 2336 | 2184 | ); |
| 2337 | 2185 | printf('<span class="description"> Output article:section from the primary category (falls back to first category).</span>'); |
| 2338 | 2186 | } |
| @@ -2340,9 +2188,9 @@ | ||
| 2340 | 2188 | public function article_tags_callback() |
| 2341 | 2189 | { |
| 2342 | 2190 | $val = Metasync::get_option('common_meta_settings')['article_tags'] ?? 'true'; |
| 2343 | 2191 | printf( |
| 2344 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][article_tags]" value="true" %s />', | |
| 2192 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][article_tags]" value="true" %s />', | |
| 2345 | 2193 | $val === 'true' ? 'checked' : '' |
| 2346 | 2194 | ); |
| 2347 | 2195 | printf('<span class="description"> Output one article:tag meta tag per WordPress post tag.</span>'); |
| 2348 | 2196 | } |
| @@ -2350,9 +2198,9 @@ | ||
| 2350 | 2198 | public function twitter_image_alt_callback() |
| 2351 | 2199 | { |
| 2352 | 2200 | $val = Metasync::get_option('common_meta_settings')['twitter_image_alt'] ?? 'true'; |
| 2353 | 2201 | printf( |
| 2354 | - '<input type="checkbox" name="' . Metasync_Admin::option_key . '[common_meta_settings][twitter_image_alt]" value="true" %s />', | |
| 2202 | + '<input type="checkbox" name="' . esc_attr(Metasync_Admin::option_key) . '[common_meta_settings][twitter_image_alt]" value="true" %s />', | |
| 2355 | 2203 | $val === 'true' ? 'checked' : '' |
| 2356 | 2204 | ); |
| 2357 | 2205 | printf('<span class="description"> Output twitter:image:alt using the stored alt text or the OG image attachment alt attribute.</span>'); |
| 2358 | 2206 | } |
| @@ -2359,9 +2207,9 @@ | ||
| 2359 | 2207 | |
| 2360 | 2208 | public function facebook_page_url_callback() |
| 2361 | 2209 | { |
| 2362 | 2210 | $facebook_page_url = Metasync::get_option('social_meta')['facebook_page_url'] ?? ''; |
| 2363 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][facebook_page_url]" value="%s" size="50" />', esc_attr($facebook_page_url)); | |
| 2211 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][facebook_page_url]" value="%s" size="50" />', esc_attr($facebook_page_url)); | |
| 2364 | 2212 | printf('<br><span class="description"> Enter your Facebook page URL. eg: <code>https://www.facebook.com/MetaSync/</code> </span>'); |
| 2365 | 2213 | } |
| 2366 | 2214 | |
| 2367 | 2215 | public function facebook_authorship_callback() |
| @@ -2366,9 +2214,9 @@ | ||
| 2366 | 2214 | |
| 2367 | 2215 | public function facebook_authorship_callback() |
| 2368 | 2216 | { |
| 2369 | 2217 | $facebook_authorship = Metasync::get_option('social_meta')['facebook_authorship'] ?? ''; |
| 2370 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][facebook_authorship]" value="%s" size="50" />', esc_attr($facebook_authorship)); | |
| 2218 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][facebook_authorship]" value="%s" size="50" />', esc_attr($facebook_authorship)); | |
| 2371 | 2219 | printf('<br><span class="description"> Enter Facebook profile URL to show Facebook Authorship when your articles are being shared on Facebook. eg: <code>https://www.facebook.com/shahrukh/</code> </span>'); |
| 2372 | 2220 | } |
| 2373 | 2221 | |
| 2374 | 2222 | public function facebook_admin_callback() |
| @@ -2373,9 +2221,9 @@ | ||
| 2373 | 2221 | |
| 2374 | 2222 | public function facebook_admin_callback() |
| 2375 | 2223 | { |
| 2376 | 2224 | $facebook_admin = Metasync::get_option('social_meta')['facebook_admin'] ?? ''; |
| 2377 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][facebook_admin]" value="%s" size="50" />', esc_attr($facebook_admin)); | |
| 2225 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][facebook_admin]" value="%s" size="50" />', esc_attr($facebook_admin)); | |
| 2378 | 2226 | printf(' <br> <span class="description"> Enter numeric user ID of Facebook. </span>'); |
| 2379 | 2227 | } |
| 2380 | 2228 | |
| 2381 | 2229 | public function facebook_app_callback() |
| @@ -2380,9 +2228,9 @@ | ||
| 2380 | 2228 | |
| 2381 | 2229 | public function facebook_app_callback() |
| 2382 | 2230 | { |
| 2383 | 2231 | $facebook_app = Metasync::get_option('social_meta')['facebook_app'] ?? ''; |
| 2384 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][facebook_app]" value="%s" size="50" />', esc_attr($facebook_app)); | |
| 2232 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][facebook_app]" value="%s" size="50" />', esc_attr($facebook_app)); | |
| 2385 | 2233 | printf(' <br> <span class="description"> Enter numeric app ID of Facebook </span>'); |
| 2386 | 2234 | } |
| 2387 | 2235 | |
| 2388 | 2236 | public function facebook_secret_callback() |
| @@ -2387,9 +2235,9 @@ | ||
| 2387 | 2235 | |
| 2388 | 2236 | public function facebook_secret_callback() |
| 2389 | 2237 | { |
| 2390 | 2238 | $facebook_secret = Metasync::get_option('social_meta')['facebook_secret'] ?? ''; |
| 2391 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][facebook_secret]" value="%s" size="50" />', esc_attr($facebook_secret)); | |
| 2239 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][facebook_secret]" value="%s" size="50" />', esc_attr($facebook_secret)); | |
| 2392 | 2240 | printf(' <br> <span class="description"> Enter alphanumeric access token from Facebook. </span>'); |
| 2393 | 2241 | } |
| 2394 | 2242 | |
| 2395 | 2243 | public function twitter_username_callback() |
| @@ -2394,9 +2242,9 @@ | ||
| 2394 | 2242 | |
| 2395 | 2243 | public function twitter_username_callback() |
| 2396 | 2244 | { |
| 2397 | 2245 | $twitter_username = Metasync::get_option('social_meta')['twitter_username'] ?? ''; |
| 2398 | - printf('<input type="text" name="' . Metasync_Admin::option_key . '[social_meta][twitter_username]" value="%s" size="50" />', esc_attr($twitter_username)); | |
| 2246 | + printf('<input type="text" name="' . esc_attr(Metasync_Admin::option_key) . '[social_meta][twitter_username]" value="%s" size="50" />', esc_attr($twitter_username)); | |
| 2399 | 2247 | printf(' <br> <span class="description"> Twitter username of the author to add <code>twitter:creator</code> tag to post. eg: <code>MetaSync</code> </span>'); |
| 2400 | 2248 | } |
| 2401 | 2249 | |
| 2402 | 2250 | public static function get_business_types() |
| @@ -2571,8 +2419,14 @@ | ||
| 2571 | 2419 | } |
| 2572 | 2420 | |
| 2573 | 2421 | /** |
| 2574 | 2422 | * Render breadcrumbs settings section |
| 2423 | + * | |
| 2424 | + * Rendered by the dedicated Breadcrumbs admin page. The three checkbox | |
| 2425 | + * fields each ship a hidden companion input so their keys are always | |
| 2426 | + * present in the submitted payload, which lets the save handlers treat an | |
| 2427 | + * absent key as "this form does not manage that field" instead of | |
| 2428 | + * "unchecked". | |
| 2575 | 2429 | */ |
| 2576 | 2430 | public function render_breadcrumbs_section() { |
| 2577 | 2431 | $options = Metasync::get_option('breadcrumbs', array()); |
| 2578 | 2432 | |
| @@ -2577,9 +2431,9 @@ | ||
| 2577 | 2431 | $options = Metasync::get_option('breadcrumbs', array()); |
| 2578 | 2432 | |
| 2579 | 2433 | $defaults = array( |
| 2580 | 2434 | 'enabled' => true, |
| 2581 | - 'separator' => '»', | |
| 2435 | + 'separator' => '»', | |
| 2582 | 2436 | 'home_label' => 'Home', |
| 2583 | 2437 | 'home_url' => '', |
| 2584 | 2438 | 'show_current_page' => true, |
| 2585 | 2439 | 'prefix_text' => '', |
| @@ -2587,8 +2441,19 @@ | ||
| 2587 | 2441 | 'disable_schema' => false, |
| 2588 | 2442 | ); |
| 2589 | 2443 | |
| 2590 | 2444 | $options = wp_parse_args($options, $defaults); |
| 2445 | + | |
| 2446 | + # Older builds stored the separator as an HTML entity (e.g. "»"). | |
| 2447 | + # Decode before matching so the saved choice still lights up its radio. | |
| 2448 | + $separator_presets = array('»', '/', '>', '·'); | |
| 2449 | + $separator_current = html_entity_decode((string) $options['separator'], ENT_QUOTES, 'UTF-8'); | |
| 2450 | + if ($separator_current === '') { | |
| 2451 | + $separator_current = '»'; | |
| 2452 | + } | |
| 2453 | + # A separator that predates the radio picker (or came from the old free | |
| 2454 | + # text field) gets its own option so it stays selected and round-trips. | |
| 2455 | + $separator_custom = in_array($separator_current, $separator_presets, true) ? '' : $separator_current; | |
| 2591 | 2456 | ?> |
| 2592 | 2457 | <div style="background: var(--dashboard-card-bg); padding: 20px; border-radius: 8px;"> |
| 2593 | 2458 | |
| 2594 | 2459 | <!-- Enable/Disable --> |
| @@ -2593,8 +2458,9 @@ | ||
| 2593 | 2458 | |
| 2594 | 2459 | <!-- Enable/Disable --> |
| 2595 | 2460 | <div style="margin-bottom: 24px;"> |
| 2596 | 2461 | <label style="display: flex; align-items: center; gap: 12px; cursor: pointer;"> |
| 2462 | + <input type="hidden" name="metasync_options[breadcrumbs][enabled]" value="0"> | |
| 2597 | 2463 | <input type="checkbox" |
| 2598 | 2464 | name="metasync_options[breadcrumbs][enabled]" |
| 2599 | 2465 | value="1" |
| 2600 | 2466 | <?php checked($options['enabled'], 1); ?> |
| @@ -2599,8 +2465,9 @@ | ||
| 2599 | 2465 | value="1" |
| 2600 | 2466 | <?php checked($options['enabled'], 1); ?> |
| 2601 | 2467 | style="width: 18px; height: 18px; cursor: pointer;"> |
| 2602 | 2468 | <span style="font-weight: 500; color: var(--dashboard-text);">Enable breadcrumbs globally</span> |
| 2469 | + <?php Metasync::render_tooltip_icon('breadcrumbs_enabled', 'Shows a trail of links (e.g. Home > Blog > This Post) near the top of your pages so visitors can see where they are and navigate back up a level. Turn off to hide breadcrumbs everywhere.'); ?> | |
| 2603 | 2470 | </label> |
| 2604 | 2471 | <p style="margin: 8px 0 0 0; font-size: 12px; color: var(--dashboard-text-secondary);"> |
| 2605 | 2472 | Enable or disable breadcrumb navigation on your site |
| 2606 | 2473 | </p> |
| @@ -2608,8 +2475,9 @@ | ||
| 2608 | 2475 | |
| 2609 | 2476 | <!-- Disable Schema Markup --> |
| 2610 | 2477 | <div style="margin-bottom: 24px;"> |
| 2611 | 2478 | <label style="display: flex; align-items: center; gap: 12px; cursor: pointer;"> |
| 2479 | + <input type="hidden" name="metasync_options[breadcrumbs][disable_schema]" value="0"> | |
| 2612 | 2480 | <input type="checkbox" |
| 2613 | 2481 | name="metasync_options[breadcrumbs][disable_schema]" |
| 2614 | 2482 | value="1" |
| 2615 | 2483 | <?php checked($options['disable_schema'], 1); ?> |
| @@ -2614,8 +2482,9 @@ | ||
| 2614 | 2482 | value="1" |
| 2615 | 2483 | <?php checked($options['disable_schema'], 1); ?> |
| 2616 | 2484 | style="width: 18px; height: 18px; cursor: pointer;"> |
| 2617 | 2485 | <span style="font-weight: 500; color: var(--dashboard-text);">Disable breadcrumb schema markup (JSON-LD)</span> |
| 2486 | + <?php Metasync::render_tooltip_icon('breadcrumbs_disable_schema', 'Leave off. Only check this if another SEO plugin (Yoast, Rank Math, etc.) already sends breadcrumb data to Google, so you don\'t send it twice.'); ?> | |
| 2618 | 2487 | </label> |
| 2619 | 2488 | <p style="margin: 8px 0 0 0; font-size: 12px; color: var(--dashboard-text-secondary);"> |
| 2620 | 2489 | When checked, MetaSync will not output the <code style="background: rgba(0,0,0,0.1); padding: 2px 4px; border-radius: 3px;">BreadcrumbList</code> JSON-LD in <code style="background: rgba(0,0,0,0.1); padding: 2px 4px; border-radius: 3px;"><head></code>. Use this if another SEO plugin already handles breadcrumb schema. |
| 2621 | 2490 | </p> |
| @@ -2626,24 +2495,21 @@ | ||
| 2626 | 2495 | <label for="breadcrumb_separator" style="display: block; margin-bottom: 8px; font-weight: 500; color: var(--dashboard-text);"> |
| 2627 | 2496 | Separator Character |
| 2628 | 2497 | </label> |
| 2629 | 2498 | <div style="display: flex; gap: 12px; flex-wrap: wrap;"> |
| 2499 | + <?php foreach ($separator_presets as $separator_option) : ?> | |
| 2630 | 2500 | <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;"> |
| 2631 | - <input type="radio" name="metasync_options[breadcrumbs][separator]" value="»" <?php checked($options['separator'], '»'); ?>> | |
| 2632 | - <span style="color: var(--dashboard-text);">»</span> | |
| 2501 | + <input type="radio" name="metasync_options[breadcrumbs][separator]" value="<?php echo esc_attr($separator_option); ?>" <?php checked($separator_current, $separator_option); ?>> | |
| 2502 | + <span style="color: var(--dashboard-text);"><?php echo esc_html($separator_option); ?></span> | |
| 2633 | 2503 | </label> |
| 2634 | - <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;"> | |
| 2635 | - <input type="radio" name="metasync_options[breadcrumbs][separator]" value="/" <?php checked($options['separator'], '/'); ?>> | |
| 2636 | - <span style="color: var(--dashboard-text);">/</span> | |
| 2637 | - </label> | |
| 2638 | - <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;"> | |
| 2639 | - <input type="radio" name="metasync_options[breadcrumbs][separator]" value=">" <?php checked($options['separator'], '>'); ?>> | |
| 2640 | - <span style="color: var(--dashboard-text);">></span> | |
| 2641 | - </label> | |
| 2642 | - <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;"> | |
| 2643 | - <input type="radio" name="metasync_options[breadcrumbs][separator]" value="·" <?php checked($options['separator'], '·'); ?>> | |
| 2644 | - <span style="color: var(--dashboard-text);">·</span> | |
| 2645 | - </label> | |
| 2504 | + <?php endforeach; ?> | |
| 2505 | + <div style="display: flex; align-items: center; gap: 8px;"> | |
| 2506 | + <label style="display: flex; align-items: center; gap: 8px; cursor: pointer;"> | |
| 2507 | + <input type="radio" id="metasync-breadcrumb-separator-custom" name="metasync_options[breadcrumbs][separator]" value="<?php echo esc_attr($separator_custom); ?>" <?php checked($separator_custom !== ''); ?>> | |
| 2508 | + <span style="color: var(--dashboard-text);">Custom</span> | |
| 2509 | + </label> | |
| 2510 | + <input type="text" value="<?php echo esc_attr($separator_custom); ?>" placeholder="~" maxlength="16" aria-label="Custom separator character" oninput="var r=document.getElementById('metasync-breadcrumb-separator-custom');r.value=this.value;r.checked=true" style="width: 80px; padding: 8px 10px; background: var(--dashboard-input-bg); border: 1px solid var(--dashboard-border); border-radius: 6px; color: var(--dashboard-text); font-size: 14px;"> | |
| 2511 | + </div> | |
| 2646 | 2512 | </div> |
| 2647 | 2513 | <p style="margin: 8px 0 0 0; font-size: 12px; color: var(--dashboard-text-secondary);"> |
| 2648 | 2514 | Choose how to separate breadcrumb items |
| 2649 | 2515 | </p> |
| @@ -2683,8 +2549,9 @@ | ||
| 2683 | 2549 | |
| 2684 | 2550 | <!-- Show Current Page --> |
| 2685 | 2551 | <div style="margin-bottom: 24px;"> |
| 2686 | 2552 | <label style="display: flex; align-items: center; gap: 12px; cursor: pointer;"> |
| 2553 | + <input type="hidden" name="metasync_options[breadcrumbs][show_current_page]" value="0"> | |
| 2687 | 2554 | <input type="checkbox" |
| 2688 | 2555 | name="metasync_options[breadcrumbs][show_current_page]" |
| 2689 | 2556 | value="1" |
| 2690 | 2557 | <?php checked($options['show_current_page'], 1); ?> |
| @@ -2715,8 +2582,9 @@ | ||
| 2715 | 2582 | <!-- Archive Label Format --> |
| 2716 | 2583 | <div style="margin-bottom: 24px;"> |
| 2717 | 2584 | <label for="breadcrumb_archive_format" style="display: block; margin-bottom: 8px; font-weight: 500; color: var(--dashboard-text);"> |
| 2718 | 2585 | Archive Label Format |
| 2586 | + <?php Metasync::render_tooltip_icon('breadcrumb_archive_format', 'On category/archive pages, {name} is replaced with that section\'s name. Type {name} alone for just the name, or something like "Category: {name}".'); ?> | |
| 2719 | 2587 | </label> |
| 2720 | 2588 | <input type="text" |
| 2721 | 2589 | id="breadcrumb_archive_format" |
| 2722 | 2590 | name="metasync_options[breadcrumbs][archive_label_format]" |
