Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9aaca433

Von Moritz Bunkus vor etwa 17 Jahren hinzugefügt

  • ID 9aaca43317d3ea33d80a308cab7ce4c20d732a16
  • Vorgänger 1ced937c
  • Nachfolger 0451bb96

Die Funktion Form::parse_html_template2() in Form::parse_html_template() umbenannt (letztere wurde in Revision 2923 entfernt).

Unterschiede anzeigen:

SL/Form.pm
546 546
  return $file;
547 547
}
548 548

  
549
sub parse_html_template2 {
549
sub parse_html_template {
550 550
  $main::lxdebug->enter_sub();
551 551

  
552 552
  my ($self, $file, $additional_params) = @_;
......
598 598
  $self->{title} = $title if ($title);
599 599

  
600 600
  $self->header();
601
  print $self->parse_html_template2("generic/error", $add_params);
601
  print $self->parse_html_template("generic/error", $add_params);
602 602

  
603 603
  die("Error: $error\n");
604 604
}
......
614 614
  $self->{title} = $title if ($title);
615 615

  
616 616
  $self->header();
617
  print $self->parse_html_template2("generic/information", $add_params);
617
  print $self->parse_html_template("generic/information", $add_params);
618 618

  
619 619
  die("Information: $error\n");
620 620
}
SL/ReportGenerator.pm
344 344
  my $self      = shift;
345 345
  my $variables = $self->prepare_html_content();
346 346

  
347
  return $self->{form}->parse_html_template2('report_generator/html_report', $variables);
347
  return $self->{form}->parse_html_template('report_generator/html_report', $variables);
348 348
}
349 349

  
350 350
sub verify_paper_size {
......
420 420
    $form->error($locale->text('Could not write the temporary HTML file.'));
421 421
  }
422 422

  
423
  $html_file->print($form->parse_html_template2('report_generator/pdf_report', $variables));
423
  $html_file->print($form->parse_html_template('report_generator/pdf_report', $variables));
424 424
  $html_file->close();
425 425

  
426 426
  my $cmdline =
SL/User.pm
193 193
      $form->{"stylesheet"} = "lx-office-erp.css";
194 194
      $form->{"title"} = $main::locale->text("Dataset upgrade");
195 195
      $form->header();
196
      print($form->parse_html_template2("dbupgrade/header"));
196
      print $form->parse_html_template("dbupgrade/header");
197 197

  
198 198
      $form->{dbupdate} = "db$myconfig{dbname}";
199 199
      $form->{ $form->{dbupdate} } = 1;
200 200

  
201 201
      if ($form->{"show_dbupdate_warning"}) {
202
        print($form->parse_html_template2("dbupgrade/warning"));
202
        print $form->parse_html_template("dbupgrade/warning");
203 203
        exit(0);
204 204
      }
205 205

  
......
227 227
        $self->{"menustyle"} eq "xml" ? "menuXML.pl" :
228 228
        "menu.pl";
229 229

  
230
      print($form->parse_html_template2("dbupgrade/footer",
231
                                        { "menufile" => $menufile }));
230
      print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
232 231

  
233 232
      $rc = -2;
234 233

  
......
493 492
  }
