X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FOpenDocument.pm;h=66d8f83ac3f5bbae8924020e4bb1f64cf5eeba41;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=552bc2f421a4a5848869f189d00ac90fd3d1be42;hpb=1072cd08c6f5b1905a34dcb3eeab3ddec98d6905;p=kivitendo-erp.git diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm index 552bc2f42..66d8f83ac 100644 --- a/SL/Template/OpenDocument.pm +++ b/SL/Template/OpenDocument.pm @@ -4,26 +4,159 @@ use parent qw(SL::Template::Simple); use Archive::Zip; use Encode; +use HTML::Entities; use POSIX 'setsid'; +use XML::LibXML; use SL::Iconv; +use SL::Template::OpenDocument::Styles; + +use SL::DB::BankAccount; +use SL::Helper::QrBill; +use SL::Helper::ISO3166; use Cwd; # use File::Copy; # use File::Spec; # use File::Temp qw(:mktemp); use IO::File; +use List::Util qw(first); use strict; +my %text_markup_replace = ( + b => "BOLD", + i => "ITALIC", + s => "STRIKETHROUGH", + u => "UNDERLINE", + sup => "SUPER", + sub => "SUB", +); + +sub _format_text { + my ($self, $content, %params) = @_; + + $content = $::locale->quote_special_chars('Template/OpenDocument', $content); + + # Allow some HTML markup to be converted into the output format's + # corresponding markup code, e.g. bold or italic. + foreach my $key (keys(%text_markup_replace)) { + my $value = $text_markup_replace{$key}; + $content =~ s|\<${key}\>||gi; #" + $content =~ s|\</${key}\>||gi; + } + + return $content; +} + +my %html_replace = ( + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '' => '', + '
' => '', + '
' => '', +); + +sub _format_html { + my ($self, $content, %params) = @_; + + my $in_p = 0; + my $p_start_tag = qq||; + my $prefix = ''; + my $suffix = ''; + + my (@tags_to_open, @tags_to_close); + for (my $idx = scalar(@{ $self->{tag_stack} }) - 1; $idx >= 0; --$idx) { + my $tag = $self->{tag_stack}->[$idx]; + + next if $tag =~ m{/>$}; + last if $tag =~ m{^}{>}; + $prefix .= ' |

