Changeset 3176965

Timestamp:

10/28/2024 11:40:22 AM (17 months ago)

Author:

seuroficial

Message:

v2.2.14

Location:

seur/trunk

Files:

• classes/PDFGenerator.php (modified) (1 diff)
• classes/PDFMerger.php (modified) (5 diffs)
• classes/class-seur-collections.php (modified) (1 diff)
• classes/class-seur-global.php (modified) (19 diffs)
• classes/class-seur-scheduled-actions.php (modified) (2 diffs)
• classes/class-seur-seguimiento.php (modified) (2 diffs)
• classes/tcpdf/include/tcpdf_filters.php (modified) (1 diff)
• classes/tcpdf/include/tcpdf_fonts.php (modified) (6 diffs)
• classes/tcpdf/include/tcpdf_images.php (modified) (1 diff)
• classes/tcpdf/include/tcpdf_static.php (modified) (9 diffs)
• classes/tcpdf/tcpdf.php (modified) (17 diffs)
• classes/tcpdf/tcpdf_autoconfig.php (modified) (2 diffs)
• classes/tcpdf/tcpdi.php (modified) (1 diff)
• classes/tcpdf/tcpdi_parser.php (modified) (1 diff)
• core/functions/functions.php (modified) (6 diffs)
• core/help/seur-help-tabs.php (modified) (2 diffs)
• core/installer.php (modified) (2 diffs)
• core/labels-cpt/labels-cpt.php (modified) (8 diffs)
• core/pages/about.php (modified) (2 diffs)
• core/pages/rates/custom-name-rates.php (modified) (5 diffs)
• core/pages/rates/limit-price-weight-rates.php (modified) (2 diffs)
• core/pages/rates/seur-add-form.php (modified) (4 diffs)
• core/pages/rates/seur-country-state-process.php (modified) (3 diffs)
• core/pages/rates/seur-custom-rates.php (modified) (2 diffs)
• core/pages/rates/seur-edit-form.php (modified) (3 diffs)
• core/pages/rates/seur-import-custom-rates.php (modified) (8 diffs)
• core/pages/rates/seur-rates.php (modified) (3 diffs)
• core/pages/setting-options/advanced-settings.php (modified) (1 diff)
• core/pages/setting-options/user-settings.php (modified) (2 diffs)
• core/pages/seur-get-labels.php (modified) (3 diffs)
• core/pages/seur-pickup.php (modified) (2 diffs)
• core/pages/seur-products-services.php (modified) (2 diffs)
• core/pages/status/status-check.php (modified) (1 diff)
• core/woocommerce/includes/class-seur_local_shipping_method.php (modified) (4 diffs)
• core/woocommerce/includes/class-wc-shipping-seur.php (modified) (2 diffs)
• core/woocommerce/includes/metabox/seur-metabox.php (modified) (3 diffs)
• core/woocommerce/includes/pages/seur-process-label.php (modified) (1 diff)
• core/woocommerce/includes/seur-woo-functions.php (modified) (14 diffs)
• core/woocommerce/seur-woocommerce.php (modified) (2 diffs)
• loader.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

seur/trunk/classes/PDFGenerator.php

@@ -260 +260 @@
 
         $seed .= uniqid('', true);
-        $seed .= mt_rand(0, mt_getrandmax());
+        $seed .= wp_rand(0, mt_getrandmax());
         $seed .= __FILE__;
         $seed .= $this->bufferlen;
 
         if (isset($_SERVER['REMOTE_ADDR'])) {
-            $seed .= $_SERVER['REMOTE_ADDR'];
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['REMOTE_ADDR']));
         }
         if (isset($_SERVER['HTTP_USER_AGENT'])) {
-            $seed .= $_SERVER['HTTP_USER_AGENT'];
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['HTTP_USER_AGENT']));
         }
         if (isset($_SERVER['HTTP_ACCEPT'])) {
-            $seed .= $_SERVER['HTTP_ACCEPT'];
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['HTTP_ACCEPT']));
         }
         if (isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
-            $seed .= $_SERVER['HTTP_ACCEPT_ENCODING'];
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['HTTP_ACCEPT_ENCODING']));
         }
         if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-            $seed .= $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['HTTP_ACCEPT_LANGUAGE']));
         }
         if (isset($_SERVER['HTTP_ACCEPT_CHARSET'])) {
-            $seed .= $_SERVER['HTTP_ACCEPT_CHARSET'];
-        }
-
-        $seed .= mt_rand(0, mt_getrandmax());
+            $seed .= sanitize_text_field(wp_unslash($_SERVER['HTTP_ACCEPT_CHARSET']));
+        }
+
+        $seed .= wp_rand(0, mt_getrandmax());
         $seed .= uniqid('', true);
         $seed .= microtime();

seur/trunk/classes/PDFMerger.php

@@ -49 +49 @@
         $tcpdfPath = SEUR_PLUGIN_PATH . 'classes/tcpdf/tcpdf.php';
         if (!file_exists($tcpdfPath)) {
-            echo 'File not exists: '.$tcpdfPath;
+            echo 'File not exists: '.esc_attr($tcpdfPath);
             die;
         }
@@ -76 +76 @@
         else
         {
-            throw new \exception("Could not locate PDF on '$filepath'");
+            throw new \exception("Could not locate PDF on '".esc_attr($filepath)."'.");
         }
 
@@ -121 +121 @@
                 foreach($filepages as $page)
                 {
-                    if(!$template = $fpdi->importPage($page)): throw new exception("Could not load page '$page' in PDF '$filename'. Check that the page exists."); endif;
+                    if (!$template = $fpdi->importPage($page)) {
+                        throw new exception("Could not load page '".esc_attr($page)."' in PDF '".esc_attr($filename)."'. Check that the page exists.");
+                    }
                     $size = $fpdi->getTemplateSize($template);
                     $orientation = ($size['h'] > $size['w']) ? 'P' : 'L';
@@ -151 +153 @@
             else
             {
-                throw new exception("Error outputting PDF to '$outputmode'.");
+                throw new exception("Error outputting PDF to '".esc_attr($outputmode)."'.");
                 return false;
             }
@@ -206 +208 @@
                 $y = $ind[1]; //end page
 
-                if($x > $y): throw new exception("Starting page, '$x' is greater than ending page '$y'."); return false; endif;
+                if($x > $y): throw new exception("Starting page, '".esc_attr($x)."' is greater than ending page '".esc_attr($y)."'."); return false; endif;
 
                 //add middle pages

seur/trunk/classes/class-seur-collections.php

@@ -215 +215 @@
         return json_decode( $result, true );
     }
+
+    /**
+     * Cancelar una recogida
+     *
+     * @param string $reference - La referencia de la recogida a cancelar
+     * @return mixed|false
+     */
+    public function cancel_collection( $reference ) {
+        // URL de la API para cancelar la recogida
+        $url_cancel = $this->seur_adr . '/cancel';
+
+        // Preparar los datos de la solicitud de cancelación
+        $data = wp_json_encode( array( 'codes' => array( $reference ) ) );
+
+        // Encabezados de la solicitud
+        $headers = array(
+            'Content-Type'  => 'application/json;charset=UTF-8',
+            'Accept'        => 'application/json',
+            'Authorization' => seur()->get_token_b(),
+        );
+
+        if ( seur()->log_is_acive() ) {
+            seur()->slog( 'Cancelando recogida con referencia: ' . $reference );
+            seur()->slog( 'Data enviada: ' . print_r( $data, true ) );
+        }
+
+        // Configuración de la solicitud
+        $args = array(
+            'method'      => 'POST',
+            'timeout'     => 45,
+            'httpversion' => '1.0',
+            'user-agent'  => 'WooCommerce',
+            'headers'     => $headers,
+            'body'        => $data,
+        );
+
+        // Enviar la solicitud a la API
+        $response      = wp_remote_post(
+            $url_cancel,
+            $args
+        );
+        $response_body = wp_remote_retrieve_body( $response );
+        $result        = json_decode( wp_json_encode( $response_body ), true );
+        return json_decode( $result, true );
+
+    }
 }
 function seur_collections( $data ) {
-    $collection = new Seur_Collections();
-    $result     = $collection->collection_remote_post( $data );
-    return $result;
-}
+    return ( new Seur_Collections() )->collection_remote_post( $data );
+}
+
+function seur_cancel_collection( $reference ) {
+    return ( new Seur_Collections() )->cancel_collection( $reference );
+}
+

seur/trunk/classes/class-seur-global.php

@@ -148 +148 @@
         return get_option( 'seur_save_date_cold' );
     }