494 493

  
495 494
  if (!defined($result)) {
496
    print($form->parse_html_template2("dbupgrade/error",
497
                                      { "file" => $filename,
498
                                        "error" => $@ }));
495
    print $form->parse_html_template("dbupgrade/error",
496
                                     { "file"  => $filename,
497
                                       "error" => $@ });
499 498
    exit(0);
500 499
  } elsif (1 != $result) {
501 500
    unlink("users/nologin") if (2 == $result);
......
928 927

  
929 928
      # apply upgrade
930 929
      $main::lxdebug->message(DEBUG2, "Applying Update $control->{file}");
931
      print($form->parse_html_template2("dbupgrade/upgrade_message2",
932
                                        $control));
930
      print $form->parse_html_template("dbupgrade/upgrade_message2", $control);
933 931

  
934 932
      if ($file_type eq "sql") {
935 933
        $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} .
bin/mozilla/admin.pl
115 115
    qq|Lx-Office ERP $form->{version} | . $locale->text('Administration');
116 116

  
117 117
  $form->header();
118
  print $form->parse_html_template2('admin/adminlogin');
118
  print $form->parse_html_template('admin/adminlogin');
119 119
}
120 120

  
121 121
sub login {
......
155 155
  $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
156 156

  
157 157
  $form->header();
158
  print $form->parse_html_template2("admin/list_users");
158
  print $form->parse_html_template("admin/list_users");
159 159
}
160 160

  
161 161
sub add_user {
......
313 313
  chop $form->{all_acs};
314 314

  
315 315
  $form->header();
316
  print $form->parse_html_template2("admin/edit_user");
316
  print $form->parse_html_template("admin/edit_user");
317 317
}
318 318

  
319 319
sub save {
......
520 520
    . $locale->text('Change Admin Password');
521 521

  
522 522
  $form->header();
523
  print $form->parse_html_template2("admin/change_admin_password");
523
  print $form->parse_html_template("admin/change_admin_password");
524 524
}
525 525

  
526 526
sub change_password {
......
572 572
  $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED";
573 573

  
574 574
  $form->header();
575
  print $form->parse_html_template2("admin/dbadmin");
575
  print $form->parse_html_template("admin/dbadmin");
576 576
}
577 577

  
578 578
sub continue {
......
594 594
  $form->{ALL_UPDATED}  = !scalar @need_updates;
595 595

  
596 596
  $form->header();
597
  print $form->parse_html_template2("admin/update_dataset");
597
  print $form->parse_html_template("admin/update_dataset");
598 598
}
599 599

  
600 600
sub dbupdate {
......
609 609

  
610 610
  $| = 1;
611 611

  
612
  print $form->parse_html_template2("admin/dbupgrade_all_header");
612
  print $form->parse_html_template("admin/dbupgrade_all_header");
613 613

  
614 614
  foreach my $i (@update_rows) {
615 615
    restore_form($saved_form);
......
618 618

  
619 619
    my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
620 620

  
621
    print $form->parse_html_template2("admin/dbupgrade_header");
621
    print $form->parse_html_template("admin/dbupgrade_header");
622 622

  
623 623
    $form->{dbupdate}        = $form->{dbname};
624 624
    $form->{$form->{dbname}} = 1;
......
626 626
    User->dbupdate($form);
627 627
    User->dbupdate2($form, $controls);
628 628

  
629
    print $form->parse_html_template2("admin/dbupgrade_footer");
629
    print $form->parse_html_template("admin/dbupgrade_footer");
630 630
  }
631 631

  
632
  print $form->parse_html_template2("admin/dbupgrade_all_done");
632
  print $form->parse_html_template("admin/dbupgrade_all_done");
633 633
}
634 634

  
635 635
sub create_dataset {
......
663 663
    . $locale->text('Create Dataset');
664 664

  
665 665
  $form->header();
666
  print $form->parse_html_template2("admin/create_dataset");
666
  print $form->parse_html_template("admin/create_dataset");
667 667
}
668 668

  
669 669
sub dbcreate {
......
677 677
    . $locale->text('Create Dataset');
678 678

  
679 679
  $form->header();
680
  print $form->parse_html_template2("admin/dbcreate");
680
  print $form->parse_html_template("admin/dbcreate");
681 681
}
682 682

  
683 683
sub delete_dataset {
......
691 691
  $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
692 692

  
693 693
  $form->header();
694
  print $form->parse_html_template2("admin/delete_dataset");
694
  print $form->parse_html_template("admin/delete_dataset");
695 695
}
696 696

  
697 697
sub dbdelete {
......
707 707
    . $locale->text('Database Administration') . " / "
708 708
    . $locale->text('Delete Dataset');
709 709
  $form->header();
710
  print $form->parse_html_template2("admin/dbdelete");
710
  print $form->parse_html_template("admin/dbdelete");
711 711
}
712 712

  
713 713
sub backup_dataset {
......
729 729
  $form->{from} = "Lx-Office Admin <${username}\@${hostname}>";
730 730

  
731 731
  $form->header();
732
  print $form->parse_html_template2("admin/backup_dataset");
732
  print $form->parse_html_template("admin/backup_dataset");
733 733
}
734 734

  
735 735
sub backup_dataset_start {
......
818 818
      . $locale->text('Backup Dataset');
819 819

  
820 820
    $form->header();
821
    print $form->parse_html_template2("admin/backup_dataset_email_done");
821
    print $form->parse_html_template("admin/backup_dataset_email_done");
822 822
  }
823 823
}
824 824

  
......
844 844
  }
845 845

  
846 846
  $form->header();
847
  print $form->parse_html_template2("admin/restore_dataset");
847
  print $form->parse_html_template("admin/restore_dataset");
848 848
}
849 849

  
850 850
sub restore_dataset_start {
......
956 956
  $AUTOFLUSH = 1;
957 957

  
958 958
  $form->header();
959
  print $form->parse_html_template2("admin/restore_dataset_start_header");
959
  print $form->parse_html_template("admin/restore_dataset_start_header");
960 960

  
961 961
  while (my $line = <$in>) {
962 962
    print $line;
......
964 964
  $in->close();
965 965

  
966 966
  $form->{retval} = $CHILD_ERROR >> 8;
967
  print $form->parse_html_template2("admin/restore_dataset_start_footer");
967
  print $form->parse_html_template("admin/restore_dataset_start_footer");
968 968

  
969 969
  unlink "${tmpdir}/.pgpass", $tmp;
970 970
  rmdir $tmpdir;
bin/mozilla/am.pl
339 339
  };
340 340
  
341 341
  # Ausgabe des Templates
342
  print($form->parse_html_template2('am/edit_accounts', $parameters_ref));
342
  print($form->parse_html_template('am/edit_accounts', $parameters_ref));
343 343

  
344 344

  
345 345
  $lxdebug->leave_sub();
......
438 438
  };
439 439
  
440 440
  # Ausgabe des Templates
441
  print($form->parse_html_template2('am/list_accounts', $parameters_ref));
441
  print($form->parse_html_template('am/list_accounts', $parameters_ref));
442 442
  
443 443
  $lxdebug->leave_sub();
444 444

  
......
505 505
  $form->{title} = $locale->text('Chart of Accounts');
506 506
  $form->header();
507 507

  
508
  print $form->parse_html_template2('am/list_account_details');
