From d629acd82a27e980899a044ca8b0f4becc8e94bb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Tue, 24 Apr 2007 13:25:28 +0000 Subject: [PATCH] $form->{path} entfernt und hardcodiert auf bin/mozilla gesetzt. Vorlagen sind nicht betroffen, aber locales.pl schon. --- SL/Drafts.pm | 2 +- SL/Menu.pm | 6 +- am.pl | 15 ++--- bin/mozilla/admin.pl | 35 ++++------- bin/mozilla/am.pl | 58 ++++++++----------- bin/mozilla/amtemplates.pl | 4 +- bin/mozilla/ap.pl | 11 ++-- bin/mozilla/ar.pl | 13 ++--- bin/mozilla/arap.pl | 8 +-- bin/mozilla/bp.pl | 12 ++-- bin/mozilla/ca.pl | 9 ++- bin/mozilla/cp.pl | 5 +- bin/mozilla/ct.pl | 24 ++++---- bin/mozilla/datev.pl | 5 +- bin/mozilla/dn.pl | 21 +++---- bin/mozilla/gl.pl | 11 ++-- bin/mozilla/ic.pl | 37 +++++------- bin/mozilla/io.pl | 20 +++---- bin/mozilla/ir.pl | 8 +-- bin/mozilla/is.pl | 12 ++-- bin/mozilla/kopf.pl | 4 +- bin/mozilla/licenses.pl | 11 +--- bin/mozilla/login.pl | 17 +++--- bin/mozilla/menu.pl | 8 +-- bin/mozilla/menunew.pl | 10 ++-- bin/mozilla/menuv3.pl | 8 +-- bin/mozilla/oe.pl | 19 +++--- bin/mozilla/pe.pl | 21 +++---- bin/mozilla/rc.pl | 4 +- bin/mozilla/rp.pl | 24 ++++---- bin/mozilla/ustva.pl | 14 ++--- doc/programmierstilrichtlinien.txt | 2 +- doc/ustva.html | 12 ++-- js/calculate_qty.js | 1 - js/common.js | 1 - js/delivery_customer_selection.js | 1 - js/dunning.js | 1 - js/parts_language_selection.js | 1 - js/show_history.js | 3 +- js/vendor_selection.js | 1 - locale/de/all | 3 + locale/de/ap | 2 + locale/de/ar | 2 + locale/de/bp | 2 + locale/de/cp | 2 + locale/de/dn | 2 + locale/de/gl | 2 + locale/de/ir | 2 + locale/de/is | 2 + locale/de/locales.pl | 1 - locale/de/oe | 2 + locale/de/rc | 1 + locale/de/rp | 2 + login.pl | 50 +--------------- lx-erp.conf | 2 +- scripts/spawn_oo.pl | 2 - t/demolx/AllTests.t | 2 +- t/demolx/cleanup.pl | 2 +- t/lxtest.conf.default | 3 +- t/selenium/AllTests.t | 2 +- t/selenium/cleanup.pl | 2 +- t/selenium/incomming/ustva-Inland-linet.html | 4 +- templates/webpages/am/edit_units_de.html | 1 - templates/webpages/am/edit_units_master.html | 1 - .../webpages/common/search_history_de.html | 1 - .../common/search_history_master.html | 1 - .../webpages/common/show_history_de.html | 21 +++++-- .../webpages/common/show_history_master.html | 1 - .../buchungsgruppen_assemblies_de.html | 1 - .../buchungsgruppen_assemblies_master.html | 1 - .../dbupgrade/buchungsgruppen_parts_de.html | 1 - .../buchungsgruppen_parts_master.html | 1 - .../buchungsgruppen_services_de.html | 1 - .../buchungsgruppen_services_master.html | 1 - .../webpages/dbupgrade/coa_guess_de.html | 1 - .../webpages/dbupgrade/coa_guess_master.html | 1 - templates/webpages/dbupgrade/footer_de.html | 1 - .../webpages/dbupgrade/footer_master.html | 1 - ...td_buchungsgruppen_unknown_coa_master.html | 1 - .../webpages/dbupgrade/units_parts_de.html | 1 - .../dbupgrade/units_parts_master.html | 1 - .../webpages/dbupgrade/units_services_de.html | 1 - .../dbupgrade/units_services_master.html | 1 - .../dbupgrade/units_set_default_de.html | 1 - .../dbupgrade/units_set_default_master.html | 1 - templates/webpages/dbupgrade/warning_de.html | 1 - .../webpages/dbupgrade/warning_master.html | 1 - templates/webpages/drafts/load_de.html | 3 +- templates/webpages/drafts/load_master.html | 3 +- templates/webpages/drafts/save_new_de.html | 1 - .../webpages/drafts/save_new_master.html | 1 - templates/webpages/ustva/report_de.html | 1 - templates/webpages/ustva/report_master.html | 3 +- 93 files changed, 244 insertions(+), 386 deletions(-) diff --git a/SL/Drafts.pm b/SL/Drafts.pm index 698b217f5..a4d4dc6a1 100644 --- a/SL/Drafts.pm +++ b/SL/Drafts.pm @@ -53,7 +53,7 @@ sub save { do_query($form, $dbh, $query, $draft_id, $module, $submodule); } - @dont_save = qw(login password path action); + @dont_save = qw(login password action); map({ $saved{$_} = $form->{$_}; delete($form->{$_}); } @dont_save); $dumped = YAML::Dump($form); diff --git a/SL/Menu.pm b/SL/Menu.pm index 77bc848fd..044ce9b79 100644 --- a/SL/Menu.pm +++ b/SL/Menu.pm @@ -69,7 +69,7 @@ sub menuitem { my $level = $form->escape($item); my $str = - qq|{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|; + qq|{login}&password=$form->{password}|; my @vars = qw(module action target href); @@ -122,7 +122,7 @@ sub menuitem_v3 { my $str = qq|error($locale->text('Incorrect Password!')) if ($form->{password} ne $myconfig{password}); -$form->{path} =~ s/\.\.\///g; -if ($form->{path} !~ /^bin\//) { - $form->error($locale->text('Invalid path!') . "\n"); -} - # did sysadmin lock us out if (-e "$userspath/nologin") { $form->error($locale->text('System currently down for maintenance!')); } # pull in the main code -require "$form->{path}/$form->{script}"; +require "bin/mozilla/$form->{script}"; # customized scripts -if (-f "$form->{path}/custom_$form->{script}") { - eval { require "$form->{path}/custom_$form->{script}"; }; +if (-f "bin/mozilla/custom_$form->{script}") { + eval { require "bin/mozilla/custom_$form->{script}"; }; $form->error($@) if ($@); } # customized scripts for login -if (-f "$form->{path}/$form->{login}_$form->{script}") { - eval { require "$form->{path}/$form->{login}_$form->{script}"; }; +if (-f "bin/mozilla/$form->{login}_$form->{script}") { + eval { require "bin/mozilla/$form->{login}_$form->{script}"; }; $form->error($@) if ($@); } diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 1e362973d..e936b2a12 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -46,8 +46,8 @@ $form->{"root"} = "root login"; $locale = new Locale $language, "admin"; # customization -if (-f "$form->{path}/custom_$form->{script}") { - eval { require "$form->{path}/custom_$form->{script}"; }; +if (-f "bin/mozilla/custom_$form->{script}") { + eval { require "bin/mozilla/custom_$form->{script}"; }; $form->error($@) if ($@); } @@ -125,7 +125,6 @@ sub adminlogin { . $locale->text('Login') . qq|"> -{path}> @@ -197,8 +196,7 @@ sub form_footer { print qq| - -{path}> + {rpw}> {path}&rpw=$form->{rpw}"; + "$script?action=edit&login=$key&rpw=$form->{rpw}"; $href =~ s/ /%20/g; $member{$key}{templates} =~ s/^$templates\///; @@ -330,7 +328,6 @@ sub list_users { -{path}> {rpw}>
text('Login') . qq|"> -{path}> @@ -1147,7 +1143,6 @@ sub change_admin_password { -{path}> {rpw}>

@@ -1188,7 +1183,7 @@ sub change_password { $root->save_member($memberfile); $form->{callback} = - "$form->{script}?action=list_users&path=$form->{path}&rpw=$root->{password}"; + "$form->{script}?action=list_users&rpw=$root->{password}"; $form->redirect($locale->text('Password changed!')); @@ -1309,8 +1304,7 @@ sub dbselect_source { - -{path}> + {rpw}>
@@ -1404,9 +1398,8 @@ $upd - + -{path}> {rpw}> @@ -1458,7 +1451,7 @@ sub dbupdate {
| . $locale->text("Continue") . qq||; } @@ -1556,9 +1549,8 @@ sub create_dataset { - + -{path}> {rpw}> @@ -1609,7 +1601,6 @@ sub dbcreate { . qq| - @@ -1672,9 +1663,8 @@ sub delete_dataset { - + - @@ -1724,7 +1714,6 @@ $form->{db} | . $locale->text('successfully deleted!') . qq| - @@ -1745,7 +1734,7 @@ sub unlock_system { unlink "$userspath/nologin"; $form->{callback} = - "$form->{script}?action=list_users&path=$form->{path}&rpw=$root->{password}"; + "$form->{script}?action=list_users&rpw=$root->{password}"; $form->redirect($locale->text('Lockfile removed!')); @@ -1758,7 +1747,7 @@ sub lock_system { close(FH); $form->{callback} = - "$form->{script}?action=list_users&path=$form->{path}&rpw=$root->{password}"; + "$form->{script}?action=list_users&rpw=$root->{password}"; $form->redirect($locale->text('Lockfile created!')); diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index 38eedb0c2..ca1ee4c0d 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -40,7 +40,7 @@ use Data::Dumper; 1; -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # end of main @@ -58,7 +58,7 @@ sub add_account { AM->get_account(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &account_header; @@ -485,7 +485,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -534,7 +533,7 @@ sub list_account { # construct callback $callback = - "$form->{script}?action=list_account&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_account&login=$form->{login}&password=$form->{password}"; $form->header; @@ -599,7 +598,7 @@ sub list_account { $ca->{link_edit_account} = qq|$form->{script}?action=edit_account&id=$ca->{id}| - .qq|&path=$form->{path}&login=$form->{login}| + .qq|&login=$form->{login}| .qq|&password=$form->{password}&callback=$callback|; } @@ -644,7 +643,7 @@ sub add_department { $form->{role} = "P"; $form->{callback} = - "$form->{script}?action=add_department&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_department&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &department_header; @@ -672,7 +671,7 @@ sub list_department { AM->departments(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_department&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_department&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -728,7 +727,7 @@ sub list_department { $profitcenter = ($ref->{role} eq "P") ? "X" : ""; $column_data{description} = - qq|{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{cost} = qq|$costcenter|; $column_data{profit} = qq|$profitcenter|; @@ -755,7 +754,6 @@ sub list_department { -{path}> {login}> {password}> @@ -852,7 +850,7 @@ sub add_lead { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_lead&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &lead_header; @@ -882,7 +880,7 @@ sub list_lead { AM->lead(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_lead&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_lead&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -926,7 +924,7 @@ sub list_lead { $lead = $ref->{lead}; $column_data{description} = - qq|{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}|; + qq|{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}|; map { print "$column_data{$_}\n" } @column_index; @@ -948,7 +946,6 @@ sub list_lead { -{path}> {login}> {password}> @@ -1029,7 +1026,7 @@ sub add_business { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_business&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_business&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &business_header; @@ -1059,7 +1056,7 @@ sub list_business { AM->business(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_business&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_business&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1116,7 +1113,7 @@ sub list_business { $description = $ref->{description}; $column_data{description} = - qq|{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description|; + qq|{script}?action=edit_business&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$description|; $column_data{discount} = qq|$discount|; $column_data{customernumberinit} = qq|$ref->{customernumberinit}|; @@ -1144,7 +1141,6 @@ sub list_business { -{path}> {login}> {password}> @@ -1233,7 +1229,7 @@ sub add_language { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_language&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &language_header; @@ -1263,7 +1259,7 @@ sub list_language { AM->language(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_language&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_language&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1329,7 +1325,7 @@ sub list_language { $column_data{description} = - qq|{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_language&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{template_code} = qq|$ref->{template_code}|; $column_data{article_code} = qq|$ref->{article_code}|; @@ -1371,7 +1367,6 @@ sub list_language { -{path}> {login}> {password}> @@ -1505,7 +1500,7 @@ sub add_buchungsgruppe { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_buchungsgruppe&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AM->get_buchungsgruppe(\%myconfig, \%$form); $form->{"inventory_accno_id"} = $form->{"std_inventory_accno_id"}; @@ -1540,7 +1535,7 @@ sub list_buchungsgruppe { AM->buchungsgruppe(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_buchungsgruppe&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_buchungsgruppe&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1624,7 +1619,7 @@ sub list_buchungsgruppe { my $swap_link = qq|$form->{script}?action=swap_buchungsgruppen&|; map({ $swap_link .= $_ . "=" . $form->escape($form->{$_}) . "&" } - qw(login password path)); + qw(login password)); my $row = 0; foreach $ref (@{ $form->{ALL} }) { @@ -1659,7 +1654,7 @@ sub list_buchungsgruppe { } $column_data{description} = - qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; + qq|{script}?action=edit_buchungsgruppe&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}|; $column_data{inventory_accno} = qq|$ref->{inventory_accno}|; $column_data{income_accno_0} = qq|$ref->{income_accno_0}|; @@ -1699,7 +1694,6 @@ sub list_buchungsgruppe { -{path}> {login}> {password}> @@ -1891,7 +1885,7 @@ sub add_printer { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_printer&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &printer_header; @@ -1921,7 +1915,7 @@ sub list_printer { AM->printer(\%myconfig, \%$form); $form->{callback} = - "$form->{script}?action=list_printer&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=list_printer&login=$form->{login}&password=$form->{password}"; $callback = $form->escape($form->{callback}); @@ -1975,7 +1969,7 @@ sub list_printer { $column_data{printer_description} = - qq|{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}|; + qq|{script}?action=edit_printer&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}|; $column_data{printer_command} = qq|$ref->{printer_command}|; $column_data{template_code} = qq|$ref->{template_code}|; @@ -2003,7 +1997,6 @@ sub list_printer { -{path}> {login}> {password}> @@ -2093,7 +2086,7 @@ sub add_payment { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add_payment&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add_payment&login=$form->{login}&password=$form->{password}" unless $form->{callback}; $form->{terms_netto} = 0; @@ -2263,7 +2256,6 @@ sub list_payment { -{path}> {login}> {password}> @@ -2789,7 +2781,6 @@ print qq| -{path}> {login}> {password}> @@ -2840,7 +2831,6 @@ sub audit_control {

{script}> -{path}> {login}> {password}> diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl index fa55a0118..77f7659a2 100644 --- a/bin/mozilla/amtemplates.pl +++ b/bin/mozilla/amtemplates.pl @@ -38,7 +38,7 @@ use Data::Dumper; 1; -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # end of main @@ -98,7 +98,7 @@ sub display_template_form { my %options; - my @hidden = qw(login path password type format); + my @hidden = qw(login password type format); if (($form->{"type"} ne "stylesheet") && !$form->{"edit"}) { $options{"SHOW_EDIT_OPTIONS"} = 1; diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index 22fc65cfa..65c51a1f1 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -35,7 +35,7 @@ use SL::AP; use SL::IR; use SL::PE; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/drafts.pl"; @@ -79,7 +79,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AP->get_transdate(\%myconfig, $form); @@ -826,7 +826,6 @@ sub form_footer { -{path}> {login}> {password}> | @@ -1366,7 +1365,6 @@ $jsscript
{nextsub}> -{path}> {login}> {password}> @@ -1390,7 +1388,7 @@ sub ap_transactions { AP->ap_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=ap_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=ap_transactions&login=$form->{login}&password=$form->{password}"; $href = $callback; if ($form->{vendor}) { @@ -1604,7 +1602,7 @@ sub ap_transactions { $module = ($ap->{invoice}) ? "ir.pl" : $form->{script}; $column_data{invnumber} = - qq|
$ap->{invnumber}|; + qq|$ap->{invnumber}|; $column_data{id} = "$ap->{id}"; $column_data{ordnumber} = "$ap->{ordnumber} "; $column_data{name} = "$ap->{name}"; @@ -1673,7 +1671,6 @@ sub ap_transactions { -{path}> {login}> {password}> diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index 482ac6483..1597c550d 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -36,7 +36,7 @@ use SL::IS; use SL::PE; use Data::Dumper; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; require "bin/mozilla/drafts.pl"; @@ -87,7 +87,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; AR->get_transdate(\%myconfig, $form); @@ -843,7 +843,6 @@ sub form_footer { -{path}> {login}> {password}> | @@ -899,7 +898,7 @@ sub form_footer { } if ($form->{menubar}) { - require "$form->{path}/menu.pl"; + require "bin/mozilla/menu.pl"; &menubar; } # button for saving history @@ -1386,7 +1385,6 @@ sub search { {nextsub}> -{path}> {login}> {password}> @@ -1415,7 +1413,7 @@ sub ar_transactions { AR->ar_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=ar_transactions&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=ar_transactions&login=$form->{login}&password=$form->{password}"; $href = $callback; if ($form->{customer}) { @@ -1645,7 +1643,7 @@ sub ar_transactions { $module = ($ar->{invoice}) ? "is.pl" : $form->{script}; $column_data{invnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}"; $column_data{type} = "" . ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") : $ar->{amount} < 0 ? @@ -1720,7 +1718,6 @@ sub ar_transactions { -{path}> {login}> {password}> diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index 08cdc3be2..7952922f6 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -31,11 +31,11 @@ # # any custom scripts for this one -if (-f "$form->{path}/custom_arap.pl") { - eval { require "$form->{path}/custom_arap.pl"; }; +if (-f "bin/mozilla/custom_arap.pl") { + eval { require "bin/mozilla/custom_arap.pl"; }; } -if (-f "$form->{path}/$form->{login}_arap.pl") { - eval { require "$form->{path}/$form->{login}_arap.pl"; }; +if (-f "bin/mozilla/$form->{login}_arap.pl") { + eval { require "bin/mozilla/$form->{login}_arap.pl"; }; } 1; diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl index 6e7d9277a..457a35ebc 100644 --- a/bin/mozilla/bp.pl +++ b/bin/mozilla/bp.pl @@ -229,7 +229,6 @@ sub search { -{path}> {login}> {password}> @@ -353,11 +352,11 @@ sub list_spool { $title = $form->escape($form->{title}); $href = - "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; + "$form->{script}?action=list_spool&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; $title = $form->escape($form->{title}, 1); $callback = - "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; + "$form->{script}?action=list_spool&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title"; if ($form->{ $form->{vc} }) { $callback .= "&$form->{vc}=" . $form->escape($form->{ $form->{vc} }, 1); @@ -507,11 +506,11 @@ sub list_spool { } $column_data{invnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}"; $column_data{ordnumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}"; $column_data{quonumber} = - "{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}"; + "{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; $column_data{spoolfile} = qq|{spoolfile}>$ref->{spoolfile} @@ -556,7 +555,6 @@ sub list_spool { -{path}> {login}> {password}> |; diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 9e3d4ecf2..12aef7aa6 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -107,7 +107,7 @@ sub chart_of_accounts { $description = $form->escape($ca->{description}); $href = - qq|$form->{script}?path=$form->{path}&action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description|; + qq|$form->{script}?action=list&accno=$ca->{accno}&login=$form->{login}&password=$form->{password}&description=$description|; if ($ca->{charttype} eq "H") { print qq||; @@ -239,7 +239,6 @@ sub list { {login}> -{path}> {password}>
{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; + "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; $description = $form->escape($form->{description}, 1); $department = $form->escape($form->{department}, 1); @@ -274,7 +273,7 @@ sub list_transactions { # construct callback $callback = - "$form->{script}?path=$form->{path}&action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; + "$form->{script}?action=list_transactions&accno=$form->{accno}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&description=$description&accounttype=$form->{accounttype}&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title"; # figure out which column comes first $column_header{transdate} = @@ -391,7 +390,7 @@ sub list_transactions { # construct link to source $href = - "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; + "{module}.pl?action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") : " "; $column_data{debit} = "$debit"; diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl index 5a1d2e3bc..b68865a4f 100644 --- a/bin/mozilla/cp.pl +++ b/bin/mozilla/cp.pl @@ -36,7 +36,7 @@ use SL::OP; use SL::IS; use SL::IR; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; 1; @@ -467,7 +467,6 @@ sub form_footer { {rowcount}> -{path}> {login}> {password}> @@ -724,7 +723,7 @@ sub print { if ($form->{media} ne 'screen') { $form->{callback} = - "$form->{script}?action=payment&vc=$form->{vc}&path=$form->{path}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; + "$form->{script}?action=payment&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&all_vc=$form->{all_vc}"; $form->redirect if (CP->process_payment(\%myconfig, \%$form)); $form->error($locale->text('Cannot post payment!')); diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 5bffd7c29..fe166c520 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -54,7 +54,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&db=$form->{db}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; CT->populate_drop_down_boxes(\%myconfig, \%$form); @@ -199,7 +199,6 @@ sub search { -{path}> {login}> {password}> @@ -313,7 +312,6 @@ sub search_delivery { -{path}> {login}> {password}> @@ -334,7 +332,7 @@ sub list_names { CT->search(\%myconfig, \%$form); $callback = - "$form->{script}?action=list_names&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&obsolete=$form->{obsolete}"; + "$form->{script}?action=list_names&db=$form->{db}&login=$form->{login}&password=$form->{password}&status=$form->{status}&obsolete=$form->{obsolete}"; $href = $callback; @columns = @@ -496,7 +494,7 @@ sub list_names { (invnumber, ordnumber, quonumber); $column_data{name} = - "{script}?action=edit&id=$ref->{id}&db=$form->{db}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name} "; + "{script}?action=edit&id=$ref->{id}&db=$form->{db}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name} "; if ($ref->{email}) { $email = $ref->{email}; @@ -511,17 +509,17 @@ sub list_names { if ($ref->{formtype} eq 'invoice') { $column_data{invnumber} = - "{module}.pl?action=edit&id=$ref->{invid}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber} "; + "{module}.pl?action=edit&id=$ref->{invid}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber} "; } if ($ref->{formtype} eq 'order') { $column_data{ordnumber} = - "{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber} "; + "{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber} "; } if ($ref->{formtype} eq 'quotation') { $column_data{quonumber} = - "{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber} "; + "{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber} "; } $i++; @@ -555,7 +553,6 @@ sub list_names { {db}> -{path}> {login}> {password}> @@ -661,7 +658,7 @@ sub form_header { |; $get_contact_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_contact"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_contact"; my $pjx = new CGI::Ajax( 'get_contact' => $get_contact_url ); $form->{selectcontact} = ""; @@ -685,7 +682,7 @@ sub form_header { |; $get_shipto_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_shipto"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_shipto"; my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url ); $form->{selectshipto} = ""; @@ -713,7 +710,7 @@ sub form_header { $get_delivery_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=get_delivery"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=get_delivery"; my $pjz = new CGI::Ajax( 'get_delivery' => $get_delivery_url ); @@ -1195,7 +1192,6 @@ sub form_footer { -{path}> {login}> {password}> @@ -1269,7 +1265,7 @@ sub add_transaction { $name = $form->escape("$form->{name}", 1); $form->{callback} = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&callback=$form->{callback}"; $form->redirect; $lxdebug->leave_sub(); diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl index a21125308..a98a9529f 100644 --- a/bin/mozilla/datev.pl +++ b/bin/mozilla/datev.pl @@ -113,7 +113,6 @@ sub export { -{path}> {login}> {password}> @@ -248,7 +247,6 @@ sub export_bewegungsdaten { -{path}> {login}> {password}> @@ -314,7 +312,6 @@ sub export_stammdaten { -{path}> {login}> {password}> @@ -336,7 +333,7 @@ sub export3 { DATEV->save_datev_stamm(\%myconfig, \%$form); my $link = $form->{"script"} . "?"; - map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(path login password)); + map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(login password)); $link .= "action=download"; if ($form->{kne}) { diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 88b2cb339..b91456aba 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -36,8 +36,8 @@ use SL::PE; use SL::DN; use Data::Dumper; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; 1; @@ -51,7 +51,7 @@ sub edit_config { $form->{title} = $locale->text('Edit Dunning Process Config'); $form->{callback} = - "$form->{script}?action=edit_config&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=edit_config&login=$form->{login}&password=$form->{password}" unless $form->{callback}; @column_index = qw(dunning_level dunning_description active auto email payment_terms terms fee interest template); @@ -201,7 +201,6 @@ sub edit_config { -{path}> {login}> {password}> @@ -348,7 +347,6 @@ sub add { {nextsub}> -{path}> {login}> {password}> @@ -386,7 +384,7 @@ sub show_invoices { $form->{nextsub} = "save_dunning"; $form->{callback} = - "$form->{script}?action=show_invoices&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}" + "$form->{script}?action=show_invoices&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&paymentuntil=$form->{paymentuntil}&groupinvoices=$form->{groupinvoices}&minamount=$form->{minamount}&dunning_level=$form->{dunning_level}¬es=$form->{notes}" unless $form->{callback}; @column_index = qw(dunning_description active email customername invnumber invdate inv_duedate invamount next_duedate fee interest ); @@ -523,7 +521,6 @@ sub show_invoices { -{path}> {login}> {password}> @@ -627,7 +624,7 @@ sub set_email { my $callback = "$form->{script}?action=set_email&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$form))); + (qw(login password name input_subject input_body input_attachment email_subject email_body email_attachment), grep({ /^[fl]_/ } keys %$form))); if ($form->{email_attachment}) { $form->{email_attachment} = "checked"; @@ -798,7 +795,6 @@ sub search { {nextsub}> -{path}> {login}> {password}> @@ -830,7 +826,7 @@ sub show_dunning { $form->{callback} = - "$form->{script}?action=show_dunning&path=$form->{path}&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" + "$form->{script}?action=show_dunning&login=$form->{login}&password=$form->{password}&customer=$form->{customer}&invnumber=$form->{invnumber}&ordnumber=$form->{ordnumber}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&dunningfrom=$form->{dunningfrom}&dunningto=$form->{dunningto}¬es=$form->{notes}&showold=$form->{showold}&dunning_level=$form->{dunning_level}" unless $form->{callback}; @column_index = qw(dunning_description customername invnumber invdate inv_duedate invamount dunning_date next_duedate fee interest ); @@ -936,7 +932,7 @@ sub show_dunning { $column_data{dunning_description} = qq|| . H($ref->{dunning_description}) . qq||; } else { $column_data{dunning_description} = qq| |; @@ -946,7 +942,7 @@ sub show_dunning { $column_data{invnumber} = qq|{id}) . - join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) . + join(map({ "&${_}=" . E($form->{$_}) } qw(login password callback))) . qq|">| . H($ref->{invnumber}) . qq||; map { print "$column_data{$_}\n" } @column_index; @@ -975,7 +971,6 @@ sub show_dunning { -{path}> {login}> {password}> diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl index e3a7a471e..faaad5828 100644 --- a/bin/mozilla/gl.pl +++ b/bin/mozilla/gl.pl @@ -34,7 +34,7 @@ use SL::GL; use SL::PE; -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; 1; @@ -75,7 +75,7 @@ sub add { $form->{title} = "Add"; $form->{callback} = - "$form->{script}?action=add&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&login=$form->{login}&password=$form->{password}" unless $form->{callback}; # we use this only to set a default date @@ -364,7 +364,6 @@ $jsscript -{path}> {login}> {password}> @@ -387,7 +386,7 @@ sub generate_report { GL->all_transactions(\%myconfig, \%$form); $callback = - "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=generate_report&login=$form->{login}&password=$form->{password}"; $href = $callback; @@ -768,7 +767,7 @@ sub generate_report { $column_data{id} = " $ref->{id} "; $column_data{transdate} = "$transdate"; $column_data{reference} = - "{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}"; + "{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}"; $column_data{description} = "$ref->{description} "; $column_data{source} = "$ref->{source} "; $column_data{notes} = "$ref->{notes} "; @@ -871,7 +870,6 @@ sub generate_report { -{path}> {login}> {password}> @@ -1455,7 +1453,6 @@ sub form_footer { -{path}> {login}> {password}> diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index f3b5d84b8..b4ad1b637 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -36,7 +36,7 @@ use SL::IC; #use SL::PE; -require "$form->{path}/io.pl"; +require "bin/mozilla/io.pl"; require "bin/mozilla/common.pl"; 1; @@ -49,7 +49,7 @@ sub add { $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); $form->{callback} = - "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&item=$form->{item}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; $form->{"unit_changeable"} = 1; @@ -375,7 +375,6 @@ $jsscript -{path}> {login}> {password}> @@ -559,7 +558,6 @@ sub search_update_prices { {price_rows}> -{path}> {login}> {password}> @@ -658,7 +656,6 @@ sub choice { print qq| -{path}> {login}> {password}> @@ -805,7 +802,6 @@ sub list {
-{path}> {login}> {password}> @@ -926,7 +922,7 @@ sub addtop100 { } #fi $callback = - "$form->{script}?action=top100&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" + "$form->{script}?action=top100&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" . $form->escape($form->{title}, 1); # if we have a serialnumber limit search @@ -1356,15 +1352,15 @@ sub addtop100 { $column_data{invnumber} = ($ref->{module} ne 'oe') - ? "
{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; $column_data{ordnumber} = ($ref->{module} eq 'oe') - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" : "$ref->{ordnumber}"; $column_data{quonumber} = ($ref->{module} eq 'oe' && !$ref->{ordnumber}) - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; @@ -1436,7 +1432,6 @@ sub addtop100 { {script}> -{path}> {login}> {password}> @@ -1500,7 +1495,7 @@ sub generate_report { } #fi $callback = - "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" + "$form->{script}?action=generate_report&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title=" . $form->escape($form->{title}, 1); # if we have a serialnumber limit search @@ -1841,8 +1836,8 @@ sub generate_report { /
/g; $column_data{partnumber} = - "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber} "; - $column_data{description} = "{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} "; + "{script}?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber} "; + $column_data{description} = "{script}?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description} "; $column_data{partsgroup} = "$ref->{partsgroup} "; $column_data{onhand} = @@ -1896,15 +1891,15 @@ sub generate_report { $column_data{invnumber} = ($ref->{module} ne 'oe') - ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" + ? "{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}" : "$ref->{invnumber}"; $column_data{ordnumber} = ($ref->{module} eq 'oe') - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}" : "$ref->{ordnumber}"; $column_data{quonumber} = ($ref->{module} eq 'oe' && !$ref->{ordnumber}) - ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" + ? "{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}" : "$ref->{quonumber}"; $column_data{name} = "$ref->{name}"; @@ -1986,7 +1981,6 @@ sub generate_report { {searchitems}> -{path}> {login}> {password}>|; @@ -2650,7 +2644,6 @@ sub form_footer { } print qq| - {path}> {login}> {password}> @@ -2707,7 +2700,7 @@ sub form_footer { if (!$form->{previousform}) { if ($form->{menubar}) { - require "$form->{path}/menu.pl"; + require "bin/mozilla/menu.pl"; &menubar; } } @@ -2888,7 +2881,7 @@ sub assembly_row { } else { $href = - qq|$form->{script}?action=edit&id=$form->{"id_$i"}&path=$form->{path}&login=$form->{login}&password=$form->{password}&rowcount=$i&previousform=$previousform|; + qq|$form->{script}?action=edit&id=$form->{"id_$i"}&login=$form->{login}&password=$form->{password}&rowcount=$i&previousform=$previousform|; $column_data{partnumber} = qq|$form->{"partnumber_$i"}|; $column_data{runningnumber} = @@ -3239,7 +3232,7 @@ sub parts_language_selection { my $callback = "$form->{script}?action=parts_language_selection&"; map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" } - (qw(login path password name input_name), grep({ /^[fl]_/ } keys %$form))); + (qw(login password name input_name), grep({ /^[fl]_/ } keys %$form))); my @header_sort = qw(name longdescription); my %header_title = ( "name" => $locale->text("Name"), diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 01f290bb1..fa19d2547 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -38,14 +38,14 @@ use SL::IC; use CGI::Ajax; use CGI; -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # any custom scripts for this one -if (-f "$form->{path}/custom_io.pl") { - eval { require "$form->{path}/custom_io.pl"; }; +if (-f "bin/mozilla/custom_io.pl") { + eval { require "bin/mozilla/custom_io.pl"; }; } -if (-f "$form->{path}/$form->{login}_io.pl") { - eval { require "$form->{path}/$form->{login}_io.pl"; }; +if (-f "bin/mozilla/$form->{login}_io.pl") { + eval { require "bin/mozilla/$form->{login}_io.pl"; }; } 1; @@ -822,7 +822,7 @@ sub new_item { . $locale->text('Service'); print $cgi->hidden("-name" => "previousform", "-value" => $previousform); map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - ("rowcount", "vc", "path", "login", "password")); + qw(rowcount vc login password)); map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); } ("partnumber", "description")); print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts}); @@ -1150,7 +1150,7 @@ sub order { $form->{cp_id} *= 1; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; my $script = $form->{"script"}; $script =~ s|.*/||; $script =~ s|.pl$||; @@ -1214,7 +1214,7 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1425,7 +1425,7 @@ sub send_email { my $callback = $form->{script} . "?action=edit"; map({ $callback .= "\&${_}=" . E($form->{$_}); } - qw(login password path type id)); + qw(login password type id)); print_form("return"); @@ -2191,7 +2191,7 @@ sub new_license { map { $form->{$_} = $form->escape($form->{$_}, 1) } qw(partnumber description); $form->{callback} = - qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; + qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; $form->redirect; $lxdebug->leave_sub(); diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 67456a3ce..64a9093f0 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -35,9 +35,9 @@ use SL::IR; use SL::IS; use SL::PE; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; -require "$form->{path}/common.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; +require "bin/mozilla/common.pl"; require "bin/mozilla/drafts.pl"; 1; @@ -833,8 +833,6 @@ sub form_footer { -{path}> -{login}> {password}> | . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 3d4857276..10dc43ef1 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -35,8 +35,8 @@ use SL::IS; use SL::PE; use Data::Dumper; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/drafts.pl"; 1; @@ -61,7 +61,7 @@ sub add { $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; $form{jsscript} = "date"; @@ -329,7 +329,7 @@ sub form_header { } my $set_duedate_url = - "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate"; + "$form->{script}?login=$form->{login}&password=$form->{password}&action=set_duedate"; my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url ); push(@ { $form->{AJAX} }, $pjx); @@ -1165,7 +1165,7 @@ if ($form->{type} eq "credit_note") { $cgi->hidden("-name" => "callback", "-value" => $form->{callback}) . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]); -map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(path login password)); +map({ print $cgi->hidden("-name" => $_ , "-value" => $form->{$_});} qw(login password)); print qq|
@@ -1487,7 +1487,7 @@ sub storno { } map({ my $key = $_; delete($form->{$key}) - unless (grep({ $key eq $_ } qw(path login password id type))); } + unless (grep({ $key eq $_ } qw(login password id type))); } keys(%{ $form })); &invoice_links; diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl index f812390ac..c5de93484 100644 --- a/bin/mozilla/kopf.pl +++ b/bin/mozilla/kopf.pl @@ -15,9 +15,7 @@ foreach (@felder) { } $login = "[" . $login - . " - {"path"} - . "&password=" + . " - {"password"} . "&action=logout\" target=\"_top\">" . $locale->text('Logout') diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl index 218de1fb4..fd8f01d9f 100644 --- a/bin/mozilla/licenses.pl +++ b/bin/mozilla/licenses.pl @@ -58,7 +58,7 @@ sub form_header { sub form_footer { $lxdebug->enter_sub(); - my @items = ("path", "login", "password", "old_callback", "previousform"); + my @items = qw(login password old_callback previousform); push(@items, @{ $form->{"hidden"} }); map({ print("{$_}) . "\">\n" @@ -501,13 +501,8 @@ sub do_search { LICENSES->search(\%myconfig, $form); $callback = ""; - foreach ( - ("db", "path", "login", "password", - "partnumber", "description", "customer_name", "all", - "expiring_in", "show_expired") - ) { - $callback .= "\&${_}=" . $form->escape($form->{$_}, 1); - } + map { $callback .= "\&${_}=" . $form->escape($form->{$_}, 1) } + qw(db login password partnumber description customer_name all expiring_in show_expired); $details = $form->{"script"} . "?action=details" . $callback . "\&id="; $invdetails = "is.pl?action=edit" . $callback . "\&id="; $callback = $form->{"script"} . "?action=do_search" . $callback; diff --git a/bin/mozilla/login.pl b/bin/mozilla/login.pl index f09b88258..39890982d 100644 --- a/bin/mozilla/login.pl +++ b/bin/mozilla/login.pl @@ -38,14 +38,14 @@ $form = new Form; $locale = new Locale $language, "login"; # customization -if (-f "$form->{path}/custom_$form->{script}") { - eval { require "$form->{path}/custom_$form->{script}"; }; +if (-f "bin/mozilla/custom_$form->{script}") { + eval { require "bin/mozilla/custom_$form->{script}"; }; $form->error($@) if ($@); } # per login customization -if (-f "$form->{path}/$form->{login}_$form->{script}") { - eval { require "$form->{path}/$form->{login}_$form->{script}"; }; +if (-f "bin/mozilla/$form->{login}_$form->{script}") { + eval { require "bin/mozilla/$form->{login}_$form->{script}"; }; $form->error($@) if ($@); } @@ -107,7 +107,6 @@ sub login_screen { | . $locale->text('Password') . qq| - {path}>
@@ -153,13 +152,13 @@ sub login { # made it this far, execute the menu if ($user->{menustyle} eq "v3") { $form->{callback} = - "menuv3.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + "menuv3.pl?login=$form->{login}&password=$form->{password}&action=display"; } elsif ($user->{menustyle} eq "neu") { $form->{callback} = - "menunew.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + "menunew.pl?login=$form->{login}&password=$form->{password}&action=display"; } else { $form->{callback} = - "menu.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + "menu.pl?login=$form->{login}&password=$form->{password}&action=display"; } $form->redirect; @@ -173,7 +172,7 @@ sub logout { unlink "$userspath/$form->{login}.conf"; # remove the callback to display the message - $form->{callback} = "login.pl?path=$form->{path}&action=&login="; + $form->{callback} = "login.pl?action=&login="; $form->redirect($locale->text('You are logged out!')); $lxdebug->leave_sub(); diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl index 85efc5c37..3da92a906 100644 --- a/bin/mozilla/menu.pl +++ b/bin/mozilla/menu.pl @@ -52,10 +52,10 @@ sub display { print qq| - + - - + + You need a browser that can read frames to see this page. @@ -201,7 +201,7 @@ sub section_menu { } else { my $ml_ = $form->escape($ml); print - qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?path=bin/mozilla&action=acc_menu&level=$ml_&login=$form->{login}&password=$form->{password}" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|; + qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?action=acc_menu&level=$ml_&login=$form->{login}&password=$form->{password}" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|; &section_menu($menu, $item); #print qq|<br>\n|; diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl index 6b74be731..1e05b801a 100644 --- a/bin/mozilla/menunew.pl +++ b/bin/mozilla/menunew.pl @@ -52,7 +52,7 @@ sub display { &acc_menu; print qq| -<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo&path=$form->{path}" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;"> +<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;"> <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. </p> </iframe> @@ -65,14 +65,12 @@ sub display { sub clock_line { - $fensterlink="menunew.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + $fensterlink="menunew.pl?login=$form->{login}&password=$form->{password}&action=display"; $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]"; $login = "[Nutzer " . $form->{login} - . " - <a href=\"login.pl?path=" - . $form->{"path"} - . "&password=" + . " - <a href=\"login.pl?password=" . $form->{"password"} . "&action=logout\" target=\"_top\">" . $locale->text('Logout') @@ -407,7 +405,7 @@ sub section_menu { print qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|; - #print qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?path=bin/mozilla&action=acc_menu&level=$ml_&login=$form->{login}&password=$form->{password}" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|; + #print qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?action=acc_menu&level=$ml_&login=$form->{login}&password=$form->{password}" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|; &section_menu($menu, $item); #print qq|<br>\n|; diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl index aedb881a2..2837a30ca 100644 --- a/bin/mozilla/menuv3.pl +++ b/bin/mozilla/menuv3.pl @@ -57,7 +57,7 @@ sub display { <div style="clear: both;"></div> -<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo&path=$form->{path}" width="100%" height="93%" name="main_window" style="position: absolute; border: 0px; z-index: 99; "> +<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo" width="100%" height="93%" name="main_window" style="position: absolute; border: 0px; z-index: 99; "> <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. </p> </iframe> @@ -70,14 +70,12 @@ sub display { sub clock_line { - $fensterlink="menuv3.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}&action=display"; + $fensterlink="menuv3.pl?login=$form->{login}&password=$form->{password}&action=display"; $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]"; $login = "[Nutzer " . $form->{login} - . " - <a href=\"login.pl?path=" - . $form->{"path"} - . "&password=" + . " - <a href=\"login.pl?password=" . $form->{"password"} . "&action=logout\" target=\"_top\">" . $locale->text('Logout') diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 1e0c8a6c6..e076691a1 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -37,8 +37,8 @@ use SL::IR; use SL::IS; use SL::PE; -require "$form->{path}/io.pl"; -require "$form->{path}/arap.pl"; +require "bin/mozilla/io.pl"; +require "bin/mozilla/arap.pl"; 1; @@ -98,7 +98,7 @@ sub add { set_headings("add"); $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&path=$form->{path}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; &order_links; @@ -1153,7 +1153,6 @@ sub form_footer { <input name=callback type=hidden value="$form->{callback}"> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -1518,7 +1517,6 @@ $jsscript <br> <input type=hidden name=nextsub value=orders> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> <input type=hidden name=vc value=$form->{vc}> @@ -1552,7 +1550,7 @@ sub orders { # construct href $href = - "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; + "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; # construct callback $number = $form->escape($form->{$ordnumber}, 1); @@ -1560,7 +1558,7 @@ sub orders { $department = $form->escape($form->{department}, 1); $callback = - "$form->{script}?path=$form->{path}&action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; + "$form->{script}?action=orders&type=$form->{type}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&transdatefrom=$form->{transdatefrom}&transdateto=$form->{transdateto}&open=$form->{open}&closed=$form->{closed}&notdelivered=$form->{notdelivered}&delivered=$form->{delivered}&$ordnumber=$number&$form->{vc}=$name&department=$department"; @columns = $form->sort_columns("transdate", "reqdate", "id", "$ordnumber", @@ -1762,7 +1760,7 @@ sub orders { $column_data{reqdate} = "<td>$oe->{reqdate}&nbsp;</td>"; $column_data{$ordnumber} = - "<td><a href=oe.pl?path=$form->{path}&action=$action&type=$form->{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}</a></td>"; + "<td><a href=oe.pl?action=$action&type=$form->{type}&id=$oe->{id}&vc=$form->{vc}&login=$form->{login}&password=$form->{password}&callback=$callback_escaped>$oe->{$ordnumber}</a></td>"; $column_data{name} = "<td>$oe->{name}</td>"; $column_data{employee} = "<td>$oe->{employee}&nbsp;</td>"; @@ -1830,7 +1828,6 @@ sub orders { if ($form->{type} =~ /sales_order/) { print qq| - <input type="hidden" name="path" value="$form->{path}"> <input class"submit" type="submit" name="action" value="| . $locale->text('Continue') . qq|"> <input type="hidden" name="nextsub" value="edit"> @@ -1853,7 +1850,6 @@ sub orders { <input type=hidden name=type value=$form->{type}> <input type=hidden name=vc value=$form->{vc}> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -2239,7 +2235,7 @@ sub invoice { # locale messages $locale = new Locale "$myconfig{countrycode}", "$script"; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -2320,7 +2316,6 @@ sub backorder_exchangerate { print qq| -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl index 6bcb0f53e..ef3a5a064 100644 --- a/bin/mozilla/pe.pl +++ b/bin/mozilla/pe.pl @@ -47,7 +47,7 @@ sub add { # construct callback $form->{callback} = - "$form->{script}?action=add&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}" + "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&password=$form->{password}" unless $form->{callback}; call_sub("form_$form->{type}_header"); @@ -173,7 +173,6 @@ sub search { <input type=hidden name=nextsub value=$report> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -197,7 +196,7 @@ sub project_report { PE->projects(\%myconfig, \%$form); $callback = - "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" . + "$form->{script}?action=project_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" . E($form->{active}); $href = $callback; @@ -278,7 +277,7 @@ sub project_report { |; $column_data{projectnumber} = - qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|; + qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|; $column_data{description} = qq|<td>$ref->{description}&nbsp;</td>|; $column_data{active} = qq|<td>| . @@ -308,7 +307,6 @@ sub project_report { <input type=hidden name=type value=$form->{type}> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -413,7 +411,6 @@ sub form_project_footer { <input name=callback type=hidden value="$form->{callback}"> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -509,7 +506,7 @@ sub partsgroup_report { PE->partsgroups(\%myconfig, \%$form); $callback = - "$form->{script}?action=partsgroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; + "$form->{script}?action=partsgroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; if ($form->{status} eq 'all') { $option = $locale->text('All'); @@ -570,7 +567,7 @@ sub partsgroup_report { |; $column_data{partsgroup} = - qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup}</td>|; + qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup}</td>|; map { print "$column_data{$_}\n" } @column_index; print " @@ -594,7 +591,6 @@ sub partsgroup_report { <input type=hidden name=type value=$form->{type}> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -662,7 +658,6 @@ sub form_partsgroup_footer { <input name=callback type=hidden value="$form->{callback}"> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -704,7 +699,7 @@ sub pricegroup_report { PE->pricegroups(\%myconfig, \%$form); $callback = - "$form->{script}?action=pricegroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; + "$form->{script}?action=pricegroup_report&type=$form->{type}&login=$form->{login}&password=$form->{password}&status=$form->{status}"; if ($form->{status} eq 'all') { $option = $locale->text('All'); @@ -767,7 +762,7 @@ sub pricegroup_report { <tr valign=top class=listrow$i> |; $column_data{pricegroup} = - qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|; + qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|; map { print "$column_data{$_}\n" } @column_index; @@ -792,7 +787,6 @@ sub pricegroup_report { <input type=hidden name=type value=$form->{type}> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -864,7 +858,6 @@ sub form_pricegroup_footer { <input name=callback type=hidden value="$form->{callback}"> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> diff --git a/bin/mozilla/rc.pl b/bin/mozilla/rc.pl index 12c87c481..4df612cc5 100644 --- a/bin/mozilla/rc.pl +++ b/bin/mozilla/rc.pl @@ -96,7 +96,6 @@ sub reconciliation { <br> <input type=hidden name=nextsub value=get_payments> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -370,7 +369,6 @@ sub display_form { <input type=hidden name=fromdate value=$form->{fromdate}> <input type=hidden name=todate value=$form->{todate}> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -425,7 +423,7 @@ sub done { $lxdebug->enter_sub(); $form->{callback} = - "$form->{script}?path=$form->{path}&action=reconciliation&login=$form->{login}&password=$form->{password}"; + "$form->{script}?action=reconciliation&login=$form->{login}&password=$form->{password}"; $form->error($locale->text('Out of balance!')) if ($form->{difference} *= 1); diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 56e7f49ad..209e082ff 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -35,7 +35,7 @@ # #====================================================================== -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; use SL::PE; @@ -976,7 +976,6 @@ $jsscript </table> <br> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -1354,7 +1353,7 @@ sub list_accounts { $description = $form->escape($ref->{description}); $href = - qq|ca.pl?path=$form->{path}&action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|; + qq|ca.pl?action=list_transactions&accounttype=$form->{accounttype}&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&sort=transdate&l_heading=$form->{l_heading}&l_subtotal=$form->{l_subtotal}&department=$department&eur=$form->{eur}&projectnumber=$projectnumber&project_id=$form->{project_id}&title=$title&nextsub=$form->{nextsub}&accno=$ref->{accno}&description=$description|; $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; @@ -1522,7 +1521,7 @@ sub generate_ar_aging { $form->{arap} = "ar"; $form->{callback} = - qq|$form->{script}?path=$form->{path}&action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|; + qq|$form->{script}?action=generate_ar_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&customer=$customer&title=$title|; RP->aging(\%myconfig, \%$form); &aging; @@ -1542,7 +1541,7 @@ sub generate_ap_aging { $form->{arap} = "ap"; $form->{callback} = - qq|$form->{script}?path=$form->{path}&action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|; + qq|$form->{script}?action=generate_ap_aging&login=$form->{login}&password=$form->{password}&todate=$form->{todate}&vendor=$vendor&title=$title|; RP->aging(\%myconfig, \%$form); &aging; @@ -1707,7 +1706,7 @@ sub aging { $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, "&nbsp;") : ""; $href = - qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| + qq|$ref->{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| . $form->escape($form->{callback}); $column_data{invnumber} = qq|<td><a href=$href>$ref->{invnumber}</a></td>|; @@ -1806,7 +1805,6 @@ sub aging { <input type=hidden name=department value="$form->{department}"> -<input type=hidden name=path value=$form->{path}> <input type=hidden name=login value=$form->{login}> <input type=hidden name=password value=$form->{password}> @@ -2143,13 +2141,13 @@ sub generate_tax_report { # construct href $href = - "$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; # construct callback $description = $form->escape($form->{$descvar}, 1); $department = $form->escape($form->{department}, 1); $callback = - "$form->{script}?path=$form->{path}&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; + "$form->{script}?&action=generate_tax_report&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&db=$form->{db}&method=$form->{method}&accno=$form->{accno}&$descvar=$description&department=$department&$ratevar=$taxrate&report=$form->{report}"; $title = $form->escape($form->{title}); $href .= "&title=$title"; @@ -2288,7 +2286,7 @@ sub generate_tax_report { $column_data{id} = qq|<td>$ref->{id}</td>|; $column_data{invnumber} = - qq|<td><a href=$module?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|; + qq|<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>|; $column_data{transdate} = qq|<td>$ref->{transdate}</td>|; $column_data{name} = qq|<td>$ref->{name}&nbsp;</td>|; @@ -2408,7 +2406,7 @@ sub list_payments { $memo = $form->escape($form->{memo}); $href = - "$form->{script}?path=$form->{path}&action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo"; + "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo"; # construct callback $account = $form->escape($form->{account}, 1); @@ -2419,7 +2417,7 @@ sub list_payments { $memo = $form->escape($form->{memo}, 1); $form->{callback} = - "$form->{script}?path=$form->{path}&action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}"; + "$form->{script}?action=list_payments&login=$form->{login}&password=$form->{password}&fromdate=$form->{fromdate}&todate=$form->{todate}&fx_transaction=$form->{fx_transaction}&db=$form->{db}&prepayment=$form->{prepayment}&title=$title&account=$account&department=$department&paymentaccounts=$form->{paymentaccounts}&reference=$reference&source=$source&memo=$memo&sort=$form->{sort}"; $callback = $form->escape($form->{callback}); $column_header{name} = @@ -2503,7 +2501,7 @@ sub list_payments { $module = 'ir' if ($payment->{invoice} && $payment->{module} eq 'ap'); $href = - qq|${module}.pl?path=$form->{path}&action=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|; + qq|${module}.pl?ction=edit&id=$payment->{id}&login=$form->{login}&password=$form->{password}&callback=$callback|; $column_data{name} = "<td>$payment->{name}&nbsp;</td>"; $column_data{reference} = diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl index 8a5be4396..3e353e832 100644 --- a/bin/mozilla/ustva.pl +++ b/bin/mozilla/ustva.pl @@ -24,7 +24,7 @@ # German Tax authority Module and later ELSTER Interface #====================================================================== -require "$form->{path}/arap.pl"; +require "bin/mozilla/arap.pl"; require "bin/mozilla/common.pl"; #use strict; @@ -113,7 +113,7 @@ sub report { my $company_given = ($form->{company} ne '') ? qq|<h3>$form->{company}</h3>\n| - : qq|<a href=am.pl?path=$form->{path}&action=config| + : qq|<a href=am.pl?action=config| . qq|&level=Programm--Preferences&login=$form->{login}| . qq|&password=$form->{password}>| . $locale->text('No Company Name given') . qq|!</a><br>|; @@ -139,7 +139,7 @@ sub report { ? qq|$form->{co_street}<br>| . qq|$form->{co_street1}<br>| . qq|$form->{co_zip} $form->{co_city}| - : qq|<a href=am.pl?path=$form->{path}&action=config| + : qq|<a href=am.pl?action=config| . qq|&level=Programm--Preferences&login=$form->{login}| . qq|&password=$form->{password}>| . $locale->text('No Company Address given') @@ -152,7 +152,7 @@ sub report { my $taxnumber_given = ($form->{steuernummer} ne '') ? qq|$form->{steuernummer}| - : qq|<a href="ustva.pl?path=$form->{path}&action="config_step1"| + : qq|<a href="ustva.pl?action="config_step1"| . qq|&level=Programm--Finanzamteinstellungen&login=$form->{login}| . qq|&password=$form->{password}">Keine Steuernummer hinterlegt!| . qq|</a><br>|; @@ -1066,7 +1066,6 @@ sub config_step1 { $callback = qq|$form->{cbscript}| .qq|?action="config_step1"| .qq|&login="$form->{cblogin}"| - .qq|&path="$form->{cbpath}"| .qq|&root="$form->{cbroot}"| .qq|&rpw="$form->{cbrpw}"|; } @@ -1103,8 +1102,7 @@ sub config_step1 { FA_BLZ_2 FA_Kontonummer_2 FA_Bankbezeichnung_oertlich FA_Oeffnungszeiten FA_Email FA_Internet steuernummer elsterland elstersteuernummer - elsterFFFF path login - password + elsterFFFF login password ); foreach my $variable (@_hidden_form_variables) { @@ -1248,7 +1246,7 @@ sub config_step2 { FA_steuerberater_city FA_steuerberater_tel FA_voranmeld method FA_dauerfrist FA_71 - elster path + elster login password type elster_init saved callback diff --git a/doc/programmierstilrichtlinien.txt b/doc/programmierstilrichtlinien.txt index aec999fed..d2982c5f1 100644 --- a/doc/programmierstilrichtlinien.txt +++ b/doc/programmierstilrichtlinien.txt @@ -43,7 +43,7 @@ sind, muss der Programmierer selbst f oder - if ($form->{"path"} eq "bin/mozilla") { + if ($form->{item_rows} > 0) { ... } diff --git a/doc/ustva.html b/doc/ustva.html index 0f279249a..85e6c82c9 100755 --- a/doc/ustva.html +++ b/doc/ustva.html @@ -66,7 +66,7 @@ A.help:hover {color: blue; text-decoration: none;} <br /> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> </td> </tr> </table> @@ -98,7 +98,7 @@ die Lx XML-Datei dann hineingespeichert werden.</p> <br> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> </td> </tr> </table> @@ -130,7 +130,7 @@ Benutzernamen zu &auml;ndern und zu speichern.)</p> <br /> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> </td> </tr> </table> @@ -151,7 +151,7 @@ Benutzernamen zu &auml;ndern und zu speichern.)</p> <br> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> </td> </tr> </table> @@ -334,7 +334,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p> <br> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="#bottom">[Ende]</a> </td> </tr> </table> @@ -424,7 +424,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p> <br> <table bgcolor="lightgrey" width="100%"> <tr align="right" valign="bottom"> - <td align="left"><a class="help" href="ustva.pl?path=<%path%>&action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="">[Ende]</a> + <td align="left"><a class="help" href="ustva.pl?action=report&level=Reports&login=<%login%>&password=<%password%>">[zur&uuml;ck zur UStVa]</a></td><td><a class="help" href="#top">[Anfang/Inhalt]</a>&nbsp;<a class="help" href="">[Ende]</a> </td> </tr> </table> diff --git a/js/calculate_qty.js b/js/calculate_qty.js index 2c992a741..048346c1a 100644 --- a/js/calculate_qty.js +++ b/js/calculate_qty.js @@ -10,7 +10,6 @@ function calculate_qty_selection_window(input_name, alu, formel, row) { "action=" + action + "&" + "login=" + encodeURIComponent(document.getElementsByName("login")[0].value) + "&" + "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" + - "path=" + encodeURIComponent(document.getElementsByName("path")[0].value) + "&" + "name=" + escape(name) + "&" + "input_name=" + escape(input_name) + "&" + "description=" + escape(description) + "&" + diff --git a/js/common.js b/js/common.js index 15a507113..797619448 100644 --- a/js/common.js +++ b/js/common.js @@ -41,7 +41,6 @@ function set_longdescription_window(input_name) { "action=set_longdescription&" + "login=" + encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+ "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" + - "path=" + encodeURIComponent(document.getElementsByName("path")[0].value) + "&" + "longdescription=" + escape(document.getElementsByName(input_name)[0].value) + "&" + "input_name=" + escape(input_name) + "&" window.open(url, "_new_generic", parm); diff --git a/js/delivery_customer_selection.js b/js/delivery_customer_selection.js index 83b226d02..a94f3c067 100644 --- a/js/delivery_customer_selection.js +++ b/js/delivery_customer_selection.js @@ -5,7 +5,6 @@ function delivery_customer_selection_window(input_name, input_id) { "action=delivery_customer_selection&" + "login=" + escape(document.getElementsByName("login")[0].value) + "&" + "password=" + escape(document.getElementsByName("password")[0].value) + "&" + - "path=" + escape(document.getElementsByName("path")[0].value) + "&" + "name=" + escape(name) + "&" + "input_name=" + escape(input_name) + "&" + "input_id=" + escape(input_id) diff --git a/js/dunning.js b/js/dunning.js index 2639ab84d..7853d2165 100644 --- a/js/dunning.js +++ b/js/dunning.js @@ -4,7 +4,6 @@ function set_email_window(input_subject, input_body, input_attachment) { "action=set_email&" + "login=" + encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+ "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" + - "path=" + encodeURIComponent(document.getElementsByName("path")[0].value) + "&" + "email_subject=" + escape(document.getElementsByName(input_subject)[0].value) + "&" + "email_body=" + escape(document.getElementsByName(input_body)[0].value) + "&" + "email_attachment=" + escape(document.getElementsByName(input_attachment)[0].value) + "&" + diff --git a/js/parts_language_selection.js b/js/parts_language_selection.js index 031788bca..0a0dc0d8b 100644 --- a/js/parts_language_selection.js +++ b/js/parts_language_selection.js @@ -5,7 +5,6 @@ function parts_language_selection_window(input_name) { "action=parts_language_selection&" + "login=" + escape(document.ic.login.value) + "&" + "password=" + escape(document.ic.password.value) + "&" + - "path=" + escape(document.ic.path.value) + "&" + "id=" + escape(document.ic.id.value) + "&" + "language_values=" + escape(document.ic.language_values.value) + "&" + "name=" + escape(name) + "&" + diff --git a/js/show_history.js b/js/show_history.js index 9d95dfacc..137e2193e 100644 --- a/js/show_history.js +++ b/js/show_history.js @@ -17,8 +17,7 @@ function set_history_window(id) { "action=show_history&" + "login=" + encodeURIComponent(document.getElementsByName("login")[0].value)+ "&"+ "password=" + encodeURIComponent(document.getElementsByName("password")[0].value) + "&" + - "path=" + encodeURIComponent(document.getElementsByName("path")[0].value) + "&" + "longdescription=" + "&" + "input_name=" + escape(id) + "&" window.open(url, "_new_generic", parm); -} \ No newline at end of file +} diff --git a/js/vendor_selection.js b/js/vendor_selection.js index f28ac516d..19e232d4e 100644 --- a/js/vendor_selection.js +++ b/js/vendor_selection.js @@ -5,7 +5,6 @@ function vendor_selection_window(input_name, input_id) { "action=vendor_selection&" + "login=" + escape(document.getElementsByName("login")[0].value) + "&" + "password=" + escape(document.getElementsByName("password")[0].value) + "&" + - "path=" + escape(document.getElementsByName("path")[0].value) + "&" + "name=" + escape(name) + "&" + "input_name=" + escape(input_name) + "&" + "input_id=" + escape(input_id) diff --git a/locale/de/all b/locale/de/all index 79ca87c17..b344b7239 100644 --- a/locale/de/all +++ b/locale/de/all @@ -483,6 +483,7 @@ gestartet', 'Extended' => 'Gesamt', 'Extension Of Time' => 'Dauerfristverlängerung', 'Factor' => 'Faktor', + 'Falsches Datumsformat!' => '', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', @@ -527,6 +528,7 @@ gestartet', 'Hostname missing!' => 'Computername fehlt!', 'I' => 'I', 'ID' => 'Buchungsnummer', + 'ID-Nummer' => '', 'II' => 'II', 'III' => 'III', 'IV' => 'IV', @@ -1280,6 +1282,7 @@ gestartet', 'von' => 'von', 'website' => 'Webseite', 'winston_export' => 'Winston-Export', + 'wrongformat' => '', }; 1; diff --git a/locale/de/ap b/locale/de/ap index 8d6b75832..869d132cd 100644 --- a/locale/de/ap +++ b/locale/de/ap @@ -52,6 +52,7 @@ $self->{texts} = { 'Exchangerate' => 'Wechselkurs', 'Exchangerate for payment missing!' => 'Es fehlt der Wechselkurs für die Bezahlung!', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Feb' => 'Feb', 'February' => 'Februar', 'From' => 'Von', @@ -157,6 +158,7 @@ $self->{texts} = { 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', 'sales_quotation' => 'Verkaufsangebot', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/ar b/locale/de/ar index e0730f7f6..81b24d4fc 100644 --- a/locale/de/ar +++ b/locale/de/ar @@ -55,6 +55,7 @@ $self->{texts} = { 'Exchangerate' => 'Wechselkurs', 'Exchangerate for payment missing!' => 'Es fehlt der Wechselkurs für die Bezahlung!', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Feb' => 'Feb', 'February' => 'Februar', 'From' => 'Von', @@ -164,6 +165,7 @@ $self->{texts} = { 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', 'sales_quotation' => 'Verkaufsangebot', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/bp b/locale/de/bp index ca95594eb..1cec1668e 100644 --- a/locale/de/bp +++ b/locale/de/bp @@ -19,6 +19,7 @@ $self->{texts} = { 'ELSE' => 'Zusatz', 'Enter longdescription' => 'Langtext eingeben', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'From' => 'Von', 'History' => 'Historie', 'Invoice' => 'Rechnung', @@ -89,6 +90,7 @@ $self->{texts} = { 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', 'sales_quotation' => 'Verkaufsangebot', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/cp b/locale/de/cp index f54cf9be8..2352bbf71 100644 --- a/locale/de/cp +++ b/locale/de/cp @@ -32,6 +32,7 @@ $self->{texts} = { 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Exchangerate' => 'Wechselkurs', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'History' => 'Historie', 'Invoice' => 'Rechnung', 'Invoices' => 'Rechnungen', @@ -100,6 +101,7 @@ $self->{texts} = { 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', 'sales_quotation' => 'Verkaufsangebot', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/dn b/locale/de/dn index 540d7549a..c88bd16b5 100644 --- a/locale/de/dn +++ b/locale/de/dn @@ -65,6 +65,7 @@ gestartet', 'Enter longdescription' => 'Langtext eingeben', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Extended' => 'Gesamt', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', @@ -224,6 +225,7 @@ gestartet', 'sales_quotation' => 'Verkaufsangebot', 'sent' => 'gesendet', 'sent to printer' => 'an Drucker geschickt', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/gl b/locale/de/gl index cfeae2e02..02bf01e78 100644 --- a/locale/de/gl +++ b/locale/de/gl @@ -58,6 +58,7 @@ $self->{texts} = { 'Equity' => 'Passiva', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Expense' => 'Aufwandskonto', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Feb' => 'Feb', 'February' => 'Februar', 'From' => 'Von', @@ -156,6 +157,7 @@ $self->{texts} = { 'request_quotation' => 'Angebotsanforderung', 'sales_order' => 'Kundenauftrag', 'sales_quotation' => 'Verkaufsangebot', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/ir b/locale/de/ir index 8459a88de..261a8999b 100644 --- a/locale/de/ir +++ b/locale/de/ir @@ -70,6 +70,7 @@ $self->{texts} = { 'Exchangerate for payment missing!' => 'Es fehlt der Wechselkurs für die Bezahlung!', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', 'Extended' => 'Gesamt', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', @@ -232,6 +233,7 @@ $self->{texts} = { 'sales_quotation' => 'Verkaufsangebot', 'sent' => 'gesendet', 'sent to printer' => 'an Drucker geschickt', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/is b/locale/de/is index 04ac9c67c..b3fd7e128 100644 --- a/locale/de/is +++ b/locale/de/is @@ -86,6 +86,7 @@ $self->{texts} = { 'Exchangerate for payment missing!' => 'Es fehlt der Wechselkurs für die Bezahlung!', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', 'Extended' => 'Gesamt', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', @@ -257,6 +258,7 @@ $self->{texts} = { 'sales_quotation' => 'Verkaufsangebot', 'sent' => 'gesendet', 'sent to printer' => 'an Drucker geschickt', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/locales.pl b/locale/de/locales.pl index 151db6fc5..f12001ce0 100755 --- a/locale/de/locales.pl +++ b/locale/de/locales.pl @@ -327,7 +327,6 @@ sub scanfile { if (/require\s+\W.*\.pl/) { my $newfile = $&; $newfile =~ s/require\s+\W//; - $newfile =~ s/\$form->{path}\///; $newfile =~ s|bin/mozilla||; # &scanfile("$bindir/$newfile", 0, $scanned_files); $cached{$file}{scan}{"$bindir/$newfile"} = 1; diff --git a/locale/de/oe b/locale/de/oe index 341bf43fe..4773bf208 100644 --- a/locale/de/oe +++ b/locale/de/oe @@ -87,6 +87,7 @@ $self->{texts} = { 'Exchangerate' => 'Wechselkurs', 'Exchangerate missing!' => 'Es fehlt der Wechselkurs!', 'Extended' => 'Gesamt', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Fax' => 'Fax', 'Feb' => 'Feb', 'February' => 'Februar', @@ -266,6 +267,7 @@ $self->{texts} = { 'saved!' => 'gespeichert', 'sent' => 'gesendet', 'sent to printer' => 'an Drucker geschickt', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/locale/de/rc b/locale/de/rc index 57c2fa938..5bba303c4 100644 --- a/locale/de/rc +++ b/locale/de/rc @@ -21,6 +21,7 @@ $self->{texts} = { 'Enter longdescription' => 'Langtext eingeben', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', 'Exchangerate Difference' => 'Wechselkursunterschied', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'From' => 'Von', 'History' => 'Historie', 'Increase' => 'Erhöhen', diff --git a/locale/de/rp b/locale/de/rp index 0f212eb90..741d3a8e1 100644 --- a/locale/de/rp +++ b/locale/de/rp @@ -48,6 +48,7 @@ $self->{texts} = { 'EUR' => 'E/Ü-Rechnung', 'Enter longdescription' => 'Langtext eingeben', 'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s', + 'Falsches Datumsformat!' => 'Falsches Datumsformat!', 'Feb' => 'Feb', 'February' => 'Februar', 'Free report period' => 'Freier Zeitraum', @@ -170,6 +171,7 @@ $self->{texts} = { 'sales_quotation' => 'Verkaufsangebot', 'ustva' => 'UStVA', 'winston_export' => 'Winston-Export', + 'wrongformat' => 'wrongformat', }; $self->{subs} = { diff --git a/login.pl b/login.pl index f49163362..f761de800 100755 --- a/login.pl +++ b/login.pl @@ -81,54 +81,8 @@ Login disabled!\n"; require "bin/mozilla/installationcheck.pl"; verify_installation(); -if ($form{path}) { - $form{path} =~ s/%2f/\//gi; - $form{path} =~ s/\.\.\///g; - - if ($form{path} !~ /^bin\//) { - print "content-type: text/plain - -Invalid path!\n"; - die; - } - - $ARGV[0] = "$_&script=$script"; - require "$form{path}/$script"; -} else { - - if (!$form{terminal}) { - if ($ENV{HTTP_USER_AGENT}) { - - # web browser - if ($ENV{HTTP_USER_AGENT} =~ /(mozilla|links|opera|w3m)/i) { - $form{terminal} = "mozilla"; - } - - } else { - if ($ENV{TERM} =~ /xterm/) { - $form{terminal} = "xterm"; - } - if ($ENV{TERM} =~ /(console|linux|vt.*)/i) { - $form{terminal} = "console"; - } - } - } - - if ($form{terminal}) { - - $ARGV[0] = "path=bin/$form{terminal}&script=$script"; - map { $ARGV[0] .= "&${_}=$form{$_}" } keys %form; - - require "bin/$form{terminal}/$script"; - - } else { - - print qq| - Unknown terminal - |; - } - -} +$ARGV[0] = "$_&script=$script"; +require "bin/mozilla/$script"; # end of main diff --git a/lx-erp.conf b/lx-erp.conf index 6818572e1..85291943a 100644 --- a/lx-erp.conf +++ b/lx-erp.conf @@ -81,7 +81,7 @@ $dbcharset = "ISO-8859-15"; # # Beipiel: # $LXDebug::global_level = LXDebug::TRACE | LXDebug::QUERY; -$LXDebug::global_level = LXDebug::NONE; +$LXDebug::global_level = LXDebug::ALL; 1; diff --git a/scripts/spawn_oo.pl b/scripts/spawn_oo.pl index 03e5afd56..9e2f80739 100755 --- a/scripts/spawn_oo.pl +++ b/scripts/spawn_oo.pl @@ -25,8 +25,6 @@ require "lx-erp.conf"; $form = new Form; $form->{"script"} = "oe.pl"; -$form->{"path"} = "bin/mozilla"; - $ENV{'HOME'} = getcwd() . "/$userspath"; diff --git a/t/demolx/AllTests.t b/t/demolx/AllTests.t index 89951e92e..aafd34667 100644 --- a/t/demolx/AllTests.t +++ b/t/demolx/AllTests.t @@ -77,7 +77,7 @@ ok(defined $lxtest->{dbuser}, "found dbuser in config"); ok(defined $lxtest->{dbpasswd}, "found dbpasswd in config"); - $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?path=$lxtest->{path}&rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; + $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; diff --git a/t/demolx/cleanup.pl b/t/demolx/cleanup.pl index f5a0d552d..7e6bf6dea 100644 --- a/t/demolx/cleanup.pl +++ b/t/demolx/cleanup.pl @@ -59,7 +59,7 @@ $lxtest->{testuserlogin} = $lxtest->{testlogin}; $lxtest->{db} = $lxtest->{db}; - $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?path=$lxtest->{path}&rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; + $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; eval { $sel = WWW::Selenium->new( host => $lxtest->{seleniumhost}, diff --git a/t/lxtest.conf.default b/t/lxtest.conf.default index b7fc7de23..d570cf54b 100644 --- a/t/lxtest.conf.default +++ b/t/lxtest.conf.default @@ -49,8 +49,7 @@ $lxtest = { #Lx defaults (usualy no need for editing) rootlogin => "root login", memberfile => "users/members", - path => 'bin%2Fmozilla', # Put your own setting for individual tests after here... -}; \ No newline at end of file +}; diff --git a/t/selenium/AllTests.t b/t/selenium/AllTests.t index 3c6acf66a..6c161f6c1 100644 --- a/t/selenium/AllTests.t +++ b/t/selenium/AllTests.t @@ -77,7 +77,7 @@ ok(defined $lxtest->{dbuser}, "found dbuser in config"); ok(defined $lxtest->{dbpasswd}, "found dbpasswd in config"); - $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?path=$lxtest->{path}&rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; + $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; diff --git a/t/selenium/cleanup.pl b/t/selenium/cleanup.pl index f5a0d552d..7e6bf6dea 100644 --- a/t/selenium/cleanup.pl +++ b/t/selenium/cleanup.pl @@ -59,7 +59,7 @@ $lxtest->{testuserlogin} = $lxtest->{testlogin}; $lxtest->{db} = $lxtest->{db}; - $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?path=$lxtest->{path}&rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; + $lxtest->{lxadmin} = $lxtest->{lxbaseurl} . "admin.pl?rpw=$lxtest->{rpw}&nextsub=list_users&action=Weiter"; eval { $sel = WWW::Selenium->new( host => $lxtest->{seleniumhost}, diff --git a/t/selenium/incomming/ustva-Inland-linet.html b/t/selenium/incomming/ustva-Inland-linet.html index 1a79606fa..ed71333da 100644 --- a/t/selenium/incomming/ustva-Inland-linet.html +++ b/t/selenium/incomming/ustva-Inland-linet.html @@ -29,7 +29,7 @@ </tr> <tr> <td>open</td> - <td>admin.pl?path=bin/mozilla/&rpw=ro26F.eQBldoA&nextsub=list_users&action=Weiter</td> + <td>admin.pl?rpw=ro26F.eQBldoA&nextsub=list_users&action=Weiter</td> <td></td> </tr> <tr> @@ -2007,7 +2007,7 @@ </tr> <tr> <td>open</td> - <td>admin.pl?path=bin/mozilla/&rpw=ro26F.eQBldoA&nextsub=list_users&action=Weiter</td> + <td>admin.pl?rpw=ro26F.eQBldoA&nextsub=list_users&action=Weiter</td> <td></td> </tr> <tr> diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html index 20699ab17..ca8d4e721 100644 --- a/templates/webpages/am/edit_units_de.html +++ b/templates/webpages/am/edit_units_de.html @@ -8,7 +8,6 @@ <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html index da1c7e40a..a65b6904a 100644 --- a/templates/webpages/am/edit_units_master.html +++ b/templates/webpages/am/edit_units_master.html @@ -8,7 +8,6 @@ <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html index 5ca9837f7..f683eea5c 100644 --- a/templates/webpages/common/search_history_de.html +++ b/templates/webpages/common/search_history_de.html @@ -5,7 +5,6 @@ <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>"> -<input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> <input type="hidden" name="action" value="show_am_history"> diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html index 5b6b18e72..166d00809 100644 --- a/templates/webpages/common/search_history_master.html +++ b/templates/webpages/common/search_history_master.html @@ -5,7 +5,6 @@ <form method="post" action="<TMPL_VAR NAME=script ESCAPE=HTML>"> -<input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> <input type="hidden" name="action" value="show_am_history"> diff --git a/templates/webpages/common/show_history_de.html b/templates/webpages/common/show_history_de.html index 8c4af80d2..b74652f8f 100644 --- a/templates/webpages/common/show_history_de.html +++ b/templates/webpages/common/show_history_de.html @@ -1,5 +1,4 @@ <form> -<input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> </form> @@ -16,8 +15,14 @@ Vorgang </th> <th class=listtop> - Zusatz - </th> + Zusatz + </th> + <th class=listtop> + ID-Nummer + </th> + <th class=listtop> + Buchungsnummer + </th> </tr> <TMPL_LOOP NAME=DATEN> <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>"> @@ -31,8 +36,14 @@ <TMPL_VAR NAME=addition ESCAPE=HTML> </td> <td> - <TMPL_VAR NAME=what_done ESCAPE=HTML> - </td> + <TMPL_VAR NAME=what_done ESCAPE=HTML> + </td> + <td> + <TMPL_VAR NAME=id ESCAPE=HTML> + </td> + <td> + <TMPL_VAR NAME=snumbers ESCAPE=HTML> + </td> </tr> </TMPL_LOOP> </table> diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html index b5e4309dd..08dbaf2d5 100644 --- a/templates/webpages/common/show_history_master.html +++ b/templates/webpages/common/show_history_master.html @@ -1,5 +1,4 @@ <form> -<input type="hidden" name="path" value="<TMPL_VAR NAME=path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>"> </form> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html index 32e09e50e..da29ef7b5 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html index 1876df4e6..170c5a575 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_assemblies_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html index 452047e3b..593ffa627 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html index 6f4e949ae..3ae56c94e 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_parts_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html index b2659ceb3..4489dbd66 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_services_de.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_services_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html index 6847d6ef5..731fa8da7 100644 --- a/templates/webpages/dbupgrade/buchungsgruppen_services_master.html +++ b/templates/webpages/dbupgrade/buchungsgruppen_services_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="type" value="parts"> diff --git a/templates/webpages/dbupgrade/coa_guess_de.html b/templates/webpages/dbupgrade/coa_guess_de.html index a7f48bc6d..6379936b4 100644 --- a/templates/webpages/dbupgrade/coa_guess_de.html +++ b/templates/webpages/dbupgrade/coa_guess_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="action" value="login"> diff --git a/templates/webpages/dbupgrade/coa_guess_master.html b/templates/webpages/dbupgrade/coa_guess_master.html index 61eabac9e..2bc5acaec 100644 --- a/templates/webpages/dbupgrade/coa_guess_master.html +++ b/templates/webpages/dbupgrade/coa_guess_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="action" value="login"> diff --git a/templates/webpages/dbupgrade/footer_de.html b/templates/webpages/dbupgrade/footer_de.html index 18ea036bf..4230911a0 100644 --- a/templates/webpages/dbupgrade/footer_de.html +++ b/templates/webpages/dbupgrade/footer_de.html @@ -4,7 +4,6 @@ <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="action" value="display"> <p><input type="submit" value="Weiter"></p> diff --git a/templates/webpages/dbupgrade/footer_master.html b/templates/webpages/dbupgrade/footer_master.html index dbe31509d..c26603f18 100644 --- a/templates/webpages/dbupgrade/footer_master.html +++ b/templates/webpages/dbupgrade/footer_master.html @@ -4,7 +4,6 @@ <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="action" value="display"> <p><input type="submit" value="<translate>Continue</translate>"></p> diff --git a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html index ea13345f7..b79945373 100644 --- a/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html +++ b/templates/webpages/dbupgrade/std_buchungsgruppen_unknown_coa_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="action" value="login"> diff --git a/templates/webpages/dbupgrade/units_parts_de.html b/templates/webpages/dbupgrade/units_parts_de.html index 386ee5a7a..663088f11 100644 --- a/templates/webpages/dbupgrade/units_parts_de.html +++ b/templates/webpages/dbupgrade/units_parts_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="dimension"> diff --git a/templates/webpages/dbupgrade/units_parts_master.html b/templates/webpages/dbupgrade/units_parts_master.html index 2a2ec5287..1d8f41269 100644 --- a/templates/webpages/dbupgrade/units_parts_master.html +++ b/templates/webpages/dbupgrade/units_parts_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="dimension"> diff --git a/templates/webpages/dbupgrade/units_services_de.html b/templates/webpages/dbupgrade/units_services_de.html index 211d96d37..99a0858aa 100644 --- a/templates/webpages/dbupgrade/units_services_de.html +++ b/templates/webpages/dbupgrade/units_services_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="service"> diff --git a/templates/webpages/dbupgrade/units_services_master.html b/templates/webpages/dbupgrade/units_services_master.html index be8ffd92f..9622469b1 100644 --- a/templates/webpages/dbupgrade/units_services_master.html +++ b/templates/webpages/dbupgrade/units_services_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="service"> diff --git a/templates/webpages/dbupgrade/units_set_default_de.html b/templates/webpages/dbupgrade/units_set_default_de.html index a93d5aa71..6b0b1e273 100644 --- a/templates/webpages/dbupgrade/units_set_default_de.html +++ b/templates/webpages/dbupgrade/units_set_default_de.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="dimension"> diff --git a/templates/webpages/dbupgrade/units_set_default_master.html b/templates/webpages/dbupgrade/units_set_default_master.html index 8452c4fbb..bed20b824 100644 --- a/templates/webpages/dbupgrade/units_set_default_master.html +++ b/templates/webpages/dbupgrade/units_set_default_master.html @@ -2,7 +2,6 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="unit_type" value="dimension"> diff --git a/templates/webpages/dbupgrade/warning_de.html b/templates/webpages/dbupgrade/warning_de.html index 16ceed64a..b2600bc1a 100644 --- a/templates/webpages/dbupgrade/warning_de.html +++ b/templates/webpages/dbupgrade/warning_de.html @@ -1,6 +1,5 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="action" value="login"> diff --git a/templates/webpages/dbupgrade/warning_master.html b/templates/webpages/dbupgrade/warning_master.html index edd78039f..ac00dd4ad 100644 --- a/templates/webpages/dbupgrade/warning_master.html +++ b/templates/webpages/dbupgrade/warning_master.html @@ -1,6 +1,5 @@ <form name="Form" method="post" action="login.pl"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> <input type="hidden" name="hashed_password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="action" value="login"> diff --git a/templates/webpages/drafts/load_de.html b/templates/webpages/drafts/load_de.html index 95eb33f7c..e3c77e775 100644 --- a/templates/webpages/drafts/load_de.html +++ b/templates/webpages/drafts/load_de.html @@ -3,7 +3,6 @@ <form action="<TMPL_VAR script ESCAPE=HTML>" method="post"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="SAVED_FORM" value="<TMPL_VAR SAVED_FORM ESCAPE=HTML>"> @@ -34,7 +33,7 @@ <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>"> <td><input type="checkbox" name="checked_<TMPL_VAR id>" value="1"></td> <td><TMPL_VAR itime ESCAPE=HTML></td> - <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&path=<TMPL_VAR path ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td> + <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td> <td><TMPL_VAR employee_name ESCAPE=HTML></td> </tr> </TMPL_LOOP> diff --git a/templates/webpages/drafts/load_master.html b/templates/webpages/drafts/load_master.html index 6f42c6d0a..7ff8c3f2f 100644 --- a/templates/webpages/drafts/load_master.html +++ b/templates/webpages/drafts/load_master.html @@ -3,7 +3,6 @@ <form action="<TMPL_VAR script ESCAPE=HTML>" method="post"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="SAVED_FORM" value="<TMPL_VAR SAVED_FORM ESCAPE=HTML>"> @@ -34,7 +33,7 @@ <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>"> <td><input type="checkbox" name="checked_<TMPL_VAR id>" value="1"></td> <td><TMPL_VAR itime ESCAPE=HTML></td> - <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&path=<TMPL_VAR path ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td> + <td><a href="<TMPL_VAR script ESCAPE=URL>?login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>&action=load_draft&id=<TMPL_VAR id ESCAPE=URL>"><TMPL_VAR description ESCAPE=HTML></a></td> <td><TMPL_VAR employee_name ESCAPE=HTML></td> </tr> </TMPL_LOOP> diff --git a/templates/webpages/drafts/save_new_de.html b/templates/webpages/drafts/save_new_de.html index 1e71f4bfd..804b00dd9 100644 --- a/templates/webpages/drafts/save_new_de.html +++ b/templates/webpages/drafts/save_new_de.html @@ -3,7 +3,6 @@ <form action="<TMPL_VAR script ESCAPE=HTML>" method="post"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="SAVED_FORM" value="<TMPL_VAR SAVED_FORM ESCAPE=HTML>"> diff --git a/templates/webpages/drafts/save_new_master.html b/templates/webpages/drafts/save_new_master.html index 0e2667408..41e527364 100644 --- a/templates/webpages/drafts/save_new_master.html +++ b/templates/webpages/drafts/save_new_master.html @@ -3,7 +3,6 @@ <form action="<TMPL_VAR script ESCAPE=HTML>" method="post"> <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>"> - <input type="hidden" name="path" value="<TMPL_VAR path ESCAPE=HTML>"> <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>"> <input type="hidden" name="SAVED_FORM" value="<TMPL_VAR SAVED_FORM ESCAPE=HTML>"> diff --git a/templates/webpages/ustva/report_de.html b/templates/webpages/ustva/report_de.html index 1506fe090..2411b4dde 100644 --- a/templates/webpages/ustva/report_de.html +++ b/templates/webpages/ustva/report_de.html @@ -195,7 +195,6 @@ <input type="hidden" name="reporttype" value="custom"> <input type="hidden" name="co_street" value="<TMPL_VAR co_street>"> <input type="hidden" name="co_city" value="<TMPL_VAR co_city>"> - <input type="hidden" name="path" value="<TMPL_VAR path>"> <input type="hidden" name="login" value="<TMPL_VAR login>"> <input type="hidden" name="password" value="<TMPL_VAR password>"> <table width="100%"> diff --git a/templates/webpages/ustva/report_master.html b/templates/webpages/ustva/report_master.html index 61bc22492..9f195539e 100644 --- a/templates/webpages/ustva/report_master.html +++ b/templates/webpages/ustva/report_master.html @@ -196,7 +196,6 @@ <input type="hidden" name="reporttype" value="custom"> <input type="hidden" name="co_street" value="<TMPL_VAR co_street>"> <input type="hidden" name="co_city" value="<TMPL_VAR co_city>"> - <input type="hidden" name="path" value="<TMPL_VAR path>"> <input type="hidden" name="login" value="<TMPL_VAR login>"> <input type="hidden" name="password" value="<TMPL_VAR password>"> <table width="100%"> @@ -224,4 +223,4 @@ - \ No newline at end of file + -- 2.20.1