+
+    public function cancel_collection( $type ) {
+        update_option( 'seur_save_collection_' . $type, '' );
+    }
+
+    public function cancel_reference( $type ) {
+        update_option( 'seur_save_reference_' . $type, '' );
+    }
+
+    public function cancel_date_normal() {
+        update_option( 'seur_save_date_normal', '' );
+    }
+
+    public function cancel_date_cold() {
+        update_option( 'seur_save_date_cold', '' );
+    }
+
 
     public function is_test() {
@@ -226 +243 @@
         update_option( 'seur_api_token', $token );
 
-        if ( $this->log_is_acive() ) {
-            $this->slog( '$result: ' . print_r( $result, true ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
-            $this->slog( 'Token: ' . $token );
-            $this->slog( '/*****************************/' );
-            $this->slog( 'sending Token confirmation mail' );
-            $this->slog( '/*****************************/' );
-            $to      = get_bloginfo( 'admin_email' );
-            $subject = 'API Seur Guardada correctamente';
-            $body    = 'Se ha generado de forma correcta un nuevo Token. El nuevo token es: ' . $token;
-            $headers = array( 'Content-Type: text/html; charset=UTF-8' );
-            wp_mail( $to, $subject, $body, $headers );
-        }
         return $token;
     }
@@ -355 +360 @@
      * @param $data array
      * @param $action string
-     * @param $implode bool
+     * @param $queryparams bool
+     * @param $file bool
      *
      * @return mixed json
      * */
-    public function sendCurl($url, $header, $data, $action, $queryparams = false, $file = false) {
-        if ($action=='POST') {
-            $curl = curl_init($url);
-            /* headers didn't need to be set, cURL automatically sets headers when
-               you pass an ARRAY into CURLOPT_POSTFIELDS -> (content-type: multipart/form-data; content-length...) */
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
-
+    public function sendCurl($url, $header, $data, $action, $queryparams = false, $file = false)
+    {
+        // Prepare the args for the request
+        $args = array(
+            'headers' => $header,
+            'timeout' => 45,
+            'sslverify' => false,
+            'body' => null, // We'll set this later
+            'user-agent' => 'WooCommerce',
+            'httpversion' => '1.0',
+        );
+
+        if ($action == 'POST') {
             if ($queryparams) {
-                curl_setopt($curl, CURLOPT_POSTFIELDS, implode('&', $data));  // este para el token
+                // For token or query params, we use URL-encoded data
+                $args['body'] = implode('&', $data);
             } elseif ($file) {
-                curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
+                // For file upload, pass the data directly
+                $args['body'] = $data;
             } else {
-                curl_setopt($curl, CURLOPT_POST, true);  // application/x-www-form-urlencoded
-                curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
-            }
+                // For regular POST, we send JSON-encoded data
+                $args['body'] = json_encode($data);
+                $args['headers']['Content-Type'] = 'application/json';
+            }
+
+            // Perform the POST request
+            $response = wp_remote_post($url, $args);
+
         } else {
-            $curl = curl_init($url . '?'. http_build_query($data));
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
-            curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $action);
-        }
-
-        curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-
-        $result = curl_exec($curl);
-        if (json_decode($result) !==null ){
-            $result = json_decode($result);
-        }
-
-        if (curl_errno($curl)){
-            $this->log->log(WC_Log_Levels::ERROR, "CURL ERROR: ".curl_error($curl));
-            curl_close($curl);
+            // For other methods like GET, PUT, DELETE
+            $args['method'] = $action;
+            $url_with_params = $url . '?' . http_build_query($data);
+
+            // Perform the custom request
+            $response = wp_remote_get($url_with_params, $args);
+        }
+
+        // Handle the response
+        if (is_wp_error($response)) {
+            $error_message = $response->get_error_message();
+            $this->log->log(WC_Log_Levels::ERROR, "HTTP ERROR: $error_message");
             return false;
         }
-        if (isset($result->error) || isset($result->errors)) {
-            $this->log->log(WC_Log_Levels::ERROR, "CURL url: ".$url ."<br>
-                header: ". json_encode($header) ."<br>
-                params: ". json_encode($data) ."<br>
-                result: ". json_encode($result)
-            );
-        }
-
-        curl_close($curl);
-        return $result;
+
+        $result = wp_remote_retrieve_body($response);
+        $decoded_result = json_decode($result, true);
+
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return $decoded_result;
+        } else {
+            $this->log->log(WC_Log_Levels::ERROR, "Invalid JSON response: " . $result);
+            return $result;  // Return raw result if not JSON
+        }
     }
 
@@ -423 +437 @@
             return false;
 
-        $headers[] = "Accept: */*";
-        $headers[] = "Content-Type: application/json";
-        $headers[] = "Authorization: ".$token;
+        $headers = [
+            'Content-Type' => 'application/json;charset=UTF-8',
+            'Accept' => 'application/json',
+            'Authorization' => $token,
+        ];
 
         $data = [
@@ -439 +455 @@
         }
 
-        if (!isset($response->data)) {
+        if (!isset($response['data'])) {
             return false;
         }
-        return $response->data;
+        return $response['data'];
     }
 
@@ -631 +647 @@
     {
         $deliveryDate = new DateTime('tomorrow');
-        $deliveryDay = strtolower(date('l', $deliveryDate->getTimestamp()));
+        $deliveryDay = strtolower(gmdate('l', $deliveryDate->getTimestamp()));
         if ($deliveryDay == 'sunday') {
             $deliveryDate->add(new \DateInterval('P1D'));
@@ -681 +697 @@
                 return false;
 
-            $headers[] = "Accept: */*";
-            $headers[] = "Content-Type: application/json";
-            $headers[] = "Authorization: ".$token;
+            $headers = [
+                'Content-Type' => 'application/json;charset=UTF-8',
+                'Accept' => 'application/json',
+                'Authorization' => $token,
+            ];
 
             $response = $this->sendCurl($url, $headers, $preparedData, "POST");
 
             $message = '';
-            if (isset($response->errors)) {
-                $message = 'addShipment Error: '.$response->errors[0]->detail;
-            }
-
-            if (isset($response->error)) {
-                $message = 'addShipment Error: '.$response->error;
+            if (isset($response['errors'])) {
+                $message = 'addShipment Error: '.$response['errors'][0]['detail'];
+            }
+
+            if (isset($response['error'])) {
+                $message = 'addShipment Error: '.$response['error'];
             }
 
@@ -725 +743 @@
     public function getLabel($response, $is_pdf, $label_data, $order_id)
     {
-        if (is_array($response) && isset($response['response'])) {
+        global $wp_filesystem;
+        if ( is_array($response) && isset($response['response'])) {
             $response = $response['response'];
         }
@@ -737 +756 @@
                 return false;
 
-            $headers[] = "Accept: */*";
-            $headers[] = "Content-Type: application/json";
-            $headers[] = "Authorization: ".$token;
+            $headers = [
+                'Content-Type' => 'application/json;charset=UTF-8',
+                'Accept' => 'application/json',
+                'Authorization' => $token,
+            ];
 
             $type = new PrinterType();
@@ -749 +770 @@
 
             $data = [
-                'code' => $response->data->shipmentCode,
+                'code' => $response['data']['shipmentCode'],
                 'type' => $printerType,
                 'entity' => 'EXPEDITIONS'
@@ -759 +780 @@
             $responseLabel = $this->sendCurl($urlws, $headers, $data, "GET");
 
-            if (isset($responseLabel->errors)) {
-                $message = 'getLabel Error: '.$responseLabel->errors[0]->detail;
+            if (isset($responseLabel['errors'])) {
+                $message = 'getLabel Error: '.$responseLabel['errors'][0]['detail'];
                 $this->log->log(WC_Log_Levels::ERROR, $message);
                 return [ 'status'=> false,
@@ -769 +790 @@
             $upload_url = seur_upload_url( 'labels' );
 
-            if (!is_writable($upload_dir)) {
+            if (! $wp_filesystem->is_writable($upload_dir)) {
                 $message = 'getLabel Error: '.$upload_dir . ' is NOT writable';
                 $this->log->log(WC_Log_Levels::ERROR, $message);
@@ -781 +802 @@
             $content = '';
             // Generate file/s with then content of the labels
-            foreach ($responseLabel->data as $data) {
+            foreach ($responseLabel['data'] as $data) {
                 if ($is_pdf) {
-                    $content = base64_decode($data->pdf);
+                    $content = base64_decode($data['pdf']);
                 } else {
-                    $content = $data->label;
+                    $content = $data['label'];
                 }
 
                 // When merging labels, all labels are written to the same file. A suffix is added in other case.
-                $label_file = 'label_order_id_' . $order_id . '_' . date( 'd-m-Y' );
+                $label_file = 'label_order_id_' . $order_id . '_' . gmdate( 'd-m-Y' );
                 if ( !$merge_labels ) {
                     $label_file .= ($cont == 1 ? '' : '_' . $cont);
@@ -797 +818 @@
                 $upload_path = $upload_dir . '/' . $label_file;
 
-                if ( false === file_put_contents($upload_path, $content, FILE_APPEND) ) {
-                    $message = 'getLabel Error file_put_contents: '.$upload_path;
-                    $this->log->log(WC_Log_Levels::ERROR, $message);
-                    return [ 'status'=> false,
-                        'message' => $message ];
-                }
+                if ( ! $wp_filesystem->put_contents( $upload_path, $content, FS_CHMOD_FILE | FILE_APPEND ) ) {
+                    $message = 'getLabel Error file_put_contents: ' . $upload_path;
+                    $this->log->log( WC_Log_Levels::ERROR, $message );
+                    return [
+                        'status'  => false,
+                        'message' => $message,
+                    ];
+                }
                 if (!in_array($label_file, $label_files)) {
                     $label_files[] = $label_file;
@@ -860 +883 @@
                 if (! $labelid ) {
                     $result = false;
-                    $message = $responseLabel->out->mensaje;
+                    $message = $responseLabel['out']['mensaje'];
                 }
                 $seur_label[] = [
@@ -874 +897 @@
             $order->update_meta_data('_seur_shipping_id_number', $label_data['order_id_seur'] );
             $order->update_meta_data('_seur_label_id_number', $labelids);
+            $order->update_meta_data( '_seur_shipping_order_label_downloaded', 'yes');
             $order->save_meta_data();
 
-            $expeditionCode = $response->data->shipmentCode;
-            $ecbs = $response->data->ecbs;
-            $parcelNumbers = $response->data->parcelNumbers;
+            $expeditionCode = $response['data']['shipmentCode'];
+            $ecbs = $response['data']['ecbs'];
+            $parcelNumbers = $response['data']['parcelNumbers'];
 
             $this->log->log(WC_Log_Levels::INFO, "getLabel OK");
@@ -910 +934 @@
             $datepickup = explode(' ', $pickup_data['date']);
             $datepickup = $datepickup[0];
-            if (strtotime(date('Y-m-d')) == strtotime($datepickup))
+            if (strtotime(gmdate('Y-m-d')) == strtotime($datepickup))
                 $make_pickup = false;
         }
@@ -952 +976 @@
     public function is_seur_order($order_id) {
         global $wpdb;
-        $query = "SELECT distinct o.order_id
+        return $wpdb->get_results($wpdb->prepare(
+            "SELECT distinct o.order_id
             FROM {$wpdb->prefix}woocommerce_order_items o
             inner join {$wpdb->prefix}woocommerce_order_itemmeta om on om.order_item_id = o.order_item_id
-            where om.meta_key = 'method_id' and (om.meta_value like '%seur%')
-            AND o.order_id = ".$order_id;
-        return $wpdb->get_results( $query );
+            where om.meta_key = %s and (om.meta_value like %s)
+            AND o.order_id = %d",
+            ['method_id', '%seur%', $order_id])
+        );
     }
 
     public function is_seur_local_method($custom_rate_id) {
         global $wpdb;
-        $query = "SELECT ID
+        return $wpdb->get_results($wpdb->prepare(
+            "SELECT ID
             FROM {$wpdb->prefix}seur_custom_rates
-            where rate like '%2SHOP' and ID = ".$custom_rate_id;
-        return $wpdb->get_results( $query );
+            where rate like %s and ID = %d",
+            ['%2SHOP', $custom_rate_id])
+        );
     }
 
@@ -1012 +1040 @@
     public function has_label($post_order_int) {
         $order = seur_get_order($post_order_int);
-        $has_label = $order->get_meta('_seur_shipping_order_label_downloaded', true );
         $label_ids = seur_get_labels_ids( $order->get_id() );
-        return $has_label && (!empty($label_ids));
+        return (!empty($label_ids));
     }
 }

seur/trunk/classes/class-seur-scheduled-actions.php

@@ -10 +10 @@
     exit; // Exit if accessed directly.
 }
+require_once ABSPATH . 'wp-content/plugins/woocommerce/packages/action-scheduler/action-scheduler.php';
 
 class Seur_Scheduled_Actions {
@@ -20 +21 @@
 
     public function seur_token_schedule() {
-        if ( false === as_next_scheduled_action( 'seur_get_token_hook' ) ) {
+        //if ( false === as_next_scheduled_action( 'seur_get_token_hook' ) ) {
             as_schedule_recurring_action( strtotime( 'now' ), 1200, 'seur_get_token_hook' );
-        }
+        //}
     }
 

seur/trunk/classes/class-seur-seguimiento.php

@@ -176 +176 @@
     global $wpdb;
     $tabla  = $wpdb->prefix . 'seur_status';
-    $sql    = "SELECT * FROM ". $tabla ." WHERE cod_situ = '".$eventCode."'";
-    $result = $wpdb->get_results($sql);
+    $result = $wpdb->get_results($wpdb->prepare(
+        "SELECT * FROM %s WHERE cod_situ = %s",
+        [$tabla, $eventCode]));
     return $result ? (array)$result[0] : [];
 }
@@ -197 +198 @@
     $tabla  = $wpdb->prefix . 'wc_order_stats';
     if ($expeditionStatusKey = getExpeditionStatusKey($expeditionStatus)) {
-        $wpdb->query("UPDATE " . $tabla . " SET status='" . $expeditionStatusKey . "' WHERE order_id = '" . $order_id . "'");
+        $wpdb->query($wpdb->prepare(
+            "UPDATE %s SET status=%s WHERE order_id = %d",
+            [$tabla, $expeditionStatusKey, $order_id])
+        );
         $order = wc_get_order($order_id);
         $order->update_status($expeditionStatusKey);

seur/trunk/classes/tcpdf/include/tcpdf_filters.php

@@ -472 +472 @@
      */
     public static function Error($msg) {
-        throw new Exception('TCPDF_PARSER ERROR: '.$msg);
+        throw new Exception('TCPDF_PARSER ERROR: '.esc_attr($msg));
     }
 

seur/trunk/classes/tcpdf/include/tcpdf_fonts.php

@@ -71 +71 @@
      */
     public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false, $link=false) {
+        global $wp_filesystem;
+
         if (!TCPDF_STATIC::file_exists($fontfile)) {
             // Could not find file
@@ -103 +105 @@
         $fmetric['ctg'] = $font_name.'.ctg.z';
         // get font data
-        $font = file_get_contents($fontfile);
+        $font = $wp_filesystem->get_contents( $fontfile );
         $fmetric['originalsize'] = strlen($font);
         // autodetect font type
@@ -187 +189 @@
             // store compressed font
             $fmetric['file'] .= '.z';
-            $fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
+            $outfile = $outpath . $fmetric['file'];
+            $compressed_data = gzcompress($data);
+            $wp_filesystem->put_contents( $outfile, $compressed_data, FS_CHMOD_FILE );
+            /*$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
             fwrite($fp, gzcompress($data));
-            fclose($fp);
+            fclose($fp);*/
             // get font info
             $fmetric['Flags'] = $flags;
@@ -367 +372 @@
                     // store compressed font
                     $fmetric['file'] .= '.z';
-                    $fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
+                    $outfile = $outpath . $fmetric['file'];
+                    $compressed_font = gzcompress($font);
+                    $wp_filesystem->put_contents( $outfile, $compressed_font, FS_CHMOD_FILE );
+                    /*$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['file'], 'wb');
                     fwrite($fp, gzcompress($font));
-                    fclose($fp);
+                    fclose($fp);*/
                 }
             }
@@ -886 +894 @@
                 }
                 // store compressed CIDToGIDMap
-                $fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['ctg'], 'wb');
+                $outfile = $outpath . $fmetric['ctg'];
+                $compressed_data = gzcompress($cidtogidmap);
+                $wp_filesystem->put_contents( $outfile, $compressed_data, FS_CHMOD_FILE );
+
+                /*$fp = TCPDF_STATIC::fopenLocal($outpath.$fmetric['ctg'], 'wb');
                 fwrite($fp, gzcompress($cidtogidmap));
-                fclose($fp);
+                fclose($fp);*/
             }
         }
@@ -912 +924 @@
         $pfile .= '// --- EOF ---'."\n";
         // store file
-        $fp = TCPDF_STATIC::fopenLocal($outpath.$font_name.'.php', 'w');
+        $outfile = $outpath . $font_name . '.php';
+        $wp_filesystem->put_contents( $outfile, $pfile, FS_CHMOD_FILE );
+
+        /*$fp = TCPDF_STATIC::fopenLocal($outpath.$font_name.'.php', 'w');
         fwrite($fp, $pfile);
-        fclose($fp);
+        fclose($fp);*/
         // return TCPDF font name
         return $font_name;

seur/trunk/classes/tcpdf/include/tcpdf_images.php

@@ -1 @@
-<?php
-//============================================================+
-// File name   : tcpdf_images.php
-// Version     : 1.0.005
-// Begin       : 2002-08-03
-// Last Update : 2014-11-15
-// Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - [email protected]
-// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
-// -------------------------------------------------------------------
-// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
-//
-// This file is part of TCPDF software library.
-//
-// TCPDF is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// TCPDF is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the License
-// along with TCPDF. If not, see
-// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description :
-//   Static image methods used by the TCPDF class.
-//
-//============================================================+
-
-/**
- * @file
- * This is a PHP class that contains static image methods for the TCPDF class.<br>
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.005
- */
-
-/**
- * @class TCPDF_IMAGES
- * Static image methods used by the TCPDF class.
- * @package com.tecnick.tcpdf
- * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 1.0.005
- * @author Nicola Asuni - [email protected]
- */
-class TCPDF_IMAGES {
-
-    /**
-     * Array of hinheritable SVG properties.
-     * @since 5.0.000 (2010-05-02)
-     * @public static
-     */
-    public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    /**
-     * Return the image type given the file name or array returned by getimagesize() function.
-     * @param $imgfile (string) image file name
-     * @param $iminfo (array) array of image information returned by getimagesize() function.
-     * @return string image type
-     * @since 4.8.017 (2009-11-27)
-     * @public static
-     */
-    public static function getImageFileType($imgfile, $iminfo=array()) {
-        $type = '';
-        if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
-            $mime = explode('/', $iminfo['mime']);
-            if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
-                $type = strtolower(trim($mime[1]));
-            }
-        }
-        if (empty($type)) {
-            $fileinfo = pathinfo($imgfile);
-            if (isset($fileinfo['extension']) AND (!TCPDF_STATIC::empty_string($fileinfo['extension']))) {
-                $type = strtolower(trim($fileinfo['extension']));
-            }
-        }
-        if ($type == 'jpg') {
-            $type = 'jpeg';
-        }
-        return $type;
-    }
-
-    /**
-     * Set the transparency for the given GD image.
-     * @param $new_image (image) GD image object
-     * @param $image (image) GD image object.
-     * return GD image object.
-     * @since 4.9.016 (2010-04-20)
-     * @public static
-     */
-    public static function setGDImageTransparency($new_image, $image) {
-        // default transparency color (white)
-        $tcol = array('red' => 255, 'green' => 255, 'blue' => 255);
-        // transparency index
-        $tid = imagecolortransparent($image);
-        $palletsize = imagecolorstotal($image);
-        if (($tid >= 0) AND ($tid < $palletsize)) {
-            // get the colors for the transparency index
-            $tcol = imagecolorsforindex($image, $tid);
-        }
-        $tid = imagecolorallocate($new_image, $tcol['red'], $tcol['green'], $tcol['blue']);
-        imagefill($new_image, 0, 0, $tid);
-        imagecolortransparent($new_image, $tid);
-        return $new_image;
-    }
-
-    /**
-     * Convert the loaded image to a PNG and then return a structure for the PDF creator.
-     * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-     * @param $image (image) Image object.
-     * @param $tempfile (string) Temporary file name.
-     * return image PNG image object.
-     * @since 4.9.016 (2010-04-20)
-     * @public static
-     */
-    public static function _toPNG($image, $tempfile) {
-        // turn off interlaced mode
-        imageinterlace($image, 0);
-        // create temporary PNG image
-        imagepng($image, $tempfile);
-        // remove image from memory
-        imagedestroy($image);
-        // get PNG image data
-        $retvars = self::_parsepng($tempfile);
-        // tidy up by removing temporary image
-        unlink($tempfile);
-        return $retvars;
-    }
-
-    /**
-     * Convert the loaded image to a JPEG and then return a structure for the PDF creator.
-     * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-     * @param $image (image) Image object.
-     * @param $quality (int) JPEG quality.
-     * @param $tempfile (string) Temporary file name.
-     * return image JPEG image object.
-     * @public static
-     */
-    public static function _toJPEG($image, $quality, $tempfile) {
-        imagejpeg($image, $tempfile, $quality);
-        imagedestroy($image);
-        $retvars = self::_parsejpeg($tempfile);
-        // tidy up by removing temporary image
-        unlink($tempfile);
-        return $retvars;
-    }
-
-    /**
-     * Extract info from a JPEG file without using the GD library.
-     * @param $file (string) image file to parse
-     * @return array structure containing the image data
-     * @public static
-     */
-    public static function _parsejpeg($file) {
-        // check if is a local file
-        if (!@TCPDF_STATIC::file_exists($file)) {
-            return false;
-        }
-        $a = getimagesize($file);
-        if (empty($a)) {
-            //Missing or incorrect image file
-            return false;
-        }
-        if ($a[2] != 2) {
-            // Not a JPEG file
-            return false;
-        }
-        // bits per pixel
-        $bpc = isset($a['bits']) ? intval($a['bits']) : 8;
-        // number of image channels
-        if (!isset($a['channels'])) {
-            $channels = 3;
-        } else {
-            $channels = intval($a['channels']);
-        }
-        // default colour space
-        switch ($channels) {
-            case 1: {
-                $colspace = 'DeviceGray';
-                break;
-            }
-            case 3: {
-                $colspace = 'DeviceRGB';
-                break;
-            }
-            case 4: {
-                $colspace = 'DeviceCMYK';
-                break;
-            }
-            default: {
-                $channels = 3;
-                $colspace = 'DeviceRGB';
-                break;
-            }
-        }
-        // get file content
-        $data = file_get_contents($file);
-        // check for embedded ICC profile
-        $icc = array();
-        $offset = 0;
-        while (($pos = strpos($data, "ICC_PROFILE\0", $offset)) !== false) {
-            // get ICC sequence length
-            $length = (TCPDF_STATIC::_getUSHORT($data, ($pos - 2)) - 16);
-            // marker sequence number
-            $msn = max(1, ord($data[($pos + 12)]));
-            // number of markers (total of APP2 used)
-            $nom = max(1, ord($data[($pos + 13)]));
-            // get sequence segment
-            $icc[($msn - 1)] = substr($data, ($pos + 14), $length);
-            // move forward to next sequence
-            $offset = ($pos + 14 + $length);
-        }
-        // order and compact ICC segments
-        if (count($icc) > 0) {
-            ksort($icc);
-            $icc = implode('', $icc);
-            if ((ord($icc[36]) != 0x61) OR (ord($icc[37]) != 0x63) OR (ord($icc[38]) != 0x73) OR (ord($icc[39]) != 0x70)) {
-                // invalid ICC profile
-                $icc = false;
-            }
-        } else {
-            $icc = false;
-        }
-        return array('w' => $a[0], 'h' => $a[1], 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'DCTDecode', 'data' => $data);
-    }
-
-    /**
-     * Extract info from a PNG file without using the GD library.
-     * @param $file (string) image file to parse
-     * @return array structure containing the image data
-     * @public static
-     */
-    public static function _parsepng($file) {
-        $f = @fopen($file, 'rb');
-        if ($f === false) {
-            // Can't open image file
-            return false;
-        }
-        //Check signature
-        if (fread($f, 8) != chr(137).'PNG'.chr(13).chr(10).chr(26).chr(10)) {
-            // Not a PNG file
-            return false;
-        }
-        //Read header chunk
-        fread($f, 4);
-        if (fread($f, 4) != 'IHDR') {
-            //Incorrect PNG file
-            return false;
-        }
-        $w = TCPDF_STATIC::_freadint($f);
-        $h = TCPDF_STATIC::_freadint($f);
-        $bpc = ord(fread($f, 1));
-        $ct = ord(fread($f, 1));
-        if ($ct == 0) {
-            $colspace = 'DeviceGray';
-        } elseif ($ct == 2) {
-            $colspace = 'DeviceRGB';
-        } elseif ($ct == 3) {
-            $colspace = 'Indexed';
-        } else {
-            // alpha channel
-            fclose($f);
-            return 'pngalpha';
-        }
-        if (ord(fread($f, 1)) != 0) {
-            // Unknown compression method
-            fclose($f);
-            return false;
-        }
-        if (ord(fread($f, 1)) != 0) {
-            // Unknown filter method
-            fclose($f);
-            return false;
-        }
-        if (ord(fread($f, 1)) != 0) {
-            // Interlacing not supported
-            fclose($f);
-            return false;
-        }
-        fread($f, 4);
-        $channels = ($ct == 2 ? 3 : 1);
-        $parms = '/DecodeParms << /Predictor 15 /Colors '.$channels.' /BitsPerComponent '.$bpc.' /Columns '.$w.' >>';
-        //Scan chunks looking for palette, transparency and image data
-        $pal = '';
-        $trns = '';
-        $data = '';
-        $icc = false;
-        $n = TCPDF_STATIC::_freadint($f);
-        do {
-            $type = fread($f, 4);
-            if ($type == 'PLTE') {
-                // read palette
-                $pal = TCPDF_STATIC::rfread($f, $n);
-                fread($f, 4);
-            } elseif ($type == 'tRNS') {
-                // read transparency info
-                $t = TCPDF_STATIC::rfread($f, $n);
-                if ($ct == 0) { // DeviceGray
-                    $trns = array(ord($t[1]));
-                } elseif ($ct == 2) { // DeviceRGB
-                    $trns = array(ord($t[1]), ord($t[3]), ord($t[5]));
-                } else { // Indexed
-                    if ($n > 0) {
-                        $trns = array();
-                        for ($i = 0; $i < $n; ++ $i) {
-                            $trns[] = ord($t[$i]);
-                        }
-                    }
-                }
-                fread($f, 4);
-            } elseif ($type == 'IDAT') {
-                // read image data block
-                $data .= TCPDF_STATIC::rfread($f, $n);
-                fread($f, 4);
-            } elseif ($type == 'iCCP') {
-                // skip profile name
-                $len = 0;
-                while ((ord(fread($f, 1)) != 0) AND ($len < 80)) {
-                    ++$len;
-                }
-                // get compression method
-                if (ord(fread($f, 1)) != 0) {
-                    // Unknown filter method
-                    fclose($f);
-                    return false;
-                }
-                // read ICC Color Profile
-                $icc = TCPDF_STATIC::rfread($f, ($n - $len - 2));
-                // decompress profile
-                $icc = gzuncompress($icc);
-                fread($f, 4);
-            } elseif ($type == 'IEND') {
-                break;
-            } else {
-                TCPDF_STATIC::rfread($f, $n + 4);
-            }
-            $n = TCPDF_STATIC::_freadint($f);
-        } while ($n);
-        if (($colspace == 'Indexed') AND (empty($pal))) {
-            // Missing palette
-            fclose($f);
-            return false;
-        }
-        fclose($f);
-        return array('w' => $w, 'h' => $h, 'ch' => $channels, 'icc' => $icc, 'cs' => $colspace, 'bpc' => $bpc, 'f' => 'FlateDecode', 'parms' => $parms, 'pal' => $pal, 'trns' => $trns, 'data' => $data);
-    }
-
-} // END OF TCPDF_IMAGES CLASS
-
-//============================================================+
-// END OF FILE
-//============================================================+
+<?php /* Not used */

seur/trunk/classes/tcpdf/include/tcpdf_static.php

@@ -394 +394 @@
      */
     public static function getFormattedDate($time) {
-        return substr_replace(date('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
+        return substr_replace(gmdate('YmdHisO', intval($time)), '\'', (0 - 2), 0).'\'';
     }
 
@@ -406 +406 @@
      */
     public static function getRandomSeed($seed='') {
-        $rnd = uniqid(rand().microtime(true), true);
+        $rnd = uniqid(wp_rand().microtime(true), true);
         if (function_exists('posix_getpid')) {
             $rnd .= posix_getpid();
@@ -1525 +1525 @@
         // TEX patterns are available at:
         // http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-        $data = file_get_contents($file);
+        $response = wp_remote_get($file);
+        if (is_wp_error($response)) {
+            $error_message = $response->get_error_message();
+            $data = '';
+        } else {
+            $data = wp_remote_retrieve_body($response);  // Get the content of the response
+        }
+
         $patterns = array();
         // remove comments
@@ -1816 +1823 @@
      */
     public static function fopenLocal($filename, $mode) {
+        global $wp_filesystem;
+
+
         if (strpos($filename, '://') === false) {
             $filename = 'file://'.$filename;
@@ -1821 +1831 @@
             return false;
         }
-        return fopen($filename, $mode);
+        // Ahora utiliza WP_Filesystem para abrir el archivo
+        if ( ! $wp_filesystem->exists( $filename ) ) {
+            return false; // Si el archivo no existe, devuelve false
+        }
+
+        // Abre el archivo usando la API WP_Filesystem
+        $file_contents = $wp_filesystem->get_contents( $filename );
+
+        // Si no se pudo obtener el contenido, devuelve false
+        if ( $file_contents === false ) {
+            return false;
+        }
+
+        // Si el modo es de escritura o lectura, puedes manejar los modos
+        if ( $mode == 'r' ) {
+            return $file_contents; // Devuelve el contenido del archivo si el modo es lectura
+        } elseif ( $mode == 'w' ) {
+            return $wp_filesystem->put_contents( $filename, '', FS_CHMOD_FILE ); // Crea un archivo vacío si el modo es escritura
+        }
+
+        return false; // Si el modo no es soportado, devuelve false
     }
 
@@ -1827 +1857 @@
      * Check if the URL exist.
      * @param url (string) URL to check.
-     * @return Returns TRUE if the URL exists; FALSE otherwise.
-     * @public static
-     */
-    public static function url_exists($url) {
-        $crs = curl_init();
-        // encode query params in URL to get right response form the server
-        $url = self::encodeUrlQuery($url);
-        curl_setopt($crs, CURLOPT_URL, $url);
-        curl_setopt($crs, CURLOPT_NOBODY, true);
-        curl_setopt($crs, CURLOPT_FAILONERROR, true);
-        if (ini_get('open_basedir') == '') {
-            curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+     * @return boolean TRUE if the URL exists; FALSE otherwise.
+     * @public static
+     */
+    public static function url_exists($url) {
+        $url = self::encodeUrlQuery($url);
+        $args = array(
+            'timeout'     => 30,  // Timeout for the request
+            'redirection' => 5,   // Number of allowed redirects
+            'sslverify'   => false,  // Skip SSL verification (use with caution)
+            'user-agent'  => 'tc-lib-file'  // Custom user agent
+        );
+        $response = wp_remote_head($url, $args);
+
+        if (is_wp_error($response)) {
+            return false;
         }
-        curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
-        curl_setopt($crs, CURLOPT_TIMEOUT, 30);
-        curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
-        curl_exec($crs);
-        $code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
-        curl_close($crs);
-        return ($code == 200);
-    }
+
+        $response_code = wp_remote_retrieve_response_code($response);
+        return ($response_code == 200);
+    }
 
     /**
@@ -1894 +1921 @@
      * @param $file (string) Name of the file or URL to read.
      * @return The function returns the read data or FALSE on failure. 
-     * @author Nicola Asuni
      * @since 6.0.025
      * @public static
      */
-    public static function fileGetContents($file) {
-        $alt = array($file);
-        //
-        if ((strlen($file) > 1)
-            && ($file[0] === '/')
-            && ($file[1] !== '/')
-            && !empty($_SERVER['DOCUMENT_ROOT'])
-            && ($_SERVER['DOCUMENT_ROOT'] !== '/')
-        ) {
-            $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
-            if (($findroot === false) || ($findroot > 1)) {
-            $alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
-            }
-        }
-        //
-        $protocol = 'http';
-        if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
-            $protocol .= 's';
-        }
-        //
-        $url = $file;
-        if (preg_match('%^//%', $url) && !empty($_SERVER['HTTP_HOST'])) {
-            $url = $protocol.':'.str_replace(' ', '%20', $url);
-        }
-        $url = htmlspecialchars_decode($url);
-        $alt[] = $url;
-        //
-        if (preg_match('%^(https?)://%', $url)
-            && empty($_SERVER['HTTP_HOST'])
-            && empty($_SERVER['DOCUMENT_ROOT'])
-        ) {
-            $urldata = parse_url($url);
-            if (empty($urldata['query'])) {
-                $host = $protocol.'://'.$_SERVER['HTTP_HOST'];
-                if (strpos($url, $host) === 0) {
-                    // convert URL to full server path
-                    $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
-                    $alt[] = htmlspecialchars_decode(urldecode($tmp));
-                }
-            }
-        }
-        //
-        if (isset($_SERVER['SCRIPT_URI'])
-            && !preg_match('%^(https?|ftp)://%', $file)
-            && !preg_match('%^//%', $file)
-        ) {
-            $urldata = @parse_url($_SERVER['SCRIPT_URI']);
-            $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
-        }
-        //
-        $alt = array_unique($alt);
-        foreach ($alt as $path) {
-            if (!self::file_exists($path)) {
-                continue;
-            }
-            $ret = @file_get_contents($path);
-            if ( $ret != false ) {
-                return $ret;
-            }
-            // try to use CURL for URLs
-            if (!ini_get('allow_url_fopen')
-                && function_exists('curl_init')
-                && preg_match('%^(https?|ftp)://%', $path)
-            ) {
-                // try to get remote file data using cURL
-                $crs = curl_init();
-                curl_setopt($crs, CURLOPT_URL, $path);
-                curl_setopt($crs, CURLOPT_BINARYTRANSFER, true);
-                curl_setopt($crs, CURLOPT_FAILONERROR, true);
-                curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
-                if (ini_get('open_basedir') == '') {
-                    curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+    public static function fileGetContents($file) {
+        global $wp_filesystem;
+
+        $alt = array($file);
+
+        // Check if it's an absolute file path on the server
+        $document_root = sanitize_text_field(wp_unslash($_SERVER['DOCUMENT_ROOT']??''));
+        if ((strlen($file) > 1)
+            && ($file[0] === '/')
+            && ($file[1] !== '/')
+            && !empty($document_root)
+            && ($document_root !== '/')
+        ) {
+            $findroot = strpos($file, );
+            if (($findroot === false) || ($findroot > 1)) {
+                $alt[] = htmlspecialchars_decode(urldecode(document_root.$file));
+            }
+        }
+
+        // Determine protocol (http or https)
+        $protocol = 'http';
+        $https = sanitize_text_field(wp_unslash($_SERVER['HTTPS']??''));
+        if (!empty($https) && (strtolower(https) != 'off')) {
+            $protocol .= 's';
+        }
+
+        // Build the URL for remote access
+        $url = sanitize_text_field($file);
+        $http_host = sanitize_text_field(wp_unslash($_SERVER['HTTP_HOST']??''));
+        if (preg_match('%^//%', $url) && !empty($http_host)) {
+            $url = $protocol.':'.str_replace(' ', '%20', $url);
+        }
+        $url = htmlspecialchars_decode($url);
+        $alt[] = $url;
+
+        // Handle local URL transformations for remote files
+        if (preg_match('%^(https?)://%', $url) && empty($http_host) && empty($document_root)) {
+            $urldata = parse_url($url);
+            if (empty($urldata['query'])) {
+                $host = $protocol.'://'.$http_host;
+                if (strpos($url, $host) === 0) {
+                    $tmp = str_replace($host, $document_root, $url);
+                    $alt[] = htmlspecialchars_decode(urldecode($tmp));
                 }
-                curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
-                curl_setopt($crs, CURLOPT_TIMEOUT, 30);
-                curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
-                curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
-                curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
-                $ret = curl_exec($crs);
-                curl_close($crs);
-                if ($ret !== false) {
-                    return $ret;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
+            }
+        }
+
+        // Construct full URL if necessary
+        $script_uri = sanitize_text_field(wp_unslash($_SERVER['SCRIPT_URI']??''));
+        if (isset($script_uri)
+            && !preg_match('%^(https?|ftp)://%', $file)
+            && !preg_match('%^//%', $file)
+        ) {
+            $urldata = parse_url($script_uri);
+            $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').sanitize_text_field($file);
+        }
+
+        // Unique paths
+        $alt = array_unique($alt);
+
+        foreach ($alt as $path) {
+            if (!self::file_exists($path)) {
+                continue;
+            }
+
+            // Check if it's a local file
+            if (!preg_match('%^(https?|ftp)://%', $path)) {
+                $ret = $wp_filesystem->get_contents( $path );
+                if ($ret !== false) {
+                    return $ret;
+                }
+            } else {
+                // Use wp_remote_get for remote URLs
+                $response = wp_remote_get($path, array(
+                    'timeout' => 30,
+                    'sslverify' => false,
+                    'user-agent' => 'tc-lib-file',
+                ));
+
+                if (is_wp_error($response)) {
+                    continue;
+                }
+
+                // Retrieve the body of the response
+                $ret = wp_remote_retrieve_body($response);
+                if ($ret !== false) {
+                    return $ret;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Get ULONG from string (Big Endian 32-bit unsigned integer).
      * @param $str (string) string from where to extract value
@@ -2100 +2132 @@
      * @public static
      */
-    public static function rfread($handle, $length) {
-        $data = fread($handle, $length);
-        if ($data === false) {
-            return false;
-        }
-        $rest = ($length - strlen($data));
-        if (($rest > 0) && !feof($handle)) {
-            $data .= self::rfread($handle, $rest);
-        }
-        return $data;
-    }
+    public static function rfread($handle, $length) {
+        global $wp_filesystem;
+        if (!is_object($wp_filesystem)) {
+            require_once(ABSPATH . 'wp-admin/includes/file.php');
+            WP_Filesystem();
+        }
+        $data = $wp_filesystem->fread($handle, $length);
+        if ($data === false) {
+            return false;
+        }
+        $rest = ($length - strlen($data));
+        if (($rest > 0) && ! $wp_filesystem->feof($handle)) {
+            $data .= self::rfread($handle, $rest);
+        }
+        return $data;
+    }
 
     /**
@@ -2118 +2155 @@
      * @public static
      */
-    public static function _freadint($f) {
-        $a = unpack('Ni', fread($f, 4));
-        return $a['i'];
-    }
+    public static function _freadint($f) {
+        global $wp_filesystem;
+        if (!is_object($wp_filesystem)) {
+            require_once(ABSPATH . 'wp-admin/includes/file.php');
+            WP_Filesystem();
+        }
+        // Leer 4 bytes usando WP_Filesystem
+        $data = $wp_filesystem->fread($f, 4);
+        $a = unpack('Ni', $data);
+        return $a['i'];
+    }
 
     

seur/trunk/classes/tcpdf/tcpdf.php

@@ -116 +116 @@
 // TCPDF static color methods and data
 require_once(dirname(__FILE__).'/include/tcpdf_colors.php');
-// TCPDF static image methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_images.php');
 // TCPDF static methods and data
 require_once(dirname(__FILE__).'/include/tcpdf_static.php');
@@ -2947 +2945 @@
         $this->_destroy(true);
         if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) {
-            die('<strong>TCPDF ERROR: </strong>'.$msg);
+            die('<strong>TCPDF ERROR: </strong>'. esc_attr($msg));
         } else {
-            throw new Exception('TCPDF ERROR: '.$msg);
+            throw new Exception('TCPDF ERROR: '. esc_attr($msg));
         }
     }
@@ -6893 +6891 @@
         }
         if (!empty($imgdata)) {
-            // copy image to cache
-            $original_file = $file;
-            $file = TCPDF_STATIC::getObjFilename('img', $this->file_id);
-            $fp = TCPDF_STATIC::fopenLocal($file, 'w');
-            if (!$fp) {
-                $this->Error('Unable to write file: '.$file);
-            }
-            fwrite($fp, $imgdata);
-            fclose($fp);
-            unset($imgdata);
-            $imsize = @getimagesize($file);
-            if ($imsize === FALSE) {
-                unlink($file);
-                $file = $original_file;
-            }
-        }
+            global $wp_filesystem;
+            WP_Filesystem();
+            // Copy image to cache
+            $original_file = $file;
+            $file = TCPDF_STATIC::getObjFilename('img', $this->file_id);
+            if (!$wp_filesystem->put_contents($file, $imgdata, FS_CHMOD_FILE)) {
+                $this->Error('Unable to write file: ' . $file);
+            }
+            unset($imgdata);
+            $imsize = @getimagesize($file);
+            if ($imsize === false) {
+                $wp_filesystem->delete($file);
+                $file = $original_file;
+            }
+        }
         if ($imsize === FALSE) {
             if (($w > 0) AND ($h > 0)) {
@@ -7584 +7581 @@
             $name = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $name);
         }
-        if ($this->sign) {
-            // *** apply digital signature to the document ***
-            // get the document content
-            $pdfdoc = $this->getBuffer();
-            // remove last newline
-            $pdfdoc = substr($pdfdoc, 0, -1);
-            // remove filler space
-            $byterange_string_len = strlen(TCPDF_STATIC::$byterange_string);
-            // define the ByteRange
-            $byte_range = array();
-            $byte_range[0] = 0;
-            $byte_range[1] = strpos($pdfdoc, TCPDF_STATIC::$byterange_string) + $byterange_string_len + 10;
-            $byte_range[2] = $byte_range[1] + $this->signature_max_length + 2;
-            $byte_range[3] = strlen($pdfdoc) - $byte_range[2];
-            $pdfdoc = substr($pdfdoc, 0, $byte_range[1]).substr($pdfdoc, $byte_range[2]);
-            // replace the ByteRange
-            $byterange = sprintf('/ByteRange[0 %u %u %u]', $byte_range[1], $byte_range[2], $byte_range[3]);
-            $byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
-            $pdfdoc = str_replace(TCPDF_STATIC::$byterange_string, $byterange, $pdfdoc);
-            // write the document to a temporary folder
-            $tempdoc = TCPDF_STATIC::getObjFilename('doc', $this->file_id);
-            $f = TCPDF_STATIC::fopenLocal($tempdoc, 'wb');
-            if (!$f) {
-                $this->Error('Unable to create temporary file: '.$tempdoc);
-            }
-            $pdfdoc_length = strlen($pdfdoc);
-            fwrite($f, $pdfdoc, $pdfdoc_length);
-            fclose($f);
-            // get digital signature via openssl library
-            $tempsign = TCPDF_STATIC::getObjFilename('sig', $this->file_id);
-            if (empty($this->signature_data['extracerts'])) {
-                openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
-            } else {
-                openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED, $this->signature_data['extracerts']);
-            }
-            // read signature
-            $signature = file_get_contents($tempsign);
-            // extract signature
-            $signature = substr($signature, $pdfdoc_length);
-            $signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13));
-            $tmparr = explode("\n\n", $signature);
-            $signature = $tmparr[1];
-            // decode signature
-            $signature = base64_decode(trim($signature));
-            // add TSA timestamp to signature
-            $signature = $this->applyTSA($signature);
-            // convert signature to hex
-            $signature = current(unpack('H*', $signature));
-            $signature = str_pad($signature, $this->signature_max_length, '0');
-            // Add signature to the document
-            $this->buffer = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, $byte_range[1]);
-            $this->bufferlen = strlen($this->buffer);
-        }
+        if ($this->sign) {
+            global $wp_filesystem;
+            WP_Filesystem();
+            // *** apply digital signature to the document ***
+            // get the document content
+            $pdfdoc = $this->getBuffer();
+            // remove last newline
+            $pdfdoc = substr($pdfdoc, 0, -1);
+            // remove filler space
+            $byterange_string_len = strlen(TCPDF_STATIC::$byterange_string);
+            // define the ByteRange
+            $byte_range = array();
+            $byte_range[0] = 0;
+            $byte_range[1] = strpos($pdfdoc, TCPDF_STATIC::$byterange_string) + $byterange_string_len + 10;
+            $byte_range[2] = $byte_range[1] + $this->signature_max_length + 2;
+            $byte_range[3] = strlen($pdfdoc) - $byte_range[2];
+            $pdfdoc = substr($pdfdoc, 0, $byte_range[1]) . substr($pdfdoc, $byte_range[2]);
+            // replace the ByteRange
+            $byterange = sprintf('/ByteRange[0 %u %u %u]', $byte_range[1], $byte_range[2], $byte_range[3]);
+            $byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
+            $pdfdoc = str_replace(TCPDF_STATIC::$byterange_string, $byterange, $pdfdoc);
+            // write the document to a temporary folder
+            $tempdoc = TCPDF_STATIC::getObjFilename('doc', $this->file_id);
+            if ( ! $wp_filesystem->put_contents($tempdoc, $pdfdoc, FS_CHMOD_FILE) ) {
+                $this->Error('Unable to create temporary file: ' . $tempdoc);
+            }
+            // get digital signature via openssl library
+            $tempsign = TCPDF_STATIC::getObjFilename('sig', $this->file_id);
+            if (empty($this->signature_data['extracerts'])) {
+                openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
+            } else {
+                openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED, $this->signature_data['extracerts']);
+            }
+            // read the signature using WP_Filesystem
+            $signature = $wp_filesystem->get_contents($tempsign);
+            // extract signature
+            $signature = substr($signature, strlen($pdfdoc));
+            $signature = substr($signature, (strpos($signature, "%%EOF\n\n------") + 13));
+            $tmparr = explode("\n\n", $signature);
+            $signature = $tmparr[1];
+            // decode signature
+            $signature = base64_decode(trim($signature));
+            // add TSA timestamp to signature
+            $signature = $this->applyTSA($signature);
+            // convert signature to hex
+            $signature = current(unpack('H*', $signature));
+            $signature = str_pad($signature, $this->signature_max_length, '0');
+            // add signature to the document
+            $this->buffer = substr($pdfdoc, 0, $byte_range[1]) . '<' . $signature . '>' . substr($pdfdoc, $byte_range[1]);
+            $this->bufferlen = strlen($this->buffer);
+        }
         switch($dest) {
             case 'I': {
@@ -7692 +7687 @@
             case 'F':
             case 'FI':
-            case 'FD': {
-                // save PDF to a local file
-                $f = TCPDF_STATIC::fopenLocal($name, 'wb');
-                if (!$f) {
-                    $this->Error('Unable to create output file: '.$name);
-                }
-                fwrite($f, $this->getBuffer(), $this->bufferlen);
-                fclose($f);
-                if ($dest == 'FI') {
-                    // send headers to browser
-                    header('Content-Type: application/pdf');
-                    header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
-                    //header('Cache-Control: public, must-revalidate, max-age=0'); // HTTP/1.1
-                    header('Pragma: public');
-                    header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-                    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-                    header('Content-Disposition: inline; filename="'.basename($name).'"');
-                    TCPDF_STATIC::sendOutputData(file_get_contents($name), filesize($name));
-                } elseif ($dest == 'FD') {
-                    // send headers to browser
-                    if (ob_get_contents()) {
-                        $this->Error('Some data has already been output, can\'t send PDF file');
-                    }
-                    header('Content-Description: File Transfer');
-                    if (headers_sent()) {
-                        $this->Error('Some data has already been output to browser, can\'t send PDF file');
-                    }
-                    header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+            case 'FD': {
+                global $wp_filesystem;
+                WP_Filesystem();
+                // save PDF to a local file using WP_Filesystem
+                if ( ! $wp_filesystem->put_contents( $name, $this->getBuffer(), FS_CHMOD_FILE ) ) {
+                    $this->Error( 'Unable to create output file: ' . $name );
+                }
+                if ($dest == 'FI') {
+                    // send headers to browser
+                    header('Content-Type: application/pdf');
+                    header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
+                    header('Pragma: public');
+                    header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+                    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+                    header('Content-Disposition: inline; filename="'.basename($name).'"');
+                    $file_data = $wp_filesystem->get_contents($name);
+                    $file_size = $wp_filesystem->size($name);
+                    TCPDF_STATIC::sendOutputData($file_data, $file_size);
+                } elseif ($dest == 'FD') {
+                    if (ob_get_contents()) {
+                        $this->Error('Some data has already been output, can\'t send PDF file');
+                    }
+                    header('Content-Description: File Transfer');
+                    if (headers_sent()) {
+                        $this->Error('Some data has already been output to browser, can\'t send PDF file');
+                    }
+                    header('Cache-Control: private, must-revalidate, post-check=0, pre-check=0, max-age=1');
                     header('Pragma: public');
                     header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
@@ -7727 +7721 @@
                         header('Content-Type: application/force-download');
                         header('Content-Type: application/octet-stream', false);
-                        header('Content-Type: application/download', false);
-                        header('Content-Type: application/pdf', false);
-                    } else {
-                        header('Content-Type: application/pdf');
-                    }
-                    // use the Content-Disposition header to supply a recommended filename
-                    header('Content-Disposition: attachment; filename="'.basename($name).'"');
-                    header('Content-Transfer-Encoding: binary');
-                    TCPDF_STATIC::sendOutputData(file_get_contents($name), filesize($name));
-                }
-                break;
-            }
+                        header('Content-Type: application/download', false);
+                        header('Content-Type: application/pdf', false);
+                    } else {
+                        header('Content-Type: application/pdf');
+                    }
+                    header('Content-Disposition: attachment; filename="'.basename($name).'"');
+                    header('Content-Transfer-Encoding: binary');
+                    $file_data = $wp_filesystem->get_contents($name);
+                    $file_size = $wp_filesystem->size($name);
+                    TCPDF_STATIC::sendOutputData($file_data, $file_size);
+                }
+                break;
+            }
             case 'E': {
                 // return PDF as base64 mime multi-part email attachment (RFC 2045)
@@ -8820 +8815 @@
             // search and get font file to embedd
             $fontfile = TCPDF_FONTS::getFontFullPath($file, $info['fontdir']);
-            if (!TCPDF_STATIC::empty_string($fontfile)) {
-                $font = file_get_contents($fontfile);
-                $compressed = (substr($file, -2) == '.z');
-                if ((!$compressed) AND (isset($info['length2']))) {
-                    $header = (ord($font[0]) == 128);
-                    if ($header) {
-                        // strip first binary header
-                        $font = substr($font, 6);
-                    }
-                    if ($header AND (ord($font[$info['length1']]) == 128)) {
-                        // strip second binary header
-                        $font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
-                    }
-                } elseif ($info['subset'] AND ((!$compressed) OR ($compressed AND function_exists('gzcompress')))) {
-                    if ($compressed) {
-                        // uncompress font
-                        $font = gzuncompress($font);
-                    }
-                    // merge subset characters
-                    $subsetchars = array(); // used chars
-                    foreach ($info['fontkeys'] as $fontkey) {
-                        $fontinfo = $this->getFontBuffer($fontkey);
-                        $subsetchars += $fontinfo['subsetchars'];
-                    }
-                    // rebuild a font subset
-                    $font = TCPDF_FONTS::_getTrueTypeFontSubset($font, $subsetchars);
-                    // calculate new font length
-                    $info['length1'] = strlen($font);
-                    if ($compressed) {
-                        // recompress font
-                        $font = gzcompress($font);
-                    }
-                }
+            if (!TCPDF_STATIC::empty_string($fontfile)) {
+                global $wp_filesystem;
+                WP_Filesystem();
+
+                // Read the font file content using WP_Filesystem
+                $font = $wp_filesystem->get_contents($fontfile);
+                if ($font === false) {
+                    $this->Error('Unable to read font file: ' . $fontfile);
+                }
+                $compressed = (substr($file, -2) == '.z');
+                if ((!$compressed) && (isset($info['length2']))) {
+                    $header = (ord($font[0]) == 128);
+                    if ($header) {
+                        // strip first binary header
+                        $font = substr($font, 6);
+                    }
+                    if ($header && (ord($font[$info['length1']]) == 128)) {
+                        // strip second binary header
+                        $font = substr($font, 0, $info['length1']).substr($font, ($info['length1'] + 6));
+                    }
+                } elseif ($info['subset'] && ((!$compressed) || ($compressed && function_exists('gzcompress')))) {
+                    if ($compressed) {
+                        // uncompress font
+                        $font = gzuncompress($font);
+                    }
+                    // merge subset characters
+                    $subsetchars = array(); // used chars
+                    foreach ($info['fontkeys'] as $fontkey) {
+                        $fontinfo = $this->getFontBuffer($fontkey);
+                        $subsetchars += $fontinfo['subsetchars'];
+                    }
+                    // rebuild a font subset
+                    $font = TCPDF_FONTS::_getTrueTypeFontSubset($font, $subsetchars);
+                    // calculate new font length
+                    $info['length1'] = strlen($font);
+                    if ($compressed) {
+                        // recompress font
+                        $font = gzcompress($font);
+                    }
+                }
                 $this->_newobj();
                 $this->FontFiles[$file]['n'] = $this->n;
@@ -8961 +8963 @@
      */
     protected function _puttruetypeunicode($font) {
+        global $wp_filesystem;
+
         $fontname = '';
         if ($font['subset']) {
@@ -9041 +9045 @@
                 $this->Error('Font file not found: '.$ctgfile);
             }
-            $stream = $this->_getrawstream(file_get_contents($fontfile));
+            $stream = $this->_getrawstream( $wp_filesystem->get_contents( $fontfile ) );
             $out = '<< /Length '.strlen($stream).'';
             if (substr($fontfile, -2) == '.z') { // check file extension
@@ -9707 +9711 @@
      */
     protected function _putcatalog() {
+        global $wp_filesystem;
+
         // put XMP
         $xmpobj = $this->_putXMP();
@@ -9712 +9718 @@
         if ($this->pdfa_mode OR $this->force_srgb) {
             $iccobj = $this->_newobj();
-            $icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
+            $icc_path = dirname(__FILE__) . '/include/sRGB.icc';
+            $icc = $wp_filesystem->get_contents( $icc_path );
             $filter = '';
             if ($this->compress) {
@@ -10778 +10785 @@
      */
     protected function _generateencryptionkey() {
+        global $wp_filesystem;
+
         $keybytelen = ($this->encryptdata['Length'] / 8);
         if (!$this->encryptdata['pubkey']) { // standard mode
@@ -10850 +10859 @@
                 }
                 $envelope_length = strlen($envelope);
-                fwrite($f, $envelope, $envelope_length);
-                fclose($f);
+                $wp_filesystem->put_contents( $tempkeyfile, $envelope, FS_CHMOD_FILE );
+                //fwrite($f, $envelope, $envelope_length);
+                //fclose($f);
                 $tempencfile = TCPDF_STATIC::getObjFilename('enc', $this->file_id);
                 if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) {
@@ -10857 +10867 @@
                 }
                 // read encryption signature
-                $signature = file_get_contents($tempencfile, false, null, $envelope_length);
-                // extract signature
+                $signature = substr( $wp_filesystem->get_contents( $tempencfile ), $envelope_length );              // extract signature
                 $signature = substr($signature, strpos($signature, 'Content-Disposition'));
                 $tmparr = explode("\n\n", $signature);
@@ -12464 +12473 @@
             $title = preg_replace("/[\r]+/si", '', $title);
             $title = preg_replace("/[\n]+/si", "\n", $title);
-            $title = strip_tags($title);
+            $title = wp_strip_all_tags($title);
             $title = $this->stringTrim($title);
             $out = '<</Title '.$this->_textstring($title, $oid);
@@ -18888 +18897 @@
                     $type = '';
                 } else {
-                    if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+                    $document_root = sanitize_text_field(wp_unslash($_SERVER['DOCUMENT_ROOT'] ?? ''));
+
+                    if (($imgsrc[0] === '/') AND !empty($document_root) AND ($document_root != '/')) {
                         // fix image path
-                        $findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
+                        $findroot = strpos($imgsrc, $document_root);
                         if (($findroot === false) OR ($findroot > 1)) {
-                            if (substr($_SERVER['DOCUMENT_ROOT'], -1) == '/') {
-                                $imgsrc = substr($_SERVER['DOCUMENT_ROOT'], 0, -1).$imgsrc;
+                            if (substr($document_root, -1) == '/') {
+                                $imgsrc = substr($document_root, 0, -1).$imgsrc;
                             } else {
-                                $imgsrc = $_SERVER['DOCUMENT_ROOT'].$imgsrc;
+                                $imgsrc = $document_root.$imgsrc;
                             }
                         }
@@ -24280 +24291 @@
                     } else {
                         // fix image path
+                        $document_root = sanitize_text_field(wp_unslash($_SERVER['DOCUMENT_ROOT']??''));
                         if (!TCPDF_STATIC::empty_string($this->svgdir) AND (($img[0] == '.') OR (basename($img) == $img))) {
                             // replace relative path with full server path
                             $img = $this->svgdir.'/'.$img;
                         }
-                        if (($img[0] == '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-                            $findroot = strpos($img, $_SERVER['DOCUMENT_ROOT']);
+                        if (($img[0] == '/') AND !empty($document_root) AND ($document_root != '/')) {
+                            $findroot = strpos($img, $document_root);
                             if (($findroot === false) OR ($findroot > 1)) {
-                                if (substr($_SERVER['DOCUMENT_ROOT'], -1) == '/') {
-                                    $img = substr($_SERVER['DOCUMENT_ROOT'], 0, -1).$img;
+                                if (substr($document_root, -1) == '/') {
+                                    $img = substr($document_root, 0, -1).$img;
                                 } else {
-                                    $img = $_SERVER['DOCUMENT_ROOT'].$img;
+                                    $img = $document_root.$img;
                                 }
                             }

seur/trunk/classes/tcpdf/tcpdf_autoconfig.php

@@ -42 +42 @@
 
 // DOCUMENT_ROOT fix for IIS Webserver
-if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-    if(isset($_SERVER['SCRIPT_FILENAME'])) {
-        $_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
-    } elseif(isset($_SERVER['PATH_TRANSLATED'])) {
-        $_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
-    } else {
-        // define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
-        $_SERVER['DOCUMENT_ROOT'] = '/';
-    }
-}
-$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']);
-if (substr($_SERVER['DOCUMENT_ROOT'], -1) != '/') {
-    $_SERVER['DOCUMENT_ROOT'] .= '/';
-}
+$php_self = sanitize_text_field(wp_unslash($_SERVER['PHP_SELF'] ?? ''));
+$script_filename = sanitize_text_field(wp_unslash($_SERVER['SCRIPT_FILENAME'] ?? ''));
+$path_translated = sanitize_text_field(wp_unslash($_SERVER['PATH_TRANSLATED'] ?? ''));
+$document_root = sanitize_text_field(wp_unslash($_SERVER['DOCUMENT_ROOT'] ?? ''));
+
+if (empty($document_root)) {
+    if (!empty($script_filename)) {
+        $document_root = str_replace('\\', '/',
+            substr($script_filename, 0, -strlen($php_self)));
+    } elseif (!empty($path_translated)) {
+        $document_root = str_replace('\\', '/',
+            substr(str_replace('\\\\', '\\', $path_translated), 0, -strlen($php_self)));
+    } else {
+        $document_root = '/';  // Default to root if all else fails
+    }
+}
+$document_root = rtrim(str_replace('//', '/', $document_root), '/') . '/';
+$_SERVER['DOCUMENT_ROOT'] = $document_root;
 
 // Load main configuration file only if the K_TCPDF_EXTERNAL_CONFIG constant is set to false.
@@ -77 +81 @@
 }
 
+
 if (!defined('K_PATH_URL')) {
-    $k_path_url = K_PATH_MAIN; // default value for console mode
-    if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-        if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
-            $k_path_url = 'https://';
-        } else {
-            $k_path_url = 'http://';
-        }
-        $k_path_url .= $_SERVER['HTTP_HOST'];
-        $k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-    }
-    define ('K_PATH_URL', $k_path_url);
+    $k_path_url = K_PATH_MAIN; // Default value for console mode
+    $http_host = sanitize_text_field(wp_unslash($_SERVER['HTTP_HOST'] ?? ''));
+    $https_flag = sanitize_text_field(wp_unslash($_SERVER['HTTPS'] ?? ''));
+    $document_root = sanitize_text_field(wp_unslash($_SERVER['DOCUMENT_ROOT'] ?? ''));
+
+    if (!empty($http_host)) {
+        $k_path_url = (strtolower($https_flag) === 'on') ? 'https://' : 'http://';
+        $k_path_url .= $http_host;
+        $k_path_url .= str_replace('\\', '/', substr(K_PATH_MAIN, strlen($document_root) - 1));
+    }
+    define('K_PATH_URL', $k_path_url);
 }
 

seur/trunk/classes/tcpdf/tcpdi.php

@@ -118 +118 @@
      */
     function _getPdfParser($filename) {
-        $data = file_get_contents($filename);
-        return new tcpdi_parser($data, $filename, PDF_PARSER_ERROR_HANDLER_EXCEPTION);
+        global $wp_filesystem;
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
+            WP_Filesystem();
+        }
+        $data = $wp_filesystem->get_contents($filename);
+        return new tcpdi_parser($data, $filename, PDF_PARSER_ERROR_HANDLER_EXCEPTION);
     }
     

seur/trunk/classes/tcpdf/tcpdi_parser.php

@@ -1420 +1420 @@
         // exit program and print error.
         if ($this->errorHandler == PDF_PARSER_ERROR_HANDLER_PHP_DIE) {
-          die("<strong>TCPDI_PARSER ERROR [{$this->uniqueid}]: </strong>".$msg);
+          die("<strong>TCPDI_PARSER ERROR [".esc_attr($this->uniqueid)."]: </strong>".esc_attr($msg));
         }
         elseif ($this->errorHandler == PDF_PARSER_ERROR_HANDLER_EXCEPTION) {
-          throw new TCPdiParserException($msg);
+          throw new TCPdiParserException(esc_attr($msg));
         }
         else {
-          die("<strong>TCPDI_PARSER ERROR [{$this->uniqueid}]: </strong>".$msg);
+          die("<strong>TCPDI_PARSER ERROR [".esc_attr($this->uniqueid)."]: </strong>".esc_attr($msg));
         }
     }

seur/trunk/core/functions/functions.php

@@ -53 +53 @@
  */
 function seur_api_check_url_exists( $url ) {
-    $exception_message = '';
-    try {
-        $curl_client = curl_init($url);
-    } catch ( Exception $e ) {
-        $exception_message = $e->getMessage();
-    }
-    if ( ! $exception_message ) {
-        return true;
-    } else {
-        return false;
-    }
+    /*
+    $response = wp_remote_head( $url );
+    if ( is_wp_error( $response ) ) {
+        return false;
+    }
+    $status_code = wp_remote_retrieve_response_code( $response );
+    return ( $status_code >= 200 && $status_code < 400 );
+    */
+    return true;
 }
 
@@ -1510 +1508 @@
             $response['data']['ecbs'] = $ecbs;
             $response['data']['parcelNumbers'] = $parcelNumbers;
-            $response = json_decode(json_encode($response));
+            //$response = json_decode(json_encode($response));
         }
 
@@ -1531 +1529 @@
         $order->update_meta_data('_seur_label_trackingNumber', $trackingNumber );
         $order->update_meta_data('_seur_label_id_number', $result['label_ids']);
+        $order->update_meta_data('_seur_shipping_order_label_downloaded', 'yes');
         $order->save_meta_data();
 
@@ -1566 +1565 @@
     $preparedData['seur_shipping_method']     = $seur_shipping_method;
     //$preparedData['seur_shipping_method_id']  = $seur_shipping_method_id;
-    $preparedData['date']                     = date( 'd-m-Y' ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
+    $preparedData['date']                     = gmdate( 'd-m-Y' ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
     $preparedData['mobile_shipping']          = cleanPhone($order->get_meta('_shipping_mobile_phone', true ));
     $preparedData['mobile_billing']           = cleanPhone($order->get_meta('_billing_mobile_phone', true ));
@@ -1734 +1733 @@
             return 'Error 1: postcode not found';
         } else { // postalCode and country exist.
-            $fran = $fran[0]->depot;
+            $fran = $fran[0]['depot'];
             if ( '74' === $fran || '77' === $fran || '56' === $fran || '35' === $fran || '38' === $fran || '52' === $fran || '60' === $fran || '70' === $fran ) {
                 $shipping_class = SHIPPING_CLASS_NACIONAL_FRANQUICIAS;
@@ -1748 +1747 @@
 
     $preparedData['seur_saturday_shipping'] = '';
-    if ( 0 === (int) $shipping_class && 'Friday' === date( 'l' ) ) { // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
+    if ( 0 === (int) $shipping_class && 'Friday' === gmdate( 'l' ) ) { // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
         if (( 'ES' === $customer_country || 'AD' === $customer_country || 'PT' === $customer_country ) &&
             ( '3' === $preparedData['seur_service'] || '9' === $preparedData['seur_service'] ) ) {

seur/trunk/core/help/seur-help-tabs.php

@@ -72 +72 @@
         array(
             'id'      => 'seur_manifest_help_tab',
-            'title'   => __( 'Manifest' ),
+            'title'   => __( 'Manifest', 'seur' ),
             'content' => '<p>' . __( 'Download the list of packages with the content of the deliveries notified to SEUR as from the date you choose.', 'seur' ) . '</p>
                         <p>' . __( 'If you must hand over a list to the carrier, remember to print two copies: one for you and one for the carrier', 'seur' ) . '</p>',
@@ -150 +150 @@
             array(
                 'id'      => 'seur_label_help_tab',
-                'title'   => __( 'Label List' ),
+                'title'   => __( 'Label List', 'seur' ),
                 'content' => '<p>' . __( 'From this screen you can get the order labels requested from menu WooCommerce > Orders.', 'seur' ) . '</p>',
             )

seur/trunk/core/installer.php

@@ -63 +63 @@
     $products = get_seur_product();
 
-    $sql = "SELECT option_name, option_value as custom_name
-            FROM ".$wpdb->prefix."options 
-            where option_name like '%_custom_name_field' and option_value != ''";
-    $ratesCustomNames = $wpdb->get_results( $sql ); //custom names
+    $ratesCustomNames = $wpdb->get_results($wpdb->prepare("
+        SELECT option_name, option_value as custom_name
+        FROM ".$wpdb->prefix."options 
+        where option_name like %s and option_value != ''
+    ", ['%_custom_name_field'])); //custom names
 
     foreach ($products as $code => $product) {
@@ -78 +79 @@
     }
 
-    $sql = "select order_id, order_item_name 
+    $ordersShippingMethods = $wpdb->get_results($wpdb->prepare("
+        select order_id, order_item_name 
             from ".$wpdb->prefix . "woocommerce_order_items
-            where order_item_type = 'shipping'";
-    $ordersShippingMethods = $wpdb->get_results( $sql ); //custom names
+            where order_item_type = %s
+    ", ['shipping']));
     foreach ($ordersShippingMethods as $orderShippingMethod) {
         $rateName = $orderShippingMethod->order_item_name;

seur/trunk/core/labels-cpt/labels-cpt.php

@@ -167 +167 @@
             $url_upload_dir  = get_site_option( 'seur_uploads_url_labels' );
             $label_file_name = get_post_meta($label_id, '_seur_shipping_order_label_file_name', true );
-            echo '<a href="' . $url_upload_dir . '/' . $label_file_name . '" class="button" download>' . esc_html__( ' Open ', 'seur' ) . '</a>';
+            echo '<a href="' . esc_url( $url_upload_dir . '/' . $label_file_name ) . '" class="button" download>' . esc_html__( ' Open ', 'seur' ) . '</a>';
             break;
     }
@@ -353 +353 @@
 function seur_bulk_actions_labels_screen( $bulk_actions ) {
 
-    $bulk_actions['download_seur_label']  = __( 'Download  SEUR Labels', 'download_seur_label' );
-    $bulk_actions['update_seur_tracking'] = __( 'Update SEUR Tracking', 'update_seur_tracking' );
-    $bulk_actions['generate_seur_manifest'] = __( 'Generate Manifest', 'generate_seur_manifest' );
+    $bulk_actions['download_seur_label']  = __( 'Download  SEUR Labels', 'seur' );
+    $bulk_actions['update_seur_tracking'] = __( 'Update SEUR Tracking', 'seur' );
+    $bulk_actions['generate_seur_manifest'] = __( 'Generate Manifest', 'seur' );
     return $bulk_actions;
 }
@@ -368 +368 @@
  */
 function seur_bulk_actions_handler( $redirect_to, $doaction, $labels_ids ) {
-    if ( 'download_seur_label' !== $doaction && 'update_seur_tracking' !== $doaction && 'generate_seur_manifest' != $doaction ) {
+    global $wp_filesystem;
+
+    if ( 'download_seur_label' !== $doaction && 'update_seur_tracking' !== $doaction && 'generate_seur_manifest' != $doaction ) {
         return $redirect_to;
     }
     if ( 'download_seur_label' === $doaction ) {
 
-        $date = date( 'd-m-Y-H-i-s' ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
+        $date = gmdate( 'd-m-Y-H-i-s' ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
         $type = seur_get_file_type(seur()->get_option( 'seur_tipo_etiqueta_field' ));
         $bulk_label_name = 'label_bulk_' . $date . seur_get_file_type_extension($type);
@@ -413 +415 @@
 
         if ($type=='TERMICA') {
-            file_put_contents( $upload_path, $fp);
+            $wp_filesystem->put_contents( $upload_path, $fp, FS_CHMOD_FILE);
         } else {
             $pdf->merge('file', $upload_path);
@@ -483 +485 @@
             $manifest['postalcode'] = get_option( 'seur_postal_field' );
             $manifest['city'] = get_option( 'seur_poblacion_field' );
-            $manifest['date'] = date('d/m/Y');
-            $manifest['hour'] = date('H:i');
+            $manifest['date'] = gmdate('d/m/Y');
+            $manifest['hour'] = gmdate('H:i');
 
             $manifest_header = getManifestHeader($manifest);
@@ -501 +503 @@
             $pdf->AddPage('P', 'A4');
             $pdf->writeHTML($manifest_content, false, false, false, false, 'P');
-            $pdf->Output("Manifiesto_".$ccc."_".date('YmdHis').".pdf", 'I');
+            $pdf->Output("Manifiesto_".$ccc."_".gmdate('YmdHis').".pdf", 'I');
         }
 
@@ -665 +667 @@
     <table style="padding:2px; border:1px solid #000;">
         <tr>
-            <td colspan="2" style="border-bottom:1px solid #000;border-right:1px solid #000;">INFORME DE DETALLE DE ENVIOS Y BULTOS de '.date('d/m/Y').'</td>
+            <td colspan="2" style="border-bottom:1px solid #000;border-right:1px solid #000;">INFORME DE DETALLE DE ENVIOS Y BULTOS de '.gmdate('d/m/Y').'</td>
             <td style="border-bottom:1px solid #000;">TOTAL GENERAL </td>
         </tr>
@@ -712 +714 @@
         $url_to_dir       = seur_upload_url( 'labels' ); ?>
         <div class="notice notice-success is-dismissible">
-            <p><?php echo esc_html__( 'Bulk Print ready, please press Download Bulk Labels button for download the file. ' ) . '<a href="' . $url_to_dir . '/' . esc_html( $file_name ) . '" class="button" download>' . esc_html__( ' Download Bulk Labels ', 'seur' ) . '</a>'; ?></p>
+            <p>
+                <?php echo esc_html__( 'Bulk Print ready, please press Download Bulk Labels button for download the file.', 'seur' ) . ' <a href="' . esc_url( $url_to_dir . '/' . esc_html( $file_name ) ) . '" class="button" download>' . esc_html__( ' Download Bulk Labels ', 'seur' ) . '</a>'; ?>
+            </p>
         </div>
         <?php

seur/trunk/core/pages/about.php

@@ -17 +17 @@
             <?php
             // translators: SEUR Version.
-            printf( esc_html__( 'Welcome to SEUR %s' ), esc_html( SEUR_OFFICIAL_VERSION ) );
+            printf( esc_html__( 'Welcome to SEUR %s', 'seur' ), esc_html( SEUR_OFFICIAL_VERSION ) );
             ?>
         </h1>
@@ -29 +29 @@
             <?php
             // translators: Seur version.
-            printf( esc_html__( 'Version %s' ), esc_html( SEUR_OFFICIAL_VERSION ) );
+            printf( esc_html__( 'Version %s', 'seur' ), esc_html( SEUR_OFFICIAL_VERSION ) );
             ?>
         </div>

seur/trunk/core/pages/rates/custom-name-rates.php

@@ -5 +5 @@
     <br>
 
-    <p><?php _e( 'Custom Names for Seur Rates', 'seur' ); ?></p>
+    <p><?php esc_html_e( 'Custom Names for Seur Rates', 'seur' ); ?></p>
 
     <hr>
@@ -12 +12 @@
     if ( isset( $_POST['seur_custom_name_rates_post'] ) &&
         ( ! isset( $_POST['seur_custom_name_rates_nonce_field'] )  ||
-            ! wp_verify_nonce( $_POST['seur_custom_name_rates_nonce_field'], 'seur_custom_name_rates' ) )
+            ! wp_verify_nonce( sanitize_text_field(wp_unslash($_POST['seur_custom_name_rates_nonce_field'])), 'seur_custom_name_rates' ) )
     ) {
         print 'Sorry, your nonce did not verify.';
@@ -21 +21 @@
     if (  isset( $_POST['seur_custom_name_rates_post'] ) ) {
         foreach ($products as $custom_name => $product) {
-            update_option ($product['field'].'_custom_name_field', sanitize_text_field($_POST[$product['field'].'_custom_name_field']));
+            update_option ($product['field'].'_custom_name_field',
+                sanitize_text_field(wp_unslash(isset($_POST[$product['field'].'_custom_name_field'])??''))
+            );
         }
     }
@@ -32 +34 @@
                 <tbody>
                     <?php foreach ($products as $custom_name => $product) {
-                        echo '<tr>
-                        <th scope="row">' . $custom_name . '</th>
-                        <td><input 
-                            title="' . $custom_name . '" 
-                            type="text" name="' . $product['field'] . '_custom_name_field" 
-                            value="' . (get_option($product['field'].'_custom_name_field') ?? '') . '" size="40"></td>
-                        </tr>';
+                        echo '<tr>
+                            <th scope="row">' . esc_html( $custom_name ) . '</th>
+                            <td><input 
+                                title="' . esc_attr( $custom_name ) . '" 
+                                type="text" name="' . esc_attr( $product['field'] ) . '_custom_name_field" 
+                                value="' . esc_attr( get_option( $product['field'] . '_custom_name_field' ) ?? '' ) . '" size="40"></td>
+                          </tr>';
+
                     } ?>
                     <input type="hidden" name="seur_custom_name_rates_post" value="true" >
@@ -45 +48 @@
             </table>
 
-            <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Update Options', 'seur' ); ?>"></p>
+            <p class="submit">
+                <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( 'Update Options', 'seur' ); ?>">
+            </p>
         </form>
     </div>

seur/trunk/core/pages/rates/limit-price-weight-rates.php

@@ -28 +28 @@
                     $products = seur()->get_products();
                     foreach ( $products as $code => $product ) {
-                        if (isset( $_POST['seur_limit_price_weight_rates_post'] )) {
+                        if (isset( $_POST['seur_limit_price_weight_rates_post']) && isset( $_POST[$product['field'] . '_max_price_field'] ) ) {
                             $max_price_value = sanitize_text_field( wp_unslash( $_POST[$product['field'] . '_max_price_field'] ) );
                             update_option( $product['field'] . '_max_price_field', $max_price_value );
@@ -34 +34 @@
 
                         $max_price_field = get_option($product['field'] . '_max_price_field');
-                        echo '<tr>
-                            <th scope="row">'.$code.'</th>
-                            <td><input title="'. $code.'" type="text" 
-                                name="'.$product['field'].'_max_price_field" 
-                                value="'. ($max_price_field ? esc_html( $max_price_field ):'').'" size="40">
+                        echo '<tr>
+                            <th scope="row">' . esc_html( $code ) . '</th>
+                            <td><input title="' . esc_attr( $code ) . '" type="text" 
+                                name="' . esc_attr( $product['field'] ) . '_max_price_field" 
+                                value="' . ( $max_price_field ? esc_html( $max_price_field ) : '' ) . '" size="40">
                             </td>
                         </tr>';

seur/trunk/core/pages/rates/seur-add-form.php

@@ -17 +17 @@
     $rates_type = get_option( 'seur_rates_type_field' );
 
-    $min       = __( 'Min '.$rates_type.' (=)', 'seur' );
-    $title_min = __( 'The product '.$rates_type.' is equal or mayor of this field', 'seur' );
-    $max       = __( 'Max '.$rates_type.' (<)', 'seur' );
-    $title_max = __( 'The product '.$rates_type.' is minor of this field', 'seur' );
+    // translators: %s is the type of rate (e.g., weight, price).
+    $min = sprintf( __( 'Min %s (=)', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $title_min = sprintf( __( 'The product %s is equal or greater than this field', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $max = sprintf( __( 'Max %s (<)', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $title_max = sprintf( __( 'The product %s is less than this field', 'seur' ), esc_html( $rates_type ) );
+
     ?>
     <style type="text/css">
@@ -40 +48 @@
                 <td><?php esc_html_e( 'Rate', 'seur' ); ?></td>
                 <td>
-                    <select class="select rate" id="rate"  title="<?php esc_html_e( 'Select Rate to apply', 'seur' ); ?>" name="rate">
-                        <option value="Select"><?php esc_html_e( 'Select a Rate', 'seur' ); ?></option>
+                    <select class="select rate" id="rate"  title="<?php esc_html_e( 'Select Rate to apply', 'seur' ); ?>" name="rate" required>
+                        <option value=""><?php esc_html_e( 'Select a Rate', 'seur' ); ?></option>
                         <?php
                         $registros = seur()->get_products();
@@ -53 +61 @@
                 <td><?php esc_html_e( 'Country', 'seur' ); ?></td>
                 <td id="countryid">
-                    <select class="select country" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="country">
+                    <select class="select country" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="country" required>
                         <?php
-                        echo '<option value="Select">' . esc_html__( 'Select a Country', 'seur' ) . '</option>';
+                        echo '<option value="">' . esc_html__( 'Select a Country', 'seur' ) . '</option>';
                         echo '<option value="ES">' . esc_html__( 'Spain', 'seur' ) . '</option>';
                         ?>
@@ -73 +81 @@
             <tr>
                 <td><?php echo esc_html( $min ); ?></td>
-                <td><input title="<?php echo esc_html( $title_min ); ?>" type='text' name='min<?php echo $rates_type; ?>' class='form-control' placeholder='EX : 0.50' required=""></td>
+                <td>
+                    <input title="<?php echo esc_html( $title_min ); ?>" type='text' name='min<?php echo esc_attr( $rates_type ); ?>' class='form-control' placeholder='EX : 0.50' required="">
+                </td>
             </tr>
             <tr>
                 <td><?php echo esc_html( $max ); ?></td>
-                <td><input title="<?php echo esc_html( $title_max ); ?>" type='text' name='max<?php echo $rates_type; ?>' class='form-control' placeholder='EX : 100.50' required=""></td>
+                <td>
+                    <input title="<?php echo esc_html( $title_max ); ?>" type='text' name='max<?php echo esc_attr( $rates_type ); ?>' class='form-control' placeholder='EX : 100.50' required="">
+                </td>
             </tr>
             <tr>

seur/trunk/core/pages/rates/seur-country-state-process.php

@@ -17 +17 @@
         $countries = $products[$rate]['pais'];
         $options = seur()->getCountries($countries);
-        echo '<select class="select country" id="country" title="' . esc_html__( 'Select Country', 'seur' ) . '" name="country">';
-        echo '<option value="NULL">' . esc_html__( 'Select', 'seur' ) . '</option>';
+        echo '<select class="select country" id="country" title="' . esc_html__( 'Select Country', 'seur' ) . '" name="country" required>';
+        echo '<option value="">' . esc_html__( 'Select', 'seur' ) . '</option>';
         if (count($countries)==1 && $countries[0] !=='ES') {
             echo '<option value="*">' . esc_html__( 'All Countries', 'seur' ) . '</option>';
         }
         foreach ($options as $code => $country) {
-            echo '<option value="'.$code.'">' . esc_html__( $country, 'seur' ) . '</option>';
+            echo '<option value="' . esc_attr( $code ) . '">' . esc_html( $country ) . '</option>';
         }
         echo '</select>';
@@ -47 +47 @@
             $title = 'Type State';
             $placeholder = 'EX : State';
-            $value = 'required=""';
+            $value = '';
             if ( '*' === $country) {
                 $title = 'No needed';
@@ -53 +53 @@
                 $value = 'value="*" readonly';
             }
-            echo '<input title="' . esc_html__( $title, 'seur' ) . '" type="text" name="state" 
-                 class="form-control" placeholder="' . esc_html__( $placeholder , 'seur' ) . '" '.$value.'
-                 >';
+            echo '<input title="' . esc_html( $title ) . '" type="text" name="state" 
+                 class="form-control" placeholder="' . esc_html( $placeholder ) . '" value="' . esc_attr( $value ) . '">';
+
+
         }
         unset( $country );

seur/trunk/core/pages/rates/seur-custom-rates.php

@@ -28 +28 @@
                     <th class="manage-column"><?php esc_html_e( 'State', 'seur' ); ?></th>
                     <th class="manage-column"><?php esc_html_e( 'Postcode', 'seur' ); ?></th>
-                    <th class="manage-column"><?php esc_html_e( 'Min '. $rates_type, 'seur' ); ?></th>
-                    <th class="manage-column"><?php esc_html_e( 'Max '.$rates_type, 'seur' ); ?></th>
+                    <?php // translators: %s is the type of rate (e.g., weight, price). ?>
+                    <th class="manage-column"><?php printf( esc_html__( 'Min %s', 'seur' ), esc_html( $rates_type ) ); ?></th>
+                    <?php // translators: %s is the type of rate (e.g., weight, price). ?>
+                    <th class="manage-column"><?php printf( esc_html__( 'Max %s', 'seur' ), esc_html( $rates_type ) ); ?></th>
                     <th class="manage-column"><?php esc_html_e( 'Rate Price', 'seur' ); ?></th>
                     <th class="manage-column"><?php esc_html_e( 'edit', 'seur' ); ?></th>
@@ -84 +86 @@
                         <th class="manage-column"><?php esc_html_e( 'State', 'seur' ); ?></th>
                         <th class="manage-column"><?php esc_html_e( 'Postcode', 'seur' ); ?></th>
-                        <th class="manage-column"><?php esc_html_e( 'Min '. $rates_type, 'seur' ); ?></th>
-                        <th class="manage-column"><?php esc_html_e( 'Max '. $rates_type, 'seur' ); ?></th>
-                        <th class="manage-column"><?php esc_html_e( 'Rate Price', 'seur' ); ?></th>
+                        <?php /* translators: %s is the type of rate (e.g., weight, price) */ ?>
+                        <th class="manage-column"><?php printf( esc_html__( 'Min %s', 'seur' ), esc_html( $rates_type ) ); ?></th>
+                        <?php /* translators: %s is the type of rate (e.g., weight, price) */ ?>
+                        <th class="manage-column"><?php printf( esc_html__( 'Max %s', 'seur' ), esc_html( $rates_type ) ); ?></th>
+                        <th class="manage-column"><?php esc_html_e( 'Rate Price', 'seur' ); ?></th>
                         <th class="manage-column"><?php esc_html_e( 'edit', 'seur' ); ?></th>
                         <th class="manage-column"><?php esc_html_e( 'delete', 'seur' ); ?></th>

seur/trunk/core/pages/rates/seur-edit-form.php

@@ -27 +27 @@
     }
     $rates_type = get_option( 'seur_rates_type_field' );
-    $min       = __( 'Min '.$rates_type.' (=)', 'seur' );
-    $title_min = __( 'The product '.$rates_type.' is equal or mayor of this field', 'seur' );
-    $max       = __( 'Max '.$rates_type.' (<)', 'seur' );
-    $title_max = __( 'The product '.$rates_type.' is minor of this field', 'seur' );
-    ?>
+    // translators: %s is the type of rate (e.g., weight, price).
+    $min = sprintf( __( 'Min %s (=)', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $title_min = sprintf( __( 'The product %s is equal or greater than this field', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $max = sprintf( __( 'Max %s (<)', 'seur' ), esc_html( $rates_type ) );
+
+    // translators: %s is the type of rate (e.g., weight, price).
+    $title_max = sprintf( __( 'The product %s is less than this field', 'seur' ), esc_html( $rates_type ) );
+
+
+    ?>
     <style type="text/css">
     #dis{
@@ -62 +71 @@
                 <td><?php esc_html_e( 'Country', 'seur' ); ?></td>
                 <td id="countryid">
-                    <select class="select country" value="Select" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="country">
+                    <select class="select country" value="Select" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="country" required>
                         <?php
                         if ( 'ES' === $getrate->country || 'PT' === $getrate->country || 'AD' === $getrate->country ) {
@@ -136 +145 @@
             <tr>
                 <td><?php echo esc_html( $min ); ?></td>
-                <td><input title="<?php echo esc_html( $title_min ); ?>" type='text' name='min<?php echo $rates_type; ?>' value='<?php echo esc_html( $min_value ); ?>' class='form-control' placeholder='EX : 0.50' required=""></td>
+                <td>
+                    <input title="<?php echo esc_html( $title_min ); ?>" type='text' name='min<?php echo esc_attr( $rates_type ); ?>' value='<?php echo esc_html( $min_value ); ?>' class='form-control' placeholder='EX : 0.50' required="">
+                </td>
             </tr>
             <tr>
                 <td><?php echo esc_html( $max ); ?></td>
-                <td><input title="<?php echo esc_html( $title_max ); ?>" type='text' name='max<?php echo $rates_type; ?>' value='<?php echo esc_html( $max_value ); ?>' class='form-control' placeholder='EX : 100.34' required=""></td>
+                <td>
+                    <input title="<?php echo esc_html( $title_max ); ?>" type='text' name='max<?php echo esc_attr( $rates_type ); ?>' value='<?php echo esc_html( $max_value ); ?>' class='form-control' placeholder='EX : 100.34' required="">
+                </td>
             </tr>
             <tr>

seur/trunk/core/pages/rates/seur-import-custom-rates.php

@@ -9 +9 @@
     exit; // Exit if accessed directly.
 }
+
 $rates_type = get_option( 'seur_rates_type_field' );
-?>
-
-<?php
-if ( isset( $_POST['import_custom_rates'] ) ) {
-    try{
-        // Validar que el archivo fue subido sin errores
-        if ( isset( $_FILES['csv_file'] ) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK ) {
-            $file = $_FILES['csv_file'];
-
-            // Validar que el archivo es un CSV
-            $file_type = wp_check_filetype( $file['name'] );
-            if ( $file_type['ext'] !== 'csv' ) {
-                echo '<div class="notice notice-error"><p>El archivo subido no es un CSV.</p></div>';
-            } else {
-                // Mover el archivo a una ubicación temporal
-                $upload_dir = wp_upload_dir();
-                $upload_path = $upload_dir['basedir'] . '/seur_import_custom_rates_csv/';
-                if ( ! file_exists( $upload_path ) ) {
-                    wp_mkdir_p( $upload_path );
-                }
-
-                $uploaded_file = $upload_path . basename( $file['name'] );
-                if ( move_uploaded_file( $file['tmp_name'], $uploaded_file ) ) {
-                    // Procesar el archivo CSV
-                    $result = seur_process_csv( $uploaded_file );
-
-                    if ( $result['error'] ) {
-                        if(is_array($result['message'])){
-                            echo '<div class="notice notice-error">';
-                            echo '<ul>';
-                            foreach($result['message'] as $message){
-                                echo '<li>' . esc_html( $message ) . '</li>';
-                            }
-                            echo '</ul>';
-                            echo '</div>';
-                        }else{
-                            echo '<div class="notice notice-error"><p>' . esc_html( $result['message'] ) . '</p></div>';
-                        }
-                    } else {
-                        echo '<div class="notice notice-success"><p>' . esc_html( $result['message'] ) . '</p></div>';
-                    }
-                } else {
-                    echo '<div class="notice notice-error"><p>Error al mover el archivo subido.</p></div>';
-                }
-            }
-        } else {
-            echo '<div class="notice notice-error"><p>Error al subir el archivo.</p></div>';
-        }
-    }catch ( Exception $e ) {
-        echo '<div class="notice notice-error"><p>' . esc_html( $e->getMessage() ) . '</p></div>';
-    }
-
+
+// Verificar si el formulario fue enviado y si el nonce es válido
+if ( isset( $_POST['import_custom_rates'] ) && check_admin_referer( 'seur_import_custom_rates_nonce', 'seur_import_custom_rates_nonce_field' ) ) {
+    try {
+        // Validar que el archivo fue subido sin errores
+        if ( isset( $_FILES['csv_file'] ) && isset( $_FILES['csv_file']['error'] ) && $_FILES['csv_file']['error'] === UPLOAD_ERR_OK ) {
+            $file = $_FILES['csv_file'];
+
+            // Validar que el archivo es un CSV
+            $file_type = wp_check_filetype( $file['name'] );
+            if ( $file_type['ext'] !== 'csv' ) {
+                echo '<div class="notice notice-error"><p>El archivo subido no es un CSV.</p></div>';
+            } else {
+                // Inicializar WP_Filesystem
+                if ( ! function_exists( 'request_filesystem_credentials' ) ) {
+                    require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                }
+
+                global $wp_filesystem;
+
+                if ( ! WP_Filesystem( request_filesystem_credentials( '', '', false, false, null ) ) ) {
+                    echo '<div class="notice notice-error"><p>Error al inicializar WP_Filesystem.</p></div>';
+                    return;
+                }
+
+                // Mover el archivo a una ubicación temporal
+                $upload_dir = wp_upload_dir();
+                $upload_path = trailingslashit( $upload_dir['basedir'] ) . 'seur_import_custom_rates_csv/';
+
+                if ( ! $wp_filesystem->is_dir( $upload_path ) ) {
+                    $wp_filesystem->mkdir( $upload_path );
+                }
+
+                $uploaded_file = $upload_path . sanitize_file_name( $file['name'] );
+
+                if ( $wp_filesystem->put_contents( $uploaded_file, $wp_filesystem->get_contents( $file['tmp_name'] ), FS_CHMOD_FILE ) ) {
+                    // Procesar el archivo CSV
+                    $result = seur_process_csv( $uploaded_file );
+
+                    if ( $result['error'] ) {
+                        if ( is_array( $result['message'] ) ) {
+                            echo '<div class="notice notice-error">';
+                            echo '<ul>';
+                            foreach ( $result['message'] as $message ) {
+                                echo '<li>' . esc_html( $message ) . '</li>';
+                            }
+                            echo '</ul>';
+                            echo '</div>';
+                        } else {
+                            echo '<div class="notice notice-error"><p>' . esc_html( $result['message'] ) . '</p></div>';
+                        }
+                    } else {
+                        echo '<div class="notice notice-success"><p>' . esc_html( $result['message'] ) . '</p></div>';
+                    }
+                } else {
+                    echo '<div class="notice notice-error"><p>Error al mover el archivo subido.</p></div>';
+                }
+            }
+        } else {
+            echo '<div class="notice notice-error"><p>Error al subir el archivo.</p></div>';
+        }
+    } catch ( Exception $e ) {
+        echo '<div class="notice notice-error"><p>' . esc_html( $e->getMessage() ) . '</p></div>';
+    }
+} else {
+    echo '<div class="notice notice-error"><p>Error de seguridad. Por favor, recargue la página e inténtelo de nuevo.</p></div>';
 }
 
@@ -70 +85 @@
     try {
         // Definir las columnas esperadas
-        $expected_columns = array('ID', 'type', 'country', 'state', 'postcode', 'minprice', 'maxprice', 'minweight', 'maxweight', 'rate', 'rateprice');
+        $expected_columns = array( 'ID', 'type', 'country', 'state', 'postcode', 'minprice', 'maxprice', 'minweight', 'maxweight', 'rate', 'rateprice' );
 
         // Iniciar una transacción
-        $wpdb->query('START TRANSACTION');
-
-        // Abrir el archivo CSV
-        if ( ( $handle = fopen( $file_path, 'r' ) ) !== FALSE ) {
-            // Leer la primera línea (encabezado)
-            $header = fgetcsv( $handle, 1000, ',' );
-            if ( $header === FALSE || $header !== $expected_columns ) {
-                fclose( $handle );
-                $wpdb->query('ROLLBACK'); // Revertir la transacción
+        $wpdb->query( 'START TRANSACTION' );
+
+        // Leer el archivo CSV usando WP_Filesystem
+        global $wp_filesystem;
+        $file_contents = $wp_filesystem->get_contents( $file_path );
+
+        if ( $file_contents !== false ) {
+            $csv_lines = explode( "\n", $file_contents );
+            $header = str_getcsv( array_shift( $csv_lines ) ); // Obtener encabezado
+
+            if ( $header !== $expected_columns ) {
                 return [
-                    'error' => true,
-                    'message' => 'El archivo CSV no contiene las columnas correctas.'
+                    'error'   => true,
+                    'message' => 'El archivo CSV no contiene las columnas correctas.',
                 ];
             }
@@ -91 +108 @@
 
             // Definir los estados válidos de España
-            $valid_states_es = array('*', 'AV', 'C', 'AB', 'A', 'AL', 'VI', 'O', 'BA', 'PM', 'B', 'BI', 'BU', 'CC', 'CA', 'CO', 'S', 'CS', 'CE', 'CR', 'CU', 'SS', 'GI', 'GR', 'GU', 'H', 'HU', 'J', 'LO', 'GC', 'LE', 'L', 'LU', 'MA', 'M', 'ML', 'MU', 'NA', 'OR', 'P', 'PO', 'SA', 'TF', 'SG', 'SE', 'SO', 'T', 'TE', 'TO', 'V', 'VA', 'ZA', 'Z');
+            $valid_states_es = array( '*', 'AV', 'C', 'AB', 'A', 'AL', 'VI', 'O', 'BA', 'PM', 'B', 'BI', 'BU', 'CC', 'CA', 'CO', 'S', 'CS', 'CE', 'CR', 'CU', 'SS', 'GI', 'GR', 'GU', 'H', 'HU', 'J', 'LO', 'GC', 'LE', 'L', 'LU', 'MA', 'M', 'ML', 'MU', 'NA', 'OR', 'P', 'PO', 'SA', 'TF', 'SG', 'SE', 'SO', 'T', 'TE', 'TO', 'V', 'VA', 'ZA', 'Z' );
 
             // Leer el resto del archivo línea por línea
-            while ( ( $data = fgetcsv( $handle, 1000, ',' ) ) !== FALSE ) {
-                // Mapear los datos a las columnas
-                $record = array_combine($header, $data);
+            foreach ( $csv_lines as $line ) {
+                $data   = str_getcsv( $line );
+                $record = array_combine( $header, $data );
 
                 // Validar el campo type si no está vacío
@@ -170 +187 @@
             if ( !empty($error_messages) ) {
                 $wpdb->query('ROLLBACK'); // Revertir la transacción
-                fclose( $handle );
                 return [
                     'error' => true,
@@ -179 +195 @@
             // Confirmar la transacción si no hay errores
             $wpdb->query('COMMIT');
-            fclose( $handle );
             return [
                 'error' => false,
@@ -199 +214 @@
     }
 }
-
 ?>
 
 <div class="container">
-    <br />
+    <br />
     <h1>Importación de Tarifas</h1>
     <p>Para importar o actualizar las tarifas personalizadas de SEUR, siga estos pasos:</p>
@@ -215 +229 @@
 
     <h4>Campos Permitidos en el Archivo CSV</h4>
-    <p>El archivo CSV para la importación de tarifas SEUR debe contener las siguientes columnas:</p>
     <ul>
         <li><strong>ID</strong> (Obligatorio para actualización): Identificador único de la tarifa. Utilizado para actualizar tarifas existentes.</li>
@@ -236 +249 @@
         <!-- Formulario para subir un archivo CSV -->
         <form method="post" action="admin.php?page=seur_rates_prices&tab=import_custom_rates" enctype="multipart/form-data">
+            <?php wp_nonce_field( 'seur_import_custom_rates_nonce', 'seur_import_custom_rates_nonce_field' ); ?>
             <input type="hidden" name="import_custom_rates" value="true" >
             <label for="csv_file"><?php echo esc_html__( 'Seleccione el archivo CSV', 'seur' ); ?>:</label>

seur/trunk/core/pages/rates/seur-rates.php

@@ -72 +72 @@
         <label>
             <span class="screen-reader-text"><?php esc_html_e( 'Country', 'seur' ); ?></span>
-            <select class="select country" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="pais">
+            <select class="select country" id="country" title="<?php esc_html_e( 'Select Country', 'seur' ); ?>" name="pais" required>
             <?php
             if ( ! empty( $pais ) && 'ES' === $pais ) {
@@ -94 +94 @@
                 $selectedpt = '';
             }
-            echo '<option value="NULL">' . esc_html__( 'Select', 'seur' ) . '</option>';
+            echo '<option value="">' . esc_html__( 'Select', 'seur' ) . '</option>';
             echo '<option value="ES" ' . esc_html( $selectedes ) . '>' . esc_html__( 'Spain', 'seur' ) . '</option>';
             echo '<option value="PT" ' . esc_html( $selectedpt ) . '>' . esc_html__( 'Portugal', 'seur' ) . '</option>';
@@ -137 +137 @@
                         echo ' selected';
                     }
-                    echo 'value="'.$identifier.'">'.$code.'</option>';
+                    echo 'value="' . esc_attr( $identifier ) . '">' . esc_html( $code ) . '</option>';
                 } ?>
             </select>

seur/trunk/core/pages/setting-options/advanced-settings.php

@@ -128 +128 @@
     <select id="label_type" name="seur_tipo_etiqueta_field">
         <?php foreach ($types as $value => $label) : ?>
-            <option value="<?php echo $value; ?>" <?php if ( $option === $value) {echo ' selected';} ?>><?php echo $label; ?></option>
+            <option value="<?php echo esc_attr( $value ); ?>" <?php if ( $option === $value ) { echo ' selected'; } ?>><?php echo esc_html( $label ); ?></option>
         <?php endforeach; ?>
     </select>

seur/trunk/core/pages/setting-options/user-settings.php

@@ -136 +136 @@
 function seur_test_field() {
     ?>
-    <input type="checkbox" class="js-switch-test" title="<?php _e( 'Test Mode', 'seur' ); ?>" name="seur_test_field" value="1" <?php checked( 1, seur()->get_option( 'seur_test_field' ), true ); ?>/>
+    <input type="checkbox" class="js-switch-test" title="<?php esc_attr_e( 'Test Mode', 'seur' ); ?>" name="seur_test_field" value="1" <?php checked( 1, seur()->get_option( 'seur_test_field' ), true ); ?>/>
     <?php
 }
@@ -142 +142 @@
 function seur_log_field() {
     ?>
-    <input type="checkbox" class="js-switch-log" title="<?php _e( 'Enable Logs', 'seur' ); ?>" name="seur_log_field" value="1" <?php checked( 1, seur()->get_option( 'seur_log_field' ), true ); ?>/>
+    <input type="checkbox" class="js-switch-log" title="<?php esc_attr_e( 'Enable Logs', 'seur' ); ?>" name="seur_log_field" value="1" <?php checked( 1, seur()->get_option( 'seur_log_field' ), true ); ?>/>
     <?php
 }

seur/trunk/core/pages/seur-get-labels.php

@@ -33 +33 @@
         exit;
     }
-    $change_service = isset($_GET['change'])?$_GET['change']:'0';
-    $weight_unit = get_option( 'woocommerce_weight_unit' );
+    $change_service = false;
+    if ( isset( $_GET['change'] ) ) {
+        $change_service = sanitize_text_field( wp_unslash( $_GET['change'] ) );
+        $change_service = ($change_service == 1);
+    }
+
+    $weight_unit = get_option( 'woocommerce_weight_unit' );
     $wc_order2 = wc_get_order( $orderid2 );
     $weight      = $wc_order2->get_meta('_seur_cart_weight', true );
@@ -58 +63 @@
             <label><?php esc_html_e( 'Number of Packages', 'seur' ); ?></label><br />
             <input title="<?php esc_html_e( 'Number of Packages', 'seur' ); ?>" type="text" name="seur-number-packages" class="form-control" placeholder="<?php esc_html_e( 'EX: 2', 'seur' ); ?>" value="<?php echo esc_html( $value ); ?>" required="" <?php if ( ! empty( $shop2 ) ) { echo esc_html( $disabled ); } ?> /><br />
-            <input type="hidden" name="seur-change-service" value="<?php echo  $change_service; ?>"/>
-            <?php wp_nonce_field( 'seur_get_label_action', 'seur_get_label_nonce_field' ); ?>
+            <?php if ($change_service) {
+                echo '<input type="hidden" name="seur-change-service" value="1"/>';
+            }
+            wp_nonce_field( 'seur_get_label_action', 'seur_get_label_nonce_field' ); ?>
             <input type="submit" class="seur_label_submit button button-primary" value="<?php esc_html_e( 'Get labels', 'seur' ); ?>" />
         </form>
@@ -69 +76 @@
         $weight      = '';
         $numpackages = '';
-        $changeService = false;
+        $changeService = isset($_POST['seur-change-service']);
         if ( isset( $_POST['order-id'] ) && isset( $_POST['seur-weight'] ) && isset( $_POST['seur-number-packages'] ) ) {
             $order_id    = sanitize_text_field( wp_unslash( $_POST['order-id'] ) );
             $weight      = sanitize_text_field( wp_unslash( $_POST['seur-weight'] ) );
             $numpackages = sanitize_text_field( wp_unslash( $_POST['seur-number-packages'] ) );
-            $changeService = sanitize_text_field( wp_unslash( $_POST['seur-change-service'] ) );
         }
 

seur/trunk/core/pages/seur-pickup.php

@@ -6 +6 @@
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly.
 }
@@ -15 +15 @@
  * @param WP_Post $post Post Data.
  */
-function seur_pickup( $post ) {
+function seur_pickup($post)
+{
+    $error_message = ''; // Variable para almacenar el mensaje de error.
+
+    // Procesar solicitudes de recogida o cancelación
+    if (isset($_POST['request_normal'])) {
+        // Lógica para solicitar recogida normal
+        $date = gmdate( 'Y-m-d' );
+        $data = array(
+            'type' => 'normal',
+            'date' => $date,
+            'mfrom' => '09:00:00', // Hora de ejemplo
+            'mto' => '13:00:00',
+            'efrom' => '16:00:00',
+            'eto' => '19:00:00',
+            'ref' => 'normal_' . seur()->get_option('seur_accountnumber_field') . gmdate('ymdHis'),
+        );
+        $result = seur_collections($data);
+        if (isset($result['errors'])) {
+            // Si hay errores, almacenar el mensaje
+            $error_message = 'Error: ' . $result['errors'][0]['detail'];
+        } else {
+            seur()->save_collection($result['data']['collectionRef'], 'normal');
+            seur()->save_reference($result['data']['reference'], 'normal');
+            seur()->save_date_normal($date);
+
+            // Redirigir para refrescar la página solo si no hay error
+            $url = sanitize_url( wp_unslash($_SERVER['REQUEST_URI']??''));
+            if ( !empty($url) ) {
+                wp_redirect( $url );
+                exit;
+            }
+        }
+    }
+
+    if (isset($_POST['request_cold'])) {
+        // Lógica para solicitar recogida fría
+        $date = gmdate( 'Y-m-d' );
+        $data = array(
+            'type' => 'cold',
+            'date' => $date,
+            'mfrom' => '09:00:00', // Hora de ejemplo
+            'mto' => '13:00:00',
+            'efrom' => '16:00:00',
+            'eto' => '19:00:00',
+            'ref' => 'cold_' . seur()->get_option('seur_accountnumber_field') . gmdate('ymdHis'),
+        );
+        $result = seur_collections($data);
+        if (isset($result['errors'])) {
+            // Si hay errores, almacenar el mensaje
+            $error_message = 'Error: ' . $result['errors'][0]['detail'];
+        } else {
+            seur()->save_collection($result['data']['collectionRef'], 'cold');
+            seur()->save_reference($result['data']['reference'], 'cold');
+            seur()->save_date_cold($date);
+
+            // Redirigir para refrescar la página solo si no hay error
+            $url = sanitize_url( wp_unslash($_SERVER['REQUEST_URI']??''));
+            if ( !empty($url) ) {
+                wp_redirect( $url );
+                exit;
+            }
+        }
+    }
+
+    if (isset($_POST['cancel_normal'])) {
+        // Lógica para cancelar recogida normal
+        // Obtener la referencia de la recogida normal
+        $reference_normal = seur()->get_collection('normal');
+        $result = seur_cancel_collection($reference_normal);
+
+        if (isset($result['errors'])) {
+            // Si hay errores, almacenar el mensaje
+            $error_message = 'Error: ' . $result['errors'][0]['detail'];
+        } else {
+            seur()->cancel_collection('normal');
+            seur()->cancel_reference('normal');
+            seur()->cancel_date_normal();
+
+            // Redirigir para refrescar la página
+            $url = sanitize_url( wp_unslash($_SERVER['REQUEST_URI']??''));
+            if ( !empty($url) ) {
+                wp_redirect( $url );
+                exit;
+            }
+        }
+    }
+
+    if (isset($_POST['cancel_cold'])) {
+        // Lógica para cancelar recogida fría
+
+        $reference_cold = seur()->get_collection('cold');
+        $result = seur_cancel_collection($reference_cold);
+
+        if (isset($result['errors'])) {
+            // Si hay errores, almacenar el mensaje
+            $error_message = 'Error: ' . $result['errors'][0]['detail'];
+        } else {
+            seur()->cancel_collection('cold');
+            seur()->cancel_reference('cold');
+            seur()->cancel_date_cold();
+
+            // Redirigir para refrescar la página
+            $url = sanitize_url( wp_unslash($_SERVER['REQUEST_URI']??''));
+            if ( !empty($url) ) {
+                wp_redirect( $url );
+                exit;
+            }
+        }
+    }
 
     ?>
-    <div class="wrap">
-    <h1 class="wp-heading-inline"><?php esc_html_e( 'Collection', 'seur' ); ?></h1>
-    <hr class="wp-header-end">
-    <?php esc_html_e( 'Generate an order for us to pick up your customers orders.', 'seur' ); ?>
-    <form method="post"  name="formulario" width="100%">
-        <?php
-        if ( ! isset( $_POST['type'] ) ) {
-            wp_nonce_field( 'seur_pickup_action', 'seur_pickup_nonce_field' );
-        } else {
-            if ( ! isset( $_POST['seur_pickup_nonce_field'] ) || ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['seur_pickup_nonce_field'] ) ), 'seur_pickup_action' ) ) {
+    <div class="wrap">
+        <h1 class="wp-heading-inline"><?php esc_html_e('Collection Management', 'seur'); ?></h1>
+        <hr class="wp-header-end">
+        <form method="post" name="formulario" style="width: 100%;">
+            <?php
+            wp_nonce_field('seur_pickup_action', 'seur_pickup_nonce_field');
+
+            if (isset($_POST['seur_pickup_nonce_field']) && !wp_verify_nonce(sanitize_text_field(wp_unslash($_POST['seur_pickup_nonce_field'])), 'seur_pickup_action')) {
                 print 'Sorry, your nonce did not verify.';
                 exit;
-            } else {
-
-                $tipo            = sanitize_text_field( wp_unslash( $_POST['type'] ) );
-                $md              = sanitize_text_field( wp_unslash( $_POST['Md'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
-                $mh              = sanitize_text_field( wp_unslash( $_POST['Mh'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
-                $td              = sanitize_text_field( wp_unslash( $_POST['Td'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
-                $th              = sanitize_text_field( wp_unslash( $_POST['Th'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
-                $now             = date( 'Y-m-d' ); // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date
-                $ref             = $tipo . seur()->get_option( 'seur_accountnumber_field' ) . gmdate( 'ymdHis' ); // . gmdate( 'm' ) . gmdate( 'd' ) . gmdate( 'H' ) . gmdate( 'i' ) . gmdate( 's' );
-                $data            = array();
-                $data['type']    = $tipo; // cold, normal.
-                $data['date']    = $now; // '2021-09-08-12:00:00.000'.
-                $data['mfrom']   = $md; // '09:00:00'
-                $data['mto']     = $mh; // '13:00:00'
-                $data['efrom']   = $td; // '16:00:00'
-                $data['eto']     = $th; // '19:00:00'
-                $data['comment'] = ''; // 'ENVIO DE PRUEBA'
-                $data['ref']     = $ref;
-                $result          = seur_collections( $data );
-                if ( $data ) {
-                    $collectionref = $result['data']['collectionRef'];
-                    $reference     = $result['data']['reference'];
-                    if ( strpos( $reference, 'normal' ) !== false ) {
-                        seur()->slog( 'Es recogida normal' );
-                        seur()->save_collection( $collectionref, 'normal' );
-                        seur()->save_reference( $reference, 'normal' );
-                        seur()->save_date_normal( seur()->today() );
-
-                    }
-                    if ( strpos( $reference, 'cold' ) !== false ) {
-                        seur()->slog( 'Es recogida frio' );
-                        seur()->slog( 'Es recogida normal' );
-                        seur()->save_collection( $collectionref, 'cold' );
-                        seur()->save_reference( $reference, 'cold' );
-                        seur()->save_date_cold( seur()->today() );
-                    }
-                    if ( seur()->log_is_acive() ) {
-                        seur()->slog( '$result: ' . print_r( $result, true ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
-                        seur()->slog( '$collectionRef: ' . $collectionref );
-                        seur()->slog( '$reference: ' . $reference );
-                    }
-                } else {
-                    if ( seur()->log_is_acive() ) {
-                        seur()->slog( '$result: Ha habido un problema' );
-                    }
-                }
             }
-        }
-
-        /**
-         * Comprobar si tiene una recogida para hoy y mostrar sus situaciones
-         */
-
-        $date              = seur()->today();
-        $collection_normal = seur()->get_collection( 'normal' );
-        $collection_cold   = seur()->get_collection( 'cold' );
-        $reference_normal  = seur()->get_reference( 'normal' );
-        $reference_cold    = seur()->get_reference( 'cold' );
-        $date_normal       = seur()->get_date_normal();
-        $date_cold         = seur()->get_date_cold();
-        $normal            = false;
-        $cold              = false;
-
-        if ( $date === $date_normal ) {
-
-            echo "<div style='color:#e53920;font-weight:bold; font-size:12px;'>";
-            echo esc_html__( 'You have a collection today', 'seur' );
-            echo '<br>';
-            echo esc_html__( 'Reference: ', 'seur' ) . esc_html( $reference_normal );
-            echo '<br>';
-            echo esc_html__( 'Collection: ', 'seur' ) . esc_html( $collection_normal );
-            echo '</div>';
-            $normal = true;
-        }
-        if ( $date === $date_cold ) {
-
-            echo "<div style='color:#e53920;font-weight:bold; font-size:12px;'>";
-            echo esc_html__( 'You have a Cold collection today', 'seur' );
-            echo '<br>';
-            echo esc_html__( 'Cold Reference: ', 'seur' ) . esc_html( $reference_cold );
-            echo '<br>';
-            echo esc_html__( 'Cold Collection: ', 'seur' ) . esc_html( $collection_cold );
-            echo '</div>';
-            $cold = true;
-        }
-
-        if ( $date === $date_normal && $date === $date_cold ) {
-            return;
-        }
-
-        // -------------------------------------------------
-        // NO TIENE RECOGIDA -> CONTINUA EL PROCESO
-        // -------------------------------------------------
-
-        // ********************************************
-        // ** PARAMETROS INFORMATIVOS DE LA RECOGIDA **
-        // ********************************************
-        ?>
-        <table width='100%' style='color:ed734d;font-weight:bold; font-size:12px;'>
-
-            <tr>
-                <td>
-                    <table width='50%'>
-                        <tr>
-                            <td colspan="2"><?php esc_html_e( 'COLLECTION', 'seur' ); ?></div><hr></td>
-                        </tr>
-                        <tr>
-                            <td colspan="2"><?php esc_html_e( 'Select type.', 'seur' ); ?></div></td></tr>
-                        </tr>
-                        <tr>
-                            <td>
-                                <?php esc_html_e( 'Type:', 'seur' ); ?>&nbsp;&nbsp;&nbsp;
-                                <select id="manana_desde_type" name="type">
-                                <?php
-                                if ( ! $cold ) {
-                                    ?>
-                                    <option value="cold"><?php esc_html_e( 'Cold Shipping', 'seur' ); ?></option>
-                                    <?php
-                                }
-                                if ( ! $normal ) {
-                                    ?>
-                                    <option value="normal"><?php esc_html_e( 'Normal Shipping', 'seur' ); ?></option>
-                                    <?php
-                                }
-                                ?>
-                                </select>
-                            </td>
-                        </td>
-                    </tr>
-                    <tr>
-                <td colslpan="2"><br><?php esc_html_e( 'Enter a schedule for Collection', 'seur' ); ?><br />
-                <?php esc_html_e( 'The minimum margin between each schedule has to be 2 hours.', 'seur' ); ?></div></td></tr>
-            <tr>
-            <td>
-                <?php esc_html_e( 'Morning from:', 'seur' ); ?>&nbsp;&nbsp;&nbsp;
-                <select id="manana_desde_type" name="Md">
-                <option value="none"<?php if ( 'none' === $md ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>><?php esc_html_e( 'None', 'seur' ); ?></option>
-                <option value="09:00:00"<?php if ( '09:00:00' === $md ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>09:00</option> 
-                <option value="10:01:00"<?php if ( '10:01:00' === $md ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>10:00</option>
-                <option value="11:02:00"<?php if ( '11:02:00' === $md ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>11:00</option>
-                <option value="12:03:00"<?php if ( '12:03:00' === $md ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>12:00</option>
-            </select>
-            &nbsp;&nbsp;&nbsp;
-            <?php esc_html_e( 'to', 'seur' ); ?>&nbsp;&nbsp;&nbsp;
-            <select id="manana_hasta_type" name="Mh">
-                <option value="none"<?php if ( 'none' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>><?php esc_html_e( 'None', 'seur' ); ?></option>
-                <option value="11:00:00"<?php if ( '11:00:00' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>11:00</option>
-                <option value="12:01:00"<?php if ( '12:01:00' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>12:00</option>
-                <option value="13:02:00"<?php if ( '13:02:00' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>13:00</option>
-                <option value="14:03:00"<?php if ( '14:03:00' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>14:00</option>
-                <option value="15:04:00"<?php if ( '15:04:00' === $mh ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>15:00</option>
-            </select>
-            </td></tr><tr>
-            <td><?php esc_html_e( 'Afternoon From:', 'seur' ); ?>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <select id="tarde_desde_type" name="Td">
-                <option value="none"<?php if ( 'none' === $td ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>><?php esc_html_e( 'None', 'seur' ); ?></option>
-                <option value="15:00:00"<?php if ( '15:00:00' === $td ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>15:00</option>
-                <option value="16:01:00"<?php if ( '16:01:00' === $td ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>16:00</option>
-                <option value="17:02:00"<?php if ( '17:02:00' === $td ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>17:00</option>
-                <option value="18:03:00"<?php if ( '18:03:00' === $td ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>18:00</option>
-            </select>
-            &nbsp;&nbsp;&nbsp;
-            <?php esc_html_e( 'to', 'seur' ); ?>&nbsp;&nbsp;&nbsp;
-            <select id="tarde_hasta_type" name="Th">
-                <option value="none"<?php if ( 'none' === $th ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>><?php esc_html_e( 'None', 'seur' ); ?></option>
-                <option value="17:00:00"<?php if ( '17:00:00' === $th ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>17:00</option>
-                <option value="18:01:00"<?php if ( '18:01:00' === $th ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>18:00</option>
-                <option value="19:02:00"<?php if ( '19:02:00' === $th ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>19:00</option>
-                <option value="20:03:00"<?php if ( '20:03:00' === $th ) { echo ' selected'; } // phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace ?>>20:00</option>
-            </select>
-            </td>
-            </tr>
-            <tr><td colslpan=2><br><?php esc_html_e( 'If the schedule is only of mornings, leave the afternoon schedules with null.', 'seur' ); ?>
-                <br><?php esc_html_e( 'If schedule is only of afternoon leave the morning hours with null.', 'seur' ); ?>
-                </div></td></tr>
-            </tr>
-        </table>
-    </form>
-    <?php
-
-    // Si no está setado, boton Solicitar.
-    if ( ! isset( $_POST['type'] ) ) {
-        submit_button( __( 'Request', 'seur' ) );
-        return;
-    }
-    ?>
-    </div> 
+
+            // Obtener los datos de las recogidas actuales
+            $date = gmdate( 'Y-m-d' );
+            $collection_normal = seur()->get_collection('normal');
+            $collection_cold = seur()->get_collection('cold');
+            $reference_normal = seur()->get_reference('normal');
+            $reference_cold = seur()->get_reference('cold');
+            $date_normal = seur()->get_date_normal();
+            $date_cold = seur()->get_date_cold();
+
+            // Mostrar errores si existen
+            if ($error_message) {
+                echo "<div style='color: red; font-weight: bold; margin-top: 20px;'>" . esc_html( $error_message ) . "</div>";
+            }
+
+            // Paneles para normal y frío
+            ?>
+            <div class="seur-collection-wrapper" style="display: flex; justify-content: space-between; gap: 20px;">
+                <!-- Panel para recogida normal -->
+                <div class="collection-panel" style="background-color: #f1f1f1; border: 1px solid #ddd; padding: 20px; width: 48%; border-radius: 5px;">
+                    <h2 style="font-size: 18px; font-weight: bold; text-align: center;"><?php esc_html_e('Normal Collection', 'seur'); ?></h2>
+
+                    <!-- Mostrar recogida activa -->
+                    <?php if ($date === $date_normal): ?>
+                        <div style="background-color: #e0ffe0; padding: 10px; border-radius: 5px; margin-bottom: 10px;">
+                            <p><?php esc_html_e('You have a Normal collection today', 'seur'); ?></p>
+                            <p><?php esc_html_e('Reference: ', 'seur'); echo esc_html($reference_normal); ?></p>
+                            <p><?php esc_html_e('Collection: ', 'seur'); echo esc_html($collection_normal); ?></p>
+                        </div>
+                    <?php endif; ?>
+
+                    <!-- Botón de solicitar/cancelar recogida -->
+                    <?php if ($date === $date_normal): ?>
+                        <button name="cancel_normal" type="submit" style="width: 100%; background-color: #e53935; color: #fff; padding: 10px; border: none; border-radius: 5px; cursor: pointer;">
+                            <?php esc_html_e('Cancel Normal Collection', 'seur'); ?>
+                        </button>
+                    <?php else: ?>
+                        <button name="request_normal" type="submit" style="width: 100%; background-color: #4CAF50; color: #fff; padding: 10px; border: none; border-radius: 5px; cursor: pointer;">
+                            <?php esc_html_e('Request Normal Collection', 'seur'); ?>
+                        </button>
+                    <?php endif; ?>
+                </div>
+
+                <!-- Panel para recogida fría -->
+                <div class="collection-panel" style="background-color: #f1f1f1; border: 1px solid #ddd; padding: 20px; width: 48%; border-radius: 5px;">
+                    <h2 style="font-size: 18px; font-weight: bold; text-align: center;"><?php esc_html_e('Cold Collection', 'seur'); ?></h2>
+
+                    <!-- Mostrar recogida activa -->
+                    <?php if ($date === $date_cold): ?>
+                        <div style="background-color: #e0ffe0; padding: 10px; border-radius: 5px; margin-bottom: 10px;">
+                            <p><?php esc_html_e('You have a Cold collection today', 'seur'); ?></p>
+                            <p><?php esc_html_e('Reference: ', 'seur'); echo esc_html($reference_cold); ?></p>
+                            <p><?php esc_html_e('Collection: ', 'seur'); echo esc_html($collection_cold); ?></p>
+                        </div>
+                    <?php endif; ?>
+
+                    <!-- Botón de solicitar/cancelar recogida -->
+                    <?php if ($date === $date_cold): ?>
+                        <button name="cancel_cold" type="submit" style="width: 100%; background-color: #e53935; color: #fff; padding: 10px; border: none; border-radius: 5px; cursor: pointer;">
+                            <?php esc_html_e('Cancel Cold Collection', 'seur'); ?>
+                        </button>
+                    <?php else: ?>
+                        <button name="request_cold" type="submit" style="width: 100%; background-color: #4CAF50; color: #fff; padding: 10px; border: none; border-radius: 5px; cursor: pointer;">
+                            <?php esc_html_e('Request Cold Collection', 'seur'); ?>
+                        </button>
+                    <?php endif; ?>
+                </div>
+            </div>
+        </form>
+    </div>
     <?php
 }

seur/trunk/core/pages/seur-products-services.php

@@ -19 +19 @@
     ?>
 <div class="wrap">
-    <h2><?php echo esc_html__( 'Products / Services', 'woocommerce-seur' ); ?></h2>
+    <h2><?php echo esc_html__( 'Products / Services', 'seur' ); ?></h2>
 
-    <h2 class="screen-reader-text"><?php esc_html_e( 'Products / Services List', 'woocommerce-seur' ); ?></h2>
-    <p><?php esc_html_e( 'These services and products might not be available in your commercial proposal. Please verify with your SEUR sales contact that you have all combinations enabled.', 'woocommerce-seur' ); ?></p>
-    <p><?php esc_html_e( 'List of combinations of SEUR Services and Products available in the plugin.', 'woocommerce-seur' ); ?></p>
+    <h2 class="screen-reader-text"><?php esc_html_e( 'Products / Services List', 'seur' ); ?></h2>
+    <p><?php esc_html_e( 'These services and products might not be available in your commercial proposal. Please verify with your SEUR sales contact that you have all combinations enabled.', 'seur' ); ?></p>
+    <p><?php esc_html_e( 'List of combinations of SEUR Services and Products available in the plugin.', 'seur' ); ?></p>
     <table class="wp-list-table widefat fixed striped pages">
         <thead>
             <tr>
-                <th scope="col" id="response" class="manage-column column-author column-primary"><?php esc_html_e( 'Description', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Service', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Product', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Type', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'County', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'State', 'woocommerce-seur' ); ?></th>
+                <th scope="col" id="response" class="manage-column column-author column-primary"><?php esc_html_e( 'Description', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Service', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Product', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Type', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'County', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'State', 'seur' ); ?></th>
             </tr>
         </thead>
@@ -61 +61 @@
         <tfoot>
             <tr>
-                <th scope="col" id="response" class="manage-column column-author column-primary"><?php esc_html_e( 'Description', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Service', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Product', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Type', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Zone', 'woocommerce-seur' ); ?></th>
-                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'State', 'woocommerce-seur' ); ?></th>
+                <th scope="col" id="response" class="manage-column column-author column-primary"><?php esc_html_e( 'Description', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Service', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Product', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Type', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'Zone', 'seur' ); ?></th>
+                <th scope="col" id="author" class="manage-column column-author"><?php esc_html_e( 'State', 'seur' ); ?></th>
             </tr>
         </tfoot>

seur/trunk/core/pages/status/status-check.php

@@ -601 +601 @@
                     foreach ( $products as $code => $product ) {
                         echo '<tr>
-                            <td data-export-label="'.$code.'">'.$code.'</td>';
+                            <td data-export-label="'.esc_attr($code).'">'.esc_attr($code).'</td>';
                         if ( seur_check_service_names($code) ) {
                             echo '<td><span class="yes">&#10004;</span></td>';

seur/trunk/core/woocommerce/includes/class-seur_local_shipping_method.php

@@ -38 +38 @@
         $this->instance_form_fields = array(
             'title' => array(
-                'title'       => __( 'Method Title' ),
+                'title'       => __( 'Method Title', 'seur' ),
                 'type'        => 'text',
-                'description' => __( 'This controls the title which the user sees during checkout.' ),
-                'default'     => __( 'SEUR Local Pickup' ),
+                'description' => __( 'This controls the title which the user sees during checkout.', 'seur' ),
+                'default'     => __( 'SEUR Local Pickup', 'seur' ),
                 'desc_tip'    => true,
             ),
@@ -338 +338 @@
             }
             echo '<br />';
-            esc_html_e( 'Choose a location:', 'woocommerce-seur' );
+            esc_html_e( 'Choose a location:', 'seur' );
             echo '<div id="controls"></div>';
             echo '<div id="seur-gmap" style="with:300px;height:250px;"></div>';
@@ -437 +437 @@
 function seur_validation_2shop_fields() {
 
-    $seur_cutom_rate_ID = $_POST['shipping_method'][0];
+    $seur_cutom_rate_ID = sanitize_text_field( wp_unslash(isset($_POST['shipping_method'][0])??''));
     if (seur()->is_seur_local_method($seur_cutom_rate_ID)) {
         $seur_pickup     = sanitize_text_field( wp_unslash( $_POST['seur_pickup'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated,WordPress.Security.NonceVerification.Missing
@@ -459 +459 @@
 
     if ( ! empty( $_POST['seur_pickup'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-        seur()->slog( '$_POST: ' . print_r( $_POST, true ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
-        seur()->slog( '$_POST["seur_pickup"]: ' . print_r( $_POST['seur_pickup'], true ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
         $id              = sanitize_text_field( wp_unslash( $_POST['seur_pickup'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
         $seur_depot      = 'seur_depot_' . $id;

seur/trunk/core/woocommerce/includes/class-wc-shipping-seur.php

@@ -306 +306 @@
             </th>
             <td class="forminp">
-                <select name="woocommerce_seur_origin_country_state" id="woocommerce_seur_origin_country_state" style="width: 250px;" data-placeholder="<?php esc_html_e( 'Choose a country&hellip;', 'woocommerce' ); ?>" title="Country" class="chosen_select">
+                <select name="woocommerce_seur_origin_country_state" id="woocommerce_seur_origin_country_state" style="width: 250px;" data-placeholder="<?php esc_html_e( 'Choose a country&hellip;', 'seur' ); ?>" title="Country" class="chosen_select">
                 <?php echo WC()->countries->country_dropdown_options( $this->origin_country, $this->origin_state ? $this->origin_state : '*' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
                 </select>
@@ -617 +617 @@
     // if shipping rate is 0, concatenate ": $0.00" to the label
     if ( floatval($method->cost) <= 0  ) {
-        $label .= ': ' . wc_price(0) . ' - ' . __( 'Free shipping', 'woocommerce' );
+        $label .= ': ' . wc_price(0) . ' - ' . __( 'Free shipping', 'seur' );
     }
 

seur/trunk/core/woocommerce/includes/metabox/seur-metabox.php

@@ -37 +37 @@
         $url             = esc_url( admin_url( add_query_arg( array( 'page' => 'seur_get_labels_from_order' ), 'admin.php' ) ) );
         $arrayiframe     = array(
-            '?TB_iframe' => 'true',
+            'TB_iframe' => 'true',
             'width'      => '400',
             'height'     => '300',
@@ -52 +52 @@
             $text = 'Get SEUR'.($k==1?' CHANGE':'').' Label'.($k==1?'s':'');
             ?>
-            <a class='thickbox button btn-seur-label' title='<?php esc_html_e( $text, 'seur' ); ?>'
-               alt='<?php esc_html_e( $text, 'seur' ); ?>'
+            <a class='thickbox button btn-seur-label' title='<?php echo esc_html( $text ); ?>'
+               alt='<?php echo esc_html( $text ); ?>'
                href='<?php echo esc_html( $final_get_label_url ); ?>'>
-                <?php esc_html_e( $text, 'seur' ); ?>
+                <?php echo esc_html( $text ); ?>
             </a>
             <?php
@@ -71 +71 @@
             $cont++;
             ?>
-            <a href="<?= esc_url( $url_upload_dir ) . '/' . esc_html( $label_file_name ) ?> " class="button btn-seur-label" download> <?= esc_html__( ' See SEUR Label ', 'seur' ) . $suffix ?> </a>
+            <a href="<?php echo esc_url( $url_upload_dir ) . '/' . esc_html( $label_file_name ); ?> " class="button btn-seur-label" download>
+                <?php echo esc_html__( ' See SEUR Label ', 'seur' ) . esc_html( $suffix ); ?>
+            </a>
             <?php
         }

seur/trunk/core/woocommerce/includes/pages/seur-process-label.php

@@ -6 +6 @@
 function seur_process_label_woocommerce() {
 
-    if ( $_POST ) {
-        global $wpdb;
 
-        $table = $wpdb->prefix . 'seur_custom_rates';
-
-        $seur_rate      = sanitize_text_field( wp_unslash( $_POST['rate'] ) );
-        $seur_country   = sanitize_text_field( wp_unslash( $_POST['country'] ) );
-        $seur_state     = sanitize_text_field( wp_unslash( $_POST['state'] ) );
-        $seur_minprice  = sanitize_text_field( wp_unslash( $_POST['minprice'] ) );
-        $seur_maxprice  = sanitize_text_field( wp_unslash( $_POST['maxprice'] ) );
-        $seur_rateprice = sanitize_text_field( wp_unslash( $_POST['rateprice'] ) );
-        $seur_postcode  = seur_sanitize_postcode( $_POST['postcode'], $seur_country );
-
-        if ( empty( $seur_city ) ) {
-            $seur_city = '*';
-        }
-        if ( empty( $seur_minprice ) ) {
-            $seur_minprice = '0';
-        }
-        if ( empty( $seur_postcode ) || $seur_postcode == '00000' || $seur_postcode == '0000' || $seur_postcode == '*' ) {
-            $seur_postcode = '*';
-        }
-        if ( empty( $seur_rateprice ) ) {
-            $seur_rateprice = '0';
-        }
-        if ( empty( $seur_state ) ) {
-            $seur_state = '0';
-        }
-        if ( empty( $seur_country ) ) {
-            $seur_country = '*';
-        }
-        if ( empty( $seur_maxprice ) || $seur_maxprice == '*' || $seur_maxprice > '9999999' ) {
-            $seur_maxprice = '9999999';
-        }
-
-        $wpdb->insert(
-            $table,
-            array(
-                'rate'      => $seur_rate,
-                'country'   => $seur_country,
-                'state'     => $seur_state,
-                'postcode'  => $seur_postcode,
-                'minprice'  => $seur_minprice,
-                'maxprice'  => $seur_maxprice,
-                'rateprice' => $seur_rateprice,
-            ),
-            array(
-                '%s',
-                '%s',
-                '%s',
-                '%s',
-                '%d',
-                '%d',
-                '%d',
-            )
-        );
-        if ( $wpdb->insert_id ) {
-            echo '<div class="notice notice-success">' . esc_html__( 'New rate successfully added', 'seur' ) . '</div>';
-        } else {
-            echo '<div class="notice notice notice-error">' . esc_html__( 'There was and error adding the new rate, please try again', 'seur' ) . '</div>';
-        }
-    } else {
-        esc_html_e( "Sorry, you didn't post data.", 'seur' );
-        exit;
-    }
 }

seur/trunk/core/woocommerce/includes/seur-woo-functions.php

@@ -118 +118 @@
     $offset          = 8;
     $updated_columns = array_slice( $columns, 0, $offset, true ) +
-    array( 'total_weight' => esc_html__( 'Weight', 'woocommerce' ) ) +
+    array( 'total_weight' => esc_html__( 'Weight', 'seur' ) ) +
     array_slice( $columns, $offset, null, true );
     return $updated_columns;
@@ -135 +135 @@
         $weight = get_post_meta( $post->ID, '_seur_cart_weight', true );
         if ( $weight > 0 ) {
-            print $weight . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) );
+            print esc_html( $weight ) . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) );
         } else {
             print 'N/A';
@@ -145 +145 @@
         $weight = $order->get_meta(  '_seur_cart_weight', true );
         if ( $weight > 0 ) {
-            print $weight . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) );
+            print esc_html( $weight ) . ' ' . esc_attr( get_option( 'woocommerce_weight_unit' ) );
         } else {
             print 'N/A';
@@ -163 +163 @@
             'public'                    => true,
             'show_in_admin_status_list' => true, // show count All (12) , Completed (9) , Awaiting shipment (2) ...
-            'label_count'               => _n_noop( __( 'Awaiting SEUR shipment <span class="count">(%s)</span>', '' ), __( 'Awaiting SEUR shipment <span class="count">(%s)</span>', 'seur' ) ),
+            // translators: %s is the number of SEUR shipments awaiting processing.
+            'label_count' => _n_noop(
+                'Awaiting SEUR shipment <span class="count">(%s)</span>',  // Singular
+                'Awaiting SEUR shipments <span class="count">(%s)</span>', // Plural
+                'seur'
+            ),
         )
     );
@@ -200 +205 @@
             'public'                    => true,
             'show_in_admin_status_list' => true, // show count All (12) , Completed (9) , Awaiting shipment (2) ...
-            'label_count'               => _n_noop( __( 'Awaiting SEUR Label <span class="count">(%s)</span>', 'seur' ), __( 'Awaiting SEUR Label <span class="count">(%s)</span>', 'seur' ) ),
+            // translators: %s is the number of SEUR labels awaiting processing.
+            'label_count' => _n_noop(
+                'Awaiting SEUR Label <span class="count">(%s)</span>',  // Singular
+                'Awaiting SEUR Labels <span class="count">(%s)</span>', // Plural
+                'seur'
+            ),
         )
     );
@@ -245 +255 @@
             'public'                    => true,
             'show_in_admin_status_list' => true, // show count All (12) , Completed (9) , Awaiting shipment (2) ...
-            'label_count'               => _n_noop( __( 'Awaiting SEUR Shipment <span class="count">(%s)</span>', 'seur' ), __( 'Awaiting SEUR Shipment <span class="count">(%s)</span>', 'seur' ) ),
+            // translators: %s is the number of SEUR shipments awaiting processing.
+            'label_count' => _n_noop(
+                'Awaiting SEUR Shipment <span class="count">(%s)</span>',  // Singular
+                'Awaiting SEUR Shipments <span class="count">(%s)</span>', // Plural
+                'seur'
+            ),
         )
     );
@@ -358 +373 @@
 
     if ( isset( $_GET['post_status'] ) ) {
-            $sendback = add_query_arg( 'post_status', sanitize_text_field( $_GET['post_status'] ), $sendback );
+            $sendback = add_query_arg( 'post_status', sanitize_text_field(wp_unslash($_GET['post_status'])), $sendback );
     }
 
@@ -432 +447 @@
 function seur_get_label_ajax() {
 
-    $order_id  = absint( $_GET['order_id'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
+    $order_id  = absint(sanitize_text_field( wp_unslash( $_GET['order_id'])) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidated
     $has_label = seur()->has_label($order_id);
 
@@ -472 +487 @@
 
 function seur_billing_mobil_phone_fields_display_admin_order_meta( $order ) {
-    echo '<p><strong>' . __( 'Billing Mobile Phone' ) . ':</strong> ' . $order->get_meta( '_billing_mobile_phone', true ) . '</p>';
+    echo '<p><strong>' . esc_html__( 'Billing Mobile Phone', 'seur' ) . ':</strong> ' . esc_html( $order->get_meta( '_billing_mobile_phone', true ) ) . '</p>';
 }
 
@@ -494 +509 @@
 
 function seur_shipping_mobil_phone_fields_display_admin_order_meta( $order ) {
-    echo '<p><strong>' . esc_html__( 'Shipping Mobile Phone' ) . ':</strong> ' . $order->get_meta(  '_shipping_mobile_phone', true ) . '</p>';
+    echo '<p><strong>' . esc_html__( 'Shipping Mobile Phone', 'seur' ) . ':</strong> ' . esc_html( $order->get_meta( '_shipping_mobile_phone', true ) ) . '</p>';
 }
 
@@ -523 +538 @@
 
     if (seur_is_order_page($post_type)) { ?>
-        <label for="dropdown_shop_order_seur_shipping_method" class="screen-reader-text"><?php _e( 'Seur Shippments', 'seur' ); ?></label>
+        <label for="dropdown_shop_order_seur_shipping_method" class="screen-reader-text"><?php esc_attr_e( 'Seur Shippments', 'seur' ); ?></label>
         <select name="_shop_order_seur_shipping_method" id="dropdown_shop_order_seur_shipping_method">
             <option value=""><?php esc_html_e( 'All', 'seur' ); ?></option>
             <option value="seur"
             <?php
-            if ( ( esc_attr( isset( $_GET['_shop_order_seur_shipping_method'] ) ) ) && ( esc_attr( $_GET['_shop_order_seur_shipping_method'] ) == 'seur' ) ) {
-                echo 'selected'; }
-            ?>
+            $_shop_order_seur_shipping_method = isset( $_GET['_shop_order_seur_shipping_method'] ) ? esc_attr( sanitize_text_field(wp_unslash($_GET['_shop_order_seur_shipping_method']))) : '';
+            if ($_shop_order_seur_shipping_method == 'seur') {
+                echo 'selected';
+            }?>
             ><?php esc_html_e( 'All Seur Shipping', 'seur' ); ?></option>
             <?php
@@ -539 +555 @@
                 $shippment_sani = sanitize_title( $custom_name ); ?>
                 <option value="<?php echo esc_attr( $shippment_sani ); ?>"
-                    <?php echo esc_attr( isset( $_GET['_shop_order_seur_shipping_method'] ) ? selected( $shippment_sani, $_GET['_shop_order_seur_shipping_method'], false ) : '' ); ?>>
+                    <?php echo esc_attr( $_shop_order_seur_shipping_method !='' ? selected( $shippment_sani,$_shop_order_seur_shipping_method, false ) : '' ); ?>>
                     <?php echo esc_html( !empty($custom_name) ? $custom_name : $code ); ?>
                 </option>
@@ -565 +581 @@
             $custom_name = get_option($product['field'].'_custom_name_field')?get_option($product['field'].'_custom_name_field'):$code;
             $shippment_sani = sanitize_title( $custom_name );
-            if ( $shippment_sani == $_GET['_shop_order_seur_shipping_method']) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            if ( $shippment_sani == sanitize_text_field( wp_unslash( $_GET['_shop_order_seur_shipping_method']))) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 $vars['meta_key'] = '_seur_shipping_method_service_real_name';
                 $vars['meta_value'] = $code;
@@ -584 +600 @@
  */
 function seur_register_tracking_statuses() {
-    foreach (Seur_Logistica_Seguimiento::tracking_statuses_arr as $tracking_status => $tracking_label) {
-        $new_statuses_arr[$tracking_status] = $tracking_label;
-        register_post_status(
-            $tracking_status,
-            array(
-                'label'                     => $tracking_label,
-                'public'                    => true,
-                'show_in_admin_status_list' => true, // show count All (12) , Completed (9) , Awaiting shipment (2) ...
-                'label_count'               => _n_noop( __( $tracking_label. ' <span class="count">(%s)</span>', '' ), __( $tracking_label. ' <span class="count">(%s)</span>', 'seur' ) ),
-            )
-        );
-    }
-}
+    foreach (Seur_Logistica_Seguimiento::tracking_statuses_arr as $tracking_status => $tracking_label) {
+        $new_statuses_arr[$tracking_status] = $tracking_label;
+        register_post_status(
+            $tracking_status,
+            array(
+                'label'                     => $tracking_label,
+                'public'                    => true,
+                'show_in_admin_status_list'  => true, // show count All (12), Completed (9), Awaiting shipment (2) ...
+                // translators: %s is the count of tracking labels.
+                'label_count' => _n_noop(
+                    'Tracking Label <span class="count">(%s)</span>',  // Singular
+                    'Tracking Labels <span class="count">(%s)</span>',  // Plural
+                    'seur'  // Text domain
+                ),
+            )
+        );
+    }
+}
+
 add_action( 'init', 'seur_register_tracking_statuses' );
 

seur/trunk/core/woocommerce/seur-woocommerce.php

@@ -126 +126 @@
      */
     public function wc_deactivated() {
-        echo '<div class="error"><p>' . sprintf( esc_html__( 'WooCommerce SEUR Shipping requires %s to be installed and active.', 'seur' ), '<a href="http://www.woothemes.com/woocommerce/" target="_blank">WooCommerce</a>' ) . '</p></div>';
+        /* translators: %s is the name of Woocommerce plugin */
+        echo '<div class="error"><p>' . sprintf( esc_html__( 'WooCommerce SEUR Shipping requires %s to be installed and active.', 'seur' ), '<a href="http://www.woothemes.com/woocommerce/" target="_blank">WooCommerce</a>' ) . '</p></div>';
     }
 
@@ -194 +195 @@
         $zones_admin_url = add_query_arg( $query_args, get_admin_url() . 'admin.php' );
         ?>
-        <div class="notice notice-success is-dismissible wc-seur-notice">
-            <p><?php echo sprintf( esc_html__( 'SEUR now supports shipping zones. The zone settings were added to a new SEUR method on the "Rest of the World" Zone. See the zones %1$shere%2$s ', 'seur' ), '<a href="' . esc_url( $zones_admin_url ) . '">', '</a>' ); ?></p>
-        </div>
-
-        <script type="application/javascript">
+        <div class="notice notice-success is-dismissible wc-seur-notice">
+            <p>
+                <?php
+                // translators: %1$s is the opening anchor tag, and %2$s is the closing anchor tag.
+                echo sprintf( esc_html__( 'SEUR now supports shipping zones. The zone settings were added to a new SEUR method on the "Rest of the World" Zone. See the zones %1$shere%2$s', 'seur' ), '<a href="' . esc_url( $zones_admin_url ) . '">', '</a>' ); ?>
+            </p>
+        </div>
+
+
+        <script type="application/javascript">
             jQuery( '.notice.wc-seur-notice' ).on( 'click', '.notice-dismiss', function () {
                 wp.ajax.post('seur_dismiss_upgrade_notice');

seur/trunk/loader.php

@@ -4 +4 @@
  * Plugin URI: http://www.seur.com/
  * Description: Add SEUR shipping method to WooCommerce. The SEUR plugin for WooCommerce allows you to manage your order dispatches in a fast and easy way
- * Version: 2.2.12
+ * Version: 2.2.14
  * Author: SEUR Oficial
  * Author URI: http://www.seur.com/
- * Tested up to: 6.2
+ * Tested up to: 6.6.2
  * WC requires at least: 3.0
- * WC tested up to: 7.4
+ * WC tested up to: 9.1.4
  * Text Domain: seur
  * Domain Path: /languages/
@@ -18 +18 @@
  **/
 
-define( 'SEUR_OFFICIAL_VERSION', '2.2.12' );
+define( 'SEUR_OFFICIAL_VERSION', '2.2.14' );
 define( 'SEUR_DB_VERSION', '1.0.4' );
 define( 'SEUR_TABLE_VERSION', '1.0.4' );
@@ -140 +140 @@
             ?>
             <div id="message" class="updated woocommerce-message woocommerce-seur-messages">
-                <a class="woocommerce-message-close notice-dismiss" style="top:0;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'seur-hide-new-version', 'hide-new-version-seur' ), 'seur_hide_new_version_nonce', '_seur_hide_new_version_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce-seur' ); ?></a>
+                <a class="woocommerce-message-close notice-dismiss" style="top:0;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'seur-hide-new-version', 'hide-new-version-seur' ), 'seur_hide_new_version_nonce', '_seur_hide_new_version_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'seur' ); ?></a>
                 <p>
-                    <?php echo esc_html__( 'SEUR has been updated to version', 'woocommerce-seur' ) . ' ' . esc_html( SEUR_OFFICIAL_VERSION ); ?>
+                    <?php echo esc_html__( 'SEUR has been updated to version', 'seur' ) . ' ' . esc_html( SEUR_OFFICIAL_VERSION ); ?>
                 </p>
                 <p>
                     <?php
                     // translators: Link to SEUR website with new features.
-                    printf( wp_kses( __( 'Discover the improvements that have been made in this version, and how to take advantage of them <a href="%s" target="_blank">here</a>', 'woocommerce-seur' ), array( 'a' => array( 'href' => array() ) ) ), esc_url( SEUR_POST_UPDATE_URL ) );
+                    printf( wp_kses( __( 'Discover the improvements that have been made in this version, and how to take advantage of them <a href="%s" target="_blank">here</a>', 'seur' ), array( 'a' => array( 'href' => array() ) ) ), esc_url( SEUR_POST_UPDATE_URL ) );
                     ?>
                 </p>
@@ -173 +173 @@
             ?>
             <div id="message" class="updated woocommerce-message woocommerce-seur-messages">
-                <a class="woocommerce-message-close notice-dismiss" style="top:0;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'seur-hide-new-v2', 'hide-new-v2-seur' ), 'seur_hide_new_v2_nonce', '_seur_hide_new_v2_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce-seur' ); ?></a>
+                <a class="woocommerce-message-close notice-dismiss" style="top:0;" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'seur-hide-new-v2', 'hide-new-v2-seur' ), 'seur_hide_new_v2_nonce', '_seur_hide_new_v2_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'seur' ); ?></a>
                 <p>
-                    <?php echo esc_html__( 'WARNING', 'woocommerce-seur' ); ?>
+                    <?php echo esc_html__( 'WARNING', 'seur' ); ?>
                 </p>
                 <p>
                     <?php
-                    esc_html_e( 'You need to contact to SEUR for new credentials. Call to +34913228380 or email to [email protected]', 'woocommerce-seur' );
+                    esc_html_e( 'You need to contact to SEUR for new credentials. Call to +34913228380 or email to [email protected]', 'seur' );
                     ?>
                 </p>

seur/trunk/readme.txt

@@ -1 +1 @@
 === SEUR Oficial ===
 Contributors: seuroficial
-Tags: woocommerce, shipping, seur, logistica, enviar paquete, pedidos, entregas
+Tags: woocommerce, shipping, seur, logistica, enviar paquete
 Requires at least: 4.0
-Tested up to: 6.2
-Stable tag: 2.2.12
+Tested up to: 6.6.2
+Stable tag: 2.2.14
 WC requires at least: 3.0
-WC tested up to: 7.4
-License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
+WC tested up to: 9.1.4
+License: GNU General Public License v3.0
+License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
 Add SEUR shipping method to WooCommerce. The SEUR plugin for WooCommerce allows you to manage your order dispatches in a fast and easy way
@@ -94 +94 @@
 == Changelog ==
 
+== 2.2.14 ==
+
+* ADDED: New pick-up layout design and cancel pick-up functionality
+* ADDED: Set downloaded label meta in other functions
+* FIXED: Vulnerability Report CVE-2024-9438
+* FIXED: Fix change value
+* FIXED: Fix has label function
+* FIXED: Fix required from rate state value
+* REMOVED: Log token email
+
+== 2.2.13 ==
+
+* FIXED: Vulnerability Report CVE-2024-9438
+
 == 2.2.12 ==
 
-* ADDED: Add new service 13:30 Documentos
+* ADDED: Add new service 13:30 Frío
 * ADDED: PHP8.2 compatibility
 * CHANGED: Change _seur_2shop_codCentro value