$ }{}gx if $in_p; + $content =~ s{ \r+ }{}gx; + $content =~ s{ \n+ }{ }gx; + $content =~ s{ (?:\ |\s)+ }{ }gx; + + my $ul_start_tag = qq||; + my $ol_start_tag = qq||; + my $ul_li_start_tag = qq||; + my $ol_li_start_tag = qq||; + + my @parts = map { + if (substr($_, 0, 1) eq '<') { + s{ +}{}g; + if ($_ eq '

') { + $in_p--; + $in_p == 0 ? '
' : ''; + + } elsif ($_ eq '

') { + $in_p++; + $in_p == 1 ? $p_start_tag : ''; + + } elsif ($_ eq '

    ') { + $self->{used_list_styles}->{itemize}->{$self->{current_text_style}} = 1; + $html_replace{'
  • '} = $ul_li_start_tag; + $ul_start_tag; + + } elsif ($_ eq '
      ') { + $self->{used_list_styles}->{enumerate}->{$self->{current_text_style}} = 1; + $html_replace{'
    1. '} = $ol_li_start_tag; + $ol_start_tag; + + } else { + $html_replace{$_} || ''; + } + + } else { + $::locale->quote_special_chars('Template/OpenDocument', HTML::Entities::decode_entities($_)); + } + } split(m{(<.*?>)}x, $content); + + my $out = join('', $prefix, @parts, $suffix); + + # $::lxdebug->dump(0, "prefix parts suffix", [ $prefix, join('', @parts), $suffix ]); + + return $out; +} + +my %formatters = ( + html => \&_format_html, + text => \&_format_text, +); + sub new { my $type = shift; my $self = $type->SUPER::new(@_); - $self->{"rnd"} = int(rand(1000000)); - $self->{"iconv"} = SL::Iconv->new($::lx_office_conf{system}->{dbcharset}, "UTF-8"); - $self->set_tag_style('<%', '%>'); $self->{quot_re} = '"'; @@ -37,7 +170,7 @@ sub parse_foreach { my $ary = $self->_get_loop_variable($var, 1, @indices); - for (my $i = 0; $i < scalar(@{$ary}); $i++) { + for (my $i = 0; $i < scalar(@{$ary || []}); $i++) { $form->{"__first__"} = $i == 0; $form->{"__last__"} = ($i + 1) == scalar(@{$ary}); $form->{"__odd__"} = (($i + 1) % 2) == 1; @@ -102,9 +235,13 @@ sub parse_block { while ($contents ne "") { if (substr($contents, 0, 1) eq "<") { - $contents =~ m|^<[^>]+>|; - my $tag = $&; - substr($contents, 0, length($&)) = ""; + $contents =~ m|^(<[^>]+>)|; + my $tag = $1; + substr($contents, 0, length($1)) = ""; + + $self->{current_text_style} = $1 if $tag =~ m|text:style-name\s*=\s*"([^"]+)"|; + + push @{ $self->{tag_stack} }, $tag; if ($tag =~ m|]*>)|; @@ -114,10 +251,10 @@ sub parse_block { if ($table_row =~ m|\<\%foreachrow\s+(.*?)\%\>|) { my $var = $1; - $contents =~ m|\<\%foreachrow\s+.*?\%\>|; - substr($contents, length($`), length($&)) = ""; + $contents =~ m|^(.*?)(\<\%foreachrow\s+.*?\%\>)|; + substr($contents, length($1), length($2)) = ""; - ($table_row, $contents) = $self->find_end($contents, length($`)); + ($table_row, $contents) = $self->find_end($contents, length($1)); if (!$table_row) { $self->{"error"} = "Unclosed <\%foreachrow\%>." unless ($self->{"error"}); $main::lxdebug->leave_sub(); @@ -128,7 +265,7 @@ sub parse_block { $table_row .= $1; $end_tag = $2; - substr $contents, 0, length($&), ''; + substr $contents, 0, length($1) + length($2), ''; my $new_text = $self->parse_foreach($var, $table_row, $tag, $end_tag, @indices); if (!defined($new_text)) { @@ -151,9 +288,14 @@ sub parse_block { $new_contents .= $tag; } + if ($tag =~ m{^$}x) { + # $::lxdebug->message(0, "popping top tag is $tag top " . $self->{tag_stack}->[-1]); + pop @{ $self->{tag_stack} }; + } + } else { - $contents =~ /^[^<]+/; - my $text = $&; + $contents =~ /^([^<]+)/; + my $text = $1; my $pos_if = index($text, '<%if'); my $pos_foreach = index($text, '<%foreach'); @@ -168,15 +310,15 @@ sub parse_block { $new_contents .= $self->substitute_vars(substr($contents, 0, $pos_foreach), @indices); substr($contents, 0, $pos_foreach) = ""; - if ($contents !~ m|^\<\%foreach (.*?)\%\>|) { + if ($contents !~ m|^(\<\%foreach (.*?)\%\>)|) { $self->{"error"} = "Malformed <\%foreach\%>."; $main::lxdebug->leave_sub(); return undef; } - my $var = $1; + my $var = $2; - substr($contents, 0, length($&)) = ""; + substr($contents, 0, length($1)) = ""; my $block; ($block, $contents) = $self->find_end($contents); @@ -210,11 +352,20 @@ sub parse_block { sub parse { $main::lxdebug->enter_sub(); my $self = $_[0]; + local *OUT = $_[1]; my $form = $self->{"form"}; close(OUT); + my $qr_image_path; + if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') { + # the biller account information, biller address and the reference number, + # are needed in the template aswell as in the qr-code generation, therefore + # assemble these and add to $::form + $qr_image_path = $self->generate_qr_code; + } + my $file_name; if ($form->{"IN"} =~ m|^/|) { $file_name = $form->{"IN"}; @@ -236,48 +387,74 @@ sub parse { return 0; } - my $rnd = $self->{"rnd"}; - my $new_styles = qq| - - - - - - - - - - - - - - - - - -|; - - $contents =~ s||${new_styles}|; - $contents =~ s|[\n\r]||gm; - - my $new_contents = $self->parse_block($contents); + $self->{current_text_style} = ''; + $self->{used_list_styles} = { + itemize => {}, + enumerate => {}, + }; + + my $new_contents; + if ($self->{use_template_toolkit}) { + my $additional_params = $::form; + + $::form->template->process(\$contents, $additional_params, \$new_contents) || die $::form->template->error; + } else { + $self->{tag_stack} = []; + $new_contents = $self->parse_block($contents); + } if (!defined($new_contents)) { $main::lxdebug->leave_sub(); return 0; } + my $new_styles = SL::Template::OpenDocument::Styles->get_style('text_basic'); + + foreach my $type (qw(itemize enumerate)) { + foreach my $parent (sort { $a cmp $b } keys %{ $self->{used_list_styles}->{$type} }) { + $new_styles .= SL::Template::OpenDocument::Styles->get_style('text_list_item', TYPE => $type, PARENT => $parent) + . SL::Template::OpenDocument::Styles->get_style("list_${type}", TYPE => $type, PARENT => $parent); + } + } + + # $::lxdebug->dump(0, "new_Styles", $new_styles); + + $new_contents =~ s||${new_styles}|; + $new_contents =~ s|[\n\r]||gm; + # $new_contents =~ s|>|>\n|g; $zip->contents("content.xml", Encode::encode('utf-8-strict', $new_contents)); - my $styles = $zip->contents("styles.xml"); + my $styles = Encode::decode('utf-8-strict', $zip->contents("styles.xml")); if ($contents) { my $new_styles = $self->parse_block($styles); if (!defined($new_contents)) { $main::lxdebug->leave_sub(); return 0; } - $zip->contents("styles.xml", $new_styles); + $zip->contents("styles.xml", Encode::encode('utf-8-strict', $new_styles)); + } + + if ($::instance_conf->get_create_qrbill_invoices && $form->{formname} eq 'invoice') { + # get placeholder path from odt XML + my $qr_placeholder_path; + my $dom = XML::LibXML->load_xml(string => $contents); + my @nodelist = $dom->getElementsByTagName("draw:frame"); + for my $node (@nodelist) { + my $attr = $node->getAttribute('draw:name'); + if ($attr eq 'QRCodePlaceholder') { + my @children = $node->getChildrenByTagName('draw:image'); + $qr_placeholder_path = $children[0]->getAttribute('xlink:href'); + } + } + if (!defined($qr_placeholder_path)) { + $::form->error($::locale->text('QR-Code placeholder image: QRCodePlaceholder not found in template.')); + } + # replace QR-Code Placeholder Image in zip file (odt) with generated one + $zip->updateMember( + $qr_placeholder_path, + $qr_image_path + ); } $zip->writeToFileNamed($form->{"tmpfile"}, 1); @@ -291,6 +468,276 @@ sub parse { return $res; } +sub get_qrbill_account { + $main::lxdebug->enter_sub(); + my ($self) = @_; + + my $qr_account; + + my $bank_accounts = SL::DB::Manager::BankAccount->get_all; + $qr_account = scalar(@{ $bank_accounts }) == 1 ? + $bank_accounts->[0] : + first { $_->use_for_qrbill } @{ $bank_accounts }; + + if (!$qr_account) { + $::form->error($::locale->text('No bank account flagged for QRBill usage was found.')); + } + + $main::lxdebug->leave_sub(); + return $qr_account; +} + +sub remove_letters_prefix { + my $s = $_[0]; + $s =~ s/^[a-zA-Z]+//; + return $s; +} + +sub check_digits_and_max_length { + my $s = $_[0]; + my $length = $_[1]; + + return 0 if (!($s =~ /^\d*$/) || length($s) > $length); + return 1; +} + +sub calculate_check_digit { + # calculate ESR check digit using algorithm: "modulo 10, recursive" + my $ref_number_str = $_[0]; + + my @m = (0, 9, 4, 6, 8, 2, 7, 1, 3, 5); + my $carry = 0; + + my @ref_number_split = map int($_), split(//, $ref_number_str); + + for my $v (@ref_number_split) { + $carry = @m[($carry + $v) % 10]; + } + + return (10 - $carry) % 10; +} + +sub assemble_ref_number { + $main::lxdebug->enter_sub(); + + my $bank_id = $_[0]; + my $customer_number = $_[1]; + my $order_number = $_[2] // "0"; + my $invoice_number = $_[3] // "0"; + + # check values (analog to checks in makro) + # - bank_id + # input: 6 digits, only numbers + # output: 6 digits, only numbers + if (!($bank_id =~ /^\d*$/) || length($bank_id) != 6) { + $::form->error($::locale->text('Bank account id number invalid. Must be 6 digits.')); + } + + # - customer_number + # input: prefix (letters) + up to 6 digits (numbers) + # output: prefix removed, 6 digits, filled with leading zeros + $customer_number = remove_letters_prefix($customer_number); + if (!check_digits_and_max_length($customer_number, 6)) { + $::form->error($::locale->text('Customer number invalid. Must be less then or equal to 6 digits after prefix.')); + } + # fill with zeros + $customer_number = sprintf "%06d", $customer_number; + + # - order_number + # input: prefix (letters) + up to 7 digits, may be zero + # output: prefix removed, 7 digits, filled with leading zeros + $order_number = remove_letters_prefix($order_number); + if (!check_digits_and_max_length($order_number, 7)) { + $::form->error($::locale->text('Order number invalid. Must be less then or equal to 7 digits after prefix.')); + } + # fill with zeros + $order_number = sprintf "%07d", $order_number; + + # - invoice_number + # input: prefix (letters) + up to 7 digits, may be zero + # output: prefix removed, 7 digits, filled with leading zeros + $invoice_number = remove_letters_prefix($invoice_number); + if (!check_digits_and_max_length($invoice_number, 7)) { + $::form->error($::locale->text('Invoice number invalid. Must be less then or equal to 7 digits after prefix.')); + } + # fill with zeros + $invoice_number = sprintf "%07d", $invoice_number; + + # assemble ref. number + my $ref_number = $bank_id . $customer_number . $order_number . $invoice_number; + + # calculate check digit + my $ref_number_cpl = $ref_number . calculate_check_digit($ref_number); + + $main::lxdebug->leave_sub(); + return $ref_number_cpl; +} + +sub get_ref_number_formatted { + $main::lxdebug->enter_sub(); + + my $ref_number = $_[0]; + + # create ref. number in format: + # 'XX XXXXX XXXXX XXXXX XXXXX XXXXX' (2 digits + 5 x 5 digits) + my $ref_number_spaced = substr($ref_number, 0, 2) . ' ' . + substr($ref_number, 2, 5) . ' ' . + substr($ref_number, 7, 5) . ' ' . + substr($ref_number, 12, 5) . ' ' . + substr($ref_number, 17, 5) . ' ' . + substr($ref_number, 22, 5); + + $main::lxdebug->leave_sub(); + return $ref_number_spaced; +} + +sub get_iban_formatted { + $main::lxdebug->enter_sub(); + + my $iban = $_[0]; + + # create iban number in format: + # 'XXXX XXXX XXXX XXXX XXXX X' (5 x 4 + 1digits) + my $iban_spaced = substr($iban, 0, 4) . ' ' . + substr($iban, 4, 4) . ' ' . + substr($iban, 8, 4) . ' ' . + substr($iban, 12, 4) . ' ' . + substr($iban, 16, 4) . ' ' . + substr($iban, 20, 1); + + $main::lxdebug->leave_sub(); + return $iban_spaced; +} + +sub get_amount_formatted { + $main::lxdebug->enter_sub(); + + unless ($_[0] =~ /^\d+\.\d{2}$/) { + $::form->error($::locale->text('Amount has wrong format.')); + } + + local $_ = shift; + $_ = reverse split //; + m/^\d{2}\./g; + s/\G(\d{3})(?=\d)/$1 /g; + + $main::lxdebug->leave_sub(); + return scalar reverse split //; +} + +sub generate_qr_code { + $main::lxdebug->enter_sub(); + my $self = $_[0]; + my $form = $self->{"form"}; + + # assemble data for QR-Code + + # get qr-account data + my $qr_account = $self->get_qrbill_account(); + + my %biller_information = ( + 'iban' => $qr_account->{'iban'} + ); + + my $biller_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code( + $::instance_conf->get_address_country() + ); + if (!$biller_countrycode) { + $::form->error($::locale->text('Error mapping biller countrycode.')); + } + my %biller_data = ( + 'address_type' => 'K', + 'company' => $::instance_conf->get_company(), + 'address_row1' => $::instance_conf->get_address_street1(), + 'address_row2' => $::instance_conf->get_address_zipcode() . ' ' . $::instance_conf->get_address_city(), + 'countrycode' => $biller_countrycode, + ); + + my $amount; + if ($form->{'qrbill_without_amount'}) { + $amount = ''; + } else { + $amount = sprintf("%.2f", $form->parse_amount(\%::myconfig, $form->{'total'})); + } + + my %payment_information = ( + 'amount' => $amount, + 'currency' => $form->{'currency'}, + ); + + my $customer_countrycode = SL::Helper::ISO3166::map_name_to_alpha_2_code($form->{'country'}); + if (!$customer_countrycode) { + $::form->error($::locale->text('Error mapping customer countrycode.')); + } + my %invoice_recipient_data = ( + 'address_type' => 'K', + 'name' => $form->{'name'}, + 'address_row1' => $form->{'street'}, + 'address_row2' => $form->{'zipcode'} . ' ' . $form->{'city'}, + 'countrycode' => $customer_countrycode, + ); + + my %ref_nr_data; + if ($::instance_conf->get_create_qrbill_invoices == 1) { + # generate ref.-no. with check digit + my $ref_number = assemble_ref_number( + $qr_account->{'bank_account_id'}, + $form->{'customernumber'}, + $form->{'ordnumber'}, + $form->{'invnumber'}, + ); + %ref_nr_data = ( + 'type' => 'QRR', + 'ref_number' => $ref_number, + ); + # get ref. number/iban formatted with spaces and set into form for template + # processing + $form->{'ref_number'} = $ref_number; + $form->{'ref_number_formatted'} = get_ref_number_formatted($ref_number); + } elsif ($::instance_conf->get_create_qrbill_invoices == 2) { + %ref_nr_data = ( + 'type' => 'NON', + 'ref_number' => '', + ); + } else { + $::form->error($::locale->text('Error getting QR-Bill type.')); + } + + # set into form for template processing + $form->{'biller_information'} = \%biller_information; + $form->{'biller_data'} = \%biller_data; + $form->{'iban_formatted'} = get_iban_formatted($qr_account->{'iban'}); + + # format amount for template + $form->{'amount_formatted'} = get_amount_formatted( + sprintf( + "%.2f", + $form->parse_amount(\%::myconfig, $form->{'total'}) + ) + ); + + # set outfile + my $outfile = $form->{"tmpdir"} . '/' . 'qr-code.png'; + + # generate QR-Code Image + eval { + my $qr_image = SL::Helper::QrBill->new( + \%biller_information, + \%biller_data, + \%payment_information, + \%invoice_recipient_data, + \%ref_nr_data, + ); + $qr_image->generate($outfile); + } or do { + local $_ = $@; chomp; my $error = $_; + $::form->error($::locale->text('QR-Image generation failed: ' . $error)); + }; + + $main::lxdebug->leave_sub(); + return $outfile; +} + sub is_xvfb_running { $main::lxdebug->enter_sub(); @@ -370,7 +817,9 @@ sub spawn_xvfb { $main::lxdebug->message(LXDebug->DEBUG2(), " xauthority $xauthority\n"); - system("xauth add \"${display}\" . \"${mcookie}\""); + if (system("xauth add \"${display}\" . \"${mcookie}\"") == -1) { + die "system call to xauth failed: $!"; + } if ($? != 0) { $self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started (xauth: $!)"; $main::lxdebug->leave_sub(); @@ -389,7 +838,7 @@ sub spawn_xvfb { local *OUT; my $dfname = $self->{"userspath"} . "/xvfb_display"; - if (!open(OUT, ">$dfname")) { + if (!open(OUT, ">", $dfname)) { $self->{"error"} = "Conversion to PDF failed because OpenOffice could not be started ($dfname: $!)"; unlink($xauthority); kill($pid); @@ -416,11 +865,21 @@ sub spawn_xvfb { return $display; } +sub _run_python_uno { + my ($self, @args) = @_; + + local $ENV{PYTHONPATH}; + $ENV{PYTHONPATH} = $::lx_office_conf{environment}->{python_uno_path} . ':' . $ENV{PYTHONPATH} if $::lx_office_conf{environment}->{python_uno_path}; + my $cmd = $::lx_office_conf{applications}->{python_uno} . ' ' . join(' ', @args); + return `$cmd`; +} + sub is_openoffice_running { + my ($self) = @_; + $main::lxdebug->enter_sub(); - my $cmd = "./scripts/oo-uno-test-conn.py " . $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . " 2> /dev/null"; - my $output = `$cmd`; + my $output = $self->_run_python_uno('./scripts/oo-uno-test-conn.py', $::lx_office_conf{print_templates}->{openofficeorg_daemon_port}, ' 2> /dev/null'); chomp $output; my $res = ($? == 0) || $output; @@ -447,10 +906,19 @@ sub spawn_openoffice { last; } + if ($::dispatcher->interface_type eq 'FastCGI') { + $::dispatcher->{request}->Detach; + } + if (!$spawned_oo) { my $pid = fork(); if (0 == $pid) { $main::lxdebug->message(LXDebug->DEBUG2(), " Child daemonizing\n"); + + if ($::dispatcher->interface_type eq 'FastCGI') { + $::dispatcher->{request}->Finish; + $::dispatcher->{request}->LastCall; + } chdir('/'); open(STDIN, '/dev/null'); open(STDOUT, '>/dev/null'); @@ -464,6 +932,11 @@ sub spawn_openoffice { "-accept=socket,host=localhost,port=" . $::lx_office_conf{print_templates}->{openofficeorg_daemon_port} . ";urp;"); exec(@cmdline); + } else { + # parent + if ($::dispatcher->interface_type eq 'FastCGI') { + $::dispatcher->{request}->Attach; + } } $main::lxdebug->message(LXDebug->DEBUG2(), " Parent after fork\n"); @@ -508,27 +981,22 @@ sub convert_to_pdf { return 0; } - my @cmdline; if (!$::lx_office_conf{print_templates}->{openofficeorg_daemon}) { - @cmdline = ($::lx_office_conf{applications}->{openofficeorg_writer}, - "-minimized", "-norestore", "-nologo", "-nolockcheck", - "-headless", - "file:${filename}.odt", - "macro://" . (split('/', $filename))[-1] . - "/Standard.Conversion.ConvertSelfToPDF()"); + if (system($::lx_office_conf{applications}->{openofficeorg_writer}, + "-minimized", "-norestore", "-nologo", "-nolockcheck", "-headless", + "file:${filename}.odt", + "macro://" . (split('/', $filename))[-1] . "/Standard.Conversion.ConvertSelfToPDF()") == -1) { + die "system call to $::lx_office_conf{applications}->{openofficeorg_writer} failed: $!"; + } } else { if (!$self->spawn_openoffice()) { $main::lxdebug->leave_sub(); return 0; } - @cmdline = ("./scripts/oo-uno-convert-pdf.py", - $::lx_office_conf{print_templates}->{openofficeorg_daemon_port}, - "${filename}.odt"); + $self->_run_python_uno('./scripts/oo-uno-convert-pdf.py', $::lx_office_conf{print_templates}->{openofficeorg_daemon_port}, "${filename}.odt"); } - system(@cmdline); - my $res = $?; if ((0 == $?) || (-f "${filename}.pdf" && -s "${filename}.pdf")) { $form->{"tmpfile"} =~ s/odt$/pdf/; @@ -549,25 +1017,14 @@ sub convert_to_pdf { } sub format_string { - my ($self, $variable) = @_; - my $form = $self->{"form"}; - my $iconv = $self->{"iconv"}; - - $variable = $main::locale->quote_special_chars('Template/OpenDocument', $variable); + my ($self, $content, $variable) = @_; - # Allow some HTML markup to be converted into the output format's - # corresponding markup code, e.g. bold or italic. - my $rnd = $self->{"rnd"}; - my %markup_replace = ("b" => "BOLD", "i" => "ITALIC", "s" => "STRIKETHROUGH", - "u" => "UNDERLINE", "sup" => "SUPER", "sub" => "SUB"); - - foreach my $key (keys(%markup_replace)) { - my $value = $markup_replace{$key}; - $variable =~ s|\<${key}\>||gi; #" - $variable =~ s|\</${key}\>||gi; - } + my $formatter = + $formatters{ $self->{variable_content_types}->{$variable} } + // $formatters{ $self->{default_content_type} } + // $formatters{ text }; - return $iconv->convert($variable); + return $formatter->($self, $content, variable => $variable); } sub get_mime_type() {