From 1e255b18401edd0ebd768af51eda6c741c010573 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 3 Aug 2005 07:38:47 +0000 Subject: [PATCH] eliminate scary (but harmless) "Use of uninitalized value in length" warnings --- FS/FS/cust_bill.pm | 82 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index d9e04de53..46809f9a0 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -425,7 +425,7 @@ sub generate_email { my $path = "$FS::UID::conf_dir/conf.$FS::UID::datasrc"; my $file; - if ( length($args{'_template'}) + if ( defined($args{'_template'}) && length($args{'_template'}) && -e "$path/logo_". $args{'_template'}. ".png" ) { @@ -1785,17 +1785,25 @@ sub print_html { # 'conf_dir' => "$FS::UID::conf_dir/conf.$FS::UID::datasrc", ); - $invoice_data{'returnaddress'} = - length( $conf->config_orbase('invoice_htmlreturnaddress', $template) ) - ? join("\n", $conf->config('invoice_htmlreturnaddress', $template) ) - : join("\n", map { - s/~/ /g; - s/\\\\\*?\s*$/
/; - s/\\hyphenation\{[\w\s\-]+\}//; - $_; - } - $conf->config_orbase('invoice_latexreturnaddress', $template) - ); + if ( + defined( $conf->config_orbase('invoice_htmlreturnaddress', $template) ) + && length( $conf->config_orbase('invoice_htmlreturnaddress', $template) ) + ) { + $invoice_data{'returnaddress'} = + join("\n", $conf->config('invoice_htmlreturnaddress', $template) ); + } else { + $invoice_data{'returnaddress'} = + join("\n", map { + s/~/ /g; + s/\\\\\*?\s*$/
/; + s/\\hyphenation\{[\w\s\-]+\}//; + $_; + } + $conf->config_orbase( 'invoice_latexreturnaddress', + $template + ) + ); + } my $countrydefault = $conf->config('countrydefault') || 'US'; if ( $cust_main->country eq $countrydefault ) { @@ -1805,20 +1813,26 @@ sub print_html { encode_entities(code2country($cust_main->country)); } - $invoice_data{'notes'} = - length($conf->config_orbase('invoice_htmlnotes', $template)) - ? join("\n", $conf->config_orbase('invoice_htmlnotes', $template) ) - : join("\n", map { - s/%%(.*)$//; - s/\\section\*\{\\textsc\{(.)(.*)\}\}/

$1<\/font>\U$2<\/b>/; - s/\\begin\{enumerate\}/

    /; - s/\\item /
  1. /; - s/\\end\{enumerate\}/<\/ol>/; - s/\\textbf\{(.*)\}/$1<\/b>/; - $_; - } - $conf->config_orbase('invoice_latexnotes', $template) - ); + if ( + defined( $conf->config_orbase('invoice_htmlnotes', $template) ) + && length( $conf->config_orbase('invoice_htmlnotes', $template) ) + ) { + $invoice_data{'notes'} = + join("\n", $conf->config_orbase('invoice_htmlnotes', $template) ); + } else { + $invoice_data{'notes'} = + join("\n", map { + s/%%(.*)$//; + s/\\section\*\{\\textsc\{(.)(.*)\}\}/

    $1<\/font>\U$2<\/b>/; + s/\\begin\{enumerate\}/

      /; + s/\\item /
    1. /; + s/\\end\{enumerate\}/<\/ol>/; + s/\\textbf\{(.*)\}/$1<\/b>/; + $_; + } + $conf->config_orbase('invoice_latexnotes', $template) + ); + } # #do variable substitutions in notes # $invoice_data{'notes'} = @@ -1827,12 +1841,18 @@ sub print_html { # $conf->config_orbase('invoice_latexnotes', $suffix) # ); + if ( + defined( $conf->config_orbase('invoice_htmlfooter', $template) ) + && length( $conf->config_orbase('invoice_htmlfooter', $template) ) + ) { $invoice_data{'footer'} = - length($conf->config_orbase('invoice_htmlfooter', $template)) - ? join("\n", $conf->config_orbase('invoice_htmlfooter', $template) ) - : join("\n", map { s/~/ /g; s/\\\\\*?\s*$/
      /; $_; } - $conf->config_orbase('invoice_latexfooter', $template) - ); + join("\n", $conf->config_orbase('invoice_htmlfooter', $template) ); + } else { + $invoice_data{'footer'} = + join("\n", map { s/~/ /g; s/\\\\\*?\s*$/
      /; $_; } + $conf->config_orbase('invoice_latexfooter', $template) + ); + } $invoice_data{'po_line'} = ( $cust_main->payby eq 'BILL' && $cust_main->payinfo ) -- 2.11.0