From 9aaca43317d3ea33d80a308cab7ce4c20d732a16 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 1 Nov 2007 12:56:47 +0000 Subject: [PATCH] Die Funktion Form::parse_html_template2() in Form::parse_html_template() umbenannt (letztere wurde in Revision 2923 entfernt). --- SL/Form.pm | 6 +-- SL/ReportGenerator.pm | 4 +- SL/User.pm | 16 ++++---- bin/mozilla/admin.pl | 38 +++++++++---------- bin/mozilla/am.pl | 34 ++++++++--------- bin/mozilla/amtemplates.pl | 2 +- bin/mozilla/ap.pl | 2 +- bin/mozilla/ar.pl | 2 +- bin/mozilla/common.pl | 25 ++++++------ bin/mozilla/ct.pl | 4 +- bin/mozilla/dn.pl | 14 +++---- bin/mozilla/drafts.pl | 10 ++--- bin/mozilla/gl.pl | 2 +- bin/mozilla/ic.pl | 8 ++-- bin/mozilla/io.pl | 16 ++++---- bin/mozilla/menuv3.pl | 2 +- bin/mozilla/oe.pl | 16 ++++---- bin/mozilla/reportgenerator.pl | 4 +- bin/mozilla/rp.pl | 6 +-- bin/mozilla/ustva.pl | 10 ++--- locale/de/locales.pl | 2 +- .../Pg-upgrade-2.2.0.25-2.2.0.26.pl | 33 ++++++++-------- .../Pg-upgrade-2.2.0.27-2.2.0.28.pl | 6 +-- .../Pg-upgrade-2.2.0.28-2.2.0.29.pl | 5 +-- .../Pg-upgrade-2.2.0.31-2.2.0.32.pl | 5 +-- .../Pg-upgrade-2.2.0.33-2.2.0.34.pl | 26 ++++++------- .../Pg-upgrade-2.2.0.37-2.2.0.38.pl | 3 +- 27 files changed, 146 insertions(+), 155 deletions(-) diff --git a/SL/Form.pm b/SL/Form.pm index 951b85061..211c366fc 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -546,7 +546,7 @@ sub _prepare_html_template { return $file; } -sub parse_html_template2 { +sub parse_html_template { $main::lxdebug->enter_sub(); my ($self, $file, $additional_params) = @_; @@ -598,7 +598,7 @@ sub show_generic_error { $self->{title} = $title if ($title); $self->header(); - print $self->parse_html_template2("generic/error", $add_params); + print $self->parse_html_template("generic/error", $add_params); die("Error: $error\n"); } @@ -614,7 +614,7 @@ sub show_generic_information { $self->{title} = $title if ($title); $self->header(); - print $self->parse_html_template2("generic/information", $add_params); + print $self->parse_html_template("generic/information", $add_params); die("Information: $error\n"); } diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index c45380f16..732016b94 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -344,7 +344,7 @@ sub generate_html_content { my $self = shift; my $variables = $self->prepare_html_content(); - return $self->{form}->parse_html_template2('report_generator/html_report', $variables); + return $self->{form}->parse_html_template('report_generator/html_report', $variables); } sub verify_paper_size { @@ -420,7 +420,7 @@ END $form->error($locale->text('Could not write the temporary HTML file.')); } - $html_file->print($form->parse_html_template2('report_generator/pdf_report', $variables)); + $html_file->print($form->parse_html_template('report_generator/pdf_report', $variables)); $html_file->close(); my $cmdline = diff --git a/SL/User.pm b/SL/User.pm index 13bde36ec..1984ca5ae 100644 --- a/SL/User.pm +++ b/SL/User.pm @@ -193,13 +193,13 @@ sub login { $form->{"stylesheet"} = "lx-office-erp.css"; $form->{"title"} = $main::locale->text("Dataset upgrade"); $form->header(); - print($form->parse_html_template2("dbupgrade/header")); + print $form->parse_html_template("dbupgrade/header"); $form->{dbupdate} = "db$myconfig{dbname}"; $form->{ $form->{dbupdate} } = 1; if ($form->{"show_dbupdate_warning"}) { - print($form->parse_html_template2("dbupgrade/warning")); + print $form->parse_html_template("dbupgrade/warning"); exit(0); } @@ -227,8 +227,7 @@ sub login { $self->{"menustyle"} eq "xml" ? "menuXML.pl" : "menu.pl"; - print($form->parse_html_template2("dbupgrade/footer", - { "menufile" => $menufile })); + print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile }); $rc = -2; @@ -493,9 +492,9 @@ sub process_perl_script { } if (!defined($result)) { - print($form->parse_html_template2("dbupgrade/error", - { "file" => $filename, - "error" => $@ })); + print $form->parse_html_template("dbupgrade/error", + { "file" => $filename, + "error" => $@ }); exit(0); } elsif (1 != $result) { unlink("users/nologin") if (2 == $result); @@ -928,8 +927,7 @@ sub dbupdate2 { # apply upgrade $main::lxdebug->message(DEBUG2, "Applying Update $control->{file}"); - print($form->parse_html_template2("dbupgrade/upgrade_message2", - $control)); + print $form->parse_html_template("dbupgrade/upgrade_message2", $control); if ($file_type eq "sql") { $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} . diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index a24272b8b..ef646845c 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -115,7 +115,7 @@ sub adminlogin { qq|Lx-Office ERP $form->{version} | . $locale->text('Administration'); $form->header(); - print $form->parse_html_template2('admin/adminlogin'); + print $form->parse_html_template('admin/adminlogin'); } sub login { @@ -155,7 +155,7 @@ sub list_users { $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ]; $form->header(); - print $form->parse_html_template2("admin/list_users"); + print $form->parse_html_template("admin/list_users"); } sub add_user { @@ -313,7 +313,7 @@ sub edit_user_form { chop $form->{all_acs}; $form->header(); - print $form->parse_html_template2("admin/edit_user"); + print $form->parse_html_template("admin/edit_user"); } sub save { @@ -520,7 +520,7 @@ sub change_admin_password { . $locale->text('Change Admin Password'); $form->header(); - print $form->parse_html_template2("admin/change_admin_password"); + print $form->parse_html_template("admin/change_admin_password"); } sub change_password { @@ -572,7 +572,7 @@ sub dbselect_source { $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED"; $form->header(); - print $form->parse_html_template2("admin/dbadmin"); + print $form->parse_html_template("admin/dbadmin"); } sub continue { @@ -594,7 +594,7 @@ sub update_dataset { $form->{ALL_UPDATED} = !scalar @need_updates; $form->header(); - print $form->parse_html_template2("admin/update_dataset"); + print $form->parse_html_template("admin/update_dataset"); } sub dbupdate { @@ -609,7 +609,7 @@ sub dbupdate { $| = 1; - print $form->parse_html_template2("admin/dbupgrade_all_header"); + print $form->parse_html_template("admin/dbupgrade_all_header"); foreach my $i (@update_rows) { restore_form($saved_form); @@ -618,7 +618,7 @@ sub dbupdate { my $controls = parse_dbupdate_controls($form, $form->{dbdriver}); - print $form->parse_html_template2("admin/dbupgrade_header"); + print $form->parse_html_template("admin/dbupgrade_header"); $form->{dbupdate} = $form->{dbname}; $form->{$form->{dbname}} = 1; @@ -626,10 +626,10 @@ sub dbupdate { User->dbupdate($form); User->dbupdate2($form, $controls); - print $form->parse_html_template2("admin/dbupgrade_footer"); + print $form->parse_html_template("admin/dbupgrade_footer"); } - print $form->parse_html_template2("admin/dbupgrade_all_done"); + print $form->parse_html_template("admin/dbupgrade_all_done"); } sub create_dataset { @@ -663,7 +663,7 @@ sub create_dataset { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template2("admin/create_dataset"); + print $form->parse_html_template("admin/create_dataset"); } sub dbcreate { @@ -677,7 +677,7 @@ sub dbcreate { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template2("admin/dbcreate"); + print $form->parse_html_template("admin/dbcreate"); } sub delete_dataset { @@ -691,7 +691,7 @@ sub delete_dataset { $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ]; $form->header(); - print $form->parse_html_template2("admin/delete_dataset"); + print $form->parse_html_template("admin/delete_dataset"); } sub dbdelete { @@ -707,7 +707,7 @@ sub dbdelete { . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset'); $form->header(); - print $form->parse_html_template2("admin/dbdelete"); + print $form->parse_html_template("admin/dbdelete"); } sub backup_dataset { @@ -729,7 +729,7 @@ sub backup_dataset { $form->{from} = "Lx-Office Admin <${username}\@${hostname}>"; $form->header(); - print $form->parse_html_template2("admin/backup_dataset"); + print $form->parse_html_template("admin/backup_dataset"); } sub backup_dataset_start { @@ -818,7 +818,7 @@ sub backup_dataset_start { . $locale->text('Backup Dataset'); $form->header(); - print $form->parse_html_template2("admin/backup_dataset_email_done"); + print $form->parse_html_template("admin/backup_dataset_email_done"); } } @@ -844,7 +844,7 @@ sub restore_dataset { } $form->header(); - print $form->parse_html_template2("admin/restore_dataset"); + print $form->parse_html_template("admin/restore_dataset"); } sub restore_dataset_start { @@ -956,7 +956,7 @@ sub restore_dataset_start { $AUTOFLUSH = 1; $form->header(); - print $form->parse_html_template2("admin/restore_dataset_start_header"); + print $form->parse_html_template("admin/restore_dataset_start_header"); while (my $line = <$in>) { print $line; @@ -964,7 +964,7 @@ sub restore_dataset_start { $in->close(); $form->{retval} = $CHILD_ERROR >> 8; - print $form->parse_html_template2("admin/restore_dataset_start_footer"); + print $form->parse_html_template("admin/restore_dataset_start_footer"); unlink "${tmpdir}/.pgpass", $tmp; rmdir $tmpdir; diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 94fc1928f..89dd4f29f 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -339,7 +339,7 @@ sub account_header { }; # Ausgabe des Templates - print($form->parse_html_template2('am/edit_accounts', $parameters_ref)); + print($form->parse_html_template('am/edit_accounts', $parameters_ref)); $lxdebug->leave_sub(); @@ -438,7 +438,7 @@ sub list_account { }; # Ausgabe des Templates - print($form->parse_html_template2('am/list_accounts', $parameters_ref)); + print($form->parse_html_template('am/list_accounts', $parameters_ref)); $lxdebug->leave_sub(); @@ -505,7 +505,7 @@ sub list_account_details { $form->{title} = $locale->text('Chart of Accounts'); $form->header(); - print $form->parse_html_template2('am/list_account_details'); + print $form->parse_html_template('am/list_account_details'); $lxdebug->leave_sub(); @@ -2421,7 +2421,7 @@ sub config { $form->{title} = $locale->text('Edit Preferences for #1', $form->{login}); $form->header(); - print $form->parse_html_template2('am/config'); + print $form->parse_html_template('am/config'); $lxdebug->leave_sub(); } @@ -2559,11 +2559,11 @@ sub edit_units { $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units")); $form->header(); - print($form->parse_html_template2("am/edit_units", - { "UNITS" => \@unit_list, - "NEW_BASE_UNIT_DDBOX" => $ddbox, - "LANGUAGES" => \@languages, - "updownlink" => $updownlink })); + print($form->parse_html_template("am/edit_units", + { "UNITS" => \@unit_list, + "NEW_BASE_UNIT_DDBOX" => $ddbox, + "LANGUAGES" => \@languages, + "updownlink" => $updownlink })); $lxdebug->leave_sub(); } @@ -2706,7 +2706,7 @@ sub show_history_search { $form->{title} = $locale->text("History Search"); $form->header(); - print $form->parse_html_template2("common/search_history"); + print $form->parse_html_template("common/search_history"); $lxdebug->leave_sub(); } @@ -2785,7 +2785,7 @@ sub show_am_history { my ($sort, $sortby) = split(/\-\-/, $form->{order}); $sort =~ s/.*\.(.*)$/$1/; - print $form->parse_html_template2("common/show_history", + print $form->parse_html_template("common/show_history", {"DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}), "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"), "NONEWWINDOW" => 1, @@ -2838,7 +2838,7 @@ sub add_tax { }; # Ausgabe des Templates - print($form->parse_html_template2('am/edit_tax', $parameters_ref)); + print($form->parse_html_template('am/edit_tax', $parameters_ref)); $lxdebug->leave_sub(); } @@ -2859,7 +2859,7 @@ sub edit_tax { }; # Ausgabe des Templates - print($form->parse_html_template2('am/edit_tax', $parameters_ref)); + print($form->parse_html_template('am/edit_tax', $parameters_ref)); $lxdebug->leave_sub(); } @@ -2878,7 +2878,7 @@ sub list_tax { $form->header(); # Ausgabe des Templates - print($form->parse_html_template2('am/list_tax', $parameters_ref)); + print($form->parse_html_template('am/list_tax', $parameters_ref)); $lxdebug->leave_sub(); } @@ -2933,7 +2933,7 @@ sub add_price_factor { $form->{fokus} = 'description'; $form->header(); - print $form->parse_html_template2('am/edit_price_factor'); + print $form->parse_html_template('am/edit_price_factor'); $lxdebug->leave_sub(); } @@ -2950,7 +2950,7 @@ sub edit_price_factor { $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1); $form->header(); - print $form->parse_html_template2('am/edit_price_factor'); + print $form->parse_html_template('am/edit_price_factor'); $lxdebug->leave_sub(); } @@ -2977,7 +2977,7 @@ sub list_price_factors { $form->{url_base} = build_std_url('callback'); $form->header(); - print $form->parse_html_template2('am/list_price_factors'); + print $form->parse_html_template('am/list_price_factors'); $lxdebug->leave_sub(); } diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl index 61877259a..72e6500cb 100644 --- a/bin/mozilla/amtemplates.pl +++ b/bin/mozilla/amtemplates.pl @@ -221,7 +221,7 @@ sub display_template_form { $options{"HIDDEN"} = [ map(+{ "name" => $_, "value" => $form->{$_} }, @hidden) ]; $form->header; - print($form->parse_html_template2("am/edit_templates", \%options)); + print($form->parse_html_template("am/edit_templates", \%options)); $lxdebug->leave_sub(); } diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index f05d15823..627cbee87 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -1422,7 +1422,7 @@ sub ap_transactions { } $report->set_options('top_info_text' => join("\n", @options), - 'raw_bottom_info_text' => $form->parse_html_template2('ap/ap_transactions_bottom'), + 'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time), diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 17db605ca..11a12e440 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -1505,7 +1505,7 @@ sub ar_transactions { } $report->set_options('top_info_text' => join("\n", @options), - 'raw_bottom_info_text' => $form->parse_html_template2('ar/ar_transactions_bottom'), + 'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time), diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl index e05a146df..6f9e9bedb 100644 --- a/bin/mozilla/common.pl +++ b/bin/mozilla/common.pl @@ -307,9 +307,9 @@ sub delivery_customer_selection { $form->{"title"} = $locale->text("Select a Customer"); $form->header(); - print $form->parse_html_template2("generic/select_delivery_customer", { "HEADER" => \@header, - "DELIVERY" => $delivery, - "onload" => $onload }); + print $form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header, + "DELIVERY" => $delivery, + "onload" => $onload }); $lxdebug->leave_sub(); } @@ -349,9 +349,9 @@ sub vendor_selection { $form->{"title"} = $locale->text("Select a Customer"); $form->header(); - print $form->parse_html_template2("generic/select_vendor", { "HEADER" => \@header, - "VENDOR" => $vendor, - "onload" => $onload }); + print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header, + "VENDOR" => $vendor, + "onload" => $onload }); $lxdebug->leave_sub(); } @@ -395,9 +395,9 @@ sub calculate_qty { $form->{formel} = $formel; $form->{"title"} = $locale->text("Please enter values"); $form->header(); - print($form->parse_html_template2("generic/calculate_qty", { "HEADER" => \@header, - "VARIABLES" => \@variable, - "onload" => $onload })); + print($form->parse_html_template("generic/calculate_qty", { "HEADER" => \@header, + "VARIABLES" => \@variable, + "onload" => $onload })); $lxdebug->leave_sub(); } @@ -407,7 +407,7 @@ sub set_longdescription { $form->{title} = $locale->text("Enter longdescription"); $form->header(); - print $form->parse_html_template2("generic/set_longdescription"); + print $form->parse_html_template("generic/set_longdescription"); $lxdebug->leave_sub(); } @@ -509,7 +509,7 @@ sub show_history { $form->{title} = $locale->text("History"); $form->header(); - print $form->parse_html_template2( "common/show_history", { + print $form->parse_html_template( "common/show_history", { "DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}), "SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"), uc($sort) => 1, @@ -554,8 +554,7 @@ sub show_vc_details { $form->{title} = $form->{vc} eq "customer" ? $locale->text("Customer details") : $locale->text("Vendor details"); $form->header(); - print($form->parse_html_template2("common/show_vc_details", - { "is_customer" => $form->{vc} eq "customer" })); + print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" }); $lxdebug->leave_sub(); } diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 4d06662e2..a4171b817 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -80,7 +80,7 @@ sub search { $form->{fokus} = 'Form.name'; $form->header(); - print $form->parse_html_template2('ct/search'); + print $form->parse_html_template('ct/search'); $lxdebug->leave_sub(); } @@ -163,7 +163,7 @@ sub list_names { my $report = SL::ReportGenerator->new(\%myconfig, $form); $report->set_options('top_info_text' => join("\n", @options), - 'raw_bottom_info_text' => $form->parse_html_template2('ct/list_names_bottom'), + 'raw_bottom_info_text' => $form->parse_html_template('ct/list_names_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index b15d02928..e530050ad 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -74,7 +74,7 @@ sub edit_config { $form->{callback} ||= build_std_url("action=edit_config"); $form->header(); - print $form->parse_html_template2("dunning/edit_config"); + print $form->parse_html_template("dunning/edit_config"); $lxdebug->leave_sub(); } @@ -96,7 +96,7 @@ sub add { $form->{fokus} = "search.customer"; $form->header(); - print $form->parse_html_template2("dunning/add"); + print $form->parse_html_template("dunning/add"); $lxdebug->leave_sub(); } @@ -131,7 +131,7 @@ sub show_invoices { 'no_opendocument' => 1,); $form->header(); - print $form->parse_html_template2("dunning/show_invoices"); + print $form->parse_html_template("dunning/show_invoices"); $lxdebug->leave_sub(); } @@ -233,7 +233,7 @@ sub set_email { $form->{"title"} = $locale->text("Set eMail text"); $form->header(); - print($form->parse_html_template2("dunning/set_email")); + print($form->parse_html_template("dunning/set_email")); $lxdebug->leave_sub(); } @@ -260,7 +260,7 @@ sub search { . qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')| . qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - print $form->parse_html_template2("dunning/search"); + print $form->parse_html_template("dunning/search"); $lxdebug->leave_sub(); @@ -361,8 +361,8 @@ sub show_dunning { $report->add_data($current_dunning_rows) if (scalar @{ $current_dunning_rows }); - $report->set_options('raw_top_info_text' => $form->parse_html_template2('dunning/show_dunning_top'), - 'raw_bottom_info_text' => $form->parse_html_template2('dunning/show_dunning_bottom'), + $report->set_options('raw_top_info_text' => $form->parse_html_template('dunning/show_dunning_top'), + 'raw_bottom_info_text' => $form->parse_html_template('dunning/show_dunning_bottom'), 'output_format' => 'HTML', 'attachment_basename' => $locale->text('dunning_list') . strftime('_%Y%m%d', localtime time), ); diff --git a/bin/mozilla/drafts.pl b/bin/mozilla/drafts.pl index 515a64205..79ff97dca 100644 --- a/bin/mozilla/drafts.pl +++ b/bin/mozilla/drafts.pl @@ -24,7 +24,7 @@ sub save_draft { $form->{remove_draft} = 1; $form->header(); - print($form->parse_html_template2("drafts/save_new")); + print($form->parse_html_template("drafts/save_new")); return $lxdebug->leave_sub(); } @@ -70,10 +70,10 @@ sub load_draft_maybe { my $saved_form = save_form(); $form->header(); - print($form->parse_html_template2("drafts/load", - { "DRAFTS" => \@drafts, - "SAVED_FORM" => $saved_form, - "draft_nextsub" => $draft_nextsub })); + print($form->parse_html_template("drafts/load", + { "DRAFTS" => \@drafts, + "SAVED_FORM" => $saved_form, + "draft_nextsub" => $draft_nextsub })); $lxdebug->leave_sub(); diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index bceb08f70..5069cefa7 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -627,7 +627,7 @@ sub generate_report { . '

'; } - $raw_bottom_info_text .= $form->parse_html_template2('gl/generate_report_bottom'); + $raw_bottom_info_text .= $form->parse_html_template('gl/generate_report_bottom'); $report->set_options('raw_bottom_info_text' => $raw_bottom_info_text); diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 4b563e6b0..e5878fdfa 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1700,7 +1700,7 @@ sub generate_report { ); $report->set_options('top_info_text' => $locale->text('Options') . ': ' . join(', ', grep $_, @options), - 'raw_bottom_info_text' => $form->parse_html_template2('ic/generate_report_bottom'), + 'raw_bottom_info_text' => $form->parse_html_template('ic/generate_report_bottom'), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time), @@ -3101,9 +3101,9 @@ sub parts_language_selection { $form->{"title"} = $locale->text("Language Values"); $form->header(); - print $form->parse_html_template2("ic/parts_language_selection", { "HEADER" => \@header, - "LANGUAGES" => $languages, - "onload" => $onload }); + print $form->parse_html_template("ic/parts_language_selection", { "HEADER" => \@header, + "LANGUAGES" => $languages, + "onload" => $onload }); $lxdebug->leave_sub(); } diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 1ec0ca449..69d79511f 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -354,7 +354,7 @@ sub new_item { push @HIDDENS, { 'name' => 'taxaccount2', 'value' => $form->{taxaccounts} }; $form->header(); - print $form->parse_html_template2("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } ); + print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } ); $lxdebug->leave_sub(); } @@ -701,12 +701,12 @@ sub edit_e_mail { @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; - print $form->parse_html_template2('generic/edit_email', - { title => $title, - a_filename => $attachment_filename, - _print_options_ => print_options('inline' => 1), - HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], - SHOW_BCC => $myconfig{role} eq 'admin' }); + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + _print_options_ => print_options('inline' => 1), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); } @@ -834,7 +834,7 @@ sub print_options { remove_draft_checked => $form->{remove_draft} ? "checked" : '' ); - my $print_options = $form->parse_html_template2("generic/print_options", { SELECTS => \@SELECTS, %template_vars } ); + my $print_options = $form->parse_html_template("generic/print_options", { SELECTS => \@SELECTS, %template_vars } ); if ($options{inline}) { $lxdebug->leave_sub(); diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl index 38510e179..c2fef5df4 100644 --- a/bin/mozilla/menuv3.pl +++ b/bin/mozilla/menuv3.pl @@ -45,7 +45,7 @@ sub display { $form->{date} = clock_line(); $form->{menu} = acc_menu(); - print $form->parse_html_template2("menu/menuv3"); + print $form->parse_html_template("menu/menuv3"); } diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index a89de30c0..b515be117 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -484,7 +484,7 @@ sub form_header { is_pur_ord => scalar ($form->{type} =~ /purchase_order$/), ); - print $form->parse_html_template2("oe/orders_header", { %TMPL_VAR }); + print $form->parse_html_template("oe/orders_header", { %TMPL_VAR }); $lxdebug->leave_sub(); } @@ -541,7 +541,7 @@ sub form_footer { $form->{oldinvtotal} = $form->{invtotal}; - print $form->parse_html_template2("oe/orders_footer", { + print $form->parse_html_template("oe/orders_footer", { %TMPL_VAR, webdav => $webdav, print_options => print_options(inline => 1), @@ -1087,8 +1087,8 @@ sub orders { } $report->set_options('top_info_text' => join("\n", @options), - 'raw_top_info_text' => $form->parse_html_template2('oe/orders_top'), - 'raw_bottom_info_text' => $form->parse_html_template2('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), + 'raw_top_info_text' => $form->parse_html_template('oe/orders_top'), + 'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }), 'output_format' => 'HTML', 'title' => $form->{title}, 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time), @@ -1840,7 +1840,7 @@ sub check_for_direct_delivery { $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ]; $form->header(); - print $form->parse_html_template2("oe/check_for_direct_delivery"); + print $form->parse_html_template("oe/check_for_direct_delivery"); $lxdebug->leave_sub(); @@ -2199,9 +2199,9 @@ sub display_row { push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, }; } - print $form->parse_html_template2('oe/sales_order', { ROWS => \@ROWS, - HEADER => \@HEADER, - }); + print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS, + HEADER => \@HEADER, + }); if (0 != ($form->{sellprice_total} * 1)) { $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100; diff --git a/bin/mozilla/reportgenerator.pl b/bin/mozilla/reportgenerator.pl index 772fe68ef..bdccb3b5a 100644 --- a/bin/mozilla/reportgenerator.pl +++ b/bin/mozilla/reportgenerator.pl @@ -44,7 +44,7 @@ sub report_generator_export_as_pdf { $form->{title} = $locale->text('PDF export -- options'); $form->header(); - print $form->parse_html_template2('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values }); + print $form->parse_html_template('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values }); $lxdebug->leave_sub(); } @@ -63,7 +63,7 @@ sub report_generator_export_as_csv { $form->{title} = $locale->text('CSV export -- options'); $form->header(); - print $form->parse_html_template2('report_generator/csv_export_options', { 'HIDDEN' => \@form_values }); + print $form->parse_html_template('report_generator/csv_export_options', { 'HIDDEN' => \@form_values }); $lxdebug->leave_sub(); } diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index a6294f26a..1a2999bde 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -1441,9 +1441,9 @@ sub aging { $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal')); if ($form->{arap} eq 'ar') { - $raw_top_info_text = $form->parse_html_template2('rp/aging_ar_top'); - $raw_bottom_info_text = $form->parse_html_template2('rp/aging_ar_bottom', { 'row_idx' => $row_idx, - 'PRINT_OPTIONS' => print_options(inline => 1), }); + $raw_top_info_text = $form->parse_html_template('rp/aging_ar_top'); + $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx, + 'PRINT_OPTIONS' => print_options(inline => 1), }); $report->set_options('raw_top_info_text' => $raw_top_info_text, 'raw_bottom_info_text' => $raw_bottom_info_text); } diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 6818a0058..f2b1f7228 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -69,7 +69,7 @@ use SL::User; # $locale->text('Nov') # $locale->text('Dec') -# $form->parse_html_template2('generic/util_hidden_variables'); +# $form->parse_html_template('generic/util_hidden_variables'); ############################# @@ -217,7 +217,7 @@ sub report { }; - print($form->parse_html_template2('ustva/report', $template_ref)); + print($form->parse_html_template('ustva/report', $template_ref)); @@ -1069,7 +1069,7 @@ sub generate_ustva { taxnumber => $myconfig{taxnumber}, }; - print($form->parse_html_template2('ustva/generic_taxreport', $template_ref)); + print($form->parse_html_template('ustva/generic_taxreport', $template_ref)); } else { @@ -1161,7 +1161,7 @@ sub config_step1 { }; # Ausgabe des Templates - print($form->parse_html_template2('ustva/config_step1', $template_ref)); + print($form->parse_html_template('ustva/config_step1', $template_ref)); $lxdebug->leave_sub(); } @@ -1301,7 +1301,7 @@ sub config_step2 { }; # Ausgabe des Templates - print($form->parse_html_template2('ustva/config_step2', $template_ref)); + print($form->parse_html_template('ustva/config_step2', $template_ref)); $lxdebug->leave_sub(); diff --git a/locale/de/locales.pl b/locale/de/locales.pl index 70ca6d20e..266823f7b 100755 --- a/locale/de/locales.pl +++ b/locale/de/locales.pl @@ -336,7 +336,7 @@ sub scanfile { } # is this a template call? - if (/parse_html_template2?\s*\(\s*[\"\']([\w\/]+)/) { + if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) { my $newfile = "$basedir/templates/webpages/$1_master.html"; if (-f $newfile) { # &scanhtmlfile($newfile); diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl index da3de05c3..d52efd7ca 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl @@ -13,8 +13,7 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template2("dbupgrade/units_error", - { "message" => $msg })); + print $main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }); return 2; } @@ -219,15 +218,15 @@ sub update_units_steps_1_2 { map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); } sort({ lc($a) cmp lc($b) } keys(%unknown_dimension_units))); - print($form->parse_html_template2("dbupgrade/units_parts", - { "NEW_BASE_UNIT_DDBOX" => $ddbox, - "UNKNOWN_PART_UNITS" => \@unknown_parts, - })); + print $form->parse_html_template("dbupgrade/units_parts", + { "NEW_BASE_UNIT_DDBOX" => $ddbox, + "UNKNOWN_PART_UNITS" => \@unknown_parts, + }); return 2; } else { - print($form->parse_html_template2("dbupgrade/units_parts_done")); + print $form->parse_html_template("dbupgrade/units_parts_done"); } if (scalar(keys(%unknown_service_units)) != 0) { @@ -238,15 +237,15 @@ sub update_units_steps_1_2 { map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); } sort({ lc($a) cmp lc($b) } keys(%unknown_service_units))); - print($form->parse_html_template2("dbupgrade/units_services", - { "NEW_BASE_UNIT_DDBOX" => $ddbox, - "UNKNOWN_PART_UNITS" => \@unknown_services, - })); + print $form->parse_html_template("dbupgrade/units_services", + { "NEW_BASE_UNIT_DDBOX" => $ddbox, + "UNKNOWN_PART_UNITS" => \@unknown_services, + })); return 2; } else { - print($form->parse_html_template2("dbupgrade/units_services_done")); + print $form->parse_html_template("dbupgrade/units_services_done"); } return 0; @@ -271,13 +270,13 @@ sub update_units_step_3 { my $service_units = retrieve_units(\%dbup_myconfig, $form, "service"); my $service_ddbox = unit_select_data($service_units); - print($form->parse_html_template2("dbupgrade/units_set_default", - { "DIMENSION_DDBOX" => $dimension_ddbox, - "SERVICE_DDBOX" => $service_ddbox })); + print $form->parse_html_template("dbupgrade/units_set_default", + { "DIMENSION_DDBOX" => $dimension_ddbox, + "SERVICE_DDBOX" => $service_ddbox }); return 2; } else { - print($form->parse_html_template2("dbupgrade/units_set_default_done")); + print $form->parse_html_template("dbupgrade/units_set_default_done"); return 1; } } @@ -330,7 +329,7 @@ sub update_units { my $res; - print($form->parse_html_template2("dbupgrade/units_header")); + print $form->parse_html_template("dbupgrade/units_header"); if ($form->{"action2"} eq "add_unit") { $res = update_units_add_unit(); diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl index 9d0894779..60b4631e7 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl @@ -11,8 +11,7 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template2("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg })); return 2; } @@ -76,8 +75,7 @@ sub update_guess_chart_of_accounts { my @coas = map(+{ "name" => $_ }, @valid_coas); - print($form->parse_html_template2("dbupgrade/coa_guess", - { "COAS" => \@coas })); + print($form->parse_html_template("dbupgrade/coa_guess", { "COAS" => \@coas })); return 2; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl index 203857f82..39b7f5482 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl @@ -11,8 +11,7 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template2("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg })); return 2; } @@ -209,7 +208,7 @@ sub create_standard_buchungsgruppen { return create_standard_buchungsgruppen_skr04(); } - print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); + print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); return 1; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl index 9a8542a36..766bd6baf 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl @@ -11,8 +11,7 @@ sub mydberror { sub myshowerror { my ($msg) = @_; - print($main::form->parse_html_template2("dbupgrade/units_error", - { "message" => $msg })); + print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg })); return 2; } @@ -117,7 +116,7 @@ sub update_steuersaetze { return update_steuersaetze_skr04(); } - print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); + print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa })); return 1; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl index 2a3dbe186..497f53f85 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl @@ -302,14 +302,14 @@ sub display_create_bgs_dialog { $entry->{"eur"} = $main::eur; } - # $form->parse_html_template2("dbupgrade/buchungsgruppen_parts") - # $form->parse_html_template2("dbupgrade/buchungsgruppen_services") - # $form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies") - - print($form->parse_html_template2("dbupgrade/buchungsgruppen_${type}", - { "LIST" => $list, - "BUCHUNGSGRUPPEN" => $buchungsgruppen, - })); + # $form->parse_html_template("dbupgrade/buchungsgruppen_parts") + # $form->parse_html_template("dbupgrade/buchungsgruppen_services") + # $form->parse_html_template("dbupgrade/buchungsgruppen_assemblies") + + print($form->parse_html_template("dbupgrade/buchungsgruppen_${type}", + { "LIST" => $list, + "BUCHUNGSGRUPPEN" => $buchungsgruppen, + })); } sub create_buchungsgruppen { @@ -459,7 +459,7 @@ sub do_update { my ($acc_inventory, $acc_income, $acc_expense) = retrieve_accounts(); - print($form->parse_html_template2("dbupgrade/buchungsgruppen_header")); + print($form->parse_html_template("dbupgrade/buchungsgruppen_header")); if (scalar(@{$parts})) { display_create_bgs_dialog("parts", $parts, @@ -467,7 +467,7 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template2("dbupgrade/buchungsgruppen_parts_done")); + print($form->parse_html_template("dbupgrade/buchungsgruppen_parts_done")); } if (scalar(@{$services})) { @@ -476,7 +476,7 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template2("dbupgrade/buchungsgruppen_services_done")); + print($form->parse_html_template("dbupgrade/buchungsgruppen_services_done")); } if (scalar(@{$assemblies})) { @@ -485,10 +485,10 @@ sub do_update { $buchungsgruppen); return 2; } else { - print($form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies_done")); + print($form->parse_html_template("dbupgrade/buchungsgruppen_assemblies_done")); } - print($form->parse_html_template2("dbupgrade/buchungsgruppen_footer")); + print($form->parse_html_template("dbupgrade/buchungsgruppen_footer")); return 1; } diff --git a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl index 144875a9f..88a325257 100644 --- a/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl +++ b/sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl @@ -48,8 +48,7 @@ sub update_templates { if (@warnings) { @warnings = map(+{ "message" => $_ }, @warnings); - print($form->parse_html_template2("dbupgrade/update_templates_warnings", - { "WARNINGS" => \@warnings })); + print($form->parse_html_template("dbupgrade/update_templates_warnings", { "WARNINGS" => \@warnings })); } return 1; -- 2.20.1