Changeset 3286404

topirank-integration/trunk/admin/admin-page.php

-                      r3234611
+                      r3286404
         <div id="notification" class="notification"></div>
         <div class="topirank_wrap">
+            <div class="topirank_main_content_line server_status_line">
+                <div class="topirank_line_left_column">
+                    <div class="topirank_line_title"><?php esc_html_e('Server Status', 'topirank-integration'); ?></div>
+                </div>
+                <div class="topirank_line_right_column">
+                    <div class="server-status-container">
+                        <span class="server-status-indicator" id="server-status-indicator"></span>
+                        <span class="server-status-text" id="server-status-text"></span>
+                    </div>
+                </div>
+            </div>
             <form method="POST" enctype="multipart/form-data" action="<?php echo esc_url(admin_url('admin.php?page=topirank_process_upload')); ?>">
                 <div class="topirank_main_content_line first_line">
 …
                     </div>
                 </div>
 …
         </div>
     </div>
+    <script>
+        jQuery(document).ready(function($) {
+            function updateServerStatus() {
+                $.ajax({
+                    url: '<?php echo esc_url(rest_url('topirank-integration/ready')); ?>',
+                    method: 'GET',
+                    success: function(response) {
+                        const isReady = response.ready;
+                        const indicator = $('#server-status-indicator');
+                        const text = $('#server-status-text');
+                        const uploadBtn = $('.topirank_outline_button[type="submit"]');
+                        if (isReady) {
+                            indicator.removeClass('not-ready').addClass('ready');
+                            text.text('<?php esc_html_e('Ready to upload', 'topirank-integration'); ?>');
+                            uploadBtn.prop('disabled', false);
+                        } else {
+                            indicator.removeClass('ready').addClass('not-ready');
+                            text.text('<?php esc_html_e('Server is busy', 'topirank-integration'); ?>');
+                            uploadBtn.prop('disabled', true);
+                        }
+                    },
+                    error: function() {
+                        const indicator = $('#server-status-indicator');
+                        const text = $('#server-status-text');
+                        const uploadBtn = $('.topirank_outline_button[type="submit"]');
+                        indicator.removeClass('ready').addClass('not-ready');
+                        text.text('<?php esc_html_e('Server is busy', 'topirank-integration'); ?>');
+                        uploadBtn.prop('disabled', true);
+                    }
+                });
+            }
+            setInterval(updateServerStatus, 5000);
+            updateServerStatus();
+        });
+    </script>
+    <style>
+        .topirank_wrap .server-status-container {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+        }
+        .topirank_wrap .server-status-indicator {
+            width: 12px;
+            height: 12px;
+            border-radius: 50%;
+            display: inline-block;
+        }
+        .topirank_wrap .server-status-indicator.ready {
+            background-color: #46b450;
+        }
+        .topirank_wrap .server-status-indicator.not-ready {
+            background-color: #dc3232;
+        }
+        .topirank_wrap .server-status-text {
+            font-weight: 500;
+        }
+        .topirank_wrap .button:disabled,
+        .topirank_wrap .topirank_solid_button:disabled,
+        .topirank_wrap .topirank_outline_button:disabled {
+            opacity: 0.7;
+            cursor: not-allowed;
+        }
+    </style>
 <?php
+}

topirank-integration/trunk/admin/menu.php

-                      r3220350
+                      r3286404
 add_action('admin_menu', function () {
+    // Hidden upload processing page
     add_submenu_page(
         null,
 …
         'topirank_render_process_upload_page'
     );
+    // Hidden batch processing page
+    add_submenu_page(
+        null,
+        ('Batch Processing'),
+        ('Batch Processing'),
+        'manage_options',
+        'topirank_batch_processing',
+        'topirank_render_batch_page'
+    );
 });

topirank-integration/trunk/assets/js/topirank-admin-scripts.js

-                      r3237927
+                      r3286404
 document.addEventListener('DOMContentLoaded', function () {
+    // Helper function to make API requests
+    function makeApiRequest(url, method = 'GET', data = null) {
+        const headers = {
+            'X-WP-Nonce': topirank_ajax.nonce,
+            'Content-Type': 'application/json'
+        };
+        const options = {
+            method: method,
+            headers: headers,
+            credentials: 'same-origin'
+        };
+        if (data) {
+            options.body = JSON.stringify(data);
+        }
+        console.log('Making API request:', {
+            url: url,
+            method: method,
+            headers: headers,
+            data: data
+        });
+        return fetch(url, options)
+            .then(response => {
+                console.log('API response:', response);
+                if (!response.ok) {
+                    return response.json().then(errorData => {
+                        console.error('API error:', errorData);
+                        throw new Error(errorData.message || 'Network response was not ok');
+                    });
+                }
+                return response.json();
+            })
+            .then(data => {
+                console.log('API success:', data);
+                return data;
+            })
+            .catch(error => {
+                console.error('API request failed:', error);
+                throw error;
+            });
+    }
     document.querySelectorAll('.update-post').forEach(button => {
         button.addEventListener('click', function () {
 …
             const selstyle = this.getAttribute('data-selstyle');
+            const data = new FormData();
+            data.append('action', 'topirank_handle_conflict');
+            data.append('title', title);
+            data.append('file', file);
+            data.append('archive', archive);
+            data.append('replace', true);
+            data.append('selstyle', selstyle);
+            fetch(ajaxurl, {
+                method: 'POST',
+                body: data,
+            })
+                .then(response => response.json())
+            const data = {
+                title: title,
+                file: file,
+                archive: archive,
+                replace: true,
+                selstyle: selstyle
+            };
+            makeApiRequest(topirank_ajax.resolve_conflicts_url, 'POST', data)
                 .then(result => {
                     if (result.success) {
 …
                         parent.innerHTML = `<div class="error-message">${result.data.message}</div>`;
+                    }
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                    parent.innerHTML = `<div class="error-message">An error occurred: ${error.message}</div>`;
                 });
         });
 …
             const title = this.getAttribute('data-title');
+            const data = new FormData();
+            data.append('action', 'topirank_handle_conflict');
+            data.append('title', title);
+            data.append('replace', false);
+            fetch(ajaxurl, {
+                method: 'POST',
+                body: data,
+            })
+                .then(response => response.json())
+            const data = {
+                title: title,
+                replace: false
+            };
+            makeApiRequest(topirank_ajax.resolve_conflicts_url, 'POST', data)
                 .then(result => {
                     if (result.success) {
 …
                         parent.innerHTML = `<div class="error-message">${result.data.message}</div>`;
+                    }
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                    parent.innerHTML = `<div class="error-message">An error occurred: ${error.message}</div>`;
                 });
         });

topirank-integration/trunk/includes/api-integration.php

-                      r3268778
+                      r3286404
         'methods' => 'GET',
         'callback' => 'topirank_check_token_endpoint',
+    ]);
+    register_rest_route('topirank-integration', '/progress', [
+        'methods' => 'GET',
+        'callback' => 'topirank_get_upload_progress',
+        'permission_callback' => 'topirank_plugin_check_token',
+    ]);
+    register_rest_route('topirank-integration', '/ready', [
+        'methods' => 'GET',
+        'callback' => 'topirank_get_upload_status',
+        'permission_callback' => '__return_true',
+    ]);
+    register_rest_route('topirank-integration', '/reset', [
+        'methods' => 'POST',
+        'callback' => 'topirank_hard_reset',
+        'permission_callback' => 'topirank_plugin_check_token',
     ]);
+}
 …
