Changeset 3452204

Timestamp:

02/02/2026 03:06:52 PM (3 weeks ago)

Author:

gkanters

Message:

Avoid fatal error when Elemtor is active

Location:

ai-translate/trunk

Files:

• ai-translate.php (modified) (8 diffs)
• includes/admin-page.php (modified) (5 diffs)
• includes/class-ai-batch.php (modified) (1 diff)
• includes/class-ai-cache-meta.php (modified) (2 diffs)
• includes/class-ai-seo.php (modified) (1 diff)
• includes/class-ai-translate-core.php (modified) (3 diffs)

ai-translate/trunk/ai-translate.php

@@ -233 +233 @@
 }
 
-// Ensure slug map table exists early in init
-add_action('init', function () {
-    \AITranslate\AI_Slugs::install_table();
-}, 1);
-
-// Schedule cache metadata sync cron job
-add_action('ai_translate_sync_cache_metadata', function () {
-    \AITranslate\AI_Cache_Meta::sync_from_filesystem();
-});
-
-if (!wp_next_scheduled('ai_translate_sync_cache_metadata')) {
-    wp_schedule_event(time(), 'hourly', 'ai_translate_sync_cache_metadata');
-}
-
-
-
 // Add original-style language-prefixed rewrite rules using 'lang' query var to ensure WP resolves pages via pagename
 // Priority 999: runs AFTER custom post types are registered (default priority 10)
-add_action('init', function () {
+function ai_translate_register_rewrite_rules()
+{
     $settings = get_option('ai_translate_settings', array());
     $enabled = isset($settings['enabled_languages']) && is_array($settings['enabled_languages']) ? $settings['enabled_languages'] : array();
@@ -261 +246 @@
     }
     $langs = array_filter(array_map('sanitize_key', $langs));
-    if (empty($langs)) return;
+    if (empty($langs)) {
+        return;
+    }
     $regex = '(' . implode('|', array_map(function ($l) {
         return preg_quote($l, '/');
@@ -267 +254 @@
     add_rewrite_rule('^' . $regex . '/?$', 'index.php?lang=$matches[1]', 'top');
     
-    // Add rewrite rules for all public custom post types (generiek)
     $public_post_types = get_post_types(array('public' => true, '_builtin' => false), 'objects');
     foreach ($public_post_types as $post_type) {
@@ -273 +259 @@
             $slug = $post_type->rewrite['slug'];
             $type_name = $post_type->name;
-            // Add explicit rule for this CPT: /{lang}/{cpt-slug}/{post-name}
             add_rewrite_rule(
                 '^' . $regex . '/(?!wp-admin|wp-login\.php)(' . preg_quote($slug, '/') . ')/([^/]+)/?$',
@@ -282 +267 @@
     }
     
-    // Generic rule for hierarchical paths - try to resolve without language prefix first
     add_rewrite_rule('^' . $regex . '/(?!wp-admin|wp-login\.php)(.+)$', 'index.php?ai_translate_path=$matches[2]&lang=$matches[1]', 'top');
-    // Pagination for posts index: /{lang}/page/{n}/ (added last so it sits on top due to 'top')
     add_rewrite_rule('^' . $regex . '/page/([0-9]+)/?$', 'index.php?lang=$matches[1]&paged=$matches[2]', 'top');
-}, 999); // Priority 999: runs AFTER custom post types are registered (default priority 10)
+}
+
+add_action('init', 'ai_translate_register_rewrite_rules', 999); // Priority 999: runs AFTER custom post types are registered (default priority 10)
+
+// Ensure slug map table exists early in init
+add_action('init', function () {
+    \AITranslate\AI_Slugs::install_table();
+}, 1);
+
+// Schedule cache metadata sync cron job
+add_action('ai_translate_sync_cache_metadata', function () {
+    \AITranslate\AI_Cache_Meta::sync_from_filesystem();
+});
+
+if (!wp_next_scheduled('ai_translate_sync_cache_metadata')) {
+    wp_schedule_event(time(), 'hourly', 'ai_translate_sync_cache_metadata');
+}
+
+
+
+// Ensure slug map table exists early in init
+add_action('init', function () {
+    \AITranslate\AI_Slugs::install_table();
+}, 1);
+
+// Schedule cache metadata sync cron job
+add_action('ai_translate_sync_cache_metadata', function () {
+    \AITranslate\AI_Cache_Meta::sync_from_filesystem();
+});
+
+if (!wp_next_scheduled('ai_translate_sync_cache_metadata')) {
+    wp_schedule_event(time(), 'hourly', 'ai_translate_sync_cache_metadata');
+}
 
 add_filter('query_vars', function ($vars) {
@@ -421 +436 @@
 register_activation_hook(__FILE__, function () {
     // Ensure rules are registered before flushing
-    do_action('init');
+    ai_translate_register_rewrite_rules();
 
     // Automatically set permalinks to 'post-name' if they're currently 'plain'
@@ -560 +575 @@
  * Handles language detection and redirection according to the 4 language switcher rules.
  */
+// Check for _wp_old_slug redirects before other plugin logic (priority 1).
+// Request path is checked first: if it matches an old slug in DB, redirect. Do not rely on is_404
+// because themes/plugins may serve the homepage instead of 404 for unknown slugs.
+add_action('template_redirect', function () {
+    if (!isset($_SERVER['REQUEST_URI'])) {
+        return;
+    }
+    $request_uri = (string) $_SERVER['REQUEST_URI'];
+    $request_path = parse_url($request_uri, PHP_URL_PATH);
+    if (!is_string($request_path) || $request_path === '' || $request_path === '/') {
+        return;
+    }
+    // Skip if URL has language prefix (let AI Translate handle those)
+    if (preg_match('#^/([a-z]{2})(?:/|$)#i', $request_path)) {
+        return;
+    }
+    // Single-segment path (e.g. /programmeren-met-een-ai-agen/) – might be an old slug
+    $path_parts = array_filter(explode('/', trim($request_path, '/')));
+    if (empty($path_parts)) {
+        return;
+    }
+    $slug = end($path_parts);
+    global $wpdb;
+    $post_id = $wpdb->get_var($wpdb->prepare(
+        "SELECT post_id FROM {$wpdb->postmeta} WHERE meta_key = '_wp_old_slug' AND meta_value = %s LIMIT 1",
+        $slug
+    ));
+    if (!$post_id) {
+        return;
+    }
+    $post = get_post($post_id);
+    if (!$post || $post->post_status !== 'publish') {
+        return;
+    }
+    $permalink = get_permalink($post);
+    if ($permalink) {
+        wp_safe_redirect($permalink, 301);
+        exit;
+    }
+}, 1);
+
 add_action('template_redirect', function () {
     // Handle ai_translate_path query var for custom URL resolution
@@ -1391 +1447 @@
 
 /**
+ * Resolve _wp_old_slug in parse_request and redirect to canonical URL before 404 is set.
+ * Priority 0 so this runs before any 404 redirect plugin (which would send 404s to homepage).
+ */
+add_action('parse_request', function ($wp) {
+    if (is_admin() || wp_doing_ajax() || ai_translate_is_xml_request()) {
+        return;
+    }
+    $reqUriRaw = isset($_SERVER['REQUEST_URI']) ? (string) $_SERVER['REQUEST_URI'] : '';
+    if (strpos($reqUriRaw, '%25') !== false) {
+        $reqUriRaw = urldecode($reqUriRaw);
+    }
+    $request_path = wp_parse_url($reqUriRaw, PHP_URL_PATH) ?: '/';
+    if (!is_string($request_path) || $request_path === '' || $request_path === '/') {
+        return;
+    }
+    if (preg_match('#^/([a-z]{2})(?:/|$)#i', $request_path)) {
+        return;
+    }
+    $path_parts = array_filter(explode('/', trim($request_path, '/')));
+    if (empty($path_parts)) {
+        return;
+    }
+    $slug = end($path_parts);
+    global $wpdb;
+    $post_id = $wpdb->get_var($wpdb->prepare(
+        "SELECT post_id FROM {$wpdb->postmeta} WHERE meta_key = '_wp_old_slug' AND meta_value = %s LIMIT 1",
+        $slug
+    ));
+    if (!$post_id) {
+        return;
+    }
+    $post = get_post($post_id);
+    if (!$post || $post->post_status !== 'publish') {
+        return;
+    }
+    $permalink = get_permalink($post);
+    if ($permalink) {
+        wp_safe_redirect($permalink, 301);
+        exit;
+    }
+}, 0);
+
+/**
  * Ensure language-only URLs (e.g., /en/, /de/) route to the site's front page.
  */

ai-translate/trunk/includes/admin-page.php

@@ -5 +5 @@
 // Load the core class if it doesn't exist yet.
 // Since this file is in the "includes" folder, the core class is at the same level.
-if (! class_exists('AI_Translate_Core')) {
+if (! \class_exists('AI_Translate_Core')) {
     $core_class_file = plugin_dir_path(__FILE__) . 'class-ai-translate-core.php';
     if (file_exists($core_class_file)) {
@@ -306 +306 @@
 
 add_action('wp_ajax_ai_translate_delete_cache_file', __NAMESPACE__ . '\\ajax_delete_cache_file');
+
+/**
+ * Return route_id used for cache key when warming cache. Must match class-ai-ob current_route_id() for the same URL.
+ *
+ * @param int $post_id Post ID (0 = homepage)
+ * @return string route_id e.g. 'post:123' or 'path:' . md5('/')
+ */
+function warm_cache_route_id($post_id)
+{
+    if ($post_id === 0) {
+        $front_page_id = (int) get_option('page_on_front');
+        return ($front_page_id > 0) ? ('post:' . $front_page_id) : ('path:' . md5('/'));
+    }
+    return 'post:' . $post_id;
+}
 
 /**
@@ -417 +432 @@
             usleep(500000); // 0.5 second
             
-            // Use correct route_id format (post:ID for posts, path:md5(/) for homepage)
-            if ($post_id === 0) {
-                $route_id = 'path:' . md5('/');
-            } else {
-                $route_id = 'post:' . $post_id;
-            }
+            $route_id = warm_cache_route_id($post_id);
             $cache_key = \AITranslate\AI_Cache::key($lang_code, $route_id, '');
             $cache_file = \AITranslate\AI_Cache::get_file_path($cache_key);
@@ -474 +484 @@
         } elseif ($http_code === 301 || $http_code === 302) {
             // Redirect - might be normal, but we'll mark as success if cache exists
-            $route_id = 'post:' . $post_id;
+            $route_id = warm_cache_route_id($post_id);
             $cache_key = \AITranslate\AI_Cache::key($lang_code, $route_id, '');
             $cache_file = \AITranslate\AI_Cache::get_file_path($cache_key);
@@ -737 +747 @@
     // This ensures the database is in sync with the filesystem
     if ($warmed > 0) {
-        // Use correct route_id format (post:ID for posts, path:md5(/) for homepage)
-        if ($post_id === 0) {
-            $route_id = 'path:' . md5('/');
-        } else {
-            $route_id = 'post:' . $post_id;
-        }
+        $route_id = warm_cache_route_id($post_id);
         $enabled = \AITranslate\AI_Lang::enabled();
         $detectable = \AITranslate\AI_Lang::detectable();

ai-translate/trunk/includes/class-ai-batch.php

@@ -289 +289 @@
                     $choices = is_array($data) ? ($data['choices'] ?? []) : [];
                     if (!$choices || !isset($choices[0]['message']['content'])) { 
-                        error_log('[AI-Batch] Response ' . $idx . ' FAILED: no choices/content. Raw: ' . substr($content, 0, 500));
                         $failedIndexes[] = (int)$idx; 
                         continue; 
                     }
                     $msg = (string)$choices[0]['message']['content'];
-                    error_log('[AI-Batch] Response ' . $idx . ' message: ' . substr($msg, 0, 300));
                     if (trim($msg) === '') {
-                        error_log('[AI-Batch] Response ' . $idx . ' FAILED: empty message');
                         $failedIndexes[] = (int)$idx;
                         continue;

ai-translate/trunk/includes/class-ai-cache-meta.php

@@ -148 +148 @@
         global $wpdb;
 
+        if (get_option('ai_translate_cache_meta_indexes_applied', false)) {
+            return;
+        }
+
         $table_name = self::get_table_name();
 
@@ -172 +176 @@
 
         foreach ($indexes_to_check as $index_name => $index_definition) {
-            if (!in_array($index_name, $existing_indexes, true)) {
-                // Index doesn't exist, create it
-                // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.SchemaChange
-                $wpdb->query($wpdb->prepare(
-                    "ALTER TABLE %i ADD %1s",
-                    $table_name,
-                    $index_definition
-                ));
-            }
-        }
+            if (in_array($index_name, $existing_indexes, true)) {
+                continue;
+            }
+
+            // Guard against race conditions / duplicate key errors by double-checking the schema.
+            $schema_index_exists = $wpdb->get_var($wpdb->prepare(
+                "SELECT COUNT(1) FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema = %s AND table_name = %s AND index_name = %s",
+                $wpdb->dbname,
+                str_replace($wpdb->prefix, '', $table_name),
+                $index_name
+            ));
+            if ((int) $schema_index_exists > 0) {
+                continue;
+            }
+
+            // Index doesn't exist, create it
+            // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.SchemaChange
+            $result = $wpdb->query($wpdb->prepare(
+                "ALTER TABLE %i ADD %1s",
+                $table_name,
+                $index_definition
+            ));
+
+            if ($result === false && stripos($wpdb->last_error, 'Duplicate key name') !== false) {
+                $wpdb->flush();
+            }
+        }
+
+        update_option('ai_translate_cache_meta_indexes_applied', true);
     }
 

ai-translate/trunk/includes/class-ai-seo.php

@@ -840 +840 @@
         }
 
+        $front_page_id = (int) get_option('page_on_front');
+        if ($front_page_id > 0 && (int) $post_id === $front_page_id) {
+            if (strtolower($lang) === strtolower($default)) {
+                return home_url('/');
+            }
+            return home_url('/' . $lang . '/');
+        }
+
         if ((int) $post_id === 0) {
             if (strtolower($lang) === strtolower($default)) {

ai-translate/trunk/includes/class-ai-translate-core.php

@@ -78 +78 @@
 
         if ($provider_key === '') {
-            throw new \Exception('Provider ontbreekt');
+            throw new \Exception('Provider missing');
         }
         if ($api_key === '') {
-            throw new \Exception('API key ontbreekt');
+            throw new \Exception('API key missing');
         }
 
@@ -89 +89 @@
         }
         if ($base === '') {
-            throw new \Exception('API URL ontbreekt');
+            throw new \Exception('API URL missing');
         }
 
@@ -123 +123 @@
         $data = json_decode($body, true);
         if (!is_array($data)) {
-            throw new \Exception('Ongeldig antwoord van API');
+            throw new \Exception('Unknown response from API');
         }