508
  print $form->parse_html_template('am/list_account_details');
509 509

  
510 510
  $lxdebug->leave_sub();
511 511

  
......
2421 2421
  $form->{title}                            = $locale->text('Edit Preferences for #1', $form->{login});
2422 2422

  
2423 2423
  $form->header();
2424
  print $form->parse_html_template2('am/config');
2424
  print $form->parse_html_template('am/config');
2425 2425

  
2426 2426
  $lxdebug->leave_sub();
2427 2427
}
......
2559 2559

  
2560 2560
  $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
2561 2561
  $form->header();
2562
  print($form->parse_html_template2("am/edit_units",
2563
                                    { "UNITS"               => \@unit_list,
2564
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
2565
                                      "LANGUAGES"           => \@languages,
2566
                                      "updownlink"          => $updownlink }));
2562
  print($form->parse_html_template("am/edit_units",
2563
                                   { "UNITS"               => \@unit_list,
2564
                                     "NEW_BASE_UNIT_DDBOX" => $ddbox,
2565
                                     "LANGUAGES"           => \@languages,
2566
                                     "updownlink"          => $updownlink }));
2567 2567

  
2568 2568
  $lxdebug->leave_sub();
2569 2569
}
......
2706 2706
	$form->{title} = $locale->text("History Search");
2707 2707
    $form->header();
2708 2708
    
2709
    print $form->parse_html_template2("common/search_history");
2709
    print $form->parse_html_template("common/search_history");
2710 2710
	
2711 2711
	$lxdebug->leave_sub();
2712 2712
}
......
2785 2785
  my ($sort, $sortby) = split(/\-\-/, $form->{order});
2786 2786
  $sort =~ s/.*\.(.*)$/$1/;
2787 2787

  
2788
	print $form->parse_html_template2("common/show_history", 
2788
	print $form->parse_html_template("common/show_history", 
2789 2789
    {"DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}),
2790 2790
     "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
2791 2791
     "NONEWWINDOW" => 1,
......
2838 2838
  };
2839 2839
  
2840 2840
  # Ausgabe des Templates
2841
  print($form->parse_html_template2('am/edit_tax', $parameters_ref));
2841
  print($form->parse_html_template('am/edit_tax', $parameters_ref));
2842 2842

  
2843 2843
  $lxdebug->leave_sub();
2844 2844
}
......
2859 2859
  };
2860 2860
  
2861 2861
  # Ausgabe des Templates
2862
  print($form->parse_html_template2('am/edit_tax', $parameters_ref));
2862
  print($form->parse_html_template('am/edit_tax', $parameters_ref));
2863 2863

  
2864 2864
  $lxdebug->leave_sub();
2865 2865
}
......
2878 2878
  $form->header();
2879 2879
  
2880 2880
  # Ausgabe des Templates
2881
  print($form->parse_html_template2('am/list_tax', $parameters_ref));
2881
  print($form->parse_html_template('am/list_tax', $parameters_ref));
2882 2882

  
2883 2883
  $lxdebug->leave_sub();
2884 2884
}
......
2933 2933
  $form->{fokus}      = 'description';
2934 2934

  
2935 2935
  $form->header();
2936
  print $form->parse_html_template2('am/edit_price_factor');
2936
  print $form->parse_html_template('am/edit_price_factor');
2937 2937

  
2938 2938
  $lxdebug->leave_sub();
2939 2939
}
......
2950 2950
  $form->{factor} = $form->format_amount(\%myconfig, $form->{factor} * 1);
2951 2951

  
2952 2952
  $form->header();
2953
  print $form->parse_html_template2('am/edit_price_factor');
2953
  print $form->parse_html_template('am/edit_price_factor');
2954 2954

  
2955 2955
  $lxdebug->leave_sub();
2956 2956
}
......
2977 2977
  $form->{url_base} = build_std_url('callback');
2978 2978

  
2979 2979
  $form->header();
2980
  print $form->parse_html_template2('am/list_price_factors');
2980
  print $form->parse_html_template('am/list_price_factors');
2981 2981

  
2982 2982
  $lxdebug->leave_sub();
2983 2983
}
bin/mozilla/amtemplates.pl
221 221
  $options{"HIDDEN"} = [ map(+{ "name" => $_, "value" => $form->{$_} }, @hidden) ];
222 222

  
223 223
  $form->header;
224
  print($form->parse_html_template2("am/edit_templates", \%options));
224
  print($form->parse_html_template("am/edit_templates", \%options));
225 225

  
226 226
  $lxdebug->leave_sub();
227 227
}
bin/mozilla/ap.pl
1422 1422
  }
1423 1423

  
1424 1424
  $report->set_options('top_info_text'        => join("\n", @options),
1425
                       'raw_bottom_info_text' => $form->parse_html_template2('ap/ap_transactions_bottom'),
1425
                       'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
1426 1426
                       'output_format'        => 'HTML',
1427 1427
                       'title'                => $form->{title},
1428 1428
                       'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
bin/mozilla/ar.pl
1505 1505
  }
1506 1506

  
1507 1507
  $report->set_options('top_info_text'        => join("\n", @options),
1508
                       'raw_bottom_info_text' => $form->parse_html_template2('ar/ar_transactions_bottom'),
1508
                       'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'),
1509 1509
                       'output_format'        => 'HTML',
1510 1510
                       'title'                => $form->{title},
1511 1511
                       'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
bin/mozilla/common.pl
307 307

  
308 308
  $form->{"title"} = $locale->text("Select a Customer");
309 309
  $form->header();
310
  print $form->parse_html_template2("generic/select_delivery_customer", { "HEADER"   => \@header,
311
                                                                          "DELIVERY" => $delivery,
312
                                                                          "onload"   => $onload });
310
  print $form->parse_html_template("generic/select_delivery_customer", { "HEADER"   => \@header,
311
                                                                         "DELIVERY" => $delivery,
312
                                                                         "onload"   => $onload });
313 313

  
314 314
  $lxdebug->leave_sub();
315 315
}
......
349 349

  
350 350
  $form->{"title"} = $locale->text("Select a Customer");
351 351
  $form->header();
352
  print $form->parse_html_template2("generic/select_vendor", { "HEADER" => \@header,
353
                                                               "VENDOR" => $vendor,
354
                                                               "onload" => $onload });
352
  print $form->parse_html_template("generic/select_vendor", { "HEADER" => \@header,
353
                                                              "VENDOR" => $vendor,
354
                                                              "onload" => $onload });
355 355

  
356 356
  $lxdebug->leave_sub();
357 357
}
......
395 395
  $form->{formel} = $formel; 
396 396
  $form->{"title"} = $locale->text("Please enter values");
397 397
  $form->header();
398
  print($form->parse_html_template2("generic/calculate_qty", { "HEADER"    => \@header,
399
                                                               "VARIABLES" => \@variable,
400
                                                               "onload"    => $onload }));
398
  print($form->parse_html_template("generic/calculate_qty", { "HEADER"    => \@header,
399
                                                              "VARIABLES" => \@variable,
400
                                                              "onload"    => $onload }));
401 401

  
402 402
  $lxdebug->leave_sub();
403 403
}
......
407 407

  
408 408
  $form->{title} = $locale->text("Enter longdescription");
409 409
  $form->header();
410
  print $form->parse_html_template2("generic/set_longdescription");
410
  print $form->parse_html_template("generic/set_longdescription");
411 411

  
412 412
  $lxdebug->leave_sub();
413 413
}
......
509 509
  
510 510
	$form->{title} = $locale->text("History");
511 511
    $form->header();
512
    print $form->parse_html_template2( "common/show_history", {
512
    print $form->parse_html_template( "common/show_history", {
513 513
    	"DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
514 514
    	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
515 515
      uc($sort) => 1,
......
554 554
  $form->{title} = $form->{vc} eq "customer" ?
555 555
    $locale->text("Customer details") : $locale->text("Vendor details");
556 556
  $form->header();
557
  print($form->parse_html_template2("common/show_vc_details",
558
                                    { "is_customer" => $form->{vc} eq "customer" }));
557
  print $form->parse_html_template("common/show_vc_details", { "is_customer" => $form->{vc} eq "customer" });
559 558

  
560 559
	$lxdebug->leave_sub();
561 560
}
bin/mozilla/ct.pl
80 80
  $form->{fokus} = 'Form.name';
81 81

  
82 82
  $form->header();
83
  print $form->parse_html_template2('ct/search');
83
  print $form->parse_html_template('ct/search');
84 84

  
85 85
  $lxdebug->leave_sub();
86 86
}
......
163 163
  my $report = SL::ReportGenerator->new(\%myconfig, $form);
164 164

  
165 165
  $report->set_options('top_info_text'         => join("\n", @options),
166
                       'raw_bottom_info_text'  => $form->parse_html_template2('ct/list_names_bottom'),
166
                       'raw_bottom_info_text'  => $form->parse_html_template('ct/list_names_bottom'),
167 167
                       'output_format'         => 'HTML',
168 168
                       'title'                 => $form->{title},
169 169
                       'attachment_basename'   => $attachment_basename . strftime('_%Y%m%d', localtime time),
bin/mozilla/dn.pl
74 74
  $form->{callback} ||= build_std_url("action=edit_config");
75 75

  
76 76
  $form->header();
77
  print $form->parse_html_template2("dunning/edit_config");
77
  print $form->parse_html_template("dunning/edit_config");
78 78

  
79 79
  $lxdebug->leave_sub();
80 80
}
......
96 96
  $form->{fokus}    = "search.customer";
97 97
  $form->header();
98 98

  
99
  print $form->parse_html_template2("dunning/add");
99
  print $form->parse_html_template("dunning/add");
100 100

  
101 101
  $lxdebug->leave_sub();
102 102
}
......
131 131
                                          'no_opendocument' => 1,);
132 132

  
133 133
  $form->header();
134
  print $form->parse_html_template2("dunning/show_invoices");
134
  print $form->parse_html_template("dunning/show_invoices");
135 135

  
136 136
  $lxdebug->leave_sub();
137 137
}
......
233 233

  
234 234
  $form->{"title"} = $locale->text("Set eMail text");
235 235
  $form->header();
236
  print($form->parse_html_template2("dunning/set_email"));
236
  print($form->parse_html_template("dunning/set_email"));
237 237

  
238 238
  $lxdebug->leave_sub();
239 239
}
......
260 260
    . qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|
261 261
    . qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
262 262

  
263
  print $form->parse_html_template2("dunning/search");
263
  print $form->parse_html_template("dunning/search");
264 264

  
265 265
  $lxdebug->leave_sub();
266 266

  
......
361 361

  
362 362
  $report->add_data($current_dunning_rows) if (scalar @{ $current_dunning_rows });
363 363

  
364
  $report->set_options('raw_top_info_text'    => $form->parse_html_template2('dunning/show_dunning_top'),
365
                       'raw_bottom_info_text' => $form->parse_html_template2('dunning/show_dunning_bottom'),
364
  $report->set_options('raw_top_info_text'    => $form->parse_html_template('dunning/show_dunning_top'),
365
                       'raw_bottom_info_text' => $form->parse_html_template('dunning/show_dunning_bottom'),
366 366
                       'output_format'        => 'HTML',
367 367
                       'attachment_basename'  => $locale->text('dunning_list') . strftime('_%Y%m%d', localtime time),
368 368
    );
bin/mozilla/drafts.pl
24 24
    $form->{remove_draft} = 1;
25 25

  
26 26
    $form->header();
27
    print($form->parse_html_template2("drafts/save_new"));
27
    print($form->parse_html_template("drafts/save_new"));
28 28

  
29 29
    return $lxdebug->leave_sub();
30 30
  }
......
70 70
  my $saved_form = save_form();
71 71

  
72 72
  $form->header();
73
  print($form->parse_html_template2("drafts/load",
74
                                    { "DRAFTS" => \@drafts,
75
                                      "SAVED_FORM" => $saved_form,
76
                                      "draft_nextsub" => $draft_nextsub }));
73
  print($form->parse_html_template("drafts/load",
74
                                   { "DRAFTS"        => \@drafts,
75
                                     "SAVED_FORM"    => $saved_form,
76
                                     "draft_nextsub" => $draft_nextsub }));
77 77

  
78 78
  $lxdebug->leave_sub();
79 79

  
bin/mozilla/gl.pl
627 627
      . '</span></p> ';
628 628
  }
629 629

  
630
  $raw_bottom_info_text .= $form->parse_html_template2('gl/generate_report_bottom');
630
  $raw_bottom_info_text .= $form->parse_html_template('gl/generate_report_bottom');
631 631

  
632 632
  $report->set_options('raw_bottom_info_text' => $raw_bottom_info_text);
633 633

  
bin/mozilla/ic.pl
1700 1700
  );
1701 1701

  
1702 1702
  $report->set_options('top_info_text'         => $locale->text('Options') . ': ' . join(', ', grep $_, @options),
1703
                       'raw_bottom_info_text'  => $form->parse_html_template2('ic/generate_report_bottom'),
1703
                       'raw_bottom_info_text'  => $form->parse_html_template('ic/generate_report_bottom'),
1704 1704
                       'output_format'         => 'HTML',
1705 1705
                       'title'                 => $form->{title},
1706 1706
                       'attachment_basename'   => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time),
......
3101 3101

  
3102 3102
  $form->{"title"} = $locale->text("Language Values");
3103 3103
  $form->header();
3104
  print $form->parse_html_template2("ic/parts_language_selection", { "HEADER"    => \@header,
3105
                                                                     "LANGUAGES" => $languages,
3106
                                                                     "onload"    => $onload });
3104
  print $form->parse_html_template("ic/parts_language_selection", { "HEADER"    => \@header,
3105
                                                                    "LANGUAGES" => $languages,
3106
                                                                    "onload"    => $onload });
3107 3107

  
3108 3108
  $lxdebug->leave_sub();
3109 3109
}
bin/mozilla/io.pl
354 354
  push @HIDDENS,      { 'name' => 'taxaccount2',  'value' => $form->{taxaccounts} };
355 355

  
356 356
  $form->header();
357
  print $form->parse_html_template2("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
357
  print $form->parse_html_template("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
358 358

  
359 359
  $lxdebug->leave_sub();
360 360
}
......
701 701
  @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list;
702 702
  @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form;
703 703

  
704
  print $form->parse_html_template2('generic/edit_email',
705
                                    { title           => $title,
706
                                      a_filename      => $attachment_filename,
707
                                      _print_options_ => print_options('inline' => 1),
708
                                      HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
709
                                      SHOW_BCC        => $myconfig{role} eq 'admin' });
704
  print $form->parse_html_template('generic/edit_email',
705
                                   { title           => $title,
706
                                     a_filename      => $attachment_filename,
707
                                     _print_options_ => print_options('inline' => 1),
708
                                     HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
709
                                     SHOW_BCC        => $myconfig{role} eq 'admin' });
710 710

  
711 711
  $lxdebug->leave_sub();
712 712
}
......
834 834
    remove_draft_checked => $form->{remove_draft} ? "checked" : ''
835 835
  );
836 836

  
837
  my $print_options = $form->parse_html_template2("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
837
  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
838 838

  
839 839
  if ($options{inline}) {
840 840
    $lxdebug->leave_sub();
bin/mozilla/menuv3.pl
45 45
  $form->{date} = clock_line();
46 46
  $form->{menu} = acc_menu();
47 47

  
48
  print $form->parse_html_template2("menu/menuv3");
48
  print $form->parse_html_template("menu/menuv3");
49 49

  
50 50
}
51 51

  
bin/mozilla/oe.pl
484 484
     is_pur_ord      => scalar ($form->{type} =~ /purchase_order$/),
485 485
  );
486 486

  
487
  print $form->parse_html_template2("oe/orders_header", { %TMPL_VAR });
487
  print $form->parse_html_template("oe/orders_header", { %TMPL_VAR });
488 488

  
489 489
  $lxdebug->leave_sub();
490 490
}
......
541 541

  
542 542
  $form->{oldinvtotal} = $form->{invtotal};
543 543

  
544
  print $form->parse_html_template2("oe/orders_footer", {
544
  print $form->parse_html_template("oe/orders_footer", {
545 545
     %TMPL_VAR,
546 546
     webdav          => $webdav,
547 547
     print_options   => print_options(inline => 1),
......
1087 1087
  }
1088 1088

  
1089 1089
  $report->set_options('top_info_text'        => join("\n", @options),
1090
                       'raw_top_info_text'    => $form->parse_html_template2('oe/orders_top'),
1091
                       'raw_bottom_info_text' => $form->parse_html_template2('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }),
1090
                       'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),
1091
                       'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }),
1092 1092
                       'output_format'        => 'HTML',
1093 1093
                       'title'                => $form->{title},
1094 1094
                       'attachment_basename'  => $attachment_basename . strftime('_%Y%m%d', localtime time),
......
1840 1840
  $form->{VARIABLES} = [ map { { "key" => $_, "value" => $form->{$_} } } grep { ref $_ eq "" } keys %{ $form } ];
1841 1841

  
1842 1842
  $form->header();
1843
  print $form->parse_html_template2("oe/check_for_direct_delivery");
1843
  print $form->parse_html_template("oe/check_for_direct_delivery");
1844 1844

  
1845 1845
  $lxdebug->leave_sub();
1846 1846

  
......
2199 2199
    push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
2200 2200
  }
2201 2201

  
2202
  print $form->parse_html_template2('oe/sales_order', { ROWS   => \@ROWS,
2203
                                                        HEADER => \@HEADER,
2204
                                                      });
2202
  print $form->parse_html_template('oe/sales_order', { ROWS   => \@ROWS,
2203
                                                       HEADER => \@HEADER,
2204
                                                     });
2205 2205

  
2206 2206
  if (0 != ($form->{sellprice_total} * 1)) {
2207 2207
    $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
bin/mozilla/reportgenerator.pl
44 44

  
45 45
  $form->{title} = $locale->text('PDF export -- options');
46 46
  $form->header();
47
  print $form->parse_html_template2('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values });
47
  print $form->parse_html_template('report_generator/pdf_export_options', { 'HIDDEN' => \@form_values });
48 48

  
49 49
  $lxdebug->leave_sub();
50 50
}
......
63 63

  
64 64
  $form->{title} = $locale->text('CSV export -- options');
65 65
  $form->header();
66
  print $form->parse_html_template2('report_generator/csv_export_options', { 'HIDDEN' => \@form_values });
66
  print $form->parse_html_template('report_generator/csv_export_options', { 'HIDDEN' => \@form_values });
67 67

  
68 68
  $lxdebug->leave_sub();
69 69
}
bin/mozilla/rp.pl
1441 1441
  $report->add_data(create_aging_subtotal_row(\%totals, \@columns, \@periods, 'listtotal'));
1442 1442

  
1443 1443
  if ($form->{arap} eq 'ar') {
1444
    $raw_top_info_text    = $form->parse_html_template2('rp/aging_ar_top');
1445
    $raw_bottom_info_text = $form->parse_html_template2('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
1446
                                                                                'PRINT_OPTIONS' => print_options(inline => 1), });
1444
    $raw_top_info_text    = $form->parse_html_template('rp/aging_ar_top');
1445
    $raw_bottom_info_text = $form->parse_html_template('rp/aging_ar_bottom', { 'row_idx' => $row_idx,
1446
                                                                               'PRINT_OPTIONS' => print_options(inline => 1), });
1447 1447
    $report->set_options('raw_top_info_text'    => $raw_top_info_text,
1448 1448
                         'raw_bottom_info_text' => $raw_bottom_info_text);
1449 1449
  }
bin/mozilla/ustva.pl
69 69
# $locale->text('Nov')
70 70
# $locale->text('Dec')
71 71

  
72
# $form->parse_html_template2('generic/util_hidden_variables');
72
# $form->parse_html_template('generic/util_hidden_variables');
73 73

  
74 74
#############################
75 75

  
......
217 217

  
218 218
  };
219 219
  
220
  print($form->parse_html_template2('ustva/report', $template_ref));
220
  print($form->parse_html_template('ustva/report', $template_ref));
221 221

  
222 222

  
223 223

  
......
1069 1069
        taxnumber => $myconfig{taxnumber},
1070 1070
    };
1071 1071

  
1072
    print($form->parse_html_template2('ustva/generic_taxreport', $template_ref));
1072
    print($form->parse_html_template('ustva/generic_taxreport', $template_ref));
1073 1073

  
1074 1074
  } else
1075 1075
  { 
......
1161 1161
  };
1162 1162
  
1163 1163
  # Ausgabe des Templates
1164
  print($form->parse_html_template2('ustva/config_step1', $template_ref));
1164
  print($form->parse_html_template('ustva/config_step1', $template_ref));
1165 1165

  
1166 1166
  $lxdebug->leave_sub();
1167 1167
}
......
1301 1301
  };
1302 1302
  
1303 1303
  # Ausgabe des Templates
1304
  print($form->parse_html_template2('ustva/config_step2', $template_ref));
1304
  print($form->parse_html_template('ustva/config_step2', $template_ref));
1305 1305

  
1306 1306

  
1307 1307
  $lxdebug->leave_sub();
locale/de/locales.pl
336 336
      }
337 337

  
338 338
      # is this a template call?
339
      if (/parse_html_template2?\s*\(\s*[\"\']([\w\/]+)/) {
339
      if (/parse_html_template\s*\(\s*[\"\']([\w\/]+)/) {
340 340
        my $newfile = "$basedir/templates/webpages/$1_master.html";
341 341
        if (-f $newfile) {
342 342
#           &scanhtmlfile($newfile);
sql/Pg-upgrade/Pg-upgrade-2.2.0.25-2.2.0.26.pl
13 13
sub myshowerror {
14 14
  my ($msg) = @_;
15 15

  
16
  print($main::form->parse_html_template2("dbupgrade/units_error",
17
                                          { "message" => $msg }));
16
  print $main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg });
18 17
  return 2;
19 18
}
20 19

  
......
219 218
    map({ push(@unknown_parts, { "name" => $_, "NEW_UNITS" => $ddbox }); }
220 219
        sort({ lc($a) cmp lc($b) } keys(%unknown_dimension_units)));
221 220

  
222
    print($form->parse_html_template2("dbupgrade/units_parts",
223
                                      { "NEW_BASE_UNIT_DDBOX" => $ddbox,
224
                                        "UNKNOWN_PART_UNITS" => \@unknown_parts,
225
                                      }));
221
    print $form->parse_html_template("dbupgrade/units_parts",
222
                                     { "NEW_BASE_UNIT_DDBOX" => $ddbox,
223
                                       "UNKNOWN_PART_UNITS"  => \@unknown_parts,
224
                                     });
226 225

  
227 226
    return 2;
228 227

  
229 228
  } else {
230
    print($form->parse_html_template2("dbupgrade/units_parts_done"));
229
    print $form->parse_html_template("dbupgrade/units_parts_done");
231 230
  }
232 231

  
233 232
  if (scalar(keys(%unknown_service_units)) != 0) {
......
238 237
    map({ push(@unknown_services, { "name" => $_, "NEW_UNITS" => $ddbox }); }
239 238
        sort({ lc($a) cmp lc($b) } keys(%unknown_service_units)));
240 239

  
241
    print($form->parse_html_template2("dbupgrade/units_services",
242
                                      { "NEW_BASE_UNIT_DDBOX" => $ddbox,
243
                                        "UNKNOWN_PART_UNITS" => \@unknown_services,
244
                                      }));
240
    print $form->parse_html_template("dbupgrade/units_services",
241
                                     { "NEW_BASE_UNIT_DDBOX" => $ddbox,
242
                                       "UNKNOWN_PART_UNITS"  => \@unknown_services,
243
                                     }));
245 244

  
246 245
    return 2;
247 246

  
248 247
  } else {
249
    print($form->parse_html_template2("dbupgrade/units_services_done"));
248
    print $form->parse_html_template("dbupgrade/units_services_done");
250 249
  }
251 250

  
252 251
  return 0;
......
271 270
    my $service_units = retrieve_units(\%dbup_myconfig, $form, "service");
272 271
    my $service_ddbox = unit_select_data($service_units);
273 272

  
274
    print($form->parse_html_template2("dbupgrade/units_set_default",
275
                                      { "DIMENSION_DDBOX" => $dimension_ddbox,
276
                                        "SERVICE_DDBOX" => $service_ddbox }));
273
    print $form->parse_html_template("dbupgrade/units_set_default",
274
                                     { "DIMENSION_DDBOX" => $dimension_ddbox,
275
                                       "SERVICE_DDBOX"   => $service_ddbox });
277 276
    return 2;
278 277

  
279 278
  } else {
280
    print($form->parse_html_template2("dbupgrade/units_set_default_done"));
279
    print $form->parse_html_template("dbupgrade/units_set_default_done");
281 280
    return 1;
282 281
  }
283 282
}
......
330 329

  
331 330
  my $res;
332 331

  
333
  print($form->parse_html_template2("dbupgrade/units_header"));
332
  print $form->parse_html_template("dbupgrade/units_header");
334 333

  
335 334
  if ($form->{"action2"} eq "add_unit") {
336 335
    $res = update_units_add_unit();
sql/Pg-upgrade/Pg-upgrade-2.2.0.27-2.2.0.28.pl
11 11
sub myshowerror {
12 12
  my ($msg) = @_;
13 13

  
14
  print($main::form->parse_html_template2("dbupgrade/units_error",
15
                                          { "message" => $msg }));
14
  print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }));
16 15
  return 2;
17 16
}
18 17

  
......
76 75

  
77 76
  my @coas = map(+{ "name" => $_ }, @valid_coas);
78 77

  
79
  print($form->parse_html_template2("dbupgrade/coa_guess",
80
                                    { "COAS" => \@coas }));
78
  print($form->parse_html_template("dbupgrade/coa_guess", { "COAS" => \@coas }));
81 79

  
82 80
  return 2;
83 81
}
sql/Pg-upgrade/Pg-upgrade-2.2.0.28-2.2.0.29.pl
11 11
sub myshowerror {
12 12
  my ($msg) = @_;
13 13

  
14
  print($main::form->parse_html_template2("dbupgrade/units_error",
15
                                          { "message" => $msg }));
14
  print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }));
16 15
  return 2;
17 16
}
18 17

  
......
209 208
    return create_standard_buchungsgruppen_skr04();
210 209
  }
211 210

  
212
  print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
211
  print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
213 212

  
214 213
  return 1;
215 214
}
sql/Pg-upgrade/Pg-upgrade-2.2.0.31-2.2.0.32.pl
11 11
sub myshowerror {
12 12
  my ($msg) = @_;
13 13

  
14
  print($main::form->parse_html_template2("dbupgrade/units_error",
15
                                          { "message" => $msg }));
14
  print($main::form->parse_html_template("dbupgrade/units_error", { "message" => $msg }));
16 15
  return 2;
17 16
}
18 17

  
......
117 116
    return update_steuersaetze_skr04();
118 117
  }
119 118

  
120
  print($form->parse_html_template2("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
119
  print($form->parse_html_template("dbupgrade/std_buchungsgruppen_unknown_coa", { "coa" => $coa }));
121 120

  
122 121
  return 1;
123 122
}
sql/Pg-upgrade/Pg-upgrade-2.2.0.33-2.2.0.34.pl
302 302
    $entry->{"eur"} = $main::eur;
303 303
  }
304 304

  
305
  # $form->parse_html_template2("dbupgrade/buchungsgruppen_parts")
306
  # $form->parse_html_template2("dbupgrade/buchungsgruppen_services")
307
  # $form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies")
308

  
309
  print($form->parse_html_template2("dbupgrade/buchungsgruppen_${type}",
310
                                    { "LIST" => $list,
311
                                      "BUCHUNGSGRUPPEN" => $buchungsgruppen,
312
                                    }));
305
  # $form->parse_html_template("dbupgrade/buchungsgruppen_parts")
306
  # $form->parse_html_template("dbupgrade/buchungsgruppen_services")
307
  # $form->parse_html_template("dbupgrade/buchungsgruppen_assemblies")
308

  
309
  print($form->parse_html_template("dbupgrade/buchungsgruppen_${type}",
310
                                   { "LIST"            => $list,
311
                                     "BUCHUNGSGRUPPEN" => $buchungsgruppen,
312
                                   }));
313 313
}
314 314

  
315 315
sub create_buchungsgruppen {
......
459 459

  
460 460
  my ($acc_inventory, $acc_income, $acc_expense) = retrieve_accounts();
461 461

  
462
  print($form->parse_html_template2("dbupgrade/buchungsgruppen_header"));
462
  print($form->parse_html_template("dbupgrade/buchungsgruppen_header"));
463 463

  
464 464
  if (scalar(@{$parts})) {
465 465
    display_create_bgs_dialog("parts", $parts,
......
467 467
                              $buchungsgruppen);
468 468
    return 2;
469 469
  } else {
470
    print($form->parse_html_template2("dbupgrade/buchungsgruppen_parts_done"));
470
    print($form->parse_html_template("dbupgrade/buchungsgruppen_parts_done"));
471 471
  }
472 472

  
473 473
  if (scalar(@{$services})) {
......
476 476
                              $buchungsgruppen);
477 477
    return 2;
478 478
  } else {
479
    print($form->parse_html_template2("dbupgrade/buchungsgruppen_services_done"));
479
    print($form->parse_html_template("dbupgrade/buchungsgruppen_services_done"));
480 480
  }
481 481

  
482 482
  if (scalar(@{$assemblies})) {
......
485 485
                              $buchungsgruppen);
486 486
    return 2;
487 487
  } else {
488
    print($form->parse_html_template2("dbupgrade/buchungsgruppen_assemblies_done"));
488
    print($form->parse_html_template("dbupgrade/buchungsgruppen_assemblies_done"));
489 489
  }
490 490

  
491
  print($form->parse_html_template2("dbupgrade/buchungsgruppen_footer"));
491
  print($form->parse_html_template("dbupgrade/buchungsgruppen_footer"));
492 492

  
493 493
  return 1;
494 494
}
sql/Pg-upgrade/Pg-upgrade-2.2.0.37-2.2.0.38.pl
48 48

  
49 49
  if (@warnings) {
50 50
    @warnings = map(+{ "message" => $_ }, @warnings);
51
    print($form->parse_html_template2("dbupgrade/update_templates_warnings",
52
                                      { "WARNINGS" => \@warnings }));
51
    print($form->parse_html_template("dbupgrade/update_templates_warnings", { "WARNINGS" => \@warnings }));
53 52
  }
54 53

  
55 54
  return 1;

Auch abrufbar als: Unified diff