+}
+function topirank_process_files_via_api($zip_path, $extracted_path, $selected_style, $selected_type)
+{
+    try {
+        // Remove filters that might interfere with the process
+        remove_all_filters('wp_redirect');
+        remove_all_filters('wp_safe_redirect');
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
+        remove_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        remove_all_filters('the_content');
+        remove_all_filters('the_editor_content');
+        remove_all_filters('tiny_mce_before_init');
+        // Get original archive name without extension
+        $archive_name = pathinfo($zip_path, PATHINFO_FILENAME);
+        // Check if there's an active batch
+        $processor = Topirank_Batch_Processor::get_instance();
+        if ($processor->is_batch_active()) {
+            $processor->clear_batch_data();
+        }
+        $zip = new ZipArchive;
+        if ($zip->open($zip_path) !== true) {
+            topirank_set_processing_status(false);
+            // Restore filters before returning
+            add_filter('content_save_pre', 'wp_filter_post_kses');
+            add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+            return array(
+                'success' => false,
+                'message' => 'Failed to open ZIP archive'
+            );
+        }
+        $zip->extractTo($extracted_path);
+        $zip->close();
+        // Normalize file names and encoding
+        topirank_normalize_folder_names($extracted_path);
+        // Process files using the same logic as extract-and-create.php
+        $archive_name = topirank_process_extracted_files($extracted_path, $archive_name, $selected_style);
+        // Get list of HTML files
+        $files = array();
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($extracted_path, RecursiveDirectoryIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+        foreach ($iterator as $file) {
+            if ($file->isFile() && $file->getExtension() === 'html') {
+                // Process HTML file encoding
+                $content = file_get_contents($file->getPathname());
+                if ($content !== false) {
+                    // Convert to UTF-8 if needed
+                    if (!mb_check_encoding($content, 'UTF-8')) {
+                        $content = mb_convert_encoding($content, 'UTF-8');
+                    }
+                    // Fix HTML entities
+                    $content = html_entity_decode($content, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+                    // Save with UTF-8 encoding
+                    file_put_contents($file->getPathname(), $content);
+                }
+                $files[] = $file->getPathname();
+            }
+        }
+        if (!empty($files)) {
+            $processor = Topirank_Batch_Processor::get_instance();
+            $replace = isset($request['replace']) && $request['replace'] === 'true';
+            $processor->init_batch($files, $selected_style, $selected_type, $archive_name, $replace, true);
+            // Process all files in the batch
+            $results = array();
+            $batch_count = 0;
+            // Process all batches until complete
+            while (!$processor->is_batch_complete()) {
+                $batch_count++;
+                $batch_result = $processor->process_next_batch();
+                $results[] = $batch_result;
+                // Continue processing even if we have conflicts
+                if (!empty($batch_result['conflicts'])) {
+                    error_log('Conflicts found in batch, continuing processing');
+                }
+            }
+            // Final result when all batches are complete
+            $last_result = end($results);
+            // Restore filters before returning
+            add_filter('content_save_pre', 'wp_filter_post_kses');
+            add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+            return array(
+                'success' => true,
+                'message' => 'All files processed successfully',
+                'current_batch' => $last_result['processed'],
+                'total_files' => $last_result['total'],
+                'completed' => true,
+                'conflicts' => $last_result['conflicts'],
+                'messages' => array_merge(...array_column($results, 'messages'))
+            );
+        }
+        // Restore filters before returning
+        add_filter('content_save_pre', 'wp_filter_post_kses');
+        add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        return array(
+            'success' => false,
+            'message' => 'No HTML files found in the archive'
+        );
+    } catch (Exception $e) {
+        error_log('Error in process_files_via_api: ' . $e->getMessage());
+        topirank_set_processing_status(false);
+        // Restore filters before returning
+        add_filter('content_save_pre', 'wp_filter_post_kses');
+        add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        return array(
+            'success' => false,
+            'message' => 'Processing error: ' . $e->getMessage()
+        );
+    }
+}
 function topirank_handle_rest_file_upload(WP_REST_Request $request)
+{
     /* phpcs:disable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing */
     $file = $_FILES['html_archive'];
+    if (!$file || $file['error'] !== UPLOAD_ERR_OK) {
+        topirank_set_processing_status(false);
+        return new WP_REST_Response(['message' => 'Error uploading chunk.'], 400);
+    }
     $chunkIndex = intval($request->get_param('chunkIndex'));
 …
     $selected_type = isset($request['type']) ? sanitize_key($request['type']) : 'page';
+    if (!$file || $file['error'] !== UPLOAD_ERR_OK) {
+        return new WP_REST_Response(['message' => 'Error uploading chunk.'], 400);
+    }
+    // Set processing status at the start of upload
+    if ($chunkIndex === 0) {
+        topirank_set_processing_status(true);
+        topirank_update_progress(0);
+    }
+    // Calculate progress based on chunks
+    $progress = floor(($chunkIndex + 1) / $totalChunks * 100);
+    topirank_update_progress($progress);
     $upload_dir = wp_upload_dir();
     $base_temp_dir = $upload_dir['basedir'] . '/topirank-temp';
     $temp_dir = $base_temp_dir . '/' . md5($fileName);
     if (!file_exists($temp_dir)) {
 …
     $temp_file_path = $temp_dir . '/' . $fileName . '.part';
     $handle = fopen($temp_file_path, 'ab');
     if (!$handle) {
+        topirank_set_processing_status(false);
+        error_log('Failed to open temp file: ' . $temp_file_path);
         return new WP_REST_Response(['message' => 'Error opening temp file.'], 500);
+    }
 …
         if (!rename($temp_file_path, $final_path)) {
+            topirank_set_processing_status(false);
+            error_log('Failed to move temp file to final location: ' . $final_path);
             return new WP_REST_Response(['message' => 'Failed to finalize file upload.'], 500);
+        }
 …
         $file_extension = pathinfo($final_path, PATHINFO_EXTENSION);
         if ($file_extension !== 'zip') {
+            topirank_set_processing_status(false);
+            error_log('Invalid file extension: ' . $file_extension);
             return new WP_REST_Response(['message' => 'Please upload a ZIP archive.'], 400);
+        }
 …
         if (!file_exists($topirank_dir)) {
             wp_mkdir_p($topirank_dir);
+            error_log('Created topirank directory: ' . $topirank_dir);
+        }
         $extracted_path = $topirank_dir . '/' . basename($final_path, '.zip');
+        if (!function_exists('wp_handle_upload')) {
+            require_once ABSPATH . 'wp-admin/includes/file.php';
+        }
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
+        remove_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        ob_start();
+        $process_result = topirank_extract_and_create_posts($final_path, $extracted_path, $replace, $selected_style, $selected_type);
+        ob_end_clean();
+        add_filter('content_save_pre', 'wp_filter_post_kses');
+        add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        if ($process_result) {
+            wp_delete_file($final_path);
+            topirank_recursive_delete($extracted_path);
+        } else {
+            return new WP_REST_Response(['message' => 'Failed to process the uploaded file.'], 500);
+        }
+        // Clean up temporary directory
         $files = glob($temp_dir . '/*');
         foreach ($files as $file) {
 …
         rmdir($temp_dir);
+        return new WP_REST_Response(['message' => 'The file has been successfully uploaded and processed.'], 201);
+        // Remove filters that might interfere with the process
+        remove_all_filters('wp_redirect');
+        remove_all_filters('wp_safe_redirect');
+        remove_filter('content_save_pre', 'wp_filter_post_kses');
+        remove_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+        remove_all_filters('the_content');
+        remove_all_filters('the_editor_content');
+        remove_all_filters('tiny_mce_before_init');
+        try {
+            error_log('Starting file unpacking');
+            // Extract the zip file
+            $zip = new ZipArchive;
+            if ($zip->open($final_path) !== true) {
+                error_log('Failed to open ZIP archive: ' . $final_path);
+                topirank_set_processing_status(false);
+                return new WP_REST_Response(['message' => 'Failed to open ZIP archive'], 500);
+            }
+            $zip->extractTo($extracted_path);
+            $zip->close();
+            error_log('Zip extraction completed');
+            // Get original archive name without extension and remove --(N) suffix if present
+            $archive_name = pathinfo($final_path, PATHINFO_FILENAME);
+            $archive_name = preg_replace('/--\(\d+\)$/', '', $archive_name);
+            error_log('Base archive name: ' . $archive_name);
+            // Normalize file names and encoding
+            topirank_normalize_folder_names($extracted_path);
+            // Process files using the same logic as extract-and-create.php
+            $archive_name = topirank_process_extracted_files($extracted_path, $archive_name, $selected_style);
+            error_log('Files processed with archive name: ' . $archive_name);
+            // Get list of HTML files
+            $files = array();
+            $iterator = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($extracted_path, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::SELF_FIRST
+            );
+            foreach ($iterator as $file) {
+                if ($file->isFile() && $file->getExtension() === 'html') {
+                    $files[] = $file->getPathname();
+                }
+            }
+            error_log('Found ' . count($files) . ' HTML files');
+            if (!empty($files)) {
+                // Initialize batch processing
+                $processor = Topirank_Batch_Processor::get_instance();
+                if ($processor->is_batch_active()) {
+                    $processor->clear_batch_data();
+                }
+                $processor->init_batch($files, $selected_style, $selected_type, $archive_name, $replace, true);
+                error_log('Batch processing initialized with ' . count($files) . ' files');
+                $batch_size = 5;
+                $total_batches = ceil(count($files) / $batch_size);
+                // Save processing data
+                $processing_data = array(
+                    'final_path' => $final_path,
+                    'extracted_path' => $extracted_path,
+                    'selected_style' => $selected_style,
+                    'selected_type' => $selected_type,
+                    'archive_name' => $archive_name,
+                    'files' => $files,
+                    'current_batch' => 0,
+                    'total_batches' => $total_batches,
+                    'total_files' => count($files),
+                    'batch_size' => $batch_size
+                );
+                update_option('topirank_processing_data', $processing_data);
+                error_log('Processing data saved');
+                // Restore filters
+                add_filter('content_save_pre', 'wp_filter_post_kses');
+                add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+                return new WP_REST_Response([
+                    'message' => 'File uploaded and unpacked successfully',
+                    'status' => 'unpacked',
+                    'total_files' => count($files),
+                    'total_batches' => $total_batches,
+                    'batch_size' => $batch_size
+                ], 201);
+            } else {
+                error_log('No HTML files found in archive');
+                return new WP_REST_Response(['message' => 'No HTML files found'], 404);
+            }
+        } catch (Exception $e) {
+            error_log('Error during unpacking: ' . $e->getMessage());
+            topirank_set_processing_status(false);
+            // Restore filters before returning
+            add_filter('content_save_pre', 'wp_filter_post_kses');
+            add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+            return new WP_REST_Response(['message' => 'Unpacking error: ' . $e->getMessage()], 500);
+        }
+    }
     return new WP_REST_Response(['message' => 'Chunk uploaded successfully.'], 200);
+}
+// Add endpoint for processing next batch
+add_action('rest_api_init', function () {
+    register_rest_route('topirank-integration', '/process-batch', array(
+        'methods' => 'POST',
+        'callback' => 'topirank_process_next_batch',
+        'permission_callback' => 'topirank_plugin_check_token',
+    ));
+});
+function topirank_process_next_batch(WP_REST_Request $request)
+{
+    try {
+        error_log('Processing next batch requested');
+        $processing_data = get_option('topirank_processing_data');
+        if (!$processing_data) {
+            error_log('No processing data found');
+            return new WP_REST_Response(['message' => 'No processing data found'], 404);
+        }
+        // Initialize batch processing if not already done
+        $processor = Topirank_Batch_Processor::get_instance();
+        if (!$processor->is_batch_active()) {
+            error_log('Initializing batch processing');
+            $replace = isset($request['replace']) && $request['replace'] === 'true';
+            $processor->init_batch($processing_data['files'], $processing_data['selected_style'], $processing_data['selected_type'], $processing_data['archive_name'], $replace, true);
+            error_log('Batch processing initialized with ' . count($processing_data['files']) . ' files');
+        }
+        // Process next batch
+        $batch_result = $processor->process_next_batch();
+        // Update processing data
+        $processing_data['current_batch']++;
+        update_option('topirank_processing_data', $processing_data);
+        // Check if processing is complete
+        if ($processor->is_batch_complete()) {
+            error_log('Batch processing completed');
+            // Clean up files after successful processing
+            wp_delete_file($processing_data['final_path']);
+            topirank_recursive_delete($processing_data['extracted_path']);
+            delete_option('topirank_processing_data');
+            topirank_set_processing_status(false);
+            error_log('Files cleaned up after successful processing');
+            return new WP_REST_Response([
+                'message' => 'Processing completed',
+                'completed' => true,
+                'result' => $batch_result,
+                'current_batch' => $processing_data['current_batch'],
+                'total_batches' => $processing_data['total_batches']
+            ], 200);
+        }
+        return new WP_REST_Response([
+            'message' => 'Batch processed successfully',
+            'completed' => false,
+            'result' => $batch_result,
+            'current_batch' => $processing_data['current_batch'],
+            'total_batches' => $processing_data['total_batches']
+        ], 200);
+    } catch (Exception $e) {
+        error_log('Error during batch processing: ' . $e->getMessage());
+        topirank_set_processing_status(false);
+        return new WP_REST_Response(['message' => 'Processing error: ' . $e->getMessage()], 500);
+    }
+}
+function topirank_get_upload_progress()
+{
+    $batch_data = get_option('topirank_batch_data');
+    if (!$batch_data) {
+        return new WP_REST_Response(array('message' => 0));
+    }
+    $total = $batch_data['total_files'];
+    $processed = $batch_data['processed_files'];
+    if ($total > 0) {
+        $progress = round(($processed / $total) * 100);
+    } else {
+        $progress = 0;
+    }
+    return new WP_REST_Response(array('message' => $progress));
+}
+function topirank_get_upload_status()
+{
+    $is_processing = get_option('topirank_is_processing', false);
+    $last_activity = get_option('topirank_last_activity', 0);
+    if ($is_processing && (time() - $last_activity > 600)) {
+        error_log('Processing seems stuck, auto-resetting status');
+        topirank_set_processing_status(false);
+        $is_processing = false;
+    }
+    $is_ready = !$is_processing;
+    return new WP_REST_Response(array(
+        'ready' => $is_ready,
+        'message' => $is_ready,
+        'last_activity' => $last_activity ? date('Y-m-d H:i:s', $last_activity) : null
+    ));
+}
+// Helper functions to update progress and status
+function topirank_update_progress($progress)
+{
+    update_option('topirank_upload_progress', $progress);
+    topirank_update_activity();
+}
+function topirank_set_processing_status($is_processing)
+{
+    update_option('topirank_is_processing', $is_processing);
+    if ($is_processing) {
+        update_option('topirank_last_activity', time());
+    } else {
+        delete_option('topirank_last_activity');
+    }
+}
+function topirank_update_activity()
+{
+    if (get_option('topirank_is_processing', false)) {
+        update_option('topirank_last_activity', time());
+    }
+}
+function topirank_hard_reset()
+{
+    error_log('Performing hard reset of all processing data');
+    delete_option('topirank_is_processing');
+    delete_option('topirank_last_activity');
+    delete_option('topirank_batch_data');
+    delete_option('topirank_processing_data');
+    delete_option('topirank_upload_progress');
+    $upload_dir = wp_upload_dir();
+    $temp_dir = $upload_dir['basedir'] . '/topirank-temp';
+    $import_dir = $upload_dir['basedir'] . '/topirank-import-files';
+    if (file_exists($temp_dir)) {
+        topirank_recursive_delete($temp_dir);
+        wp_mkdir_p($temp_dir);
+        error_log('Temp directory cleaned: ' . $temp_dir);
+    }
+    if (file_exists($import_dir)) {
+        topirank_recursive_delete($import_dir);
+        wp_mkdir_p($import_dir);
+        error_log('Import directory cleaned: ' . $import_dir);
+    }
+    return new WP_REST_Response(array(
+        'message' => 'All processing data has been reset',
+        'status' => 'success',
+        'cleaned' => array(
+            'options' => [
+                'topirank_is_processing',
+                'topirank_last_activity',
+                'topirank_batch_data',
+                'topirank_processing_data',
+                'topirank_upload_progress'
+            ],
+            'directories' => [
+                'temp' => $temp_dir,
+                'import' => $import_dir
+            ]
+        )
+    ), 200);
+}
+function topirank_process_extracted_files($extracted_path, $archive_name, $selected_style)
+{
+    // Create base directories
+    $upload_dir = wp_upload_dir();
+    $base_upload_path = $upload_dir['basedir'];
+    $topirank_base_dir = $base_upload_path . '/topirank';
+    topirank_create_base_directories($topirank_base_dir);
+    // Process CSS files
+    $css_destination = $topirank_base_dir . '/css/' . $archive_name;
+    $css_destination = topirank_ensure_unique_directory($css_destination, $archive_name);
+    $archive_name = basename($css_destination);
+    $css_files = topirank_search_files($extracted_path, 'css');
+    topirank_copy_files($css_files, $css_destination, $selected_style);
+    $css_files = topirank_search_files($css_destination, 'css');
+    // Process fonts
+    $fonts_destination = $topirank_base_dir . '/fonts/' . $archive_name;
+    $fonts_destination = topirank_ensure_unique_directory($fonts_destination, $archive_name);
+    $fonts_folder = topirank_search_directory($extracted_path, 'fonts');
+    if ($fonts_folder) {
+        $font_files = topirank_search_files($fonts_folder, ['ttf', 'woff', 'woff2', 'eot', 'otf']);
+        topirank_copy_files($font_files, $fonts_destination, $selected_style);
+    }
+    topirank_process_css_fonts($css_files, $fonts_destination, $upload_dir['baseurl'] . '/topirank/fonts/' . $archive_name);
+    // Process JS files
+    $js_destination = $topirank_base_dir . '/js/' . $archive_name;
+    $js_destination = topirank_ensure_unique_directory($js_destination, $archive_name);
+    topirank_copy_files(
+        topirank_search_files($extracted_path, 'js'),
+        $js_destination,
+        $selected_style
+    );
+    return $archive_name;
+}

topirank-integration/trunk/includes/extract-and-create.php

-                      r3268778
+                      r3286404
 <?php
+if (session_status() === PHP_SESSION_NONE) {
+    session_start();
+}
 if (! defined('ABSPATH')) exit;
+// Start output buffering to prevent headers already sent error
+ob_start();
 function topirank_extract_and_create_posts($zip_path, $extracted_path, $replace, $selected_style, $selected_type, $check_delete = true)
+{
+    topirank_set_processing_status(true);
+    // Get original archive name without extension
+    $archive_name = pathinfo($zip_path, PATHINFO_FILENAME);
+    // Check if there's an active batch
+    $processor = Topirank_Batch_Processor::get_instance();
+    if ($processor->is_batch_active()) {
+        $processor->clear_batch_data();
+    }
     $zip = new ZipArchive;
     if ($zip->open($zip_path) !== true) {
+        echo '<div class="topirank_main_content_line without_space_between">
+        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22Z" stroke="#CF2323" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M14.8289 9.17188L9.17188 14.8289M9.17188 9.17188L14.8289 14.8289" stroke="#CF2323" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
+<div class="topirank_line_title">';
+        esc_html_e('Error unpacking the archive.', 'topirank-integration');
+        echo '</div>
+</div>';
+        return;
+        topirank_set_processing_status(false);
+        return false;
+    }
 …
     topirank_normalize_folder_names($extracted_path);
-    echo '<div class="topirank_main_content_line without_space_between">
-    <svg width="28" height="29" viewBox="0 0 28 29" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.5 14.5L12.8333 16.8333L17.5 12.1667M3.5 14.5C3.5 15.8789 3.77159 17.2443 4.29926 18.5182C4.82694 19.7921 5.60036 20.9496 6.57538 21.9246C7.55039 22.8996 8.70791 23.6731 9.98182 24.2007C11.2557 24.7284 12.6211 25 14 25C15.3789 25 16.7443 24.7284 18.0182 24.2007C19.2921 23.6731 20.4496 22.8996 21.4246 21.9246C22.3996 20.9496 23.1731 19.7921 23.7007 18.5182C24.2284 17.2443 24.5 15.8789 24.5 14.5C24.5 13.1211 24.2284 11.7557 23.7007 10.4818C23.1731 9.20791 22.3996 8.05039 21.4246 7.07538C20.4496 6.10036 19.2921 5.32694 18.0182 4.79927C16.7443 4.27159 15.3789 4 14 4C12.6211 4 11.2557 4.27159 9.98182 4.79927C8.70791 5.32694 7.55039 6.10036 6.57538 7.07538C5.60036 8.05039 4.82694 9.20791 4.29926 10.4818C3.77159 11.7557 3.5 13.1211 3.5 14.5Z" stroke="#21A816" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
-<div class="topirank_line_title">';
-    esc_html_e('The archive has been successfully unpacked!', 'topirank-integration');
-    echo '</div>
-</div>';
     $upload_dir = wp_upload_dir();
     $base_upload_path = $upload_dir['basedir'];
 …
     topirank_create_base_directories($topirank_base_dir);
-    $archive_name = pathinfo($zip_path, PATHINFO_FILENAME);
-    $archive_name = str_replace(' ', '-', $archive_name);
     $css_destination = $topirank_base_dir . '/css/' . $archive_name;
+    topirank_ensure_unique_directory($css_destination, $archive_name);
+    $css_destination = topirank_ensure_unique_directory($css_destination, $archive_name);
+    // Update archive name if it was changed
+    $archive_name = basename($css_destination);
     $css_files = topirank_search_files($extracted_path, 'css');
     topirank_copy_files($css_files, $css_destination, $selected_style);
 …
     $fonts_destination = $topirank_base_dir . '/fonts/' . $archive_name;
     topirank_ensure_unique_directory($fonts_destination, $archive_name);
+    $fonts_destination = topirank_ensure_unique_directory($fonts_destination, $archive_name);
     $fonts_folder = topirank_search_directory($extracted_path, 'fonts');
 …
     topirank_process_css_fonts($css_files, $fonts_destination, $upload_dir['baseurl'] . '/topirank/fonts/' . $archive_name);
     $js_destination = $topirank_base_dir . '/js/' . $archive_name;
     topirank_ensure_unique_directory($js_destination, $archive_name);
+    $js_destination = topirank_ensure_unique_directory($js_destination, $archive_name);
     topirank_copy_files(
         topirank_search_files($extracted_path, 'js'),
 …
     );
+    topirank_process_folders($extracted_path, $archive_name, $replace, $selected_style, $selected_type, $check_delete);
+    $files = array();
+    $iterator = new RecursiveIteratorIterator(
+        new RecursiveDirectoryIterator($extracted_path, RecursiveDirectoryIterator::SKIP_DOTS),
+        RecursiveIteratorIterator::SELF_FIRST
+    );
+    foreach ($iterator as $file) {
+        if ($file->isFile() && $file->getExtension() === 'html') {
+            $files[] = $file->getPathname();
+        }
+    }
+    if (!empty($files)) {
+        // Initialize batch processing with unique archive name
+        $processor = Topirank_Batch_Processor::get_instance();
+        $processor->init_batch($files, $selected_style, $selected_type, $archive_name, $replace);
+        // Store success message in session
+        $_SESSION['topirank_upload_message'] = array(
+            'type' => 'success',
+            'message' => 'The archive has been successfully unpacked!'
+        );
+        // Redirect to batch processing page
+        wp_safe_redirect(admin_url('admin.php?page=topirank_batch_processing'));
+        exit;
+    }
     return true;
 …
+}
 function topirank_ensure_unique_directory(&$path, &$archive_name)
+function topirank_ensure_unique_directory(&$path, $archive_name)
+{
     $wp_filesystem = topirank_get_filesystem();
 …
     $original_name = $archive_name;
     $counter = 1;
+    $current_name = $archive_name;
     while ($wp_filesystem->is_dir($path)) {
         $archive_name = $original_name . '--(' . $counter . ')';
         $path = dirname($original_path) . '/' . $archive_name;
+        $current_name = $original_name . '--(' . $counter . ')';
+        $path = dirname($original_path) . '/' . $current_name;
         $counter++;
+    }

topirank-integration/trunk/includes/file-upload.php

-                      r3268778
+                      r3286404
 function topirank_handle_file_upload()
+{
+  error_log('Starting file upload handler');
   if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST') {
+    error_log('POST request detected');
     if (!isset($_FILES['html_archive']) || empty($_FILES['html_archive']['tmp_name'])) {
+      error_log('No file uploaded or empty file');
       echo '<div class="topirank_main_content_line without_space_between">
         <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 …
+    }
+    error_log('File upload detected: ' . print_r($_FILES['html_archive'], true));
     $file = isset($_FILES['html_archive']) && is_array($_FILES['html_archive'])
       ? array_map('sanitize_text_field', $_FILES['html_archive'])
 …
     if (is_array($file) && isset($file['name'], $file['tmp_name'])) {
+      error_log('Valid file array detected');
       $upload_dir   = wp_upload_dir();
       $topirank_dir = $upload_dir['basedir'] . '/topirank-import-files';
+      topirank_recursive_delete($topirank_dir);
+      error_log('Upload directory: ' . $topirank_dir);
+      // Clean the topirank-import-files directory before uploading new archive
+      if (file_exists($topirank_dir)) {
+        $wp_filesystem = topirank_get_filesystem();
+        if ($wp_filesystem) {
+          $items = $wp_filesystem->dirlist($topirank_dir);
+          if ($items) {
+            foreach ($items as $item => $info) {
+              $item_path = trailingslashit($topirank_dir) . $item;
+              if ($wp_filesystem->is_dir($item_path)) {
+                $wp_filesystem->rmdir($item_path, true);
+              } else {
+                $wp_filesystem->delete($item_path);
+              }
+            }
+          }
+        }
+      }
       $selected_style = isset($_POST['style']) ? sanitize_text_field(wp_unslash($_POST['style'])) : '';
 …
       $replace = '';
+      error_log('Selected style: ' . $selected_style);
+      error_log('Selected type: ' . $selected_type);
       $file_extension = pathinfo($file['name'], PATHINFO_EXTENSION);
       if (strtolower($file_extension) !== 'zip') {
+        error_log('Invalid file extension: ' . $file_extension);
         echo '<div class="error notice"><p>';
         esc_html_e('Please upload a ZIP archive.', 'topirank-integration');
 …
       if (!file_exists($topirank_dir)) {
+        error_log('Creating directory: ' . $topirank_dir);
         wp_mkdir_p($topirank_dir);
+      }
+      error_log('Handling file upload with wp_handle_upload');
       $uploaded_file = wp_handle_upload($file, array('test_form' => false));
+      error_log('wp_handle_upload result: ' . print_r($uploaded_file, true));
       if (isset($uploaded_file['file']) && ! isset($uploaded_file['error'])) {
+        error_log('File uploaded successfully');
         $original_path = $uploaded_file['file'];
         $zip_path      = $topirank_dir . '/' . basename($original_path);
+        error_log('Original path: ' . $original_path);
+        error_log('Zip path: ' . $zip_path);
         $wp_filesystem = topirank_get_filesystem();
         if ($wp_filesystem->move($original_path, $zip_path, true)) {
+          error_log('File moved successfully to: ' . $zip_path);
           $extracted_path = $topirank_dir . '/' . basename($file['name'], '.zip');
+          error_log('Extracted path will be: ' . $extracted_path);
+          // Remove filters that might interfere with the process
+          error_log('Removing redirect filters');
+          remove_all_filters('wp_redirect');
+          remove_all_filters('wp_safe_redirect');
+          // Process the files
+          error_log('Starting file extraction and post creation');
           topirank_extract_and_create_posts($zip_path, $extracted_path, $replace, $selected_style, $selected_type);
+          error_log('File extraction and post creation completed');
+          if ($wp_filesystem->exists($zip_path)) {
+            $wp_filesystem->delete($zip_path);
+          }
+          // If we're still here (no redirect happened), redirect manually
+          error_log('Attempting manual redirect to batch processing page');
+          wp_safe_redirect(admin_url('admin.php?page=topirank_batch_processing'));
+          exit;
         } else {
+          error_log('Failed to move file from ' . $original_path . ' to ' . $zip_path);
           echo '<div class="topirank_main_content_line">';
           echo '<div class="topirank_line_title">';
 …
+        }
       } else {
+        error_log('Upload failed: ' . print_r($uploaded_file, true));
         echo '<div class="topirank_main_content_line">';
         echo '<div class="topirank_line_title">';
 …
+      }
     } else {
+      error_log('Invalid file array structure');
       esc_html_e('Invalid file upload.', 'topirank-integration');
+    }
+  } else {
+    error_log('Not a POST request');
+  }
+}

topirank-integration/trunk/includes/helpers.php

-                      r3266247
+                      r3286404
 function topirank_create_posts_from_html($folder_path, $archive_name, $replace, $selected_style, $selected_type, &$check_delete)
+{
-    set_time_limit(0);
     $wp_filesystem = topirank_get_filesystem();
     $post_type_to_create = ($selected_type === 'article') ? 'post' : 'page';
+    // Store original archive name
+    $original_archive_name = $archive_name;
     $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($folder_path));
     $post_ids = [];
     $conflicts = [];
+    $messages = [];
+    $conflict_data = [];
     foreach ($files as $file) {
         if (pathinfo($file, PATHINFO_EXTENSION) === 'html') {
             $directory_name = basename(dirname($file));
-            if ($directory_name === '404' || basename($file) === '404.html') {
-                continue;
+            }
             $file_path = $file->getPathname();
             $content = $wp_filesystem->get_contents($file_path);
             $article_title = topirank_extract_title_from_html($file_path);
 …
                     if (!is_wp_error($post_id)) {
+                        topirank_update_post_content($post_id, $file->getPathname(), $archive_name, $selected_style);
+                        topirank_update_post_content($post_id, $file_path, $archive_name, $selected_style);
+                        $messages[] = sprintf(
+                            __('Post "%s" updated successfully!', 'topirank-integration'),
+                            get_the_title($post_id)
+                        );
+                    }
                 } else {
+                    $conflicts[] = ['title' => $article_title, 'file' => $file->getPathname()];
+                    $conflicts[] = ['title' => $article_title, 'file' => $file_path];
+                    $conflict_data[] = [
+                        'title' => $article_title,
+                        'file' => $file_path,
+                        'selected_style' => $selected_style,
+                        'archive_name' => $original_archive_name
+                    ];
+                }
                 continue;
+            }
-            $directory_name = basename(dirname($file->getPathname()));
             $post_id = wp_insert_post([
 …
                 'post_content' => $content,
                 'post_status'  => 'publish',
                 'post_type'      => $post_type_to_create,
+                'post_type'    => $post_type_to_create,
                 'post_name'    => sanitize_title($directory_name),
             ]);
             if ($post_id && !is_wp_error($post_id)) {
+                $post_ids[$file->getPathname()] = $post_id;
+?>
+                <div class="topirank_main_content_line without_space_between">
+                    <svg width="28" height="29" viewBox="0 0 28 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M10.5 14.5L12.8333 16.8333L17.5 12.1667M3.5 14.5C3.5 15.8789 3.77159 17.2443 4.29926 18.5182C4.82694 19.7921 5.60036 20.9496 6.57538 21.9246C7.55039 22.8996 8.70791 23.6731 9.98182 24.2007C11.2557 24.7284 12.6211 25 14 25C15.3789 25 16.7443 24.7284 18.0182 24.2007C19.2921 23.6731 20.4496 22.8996 21.4246 21.9246C22.3996 20.9496 23.1731 19.7921 23.7007 18.5182C24.2284 17.2443 24.5 15.8789 24.5 14.5C24.5 13.1211 24.2284 11.7557 23.7007 10.4818C23.1731 9.20791 22.3996 8.05039 21.4246 7.07538C20.4496 6.10036 19.2921 5.32694 18.0182 4.79927C16.7443 4.27159 15.3789 4 14 4C12.6211 4 11.2557 4.27159 9.98182 4.79927C8.70791 5.32694 7.55039 6.10036 6.57538 7.07538C5.60036 8.05039 4.82694 9.20791 4.29926 10.4818C3.77159 11.7557 3.5 13.1211 3.5 14.5Z" stroke="#21A816" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                    </svg>
+                    <div class="topirank_line_title">
+                        <?php
+                        echo sprintf(
+                            // translators: %s: The title of the created post
+                            esc_html__('Post "%s" created successfully!', 'topirank-integration'),
+                            esc_html(get_the_title($post_id))
+                        );
+                        ?>
+                    </div>
+                </div>
+            <?php
+                // Use original archive name for meta
+                update_post_meta($post_id, '_topirank_import_archive', $archive_name);
+                topirank_update_post_content($post_id, $file_path, $archive_name, $selected_style);
+                $post_ids[$file_path] = $post_id;
+                $messages[] = sprintf(
+                    __('Post "%s" created successfully!', 'topirank-integration'),
+                    get_the_title($post_id)
+                );
             } else {
+            ?>
+                <div class="topirank_main_content_line without_space_between">
+                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22Z" stroke="#CF2323" stroke-width="1.5" stroke-linejoin="round" />
+                        <path d="M14.8289 9.17188L9.17188 14.8289M9.17188 9.17188L14.8289 14.8289" stroke="#CF2323" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                    </svg>
+                    <div class="topirank_line_title">
+                        <?php
+                        echo sprintf(
+                            // translators: %s is the file name from which we attempted to create a post.
+                            esc_html__('Error creating post from file: %s', 'topirank-integration'),
+                            esc_html($file)
+                        );
+                        ?>
+                    </div>
+                </div>
+            <?php
+                $messages[] = sprintf(
+                    __('Error creating post from file: %s', 'topirank-integration'),
+                    $file
+                );
+            }
+        }
+    }
+    if (empty($replace)) {
+        if (!empty($conflicts)) {
+            wp_localize_script('topirank-admin-script', 'hapConflicts', $conflicts);
+        }
+        if (!empty($conflicts)) {
+            $check_delete = false;
+            ?>
+            <div class="topirank_main_content_line topirank_conflict_line column_direction">
+                <div class="topirank_line_title topirank_line_conflict_title">
+                    <strong><?php esc_html_e('The following conflicts occurred:', 'topirank-integration'); ?></strong>
+                    <div class="topirank_conflict_buttons">
+                        <button class="topirank_solid_button update-all">
+                            <?php esc_html_e('Update All', 'topirank-integration'); ?>
+                        </button>
+                        <button class="topirank_outline_button skip-all">
+                            <?php esc_html_e('Skip All', 'topirank-integration'); ?>
+                        </button>
+                    </div>
+                </div>
+                <div class="topirank_conflict_items">
+                    <?php
+                    foreach ($conflicts as $conflict) { ?>
+                        <div class="topirank_conflict_item">
+                            <div class="topirank_conflict_item_left_column">
+                                <div class="notification-icon">
+                                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <path d="M12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22Z" stroke="#CF2323" stroke-width="1.5" stroke-linejoin="round" />
+                                        <path d="M14.8289 9.17188L9.17188 14.8289M9.17188 9.17188L14.8289 14.8289" stroke="#CF2323" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                                    </svg>
+                                </div>
+                                <div class="topirank_conflict_item_content">
+                                    <div class="topirank_line_title">
+                                        <strong>
+                                            <?php esc_html_e('Conflict', 'topirank-integration'); ?>
+                                        </strong>
+                                    </div>
+                                    <div class="topirank_line_text">
+                                        <strong>
+                                            <?php
+                                            echo sprintf(
+                                                // translators: %s is the title of the created post.
+                                                esc_html__('A post with the title "%s" already exists.', 'topirank-integration'),
+                                                esc_html($conflict['title'])
+                                            );
+                                            ?>
+                                        </strong>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="topirank_conflict_item_right_column">
+                                <button
+                                    class="topirank_solid_button update-post"
+                                    data-selstyle="<?php echo esc_attr($selected_style); ?>"
+                                    data-archive="<?php echo esc_attr($archive_name); ?>"
+                                    data-title="<?php echo esc_attr($conflict['title']); ?>"
+                                    data-file="<?php echo esc_attr($conflict['file']); ?>">
+                                    <?php esc_html_e('Update', 'topirank-integration'); ?>
+                                </button>
+                                <button
+                                    class="topirank_outline_button skip-post"
+                                    data-title="<?php echo esc_attr($conflict['title']); ?>">
+                                    <?php esc_html_e('Skip', 'topirank-integration'); ?>
+                                </button>
+                            </div>
+                        </div>
+                    <?php } ?>
+                </div>
+            </div>
+<?php
+        }
+    if (empty($replace) && !empty($conflicts)) {
+        wp_localize_script('topirank-admin-script', 'hapConflicts', $conflicts);
+        $check_delete = false;
+    }
     foreach ($files as $file) {
         if (pathinfo($file, PATHINFO_EXTENSION) === 'html' && isset($post_ids[$file->getPathname()])) {
             topirank_update_post_content($post_ids[$file->getPathname()], $file->getPathname(), $archive_name, $selected_style);
+        }
+    }
+    return [
+        'success' => true,
+        'messages' => $messages,
+        'conflicts' => $conflict_data
+    ];
+}

topirank-integration/trunk/includes/init.php

-                      r3234611
+                      r3286404
   if (empty($wp_filesystem)) {
     require_once ABSPATH . 'wp-admin/includes/file.php';
+    WP_Filesystem();
+    if (!function_exists('WP_Filesystem')) {
+      return false;
+    }
+    $credentials = request_filesystem_credentials('');
+    if (false === $credentials) {
+      return false;
+    }
+    if (!WP_Filesystem($credentials)) {
+      return false;
+    }
+    if (empty($wp_filesystem) || !is_object($wp_filesystem)) {
+      return false;
+    }
+  }
 …
 topirank_plugin_register_hooks();
-add_action('admin_init', function () {
-  if (isset($_GET['page']) && sanitize_text_field(wp_unslash($_GET['page'])) === 'topirank_process_upload') {
-    if (!isset($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] !== 'POST') {
-      wp_redirect(admin_url('admin.php?page=topirank_plugin'));
-      exit;
+    }
+  }
-});

topirank-integration/trunk/includes/process-folders.php

-                      r3266247
+                      r3286404
 <?php
 if (! defined('ABSPATH')) exit;
+// if (! defined('ABSPATH')) exit;
 function topirank_process_folders($base_path, $archive_name, $replace, $selected_style, $selected_type, $check_delete)
+{
     $folders = array_filter(glob($base_path . '/*'), 'is_dir');
     foreach ($folders as $folder) {
         topirank_create_posts_from_html($folder, $archive_name, $replace, $selected_style, $selected_type, $check_delete);
+    }
+// function topirank_process_folders($base_path, $archive_name, $replace, $selected_style, $selected_type, $check_delete)
+// {
+//     $folders = array_filter(glob($base_path . '/*'), 'is_dir');
+//     foreach ($folders as $folder) {
+//         topirank_create_posts_from_html($folder, $archive_name, $replace, $selected_style, $selected_type, $check_delete);
+//     }
     if ($check_delete) {
         topirank_recursive_delete($base_path);
+    }
+}
+//     if ($check_delete) {
+//         topirank_recursive_delete($base_path);
+//     }
+// }

topirank-integration/trunk/includes/register-files.php

-                      r3271065
+                      r3286404
         'toplevel_page_topirank_plugin',
         'admin_page_topirank_process_upload',
+        'admin_page_topirank_batch_processing'
     ];
 …
         'topirank-admin-style',
         plugin_dir_url(dirname(__FILE__)) . 'assets/css/topirank-admin-style.css',
+        [],
+        '1.0.0'
+    );
+    wp_enqueue_style(
+        'topirank-batch-css',
+        plugin_dir_url(dirname(__FILE__)) . 'assets/css/batch-process.css',
         [],
         '1.0.0'

topirank-integration/trunk/includes/topirank-template.php

r3268778	r3286404
12	12	get_header();
13	13	$choose_styles = get_post_meta($post->ID, 'choose_styles', true);
	14	$arhive_name = get_post_meta($post->ID, '_topirank_archive_name', true);
	15	var_dump($arhive_name);
14	16	if ($choose_styles == "wp") {
15	17	$choose_styles_class = "wordpress-styles";

topirank-integration/trunk/includes/update-content-and-seo.php

-                      r3268778
+                      r3286404
 function topirank_update_post_content($post_id, $file, $archive_name, $selected_style)
+{
+  if (!$post_id || !$file || !$archive_name) {
+    return new WP_Error('missing_params', 'Missing required parameters');
+  }
+  if (!file_exists($file)) {
+    return new WP_Error('file_not_found', 'File does not exist');
+  }
   topirank_delete_page_images($post_id);
   $wp_filesystem = topirank_get_filesystem();
+  if (!$wp_filesystem) {
+    return new WP_Error('filesystem_error', 'Failed to initialize filesystem');
+  }
   $choose_styles = ($selected_style === 'wp') ? 'wp' : 'topirank-integration';
 …
   update_post_meta($post_id, '_wp_page_template', 'includes/topirank-template.php');
   $content = $wp_filesystem->get_contents($file);
+  if ($content === false) {
+    return new WP_Error('read_error', 'Failed to read file contents');
+  }
   if (preg_match('/<title>(.*?)<\/title>/is', $content, $title_match)) {
 …
   libxml_use_internal_errors(true);
+  $dom = new DOMDocument();
+  $encoded_content = html_entity_decode(htmlspecialchars($content, ENT_QUOTES | ENT_HTML5, 'UTF-8'));
+  $dom->loadHTML($encoded_content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+  $dom = new DOMDocument('1.0', 'UTF-8');
+  $dom->preserveWhiteSpace = false;
+  $dom->formatOutput = true;
+  // Add UTF-8 meta tag and properly encode content
+  $content = '<?xml encoding="UTF-8">' . $content;
+  $dom->loadHTML($content, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD | LIBXML_NOWARNING);
   libxml_clear_errors();
 …
       $elementsWithStyle = $xpath->query('.//*[@style]', $container);
+      removeStyles($elementsWithStyle, ['color', 'background-color', 'accent-color', 'font-size', 'line-height']);
+      removeStyles($elementsWithStyle, ['color', 'background-color', 'accent-color', 'font-size', 'line-height', 'font-family']);
       $content = preg_replace('/color\s*:\s*[^;"]+;?/i', '', $content);
+      $content = preg_replace('/font-family\s*:\s*[^;"]+;?/i', '', $content);
       $buttons = $container->getElementsByTagName('button');
 …
+        }
+      }
+      $content = $dom->saveHTML();
+      $content = preg_replace('/font-family:[^;"]+;?/i', '', $content);
+      $dom = new DOMDocument();
+      libxml_use_internal_errors(true);
+      $dom->loadHTML(html_entity_decode(htmlspecialchars($content, ENT_QUOTES | ENT_HTML5, 'UTF-8')), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
+      libxml_clear_errors();
+    }
+  }
+  $content = $dom->saveHTML();
+    }
+  }
+  // Save HTML without XML declaration and doctype
+  $content = preg_replace('/<\?xml[^>]+>/', '', $dom->saveHTML());
   $content = preg_replace('/<head\b[^>]*>.*?<\/head>/is', '', $content);
 …
