WordPress.org
Get WordPress

Plugin Directory

Changeset 3412727


Ignore:
Timestamp:
12/06/2025 03:36:53 AM (4 months ago)
Author:
codemenschen
Message:

Version 4.6.2 - Released: December 06, 2025

Location:
gift-voucher
Files:
975 added
5 edited

Legend:

Unmodified
Added
Removed

  • gift-voucher/trunk/gift-voucher.php

    r3412071 r3412727  
    77 * Author: Codemenschen GmbH
    88 * Author URI: https://www.codemenschen.at/
    9  * Version: 4.6.1
     9 * Version: 4.6.2
    1010 * Text Domain: gift-voucher
    1111 * Domain Path: /languages
    … …  
    3939}
    4040
    41 define('WPGIFT_VERSION', '4.6.1');
     41define('WPGIFT_VERSION', '4.6.2');
    4242define('WPGIFT__MINIMUM_WP_VERSION', '4.0');
    4343define('WPGIFT__PLUGIN_DIR', untrailingslashit(plugin_dir_path(__FILE__)));
    … …  
    721721function wpgv_em($word)
    722722{
    723   $word = html_entity_decode(wp_strip_all_tags(stripslashes($word)), ENT_NOQUOTES, 'UTF-8');
    724   // Keep UTF-8 encoding to support emoji and special characters
    725   // Removed: iconv('UTF-8', 'windows-1252', $word) which was stripping emoji
    726   return $word;
     723  if (is_null($word)) {
     724    return '';
     725  }
     726
     727  // Undo slashes safely (use WP helper)
     728  if (function_exists('wp_unslash')) {
     729    $word = wp_unslash($word);
     730  } else {
     731    $word = stripslashes($word);
     732  }
     733
     734  // Remove any HTML tags
     735  $word = wp_strip_all_tags($word);
     736
     737  // Decode HTML entities into UTF-8. Use HTML5 flag to support wider entity set.
     738  $word = html_entity_decode($word, ENT_QUOTES | ENT_HTML5, 'UTF-8');
     739
     740  // Fix invalid UTF-8 sequences (WP helper if available)
     741  if (function_exists('wp_check_invalid_utf8')) {
     742    $word = wp_check_invalid_utf8($word);
     743  } elseif (function_exists('mb_convert_encoding')) {
     744    $word = mb_convert_encoding($word, 'UTF-8', 'UTF-8');
     745  }
     746
     747  // Normalize Unicode (NFC) if ext-intl is available
     748  if (function_exists('normalizer_normalize')) {
     749    $normalized = normalizer_normalize($word, Normalizer::FORM_C);
     750    if ($normalized !== false) {
     751      $word = $normalized;
     752    }
     753  }
     754
     755  // Trim whitespace and return; preserve full UTF-8 (including emoji and non-Latin)
     756  return trim($word);
    727757}
    728758
    … …  
    746776  $text = preg_replace('/[\x{200B}-\x{200D}]/u', '', $text);    // Zero-width characters
    747777
    748   // Try to convert to windows-1252 which supports accented characters
     778  // Replace characters that won't be representable in CP1252 with ASCII equivalents
     779  // Do this BEFORE iconv so FPDF (which expects CP1252 core fonts) receives safe bytes.
     780  $pre_map = array(
     781    // Czech/Slovak
     782    'č' => 'c', 'Č' => 'C', 'š' => 's', 'Š' => 'S', 'ž' => 'z', 'Ž' => 'Z',
     783    'ř' => 'r', 'Ř' => 'R', 'ď' => 'd', 'Ď' => 'D', 'ť' => 't', 'Ť' => 'T',
     784    'ň' => 'n', 'Ň' => 'N', 'ě' => 'e', 'Ě' => 'E', 'ů' => 'u', 'Ů' => 'U',
     785    // Polish
     786    'ł' => 'l', 'Ł' => 'L', 'ą' => 'a', 'Ą' => 'A', 'ę' => 'e', 'Ę' => 'E',
     787    'ś' => 's', 'Ś' => 'S', 'ź' => 'z', 'Ź' => 'Z', 'ż' => 'z', 'Ż' => 'Z',
     788    // Misc Latin accents -> base letters
     789    'á' => 'a', 'Á' => 'A', 'ć' => 'c', 'Ć' => 'C',
     790    'é' => 'e', 'É' => 'E', 'í' => 'i', 'Í' => 'I', 'ó' => 'o', 'Ó' => 'O',
     791    'ú' => 'u', 'Ú' => 'U', 'ý' => 'y', 'Ý' => 'Y',
     792  );
     793
     794  // Currency/symbol fallbacks not in CP1252
     795  $symbol_map = array(
     796    '₪' => 'ILS',
     797    '₱' => 'PHP',
     798    '฿' => 'THB',
     799    '₫' => 'VND',
     800    '₩' => 'KRW'
     801  );
     802
     803  $text = strtr($text, $pre_map);
     804  $text = strtr($text, $symbol_map);
     805
     806  // Now convert to CP1252 which FPDF core fonts expect.
    749807  if (function_exists('iconv')) {
    750     $text = iconv('UTF-8', 'windows-1252//IGNORE', $text);
     808    $converted = @iconv('UTF-8', 'WINDOWS-1252//TRANSLIT', $text);
     809    if ($converted !== false) {
     810      $text = $converted;
     811    } else {
     812      // As a last resort, remove non-ASCII characters
     813      $text = preg_replace('/[\x80-\x{10FFFF}]/u', '', $text);
     814    }
    751815  }
    752816
    … …  
    881945
    882946  $price = html_entity_decode(wp_strip_all_tags(stripslashes($price)), ENT_NOQUOTES, 'UTF-8');
    883   $price = iconv('UTF-8', 'windows-1252', $price);
     947  // Keep UTF-8 for front-end and general usage.
     948  // Do not convert to windows-1252 here because this function is used
     949  // in both HTML (UTF-8) and PDF contexts. PDF-specific conversion
     950  // is handled by `wpgv_text_to_pdf_safe` when rendering PDFs.
     951  if (function_exists('wp_check_invalid_utf8')) {
     952    $price = wp_check_invalid_utf8($price);
     953  } elseif (function_exists('mb_convert_encoding')) {
     954    $price = mb_convert_encoding($price, 'UTF-8', 'UTF-8');
     955  }
    884956  // number format new
    885957  $wpgv_select_number_format = get_option('wpgv_select_number_format') ? get_option('wpgv_select_number_format') : '';

  • gift-voucher/trunk/readme.txt

    r3412071 r3412727  
    44Requires at least: 4.0
    55Tested up to: 6.9
    6 Stable tag: 4.6.1
     6Stable tag: 4.6.2
    77Requires PHP: 5.6
    88License: GPLv2 or later
    … …  
    226226== Changelog ==
    227227
     228= Version 4.6.2 - Released: December 06, 2025 =
     229* Improvement: Unicode and special character support improved for all user input fields and currency symbols in PDF exports and admin UI.
     230* Fix: Currency symbols (€, £, Kč, ₱, ¥, etc.) now display correctly in voucher PDFs and admin voucher lists regardless of language or encoding.
     231* Improvement: Added transliteration and symbol mapping for unsupported Unicode characters in FPDF output.
     232* Update: All PDF templates now use `wpgv_text_to_pdf_safe()` for safe text rendering.
     233* Fix: Voucher Value in admin list now respects the currency symbol set in plugin settings.
     234* Update: Updated documentation and code comments for currency and encoding handling.
     235
    228236= Version 4.6.1 - Released: December 05, 2025 =
    229237* Fix: Escape supported-formats output in `include/voucher_metabox.php` so translatable text is escaped at output and the WordPress.Security.EscapeOutput.OutputNotEscaped warning is resolved.

  • gift-voucher/trunk/templates/pdfstyles/receipt.php

    r3401530 r3412727  
    1010$receipt->SetFont('Arial', 'B', 16);
    1111$receipt->SetFontSize(20);
    12 $receipt->MultiCell(0, 0, wpgv_em(__('Customer Receipt', 'gift-voucher')), 0, 'C');
     12$receipt->MultiCell(0, 0, wpgv_text_to_pdf_safe(__('Customer Receipt', 'gift-voucher')), 0, 'C');
    1313
    1414$receipt->SetFontSize(12);
    … …  
    1717$receipt->SetFont('Arial', 'B');
    1818$receipt->SetXY(30, 100);
    19 $receipt->Cell(0, 0, wpgv_em(__('Company Name', 'gift-voucher')), 0, 1, 'L', 0);
     19$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Company Name', 'gift-voucher')), 0, 1, 'L', 0);
    2020$receipt->SetFont('Arial', '');
    2121$receipt->SetXY(250, 100);
    22 $receipt->Cell(0, 0, ' ' . wpgv_em($setting_options->company_name), 0, 1, 'L', 0);
     22$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($setting_options->company_name), 0, 1, 'L', 0);
    2323
    2424//Company Email
    2525$receipt->SetFont('Arial', 'B');
    2626$receipt->SetXY(30, 120);
    27 $receipt->Cell(0, 0, wpgv_em(__('Company Email', 'gift-voucher')), 0, 1, 'L', 0);
     27$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Company Email', 'gift-voucher')), 0, 1, 'L', 0);
    2828$receipt->SetFont('Arial', '');
    2929$receipt->SetXY(250, 120);
    30 $receipt->Cell(0, 0, ' ' . wpgv_em($setting_options->pdf_footer_email), 0, 1, 'L', 0);
     30$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($setting_options->pdf_footer_email), 0, 1, 'L', 0);
    3131
    3232//Company Website
    3333$receipt->SetFont('Arial', 'B');
    3434$receipt->SetXY(30, 140);
    35 $receipt->Cell(0, 0, wpgv_em(__('Company Website', 'gift-voucher')), 0, 1, 'L', 0);
     35$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Company Website', 'gift-voucher')), 0, 1, 'L', 0);
    3636$receipt->SetFont('Arial', '');
    3737$receipt->SetXY(250, 140);
    38 $receipt->Cell(0, 0, ' ' . wpgv_em($setting_options->pdf_footer_url), 0, 1, 'L', 0);
     38$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($setting_options->pdf_footer_url), 0, 1, 'L', 0);
    3939
    4040//Order Number
    4141$receipt->SetFont('Arial', 'B');
    4242$receipt->SetXY(30, 160);
    43 $receipt->Cell(0, 0, wpgv_em(__('Order Number', 'gift-voucher')), 0, 1, 'L', 0);
     43$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Order Number', 'gift-voucher')), 0, 1, 'L', 0);
    4444$receipt->SetFont('Arial', '');
    4545$receipt->SetXY(250, 160);
    46 $receipt->Cell(0, 0, wpgv_em(__(' #', 'gift-voucher') . $lastid), 0, 1, 'L', 0);
     46$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__(' #', 'gift-voucher') . $lastid), 0, 1, 'L', 0);
    4747
    4848
    … …  
    5050$receipt->SetFont('Arial', 'B');
    5151$receipt->SetXY(30, 180);
    52 $receipt->Cell(0, 0, wpgv_em(__('Order Date', 'gift-voucher')), 0, 1, 'L', 0);
     52$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Order Date', 'gift-voucher')), 0, 1, 'L', 0);
    5353$receipt->SetFont('Arial', '');
    5454$receipt->SetXY(250, 180);
    … …  
    5959$receipt->SetFont('Arial', 'B');
    6060$receipt->SetXY(30, 200);
    61 $receipt->Cell(0, 0, wpgv_em(__('Your Name', 'gift-voucher')), 0, 1, 'L', 0);
     61$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Your Name', 'gift-voucher')), 0, 1, 'L', 0);
    6262$receipt->SetFont('Arial', '');
    6363$receipt->SetXY(250, 200);
    … …  
    6868$receipt->SetXY(30, 220);
    6969if ($buyingfor != 'yourself') {
    70     $receipt->Cell(0, 0, wpgv_em(__('Recipient Name', 'gift-voucher')), 0, 1, 'L', 0);
     70    $receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Recipient Name', 'gift-voucher')), 0, 1, 'L', 0);
    7171    $receipt->SetFont('Arial', '');
    7272    $receipt->SetXY(250, 220);
    … …  
    7777$receipt->SetFont('Arial', 'B');
    7878$receipt->SetXY(30, 240);
    79 $receipt->Cell(0, 0, wpgv_em(__('Email', 'gift-voucher')), 0, 1, 'L', 0);
     79$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Email', 'gift-voucher')), 0, 1, 'L', 0);
    8080$receipt->SetFont('Arial', '');
    8181$receipt->SetXY(250, 240);
    … …  
    8585$receipt->SetFont('Arial', 'B');
    8686$receipt->SetXY(30, 260);
    87 $receipt->Cell(0, 0, wpgv_em(__('Amount', 'gift-voucher')), 0, 1, 'L', 0);
     87$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Amount', 'gift-voucher')), 0, 1, 'L', 0);
    8888$receipt->SetFont('Arial', '');
    8989$receipt->SetXY(250, 260);
    90 $receipt->Cell(0, 0, ' ' . wpgv_price_format($value), 0, 1, 'L', 0);
     90$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe(wpgv_price_format($value)), 0, 1, 'L', 0);
    9191
    9292//Coupon Code
    9393$receipt->SetFont('Arial', 'B');
    9494$receipt->SetXY(30, 280);
    95 $receipt->Cell(0, 0, wpgv_em(__('Coupon Code', 'gift-voucher')), 0, 1, 'L', 0);
     95$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Coupon Code', 'gift-voucher')), 0, 1, 'L', 0);
    9696$receipt->SetFont('Arial', '');
    9797$receipt->SetXY(250, 280);
    98 $receipt->Cell(0, 0, ' ' . wpgv_em($code), 0, 1, 'L', 0);
     98$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($code), 0, 1, 'L', 0);
    9999
    100100//Coupon Expiry date
    101101$receipt->SetFont('Arial', 'B');
    102102$receipt->SetXY(30, 300);
    103 $receipt->Cell(0, 0, wpgv_em(__('Coupon Expiry date', 'gift-voucher')), 0, 1, 'L', 0);
     103$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Coupon Expiry date', 'gift-voucher')), 0, 1, 'L', 0);
    104104$receipt->SetFont('Arial', '');
    105105$receipt->SetXY(250, 300);
    106 $receipt->Cell(0, 0, ' ' . wpgv_em($expiry), 0, 1, 'L', 0);
     106$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($expiry), 0, 1, 'L', 0);
    107107
    108108//Payment Method
    109109$receipt->SetFont('Arial', 'B');
    110110$receipt->SetXY(30, 320);
    111 $receipt->Cell(0, 0, wpgv_em(__('Payment Method', 'gift-voucher')), 0, 1, 'L', 0);
     111$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Payment Method', 'gift-voucher')), 0, 1, 'L', 0);
    112112$receipt->SetFont('Arial', '');
    113113$receipt->SetXY(250, 320);
    114 $receipt->Cell(0, 0, ' ' . wpgv_em($paymentmethod), 0, 1, 'L', 0);
     114$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe($paymentmethod), 0, 1, 'L', 0);
    115115
    116116//Payment Status
    117117$receipt->SetFont('Arial', 'B');
    118118$receipt->SetXY(30, 340);
    119 $receipt->Cell(0, 0, wpgv_em(__('Payment Status', 'gift-voucher')), 0, 1, 'L', 0);
     119$receipt->Cell(0, 0, wpgv_text_to_pdf_safe(__('Payment Status', 'gift-voucher')), 0, 1, 'L', 0);
    120120$receipt->SetFont('Arial', '');
    121121$receipt->SetXY(250, 340);
    122 $receipt->Cell(0, 0, ' ' . wpgv_em(__('Paid', 'gift-voucher')), 0, 1, 'L', 0);
     122$receipt->Cell(0, 0, ' ' . wpgv_text_to_pdf_safe(__('Paid', 'gift-voucher')), 0, 1, 'L', 0);

  • gift-voucher/trunk/templates/pdfstyles/style1.php

    r3401530 r3412727  
    2727    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    2828    $pdf->SetFontSize(25);
    29     $pdf->MultiCell(550, 25, wpgv_em(get_the_title($itemid)), 0, 'C');
     29    $pdf->MultiCell(550, 25, wpgv_text_to_pdf_safe(get_the_title($itemid)), 0, 'C');
    3030
    3131    //Description
    … …  
    3333    $pdf->SetFont('Arial','',12);
    3434    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    35     $pdf->MultiCell(550, 12, wpgv_em(esc_html(get_post_meta( $itemid, 'description', true ))), 0, 'C');
     35    $pdf->MultiCell(550, 12, wpgv_text_to_pdf_safe(esc_html(get_post_meta( $itemid, 'description', true ))), 0, 'C');
    3636} else {
    3737    //Voucher
    … …  
    4040    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    4141    $pdf->SetFontSize(25);
    42     $pdf->MultiCell(550,25, wpgv_em($template_options->title),0,'C');
     42    $pdf->MultiCell(550,25, wpgv_text_to_pdf_safe($template_options->title),0,'C');
    4343}
    4444//For
    … …  
    4747$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    4848$pdf->SetFontSize(12);
    49 $pdf->Cell(0,0,wpgv_em(__('Your Name', 'gift-voucher')),0,1,'L',0);
     49$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Your Name', 'gift-voucher')),0,1,'L',0);
    5050//For Input
    5151$pdf->SetXY(33, 550);
    … …  
    6060    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    6161    $pdf->SetFontSize(12);
    62     $pdf->Cell(0,0,wpgv_em(__('Recipient Name', 'gift-voucher')),0,1,'L',0);
     62    $pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Recipient Name', 'gift-voucher')),0,1,'L',0);
    6363    //From Input
    6464    $pdf->SetXY(313, 550);
    … …  
    7474    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    7575    $pdf->SetFontSize(12);
    76     $pdf->Cell(0,0,wpgv_em(__('Voucher Value', 'gift-voucher')),0,1,'L',0);
     76    $pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Voucher Value', 'gift-voucher')),0,1,'L',0);
    7777    //Voucher Value Input
    7878    $pdf->SetXY(33, 610);
    … …  
    8080    $pdf->SetTextColor(85,85,85);
    8181    $pdf->SetFontSize(16);
    82     $pdf->Cell(265,30,' '.wpgv_em($currency),0,1,'L',1);
     82    $pdf->Cell(265,30,' '.wpgv_text_to_pdf_safe($currency),0,1,'L',1);
    8383}
    8484
    … …  
    8787$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    8888$pdf->SetFontSize(12);
    89 $pdf->Cell(0,0,wpgv_em(__('Date of Expiry', 'gift-voucher')),0,1,'L',0);
     89$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Date of Expiry', 'gift-voucher')),0,1,'L',0);
    9090//Date of Expiry Input
    9191$pdf->SetXY(313, 610);
    … …  
    9393$pdf->SetTextColor(85,85,85);
    9494$pdf->SetFontSize(16);
    95 $pdf->Cell(265,30,' '.wpgv_em($expiry),0,1,'L',1);
     95$pdf->Cell(265,30,' '.wpgv_text_to_pdf_safe($expiry),0,1,'L',1);
    9696
    9797//Personal Message
    … …  
    9999$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    100100$pdf->SetFontSize(12);
    101 $pdf->Cell(0,0,wpgv_em(__('Personal Message', 'gift-voucher')),0,1,'L',0);
     101$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Personal Message', 'gift-voucher')),0,1,'L',0);
    102102//Personal Message Input
    103103$pdf->SetXY(33, 670);
    … …  
    113113$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    114114$pdf->SetFontSize(12);
    115 $pdf->Cell(0,0,wpgv_em(__('Coupon Code', 'gift-voucher')),0,1,'L',0);
     115$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Coupon Code', 'gift-voucher')),0,1,'L',0);
    116116//Coupon Code Input
    117117$pdf->SetXY(33, 800);
    … …  
    119119$pdf->SetTextColor(85,85,85);
    120120$pdf->SetFontSize(16);
    121 $pdf->Cell(265,30,' '.wpgv_em($code),0,1,'L',1);
     121    $pdf->Cell(265,30,' '.wpgv_text_to_pdf_safe($code),0,1,'L',1);
    122122
    123123if($wpgv_barcode_on_voucher && !$preview) {
    … …  
    133133$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    134134$pdf->SetFontSize(11);
    135 $pdf->Cell(0,0,$setting_options->pdf_footer_url.' | '.wpgv_em($setting_options->pdf_footer_email),0,1,'C',0);
     135$pdf->Cell(0,0,$setting_options->pdf_footer_url.' | '.wpgv_text_to_pdf_safe($setting_options->pdf_footer_email),0,1,'C',0);
    136136
    137137//Terms
    … …  
    139139$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    140140$pdf->SetFontSize(9);
    141 $pdf->RotatedText(20,850,'* '.wpgv_em($wpgv_leftside_notice),90);
     141$pdf->RotatedText(20,850,'* '.wpgv_text_to_pdf_safe($wpgv_leftside_notice),90);
    142142
    143143if($preview) {
    … …  
    146146    $pdf->SetFont('Arial','B',55);
    147147    $pdf->SetTextColor(215,215,215);
    148     $pdf->RotatedText(75,700,wpgv_em($watermark),45);
     148    $pdf->RotatedText(75,700,wpgv_text_to_pdf_safe($watermark),45);
    149149}

  • gift-voucher/trunk/templates/pdfstyles/style2.php

    r3401530 r3412727  
    2828    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    2929    $pdf->SetFontSize(30);
    30     $pdf->MultiCell(265, 30, wpgv_em(get_the_title($itemid)), 0, 'L');
     30    $pdf->MultiCell(265, 30, wpgv_text_to_pdf_safe(get_the_title($itemid)), 0, 'L');
    3131
    3232    //Description
    … …  
    3434    $pdf->SetFont('Arial','',13);
    3535    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    36     $pdf->MultiCell(265, 12, wpgv_em(esc_html(get_post_meta( $itemid, 'description', true ))), 0, 'L');
     36    $pdf->MultiCell(265, 12, wpgv_text_to_pdf_safe(esc_html(get_post_meta( $itemid, 'description', true ))), 0, 'L');
    3737} else {
    3838    //Voucher
    … …  
    4141    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    4242    $pdf->SetFontSize(30);
    43     $pdf->MultiCell(265,30, wpgv_em($template_options->title),0,'L');
     43    $pdf->MultiCell(265,30, wpgv_text_to_pdf_safe($template_options->title),0,'L');
    4444}
    4545
    … …  
    4949$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    5050$pdf->SetFontSize(14);
    51 $pdf->Cell(0,0,wpgv_em(__('Your Name', 'gift-voucher')),0,1,'L',0);
     51$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Your Name', 'gift-voucher')),0,1,'L',0);
    5252//For Input
    5353$pdf->SetXY(313, 210);
    … …  
    6262    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    6363    $pdf->SetFontSize(14);
    64     $pdf->Cell(0,0,wpgv_em(__('Recipient Name', 'gift-voucher')),0,1,'L',0);
     64    $pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Recipient Name', 'gift-voucher')),0,1,'L',0);
    6565    //From Input
    6666    $pdf->SetXY(313, 290);
    … …  
    7676    $pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    7777    $pdf->SetFontSize(14);
    78     $pdf->Cell(0,0,wpgv_em(__('Voucher Value', 'gift-voucher')),0,1,'L',0);
     78    $pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Voucher Value', 'gift-voucher')),0,1,'L',0);
    7979    //Voucher Value Input
    8080    $pdf->SetXY(313, 370);
    … …  
    8282    $pdf->SetTextColor(85,85,85);
    8383    $pdf->SetFontSize(16);
    84     $pdf->Cell(265,40,' '.wpgv_em($currency),0,1,'L',1);
     84    $pdf->Cell(265,40,' '.wpgv_text_to_pdf_safe($currency),0,1,'L',1);
    8585}
    8686
    … …  
    8989$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    9090$pdf->SetFontSize(14);
    91 $pdf->Cell(0,0,wpgv_em(__('Personal Message', 'gift-voucher')),0,1,'L',0);
     91$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Personal Message', 'gift-voucher')),0,1,'L',0);
    9292//Personal Message Input
    9393$pdf->SetXY(33, 455);
    … …  
    103103$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    104104$pdf->SetFontSize(14);
    105 $pdf->Cell(0,0,wpgv_em(__('Date of Expiry', 'gift-voucher')),0,1,'L',0);
     105$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Date of Expiry', 'gift-voucher')),0,1,'L',0);
    106106//Date of Expiry Input
    107107$pdf->SetXY(33, 630);
    … …  
    109109$pdf->SetTextColor(85,85,85);
    110110$pdf->SetFontSize(16);
    111 $pdf->Cell(265,30,' '.wpgv_em($expiry),0,1,'L',1);
     111$pdf->Cell(265,30,' '.wpgv_text_to_pdf_safe($expiry),0,1,'L',1);
    112112//Coupon Code
    113113$pdf->SetXY(310, 620);
    114114$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    115115$pdf->SetFontSize(14);
    116 $pdf->Cell(0,0,wpgv_em(__('Coupon Code', 'gift-voucher')),0,1,'L',0);
     116$pdf->Cell(0,0,wpgv_text_to_pdf_safe(__('Coupon Code', 'gift-voucher')),0,1,'L',0);
    117117//Coupon Code Input
    118118$pdf->SetXY(313, 630);
    … …  
    120120$pdf->SetTextColor(85,85,85);
    121121$pdf->SetFontSize(16);
    122 $pdf->Cell(265,30,' '.wpgv_em($code),0,1,'L',1);
     122$pdf->Cell(265,30,' '.wpgv_text_to_pdf_safe($code),0,1,'L',1);
    123123
    124124if($wpgv_barcode_on_voucher && !$preview) {
    125125    $pdf->SetFillColor(0,0,0);
    126     $pdf->Code128(150,680,wpgv_em($code),300,50);
     126    $pdf->Code128(150,680,wpgv_text_to_pdf_safe($code),300,50);
    127127} elseif($wpgv_barcode_on_voucher) {
    128128    $pdf->SetFillColor(0,0,0);
    … …  
    134134$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    135135$pdf->SetFontSize(12);
    136 $pdf->Cell(0,0,$setting_options->pdf_footer_url.' | '.wpgv_em($setting_options->pdf_footer_email),0,1,'C',0);
     136$pdf->Cell(0,0,$setting_options->pdf_footer_url.' | '.wpgv_text_to_pdf_safe($setting_options->pdf_footer_email),0,1,'C',0);
    137137//Terms
    138138$pdf->SetXY(30, 780);
    139139$pdf->SetTextColor($voucher_color[0],$voucher_color[1],$voucher_color[2]);
    140140$pdf->SetFontSize(10);
    141 $pdf->Cell(0,0,'* '.wpgv_em($wpgv_leftside_notice),0,1,'C',0);
     141$pdf->Cell(0,0,'* '.wpgv_text_to_pdf_safe($wpgv_leftside_notice),0,1,'C',0);
    142142
    143143if($preview) {
    … …  
    146146    $pdf->SetFont('Arial','B',55);
    147147    $pdf->SetTextColor(215,215,215);
    148     $pdf->RotatedText(75,700,wpgv_em($watermark),45);
     148    $pdf->RotatedText(75,700,wpgv_text_to_pdf_safe($watermark),45);
    149149}
Note: See TracChangeset for help on using the changeset viewer.