+  }
+  wp_update_post([
+    'ID'           => $post_id,
+    'post_content' => $content,
+    'filter'       => 'raw',
+  ]);
+  wp_reset_postdata();
+  $update_args = array(
+    'ID' => $post_id,
+    'post_content' => $content
+  );
+  remove_filter('content_save_pre', 'wp_filter_post_kses');
+  remove_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+  remove_all_filters('the_content');
+  remove_all_filters('the_editor_content');
+  remove_all_filters('tiny_mce_before_init');
+  $result = wp_update_post($update_args, true);
+  add_filter('content_save_pre', 'wp_filter_post_kses');
+  add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+  if (is_wp_error($result)) {
+    error_log('Failed to update post: ' . $result->get_error_message());
+    return $result;
+  }
   if (class_exists('WPSEO_Meta')) {
     if ($title) {
       WPSEO_Meta::set_value('opengraph-title', $title, $post_id);
 …
+    }
+  }
+  return true;
+}

topirank-integration/trunk/includes/update-functionality.php

-                      r3236026
+                      r3286404
 if (! defined('ABSPATH')) exit;
+require_once plugin_dir_path(__FILE__) . 'update-content-and-seo.php';
 function topirank_generate_unique_title($title)
 …
 function topirank_handle_conflict()
+{
+    /* phpcs:disable WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing */
+    $title = isset($_POST['title']) ? sanitize_text_field(wp_unslash($_POST['title'])) : null;
+    $file = isset($_POST['file']) ? sanitize_text_field(wp_unslash($_POST['file'])) : null;
+    $archive_name = isset($_POST['archive']) ? sanitize_text_field(wp_unslash($_POST['archive'])) : null;
+    $replace = isset($_POST['replace']) ? filter_var(wp_unslash($_POST['replace']), FILTER_VALIDATE_BOOLEAN) : false;
+    $selected_style = isset($_POST['selstyle']) ? sanitize_text_field(wp_unslash($_POST['selstyle'])) : null;
+    check_ajax_referer('wp_rest', '_ajax_nonce');
+    if (!$title) {
+        wp_send_json_error(['message' => __('Missing or invalid title.', 'topirank-integration')]);
+    if (!isset($_POST['resolutions']) || !is_array($_POST['resolutions'])) {
+        wp_send_json_error(['message' => __('Missing or invalid resolutions data.', 'topirank-integration')]);
+        return;
+    }
+    $title = trim(preg_replace('/\s+/', ' ', $title));
+    $resolutions = $_POST['resolutions'];
+    $results = [];
+    $success = true;
+    $post = topirank_get_post_by_title($title);
+    foreach ($resolutions as $file_path => $resolution) {
+        if (!is_array($resolution)) {
+            continue;
+        }
+    if (!$post) {
+        wp_send_json_error(['message' => __('Post not found.', 'topirank-integration')]);
+        $post_id = isset($resolution['post_id']) ? intval($resolution['post_id']) : 0;
+        $file = isset($resolution['file']) ? sanitize_text_field($resolution['file']) : null;
+        $archive_name = isset($resolution['archive']) ? sanitize_text_field($resolution['archive']) : null;
+        $selected_style = isset($resolution['style']) ? sanitize_text_field($resolution['style']) : null;
+        $action = isset($resolution['action']) ? sanitize_text_field($resolution['action']) : null;
+        if (!$post_id || !$file || !$action) {
+            $success = false;
+            $results[$file_path] = __('Missing required data', 'topirank-integration');
+            continue;
+        }
+        $post = get_post($post_id);
+        if (!$post) {
+            $success = false;
+            $results[$file_path] = __('Post not found', 'topirank-integration');
+            error_log('Post not found for ID: ' . $post_id);
+            continue;
+        }
+        if ($action === 'UPDATE') {
+            if (!$archive_name || !$selected_style) {
+                $success = false;
+                $results[$file_path] = __('Missing archive name or style for update', 'topirank-integration');
+                continue;
+            }
+            try {
+                error_log('Attempting to update post: ' . $post_id . ' with file: ' . $file);
+                $update_result = topirank_update_post_content($post_id, $file, $archive_name, $selected_style);
+                if (is_wp_error($update_result)) {
+                    $success = false;
+                    $results[$file_path] = $update_result->get_error_message();
+                } else {
+                    $results[$file_path] = sprintf(
+                        __('Post "%s" updated successfully', 'topirank-integration'),
+                        $post->post_title
+                    );
+                }
+            } catch (Exception $e) {
+                $success = false;
+                $results[$file_path] = $e->getMessage();
+            }
+        } elseif ($action === 'SKIP') {
+            $results[$file_path] = sprintf(
+                __('Post "%s" skipped', 'topirank-integration'),
+                $post->post_title
+            );
+        } else {
+            $success = false;
+            $results[$file_path] = __('Invalid action', 'topirank-integration');
+        }
+    }
+    if ($replace && $file) {
+        topirank_update_post_content($post->ID, $file, $archive_name, $selected_style);
+    if ($success) {
         wp_send_json_success([
+            // translators: %s is the title of the created post.
+            'message' => sprintf(__('Post "%s" updated successfully.', 'topirank-integration'), $title),
+            'message' => __('All conflicts resolved successfully', 'topirank-integration'),
+            'results' => $results
+        ]);
+    } else {
+        wp_send_json_error([
+            'message' => __('Some conflicts could not be resolved', 'topirank-integration'),
+            'results' => $results
         ]);
+    }
-    if (!$replace) {
-        wp_send_json_success([
-            // translators: %s is the title of the created post.
-            'message' => sprintf(__('Post "%s" skipped.', 'topirank-integration'), $title),
-        ]);
+    }
-    wp_send_json_error(['message' => __('Invalid request.', 'topirank-integration')]);
+}
 function topirank_get_post_by_title($title)
+{
+    $args = [
+        'post_type'      => 'page',
+        'title'          => $title,
+        'post_status'    => 'any',
+        'posts_per_page' => 1,
+    ];
+    global $wpdb;
     $query = new WP_Query($args);
+    $title = trim($title);
+    if ($query->have_posts()) {
+        $query->the_post();
+        $post = get_post();
+        wp_reset_postdata();
+    $post = $wpdb->get_row($wpdb->prepare(
+        "SELECT * FROM $wpdb->posts WHERE post_title = %s AND post_type = 'post' AND post_status IN ('publish', 'draft', 'private', 'pending')",
+        $title
+    ));
+    if ($post) {
         return $post;
+    }
+    wp_reset_postdata();
+    $normalized_title = mb_strtolower(trim(preg_replace('/\s+/', ' ', $title)), 'UTF-8');
+    $posts = $wpdb->get_results($wpdb->prepare(
+        "SELECT * FROM $wpdb->posts WHERE post_type = 'post' AND post_status IN ('publish', 'draft', 'private', 'pending')"
+    ));
+    foreach ($posts as $post) {
+        $current_normalized = mb_strtolower(trim(preg_replace('/\s+/', ' ', $post->post_title)), 'UTF-8');
+        if ($current_normalized === $normalized_title) {
+            return $post;
+        }
+    }
     return null;
+}

topirank-integration/trunk/languages/topirank-integration-fr_FR.po

-                      r3220350
+                      r3286404
 msgid ""
 msgstr ""
 "Project-Id-Version: Topirank Integration 1.0.2\n"
+"Project-Id-Version: Topirank Integration 1.1.6\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/topirank-"
 "integration\n"
 "POT-Creation-Date: 2025-01-07T12:23:19+00:00\n"
 "PO-Revision-Date: 2025-01-07 14:25+0200\n"
+"POT-Creation-Date: 2025-05-02T12:06:58+00:00\n"
+"PO-Revision-Date: 2025-05-02 15:13+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 …
 msgstr "Topirank"
+#: admin/admin-page.php:25
+#: admin/admin-page.php:23
+msgid "Server Status"
+msgstr "Statut du serveur"
+#: admin/admin-page.php:36
 msgid "Upload HTML archive"
 msgstr "Télécharger l'archive HTML"
 #: admin/admin-page.php:27
+#: admin/admin-page.php:38
 msgid "Easily upload all your data as an HTML archive"
+msgstr ""
+"Téléchargez facilement toutes vos données sous forme d'archive HTML"
+#: admin/admin-page.php:28
+msgstr "Téléchargez facilement toutes vos données sous forme d'archive HTML"
+#: admin/admin-page.php:39
 msgid "Maximum upload file size"
 msgstr "Taille maximale du fichier à télécharger"
 #: admin/admin-page.php:34 includes/register-files.php:37
+#: admin/admin-page.php:45 includes/register-files.php:53
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 #: admin/admin-page.php:38
+#: admin/admin-page.php:49
 msgid "Upload and create posts"
 msgstr "Télécharger et créer des publications"
 #: admin/admin-page.php:45
+#: admin/admin-page.php:57
 msgid "Choose styles for your posts"
 msgstr "Choisissez des styles pour vos publications"
 #: admin/admin-page.php:61
+#: admin/admin-page.php:73
 msgid "Managing API Token"
 msgstr "Gestion des jetons API"
 #: admin/admin-page.php:63
+#: admin/admin-page.php:75
 msgid "Generate and manage your API token securely"
 msgstr "Générez et gérez votre token API en toute sécurité"
 #: admin/admin-page.php:68
+#: admin/admin-page.php:81
 msgid "Get token"
 msgstr "Obtenir un jeton"
 #: admin/admin-page.php:70
+#: admin/admin-page.php:83
 msgid "Copy Domain"
 msgstr "Copier le domaine"
 #: admin/admin-page.php:87
+#: admin/admin-page.php:100
 msgid "New token successfully created. Check it below and save!"
 msgstr ""
+"Nouveau token créé avec succès. Vérifiez-le ci-dessous et "
+"enregistrez-le !"
+#: admin/admin-page.php:89
+"Nouveau token créé avec succès. Vérifiez-le ci-dessous et enregistrez-le !"
+#: admin/admin-page.php:102
 msgid "Your new token:"
 msgstr "Votre nouveau token :"
 #: admin/admin-page.php:94
+#: admin/admin-page.php:107
 msgid "Copy"
 msgstr "Copie"
+#: includes/api-integration.php:50
+#: admin/admin-page.php:128
+msgid "Ready to upload"
+msgstr "Prêt à télécharger"
+#: admin/admin-page.php:132 admin/admin-page.php:142
+msgid "Server is busy"
+msgstr "Le serveur est occupé"
+#: admin/batch-page.php:30
+msgid "Conflicts Occurred"
+msgstr "Des conflits ont eu lieu"
+#: admin/batch-page.php:31
+msgid "Conflict"
+msgstr "Conflit"
+#: admin/batch-page.php:32
+msgid "A post with title \"%s\" already exists"
+msgstr "Un message avec le titre \"%s\" existe déjà"
+#: admin/batch-page.php:33
+msgid "Update All"
+msgstr "Tout mettre à jour"
+#: admin/batch-page.php:34
+msgid "Skip All"
+msgstr "Sauter tout"
+#: admin/batch-page.php:35
+msgid "Update"
+msgstr "Mise à jour"
+#: admin/batch-page.php:36
+msgid "Skip"
+msgstr "Sauter"
+#: admin/batch-page.php:57 includes/file-upload.php:12
+msgid "Go Back to Main Page"
+msgstr "Retourner à la page principale"
+#: admin/batch-page.php:62
+msgid "Batch Processing"
+msgstr "Traitement par lots"
+#: admin/batch-page.php:78
+msgid "Ready to process"
+msgstr "Prêt à être traité"
+#: includes/api-integration.php:86
 msgid "Authorization header is missing or invalid."
 msgstr "L'en-tête d'autorisation est manquant ou non valide."
 #: includes/api-integration.php:61
+#: includes/api-integration.php:97
 msgid "No token is stored in the database."
 msgstr "Aucun jeton n'est stocké dans la base de données."
 #: includes/api-integration.php:69
+#: includes/api-integration.php:105
 msgid "The provided token is invalid."
 msgstr "Le jeton fourni n'est pas valide."
+#: includes/extract-and-create.php:13
+msgid "Error unpacking the archive."
+msgstr "Erreur lors du déballage de l'archive."
+#: includes/extract-and-create.php:29
+msgid "The archive has been successfully unpacked!"
+msgstr "L'archive a été décompressée avec succès !"
+#: includes/file-upload.php:10
+msgid "Go Back to Main Page"
+msgstr "Retourner à la page principale"
+#: includes/file-upload.php:42
+#: includes/batch-processor.php:165 includes/batch-processor.php:332
+#: includes/helpers.php:68
+msgid "Post \"%s\" updated successfully!"
+msgstr "Le message \"%s\" a été mis à jour avec succès."
+#: includes/batch-processor.php:171 includes/batch-processor.php:338
+msgid "Failed to update post \"%s\""
+msgstr "Échec de la mise à jour du message \"%s\""
+#: includes/batch-processor.php:202 includes/batch-processor.php:369
+#: includes/batch-processor.php:449 includes/helpers.php:99
+msgid "Post \"%s\" created successfully!"
+msgstr "Le message \"%s\" a été créé avec succès !"
+#: includes/batch-processor.php:208 includes/batch-processor.php:375
+#: includes/batch-processor.php:455
+msgid "Failed to create post from file: %s"
+msgstr "Échec de la création de la publication à partir du fichier : %s"
+#: includes/batch-processor.php:391
+msgid "Skipping existing post \"%s\""
+msgstr "Ignorer la publication existante \"%s\""
+#: includes/batch-processor.php:407
+msgid "File \"%s\" has a conflict with existing post \"%s\" - will be reviewed"
+msgstr ""
+"Le fichier « %s » est en conflit avec la publication existante \"%s\" - sera "
+"examiné"
+#: includes/file-upload.php:39 includes/file-upload.php:156
+msgid "Invalid file upload."
+msgstr "Téléchargement de fichier invalide."
+#: includes/file-upload.php:89
 msgid "Please upload a ZIP archive."
 msgstr "Veuillez télécharger une archive ZIP."
 #: includes/file-upload.php:69
+#: includes/file-upload.php:138
 msgid "Could not move the uploaded file."
 msgstr "Impossible de déplacer le fichier téléchargé."
 #: includes/file-upload.php:79
+#: includes/file-upload.php:149
 msgid "Upload failed. Please try again."
 msgstr "Le téléchargement a échoué. Veuillez réessayer."
+#: includes/file-upload.php:85
+msgid "Invalid file upload."
+msgstr "Téléchargement de fichier invalide."
+#. translators: %s: The title of the created post
+#: includes/helpers.php:74
+msgid "Post \"%s\" created successfully!"
+msgstr "Le message \"%s\" a été créé avec succès !"
+#. translators: %s is the file name from which we attempted to create a post.
+#: includes/helpers.php:92
+#: includes/helpers.php:104
 msgid "Error creating post from file: %s"
+msgstr ""
+"Erreur lors de la création de la publication à partir du fichier : "
+"%s"
+#: includes/helpers.php:113
+msgid "The following conflicts occurred:"
+msgstr "Les conflits suivants se sont produits :"
+#: includes/helpers.php:116
+msgid "Update All"
+msgstr "Tout mettre à jour"
+#: includes/helpers.php:119
+msgid "Skip All"
+msgstr "Sauter tout"
+#: includes/helpers.php:137
+msgid "Conflict"
+msgstr "Conflit"
+#. translators: %s is the title of the created post.
+#: includes/helpers.php:145
+msgid "A post with the title \"%s\" already exists."
+msgstr "Un message avec le titre \"%s\" existe déjà."
+#: includes/helpers.php:160
+msgid "Update"
+msgstr "Mise à jour"
+#: includes/helpers.php:165
+msgid "Skip"
+msgstr "Sauter"
+#: includes/register-files.php:38
+msgstr "Erreur lors de la création de la publication à partir du fichier : %s"
+#: includes/register-files.php:54
 msgid "Domain copied to clipboard!"
 msgstr "Domaine copié dans le presse-papiers !"
 #: includes/register-files.php:39
+#: includes/register-files.php:55
 msgid "Failed to copy domain. Please try again."
 msgstr "Impossible de copier le domaine. Veuillez réessayer."
 #: includes/register-files.php:40
+#: includes/register-files.php:56
 msgid "Token copied to clipboard!"
 msgstr "Jeton copié dans le presse-papiers !"
 #: includes/register-files.php:41
+#: includes/register-files.php:57
 msgid "Failed to copy token. Please try again."
 msgstr "Impossible de copier le jeton. Veuillez réessayer."
 #: includes/update-functionality.php:23
+msgid "Missing or invalid title."
+msgstr "Titre manquant ou invalide."
+#: includes/update-functionality.php:31
+msgid "Post not found."
+msgid "Missing or invalid resolutions data."
+msgstr "Données de résolution manquantes ou non valides."
+#: includes/update-functionality.php:44
+msgid "Missing required data"
+msgstr "Données requises manquantes"
+#: includes/update-functionality.php:51
+msgid "Post not found"
 msgstr "Publication non trouvée."
+#. translators: %s is the title of the created post.
+#: includes/update-functionality.php:38
+msgid "Post \"%s\" updated successfully."
+#: includes/update-functionality.php:59
+msgid "Missing archive name or style for update"
+msgstr "Nom d'archive ou style manquant pour la mise à jour"
+#: includes/update-functionality.php:72
+msgid "Post \"%s\" updated successfully"
 msgstr "Le message \"%s\" a été mis à jour avec succès."
+#. translators: %s is the title of the created post.
+#: includes/update-functionality.php:45
+msgid "Post \"%s\" skipped."
+#: includes/update-functionality.php:82
+msgid "Post \"%s\" skipped"
 msgstr "Message \"%s\" ignoré."
+#: includes/update-functionality.php:49
+msgid "Invalid request."
+msgstr ""
+#: includes/update-functionality.php:87
+msgid "Invalid action"
+msgstr "Action invalide"
+#: includes/update-functionality.php:93
+msgid "All conflicts resolved successfully"
+msgstr "Tous les conflits ont été résolus avec succès"
+#: includes/update-functionality.php:98
+msgid "Some conflicts could not be resolved"
+msgstr "Certains conflits n'ont pas pu être résolus"
+#: admin/batch-page.php:37
+msgid "Processing completed successfully!"
+msgstr "Traitement terminé avec succès !"
+#: admin/batch-page.php:38
+msgid "Processing batch..."
+msgstr "Traitement par lots en cours..."
+#: admin/batch-page.php:39
+msgid "Processing completed, but failed to clear data"
+msgstr "Traitement terminé, mais échec de la suppression des données"
+#: admin/batch-page.php:40
+msgid "Error processing batch"
+msgstr "Erreur lors du traitement par lots"
+#: admin/batch-page.php:41
+msgid "Error connecting to server: %s"
+msgstr "Erreur de connexion au serveur : %s"
+#: admin/batch-page.php:76
+msgid "files processed"
+msgstr "fichiers traités"

topirank-integration/trunk/languages/topirank-integration.pot

-                      r3220350
+                      r3286404
 msgid ""
 msgstr ""
 "Project-Id-Version: Topirank Integration 1.0.2\n"
+"Project-Id-Version: Topirank Integration 1.1.6\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/topirank-integration\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 …
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Creation-Date: 2025-01-07T12:23:19+00:00\n"
+"POT-Creation-Date: 2025-05-02T12:06:58+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
 …
 msgstr ""
+#: admin/admin-page.php:25
+#: admin/admin-page.php:23
+msgid "Server Status"
+msgstr ""
+#: admin/admin-page.php:36
 msgid "Upload HTML archive"
 msgstr ""
 #: admin/admin-page.php:27
+#: admin/admin-page.php:38
 msgid "Easily upload all your data as an HTML archive"
 msgstr ""
 #: admin/admin-page.php:28
+#: admin/admin-page.php:39
 msgid "Maximum upload file size"
 msgstr ""
 #: admin/admin-page.php:34
 #: includes/register-files.php:37
+#: admin/admin-page.php:45
+#: includes/register-files.php:53
 msgid "Choose a file"
 msgstr ""
 #: admin/admin-page.php:38
+#: admin/admin-page.php:49
 msgid "Upload and create posts"
 msgstr ""
 #: admin/admin-page.php:45
+#: admin/admin-page.php:57
 msgid "Choose styles for your posts"
 msgstr ""
 #: admin/admin-page.php:61
+#: admin/admin-page.php:73
 msgid "Managing API Token"
 msgstr ""
 #: admin/admin-page.php:63
+#: admin/admin-page.php:75
 msgid "Generate and manage your API token securely"
 msgstr ""
 #: admin/admin-page.php:68
+#: admin/admin-page.php:81
 msgid "Get token"
 msgstr ""
 #: admin/admin-page.php:70
+#: admin/admin-page.php:83
 msgid "Copy Domain"
 msgstr ""
 #: admin/admin-page.php:87
+#: admin/admin-page.php:100
 msgid "New token successfully created. Check it below and save!"
 msgstr ""
 #: admin/admin-page.php:89
+#: admin/admin-page.php:102
 msgid "Your new token:"
 msgstr ""
 #: admin/admin-page.php:94
+#: admin/admin-page.php:107
 msgid "Copy"
 msgstr ""
+#: includes/api-integration.php:50
+#: admin/admin-page.php:128
+msgid "Ready to upload"
+msgstr ""
+#: admin/admin-page.php:132
+#: admin/admin-page.php:142
+msgid "Server is busy"
+msgstr ""
+#: admin/batch-page.php:30
+msgid "Conflicts Occurred"
+msgstr ""
+#: admin/batch-page.php:31
+msgid "Conflict"
+msgstr ""
+#: admin/batch-page.php:32
+msgid "A post with title \"%s\" already exists"
+msgstr ""
+#: admin/batch-page.php:33
+msgid "Update All"
+msgstr ""
+#: admin/batch-page.php:34
+msgid "Skip All"
+msgstr ""
+#: admin/batch-page.php:35
+msgid "Update"
+msgstr ""
+#: admin/batch-page.php:36
+msgid "Skip"
+msgstr ""
+#: admin/batch-page.php:37
+msgid "Processing completed successfully!"
+msgstr ""
+#: admin/batch-page.php:38
+msgid "Processing batch..."
+msgstr ""
+#: admin/batch-page.php:39
+msgid "Processing completed, but failed to clear data"
+msgstr ""
+#: admin/batch-page.php:40
+msgid "Error processing batch"
+msgstr ""
+#: admin/batch-page.php:41
+msgid "Error connecting to server: %s"
+msgstr ""
+#: admin/batch-page.php:57
+#: includes/file-upload.php:12
+msgid "Go Back to Main Page"
+msgstr ""
+#: admin/batch-page.php:62
+msgid "Batch Processing"
+msgstr ""
+#: admin/batch-page.php:78
+msgid "Ready to process"
+msgstr ""
+#: admin/batch-page.php:76
+msgid "files processed"
+msgstr ""
+#: includes/api-integration.php:86
 msgid "Authorization header is missing or invalid."
 msgstr ""
 #: includes/api-integration.php:61
+#: includes/api-integration.php:97
 msgid "No token is stored in the database."
 msgstr ""
 #: includes/api-integration.php:69
+#: includes/api-integration.php:105
 msgid "The provided token is invalid."
 msgstr ""
+#: includes/extract-and-create.php:13
+msgid "Error unpacking the archive."
+msgstr ""
+#: includes/extract-and-create.php:29
+msgid "The archive has been successfully unpacked!"
+msgstr ""
+#: includes/file-upload.php:10
+msgid "Go Back to Main Page"
+msgstr ""
+#: includes/file-upload.php:42
+#: includes/batch-processor.php:165
+#: includes/batch-processor.php:332
+#: includes/helpers.php:68
+msgid "Post \"%s\" updated successfully!"
+msgstr ""
+#: includes/batch-processor.php:171
+#: includes/batch-processor.php:338
+msgid "Failed to update post \"%s\""
+msgstr ""
+#: includes/batch-processor.php:202
+#: includes/batch-processor.php:369
+#: includes/batch-processor.php:449
+#: includes/helpers.php:99
+msgid "Post \"%s\" created successfully!"
+msgstr ""
+#: includes/batch-processor.php:208
+#: includes/batch-processor.php:375
+#: includes/batch-processor.php:455
+msgid "Failed to create post from file: %s"
+msgstr ""
+#: includes/batch-processor.php:391
+msgid "Skipping existing post \"%s\""
+msgstr ""
+#: includes/batch-processor.php:407
+msgid "File \"%s\" has a conflict with existing post \"%s\" - will be reviewed"
+msgstr ""
+#: includes/file-upload.php:39
+#: includes/file-upload.php:156
+msgid "Invalid file upload."
+msgstr ""
+#: includes/file-upload.php:89
 msgid "Please upload a ZIP archive."
 msgstr ""
 #: includes/file-upload.php:69
+#: includes/file-upload.php:138
 msgid "Could not move the uploaded file."
 msgstr ""
 #: includes/file-upload.php:79
+#: includes/file-upload.php:149
 msgid "Upload failed. Please try again."
 msgstr ""
+#: includes/file-upload.php:85
+msgid "Invalid file upload."
+msgstr ""
+#. translators: %s: The title of the created post
+#: includes/helpers.php:74
+msgid "Post \"%s\" created successfully!"
+msgstr ""
+#. translators: %s is the file name from which we attempted to create a post.
+#: includes/helpers.php:92
+#: includes/helpers.php:104
 msgid "Error creating post from file: %s"
 msgstr ""
+#: includes/helpers.php:113
+msgid "The following conflicts occurred:"
+msgstr ""
+#: includes/helpers.php:116
+msgid "Update All"
+msgstr ""
+#: includes/helpers.php:119
+msgid "Skip All"
+msgstr ""
+#: includes/helpers.php:137
+msgid "Conflict"
+msgstr ""
+#. translators: %s is the title of the created post.
+#: includes/helpers.php:145
+msgid "A post with the title \"%s\" already exists."
+msgstr ""
+#: includes/helpers.php:160
+msgid "Update"
+msgstr ""
+#: includes/helpers.php:165
+msgid "Skip"
+msgstr ""
+#: includes/register-files.php:38
+#: includes/register-files.php:54
 msgid "Domain copied to clipboard!"
 msgstr ""
 #: includes/register-files.php:39
+#: includes/register-files.php:55
 msgid "Failed to copy domain. Please try again."
 msgstr ""
 #: includes/register-files.php:40
+#: includes/register-files.php:56
 msgid "Token copied to clipboard!"
 msgstr ""
 #: includes/register-files.php:41
+#: includes/register-files.php:57
 msgid "Failed to copy token. Please try again."
 msgstr ""
 #: includes/update-functionality.php:23
+msgid "Missing or invalid title."
+msgstr ""
+#: includes/update-functionality.php:31
+msgid "Post not found."
+msgstr ""
+#. translators: %s is the title of the created post.
+#: includes/update-functionality.php:38
+msgid "Post \"%s\" updated successfully."
+msgstr ""
+#. translators: %s is the title of the created post.
+#: includes/update-functionality.php:45
+msgid "Post \"%s\" skipped."
+msgstr ""
+#: includes/update-functionality.php:49
+msgid "Invalid request."
+msgstr ""
+msgid "Missing or invalid resolutions data."
+msgstr ""
+#: includes/update-functionality.php:44
+msgid "Missing required data"
+msgstr ""
+#: includes/update-functionality.php:51
+msgid "Post not found"
+msgstr ""
+#: includes/update-functionality.php:59
+msgid "Missing archive name or style for update"
+msgstr ""
+#: includes/update-functionality.php:72
+msgid "Post \"%s\" updated successfully"
+msgstr ""
+#: includes/update-functionality.php:82
+msgid "Post \"%s\" skipped"
+msgstr ""
+#: includes/update-functionality.php:87
+msgid "Invalid action"
+msgstr ""
+#: includes/update-functionality.php:93
+msgid "All conflicts resolved successfully"
+msgstr ""
+#: includes/update-functionality.php:98
+msgid "Some conflicts could not be resolved"
+msgstr ""

topirank-integration/trunk/readme.txt

-                      r3271065
+                      r3286404
 Tags: seo, posts, parsing
 Requires at least: 6.0
 Tested up to: 6.7.2
 Stable tag: 1.1.6
+Tested up to: 6.8
+Stable tag: 2.0
 Requires PHP: 7.3
 License: GPLv2 or later
 …
 == Changelog ==
+= 2.0 =
+- Refactored data upload functionality (manual and via API).
+- Improved process logging.
+- Added server availability check for new requests.
+- Resolved timeout() handling issue.
+- Updated parser behavior.
+- Fixed HTML parsing errors.
+- Enhanced CPT selection functionality.
+- Redesigned admin UI with visual controls.
+- Rebuilt post skip and update logic.
+- Improved error logging.
+- Tested with WordPress version 6.8
 = 1.1.6 =

topirank-integration/trunk/topirank-integration.php

-                      r3271065
+                      r3286404
 Plugin Name: Topirank Integration
 Description: Plugin for parsing pages
 Version: 1.1.6
+Version: 2.0
 Author: Topirank
 License: GPLv2 or later
 …
+}
+// Load batch processor first to ensure it's available for other files
+require_once plugin_dir_path(__FILE__) . 'includes/batch-processor.php';
 require_once plugin_dir_path(__FILE__) . 'admin/menu.php';
 require_once plugin_dir_path(__FILE__) . 'admin/admin-page.php';
+require_once plugin_dir_path(__FILE__) . 'admin/batch-page.php';
 require_once plugin_dir_path(__FILE__) . 'includes/utils.php';
 require_once plugin_dir_path(__FILE__) . 'includes/init.php';

Plugin Directory

Context Navigation

Legend:

topirank-integration/trunk/admin/admin-page.php

topirank-integration/trunk/admin/menu.php

topirank-integration/trunk/assets/js/topirank-admin-scripts.js

topirank-integration/trunk/includes/api-integration.php

topirank-integration/trunk/includes/extract-and-create.php

topirank-integration/trunk/includes/file-upload.php

topirank-integration/trunk/includes/helpers.php

topirank-integration/trunk/includes/init.php

topirank-integration/trunk/includes/process-folders.php

topirank-integration/trunk/includes/register-files.php

topirank-integration/trunk/includes/topirank-template.php

topirank-integration/trunk/includes/update-content-and-seo.php

topirank-integration/trunk/includes/update-functionality.php

topirank-integration/trunk/languages/topirank-integration-fr_FR.po

topirank-integration/trunk/languages/topirank-integration.pot

topirank-integration/trunk/readme.txt

topirank-integration/trunk/topirank-integration.php

Download in other formats: