$form->{path} entfernt und hardcodiert auf bin/mozilla gesetzt.

Vorlagen sind nicht betroffen, aber locales.pl schon.

diff --git a/SL/Drafts.pm b/SL/Drafts.pm
index 698b217f5670d8bcd7c3cefbdcb2dc1d44ac6b4b..a4d4dc6a16f64661b7e3a8b23caf44f1d9eedc40 100644 (file)
--- a/SL/Drafts.pm
+++ b/SL/Drafts.pm
@@ -53,7 +53,7 @@ sub save {
     do_query($form, $dbh, $query, $draft_id, $module, $submodule);
   }
 
     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);
   map({ $saved{$_} = $form->{$_};
         delete($form->{$_}); } @dont_save);
   $dumped = YAML::Dump($form);

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 77bc848fd2b8fec7e23385c491ce48c443500ae8..044ce9b798ea3a3a05f4a31d05b7821f8079f8ba 100644 (file)
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -69,7 +69,7 @@ sub menuitem {
   my $level = $form->escape($item);
 
   my $str =
   my $level = $form->escape($item);
 
   my $str =

-    qq|<a style="vertical-align:top" href=$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
+    qq|<a style="vertical-align:top" href=$module?action=$action&level=$level&login=$form->{login}&password=$form->{password}|;

 
   my @vars = qw(module action target href);
 
 
   my @vars = qw(module action target href);
 


@@ -122,7 +122,7 @@ sub menuitem_v3 {
 
   my $str = qq|<a href="$module?action=| . $form->escape($action) .
     qq|&level=| . $form->escape($level);
 
   my $str = qq|<a href="$module?action=| . $form->escape($action) .
     qq|&level=| . $form->escape($level);

-  map({ $str .= "&${_}=" . $form->escape($form->{$_}); } qw(path login password));
+  map({ $str .= "&${_}=" . $form->escape($form->{$_}); } qw(login password));

 
   my @vars = qw(module action target href);
 
 
   my @vars = qw(module action target href);
 


@@ -176,7 +176,7 @@ sub menuitemNew {
 
   my $level = $form->escape($item);
   my $str   =
 
   my $level = $form->escape($item);
   my $str   =

-    qq|$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
+    qq|$module?action=$action&level=$level&login=$form->{login}&password=$form->{password}|;

   my @vars = qw(module action target href);
 
   if ($self->{$item}{href}) {
   my @vars = qw(module action target href);
 
   if ($self->{$item}{href}) {

diff --git a/am.pl b/am.pl
index 98d990c8101884f83e4c435b1ec9386e7c5aaca9..2860f61338ac4cfbd1a23d3ea8a2f6551f27d9cf 100755 (executable)
--- a/am.pl
+++ b/am.pl
@@ -98,28 +98,23 @@ $locale = new Locale "$myconfig{countrycode}", "$script";
 $form->error($locale->text('Incorrect Password!'))
   if ($form->{password} ne $myconfig{password});
 
 $form->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
 # 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
 
 # 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
   $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 ($@);
 }
 
   $form->error($@) if ($@);
 }
 

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index 1e362973d1650556c03da5972ad58e0921b1411e..e936b2a12430c68d8f04527ea53e822502bbb511 100644 (file)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -46,8 +46,8 @@ $form->{"root"} = "root login";
 $locale = new Locale $language, "admin";
 
 # customization
 $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 ($@);
 }
 
   $form->error($@) if ($@);
 }
 


@@ -125,7 +125,6 @@ sub adminlogin {
     . $locale->text('Login') . qq|"></td>
   </tr>
 <input type=hidden name=action value=login>
     . $locale->text('Login') . qq|"></td>
   </tr>
 <input type=hidden name=action value=login>

-<input type=hidden name=path value=$form->{path}>

 </table>
 
 
 </table>
 
 


@@ -197,8 +196,7 @@ sub form_footer {
 
   print qq|
 
 
   print qq|
 

-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
-<input type=hidden name=path value=$form->{path}>
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=submit class=submit name=action value="|
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=submit class=submit name=action value="|


@@ -293,7 +291,7 @@ sub list_users {
 
   foreach $key (sort keys %member) {
     $href =
 
   foreach $key (sort keys %member) {
     $href =

-      "$script?action=edit&login=$key&path=$form->{path}&rpw=$form->{rpw}";
+      "$script?action=edit&login=$key&rpw=$form->{rpw}";

     $href =~ s/ /%20/g;
 
     $member{$key}{templates} =~ s/^$templates\///;
     $href =~ s/ /%20/g;
 
     $member{$key}{templates} =~ s/^$templates\///;


@@ -330,7 +328,6 @@ sub list_users {
   </tr>
 </table>
 
   </tr>
 </table>
 

-<input type=hidden name=path value=$form->{path}>

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <br><input type=submit class=submit name=action value="|
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <br><input type=submit class=submit name=action value="|


@@ -373,7 +370,6 @@ $nologin
          <td><input type=submit name=action value="|
     . $locale->text('Login') . qq|"></td>
        </tr>
          <td><input type=submit name=action value="|
     . $locale->text('Login') . qq|"></td>
        </tr>

-<input type=hidden name=path value=$form->{path}>

       </table>
     </td>
   </tr>
       </table>
     </td>
   </tr>


@@ -1147,7 +1143,6 @@ sub change_admin_password {
   </tr>
 </table>
 
   </tr>
 </table>
 

-<input type=hidden name=path value=$form->{path}>

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <p>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <p>


@@ -1188,7 +1183,7 @@ sub change_password {
   $root->save_member($memberfile);
 
   $form->{callback} =
   $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!'));
 
 
   $form->redirect($locale->text('Password changed!'));
 


@@ -1309,8 +1304,7 @@ sub dbselect_source {
 </td></tr>
 </table>
 
 </td></tr>
 </table>
 

-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
-<input type=hidden name=path value=$form->{path}>
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <br>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <br>


@@ -1404,9 +1398,8 @@ $upd
 
 <input name=dbupdate type=hidden value="$form->{dbupdate}">
 
 
 <input name=dbupdate type=hidden value="$form->{dbupdate}">
 

-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">

 
 

-<input type=hidden name=path value=$form->{path}>

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbupdate>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbupdate>


@@ -1458,7 +1451,7 @@ sub dbupdate {
 <br>
 
 <a id="enddatasetupdate" href="admin.pl?action=login&| .
 <br>
 
 <a id="enddatasetupdate" href="admin.pl?action=login&| .

-join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(path rpw))) .
+join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(rpw))) .

 qq|">| . $locale->text("Continue") . qq|</a>|;
 
 }
 qq|">| . $locale->text("Continue") . qq|</a>|;
 
 }


@@ -1556,9 +1549,8 @@ sub create_dataset {
 <input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
 <input type=hidden name="dbdefault" value="$form->{dbdefault}">
 
 <input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
 <input type=hidden name="dbdefault" value="$form->{dbdefault}">
 

-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">

 
 

-<input type=hidden name=path value=$form->{path}>

 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbcreate>
 <input type=hidden name=rpw value=$form->{rpw}>
 
 <input type=hidden name=nextsub value=dbcreate>


@@ -1609,7 +1601,6 @@ sub dbcreate {
 
     . qq|
 
 
     . qq|
 

-<input type=hidden name=path value="$form->{path}">

 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>


@@ -1672,9 +1663,8 @@ sub delete_dataset {
 <input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
 <input type=hidden name="dbdefault" value="$form->{dbdefault}">
 
 <input type=hidden name="dbpasswd"  value="$form->{dbpasswd}">
 <input type=hidden name="dbdefault" value="$form->{dbdefault}">
 

-<input name=callback type=hidden value="$form->{script}?action=list_users&path=$form->{path}&rpw=$form->{rpw}">
+<input name=callback type=hidden value="$form->{script}?action=list_users&rpw=$form->{rpw}">

 
 

-<input type=hidden name=path value="$form->{path}">

 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=dbdelete>
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=dbdelete>


@@ -1724,7 +1714,6 @@ $form->{db} | . $locale->text('successfully deleted!')
 
     . qq|
 
 
     . qq|
 

-<input type=hidden name=path value="$form->{path}">

 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>
 <input type=hidden name=rpw value="$form->{rpw}">
 
 <input type=hidden name=nextsub value=list_users>


@@ -1745,7 +1734,7 @@ sub unlock_system {
   unlink "$userspath/nologin";
 
   $form->{callback} =
   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!'));
 
 
   $form->redirect($locale->text('Lockfile removed!'));
 


@@ -1758,7 +1747,7 @@ sub lock_system {
   close(FH);
 
   $form->{callback} =
   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!'));
 
 
   $form->redirect($locale->text('Lockfile created!'));
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 38eedb0c259cd50630bf510ddf9f29a70eaaf248..ca1ee4c0d89b75ed1b3fcf9f4a17b198a20ae3a3 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -40,7 +40,7 @@ use Data::Dumper;
 
 1;
 
 
 1;
 

-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";

 
 # end of main
 
 
 # end of main
 


@@ -58,7 +58,7 @@ sub add_account {
   AM->get_account(\%myconfig, \%$form);
 
   $form->{callback} =
   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;
     unless $form->{callback};
 
   &account_header;


@@ -485,7 +485,6 @@ sub form_footer {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -534,7 +533,7 @@ sub list_account {
 
   # construct callback
   $callback =
 
   # 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;
 
 
   $form->header;
 


@@ -599,7 +598,7 @@ sub list_account {
 
     $ca->{link_edit_account} = 
         qq|$form->{script}?action=edit_account&id=$ca->{id}|
 
     $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|;
   }
   
        .qq|&password=$form->{password}&callback=$callback|;
   }
   


@@ -644,7 +643,7 @@ sub add_department {
   $form->{role}  = "P";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   &department_header;


@@ -672,7 +671,7 @@ sub list_department {
   AM->departments(\%myconfig, \%$form);
 
   $form->{callback} =
   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});
 
 
   $callback = $form->escape($form->{callback});
 


@@ -728,7 +727,7 @@ sub list_department {
     $profitcenter = ($ref->{role} eq "P") ? "X" : "";
 
     $column_data{description} =
     $profitcenter = ($ref->{role} eq "P") ? "X" : "";
 
     $column_data{description} =

-      qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_department&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;

     $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
     $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
 
     $column_data{cost}   = qq|<td align=center>$costcenter</td>|;
     $column_data{profit} = qq|<td align=center>$profitcenter</td>|;
 


@@ -755,7 +754,6 @@ sub list_department {
 
 <input type=hidden name=type value=department>
 
 
 <input type=hidden name=type value=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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -852,7 +850,7 @@ sub add_lead {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   &lead_header;


@@ -882,7 +880,7 @@ sub list_lead {
   AM->lead(\%myconfig, \%$form);
 
   $form->{callback} =
   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});
 
 
   $callback = $form->escape($form->{callback});
 


@@ -926,7 +924,7 @@ sub list_lead {
        $lead = $ref->{lead};
        
     $column_data{description} =
        $lead = $ref->{lead};
        
     $column_data{description} =

-      qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_lead&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{lead}</td>|;

 
     map { print "$column_data{$_}\n" } @column_index;
 
 
     map { print "$column_data{$_}\n" } @column_index;
 


@@ -948,7 +946,6 @@ sub list_lead {
 
 <input type=hidden name=type value=lead>
 
 
 <input type=hidden name=type value=lead>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1029,7 +1026,7 @@ sub add_business {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   &business_header;


@@ -1059,7 +1056,7 @@ sub list_business {
   AM->business(\%myconfig, \%$form);
 
   $form->{callback} =
   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});
 
 
   $callback = $form->escape($form->{callback});
 


@@ -1116,7 +1113,7 @@ sub list_business {
     $description =
       $ref->{description};
     $column_data{description} =
     $description =
       $ref->{description};
     $column_data{description} =

-      qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;
+      qq|<td><a href=$form->{script}?action=edit_business&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$description</td>|;

     $column_data{discount}           = qq|<td align=right>$discount</td>|;
     $column_data{customernumberinit} =
       qq|<td align=right>$ref->{customernumberinit}</td>|;
     $column_data{discount}           = qq|<td align=right>$discount</td>|;
     $column_data{customernumberinit} =
       qq|<td align=right>$ref->{customernumberinit}</td>|;


@@ -1144,7 +1141,6 @@ sub list_business {
 
 <input type=hidden name=type value=business>
 
 
 <input type=hidden name=type value=business>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1233,7 +1229,7 @@ sub add_language {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   &language_header;


@@ -1263,7 +1259,7 @@ sub list_language {
   AM->language(\%myconfig, \%$form);
 
   $form->{callback} =
   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});
 
 
   $callback = $form->escape($form->{callback});
 


@@ -1329,7 +1325,7 @@ sub list_language {
 
 
     $column_data{description} =
 
 
     $column_data{description} =

-      qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_language&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;

     $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
     $column_data{article_code} =
       qq|<td align=right>$ref->{article_code}</td>|;
     $column_data{template_code}           = qq|<td align=right>$ref->{template_code}</td>|;
     $column_data{article_code} =
       qq|<td align=right>$ref->{article_code}</td>|;


@@ -1371,7 +1367,6 @@ sub list_language {
 
 <input type=hidden name=type value=language>
 
 
 <input type=hidden name=type value=language>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1505,7 +1500,7 @@ sub add_buchungsgruppe {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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"};
     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} =
   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});
 
 
   $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->{$_}) . "&" }
 
   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} }) {
 
   my $row = 0;
   foreach $ref (@{ $form->{ALL} }) {


@@ -1659,7 +1654,7 @@ sub list_buchungsgruppe {
     }
 
     $column_data{description} =
     }
 
     $column_data{description} =

-      qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_buchungsgruppe&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}</td>|;

     $column_data{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
     $column_data{income_accno_0} =
       qq|<td align=right>$ref->{income_accno_0}</td>|;
     $column_data{inventory_accno}           = qq|<td align=right>$ref->{inventory_accno}</td>|;
     $column_data{income_accno_0} =
       qq|<td align=right>$ref->{income_accno_0}</td>|;


@@ -1699,7 +1694,6 @@ sub list_buchungsgruppe {
 
 <input type=hidden name=type value=buchungsgruppe>
 
 
 <input type=hidden name=type value=buchungsgruppe>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1891,7 +1885,7 @@ sub add_printer {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   &printer_header;


@@ -1921,7 +1915,7 @@ sub list_printer {
   AM->printer(\%myconfig, \%$form);
 
   $form->{callback} =
   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});
 
 
   $callback = $form->escape($form->{callback});
 


@@ -1975,7 +1969,7 @@ sub list_printer {
 
 
     $column_data{printer_description} =
 
 
     $column_data{printer_description} =

-      qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;
+      qq|<td><a href=$form->{script}?action=edit_printer&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{printer_description}</td>|;

     $column_data{printer_command}           = qq|<td align=right>$ref->{printer_command}</td>|;
     $column_data{template_code} =
       qq|<td align=right>$ref->{template_code}</td>|;
     $column_data{printer_command}           = qq|<td align=right>$ref->{printer_command}</td>|;
     $column_data{template_code} =
       qq|<td align=right>$ref->{template_code}</td>|;


@@ -2003,7 +1997,6 @@ sub list_printer {
 
 <input type=hidden name=type value=printer>
 
 
 <input type=hidden name=type value=printer>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -2093,7 +2086,7 @@ sub add_payment {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   $form->{terms_netto} = 0;


@@ -2263,7 +2256,6 @@ sub list_payment {
 
 <input type=hidden name=type value=payment>
 
 
 <input type=hidden name=type value=payment>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -2789,7 +2781,6 @@ print qq|      </table>
   </tr>
 </table>
 
   </tr>
 </table>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -2840,7 +2831,6 @@ sub audit_control {
 
 <form method=post action=$form->{script}>
 
 
 <form method=post action=$form->{script}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 

diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index fa55a0118ccaadc3dfbbcdd78f085fd917c3067c..77f7659a2f820955167575560a71722fed9fe216 100644 (file)
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -38,7 +38,7 @@ use Data::Dumper;
 
 1;
 
 
 1;
 

-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";

 
 # end of main
 
 
 # end of main
 


@@ -98,7 +98,7 @@ sub display_template_form {
 
   my %options;
 
 
   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;
 
   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 22fc65cfa284951bcd1f1e50d9ecc2bae312a959..65c51a1f158c232039a62602bf8e5db4ab1188b5 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -35,7 +35,7 @@ use SL::AP;
 use SL::IR;
 use SL::PE;
 
 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";
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/drafts.pl";
 


@@ -79,7 +79,7 @@ sub add {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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);
     unless $form->{callback};
 
   AP->get_transdate(\%myconfig, $form);


@@ -826,7 +826,6 @@ sub form_footer {
 <input name=callback type=hidden value="$form->{callback}">
 <input name="gldate" type="hidden" value="| . Q($form->{gldate}) . qq|">
 
 <input name=callback type=hidden value="$form->{callback}">
 <input name="gldate" type="hidden" value="| . Q($form->{gldate}) . 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}>
 |
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 |


@@ -1366,7 +1365,6 @@ $jsscript
 
 <br>
 <input type=hidden name=nextsub value=$form->{nextsub}>
 
 <br>
 <input type=hidden name=nextsub value=$form->{nextsub}>

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1390,7 +1388,7 @@ sub ap_transactions {
   AP->ap_transactions(\%myconfig, \%$form);
 
   $callback =
   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}) {
   $href = $callback;
 
   if ($form->{vendor}) {


@@ -1604,7 +1602,7 @@ sub ap_transactions {
     $module = ($ap->{invoice}) ? "ir.pl" : $form->{script};
 
     $column_data{invnumber} =
     $module = ($ap->{invoice}) ? "ir.pl" : $form->{script};
 
     $column_data{invnumber} =

-      qq|<td><a href="$module?action=edit&path=$form->{path}&id=$ap->{id}&login=$form->{login}&password=$form->{password}&callback=$callback">$ap->{invnumber}</a></td>|;
+      qq|<td><a href="$module?action=edit&id=$ap->{id}&login=$form->{login}&password=$form->{password}&callback=$callback">$ap->{invnumber}</a></td>|;

     $column_data{id}        = "<td>$ap->{id}</td>";
     $column_data{ordnumber} = "<td>$ap->{ordnumber}&nbsp;</td>";
     $column_data{name}      = "<td>$ap->{name}</td>";
     $column_data{id}        = "<td>$ap->{id}</td>";
     $column_data{ordnumber} = "<td>$ap->{ordnumber}&nbsp;</td>";
     $column_data{name}      = "<td>$ap->{name}</td>";


@@ -1673,7 +1671,6 @@ sub ap_transactions {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 482ac648391e9a1af7508d668f17462aafbfed70..1597c550dd5bb617effb07c7f95662986b6a98c1 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -36,7 +36,7 @@ use SL::IS;
 use SL::PE;
 use Data::Dumper;
 
 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";
 
 require "bin/mozilla/common.pl";
 require "bin/mozilla/drafts.pl";
 


@@ -87,7 +87,7 @@ sub add {
   
   $form->{title}    = "Add";
   $form->{callback} =
   
   $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);
     unless $form->{callback};
 
   AR->get_transdate(\%myconfig, $form);


@@ -843,7 +843,6 @@ sub form_footer {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 |
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 |


@@ -899,7 +898,7 @@ sub form_footer {
   }
 
   if ($form->{menubar}) {
   }
 
   if ($form->{menubar}) {

-    require "$form->{path}/menu.pl";
+    require "bin/mozilla/menu.pl";

     &menubar;
   }
   # button for saving history
     &menubar;
   }
   # button for saving history


@@ -1386,7 +1385,6 @@ sub search {
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1415,7 +1413,7 @@ sub ar_transactions {
   AR->ar_transactions(\%myconfig, \%$form);
 
   $callback =
   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}) {
   $href = $callback;
 
   if ($form->{customer}) {


@@ -1645,7 +1643,7 @@ sub ar_transactions {
     $module = ($ar->{invoice}) ? "is.pl" : $form->{script};
 
     $column_data{invnumber} =
     $module = ($ar->{invoice}) ? "is.pl" : $form->{script};
 
     $column_data{invnumber} =

-      "<td><a href=$module?action=edit&id=$ar->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ar->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ar->{invnumber}</a></td>";

     $column_data{type} = "<td>" .
       ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
        $ar->{amount} < 0 ?
     $column_data{type} = "<td>" .
       ($ar->{storno} ? $locale->text("Storno (one letter abbreviation)") :
        $ar->{amount} < 0 ?


@@ -1720,7 +1718,6 @@ sub ar_transactions {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 08cdc3be28695df54d12e2c5ae9e30e3562ed58b..7952922f62735ea361d64c90fd841e61d59f1add 100644 (file)
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -31,11 +31,11 @@
 #
 
 # any custom scripts for this one
 #
 
 # 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;
 }
 
 1;

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 6e7d9277a7d20d7d6b85d466f3c7b5714acd00bf..457a35ebccdceefcd13c88698c2cf2c915a7c393 100644 (file)
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -229,7 +229,6 @@ sub search {
 
 <input type=hidden name=nextsub value=list_spool>
 
 
 <input type=hidden name=nextsub value=list_spool>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -353,11 +352,11 @@ sub list_spool {
 
   $title = $form->escape($form->{title});
   $href  =
 
   $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 =
 
   $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);
 
   if ($form->{ $form->{vc} }) {
     $callback .= "&$form->{vc}=" . $form->escape($form->{ $form->{vc} }, 1);


@@ -507,11 +506,11 @@ sub list_spool {
     }
 
     $column_data{invnumber} =
     }
 
     $column_data{invnumber} =

-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";

     $column_data{ordnumber} =
     $column_data{ordnumber} =

-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";

     $column_data{quonumber} =
     $column_data{quonumber} =

-      "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
+      "<td><a href=$module?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";

     $column_data{name}      = "<td>$ref->{name}</td>";
     $column_data{spoolfile} =
       qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
     $column_data{name}      = "<td>$ref->{name}</td>";
     $column_data{spoolfile} =
       qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>


@@ -556,7 +555,6 @@ sub list_spool {
 
 <input type=hidden name=account value="$form->{account}">
 
 
 <input type=hidden name=account value="$form->{account}">
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 |;

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 9e3d4ecf2f7acc44094094d40d7b0dd23f277a74..12aef7aa6c86a17636732a00abbd38f40256b70c 100644 (file)
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -107,7 +107,7 @@ sub chart_of_accounts {
     $description      = $form->escape($ca->{description});
 
     $href =
     $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|<tr class=listheading>|;
 
     if ($ca->{charttype} eq "H") {
       print qq|<tr class=listheading>|;


@@ -239,7 +239,6 @@ sub list {
 </table>
 
 <input type=hidden name=login value=$form->{login}>
 </table>
 
 <input type=hidden name=login value=$form->{login}>

-<input type=hidden name=path value=$form->{path}>

 <input type=hidden name=password value=$form->{password}>
 
 <br><input class=submit type=submit name=action value="|
 <input type=hidden name=password value=$form->{password}>
 
 <br><input class=submit type=submit name=action value="|


@@ -265,7 +264,7 @@ sub list_transactions {
 
   # construct href
   $href =
 
   # construct href
   $href =

-    "$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";

 
   $description      = $form->escape($form->{description},      1);
   $department       = $form->escape($form->{department},       1);
 
   $description      = $form->escape($form->{description},      1);
   $department       = $form->escape($form->{department},       1);


@@ -274,7 +273,7 @@ sub list_transactions {
 
   # construct callback
   $callback =
 
   # 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} =
 
   # figure out which column comes first
   $column_header{transdate} =


@@ -391,7 +390,7 @@ sub list_transactions {
 
     # construct link to source
     $href =
 
     # construct link to source
     $href =

-      "<a href=$ca->{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}</a>";
+      "<a href=$ca->{module}.pl?action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}</a>";

     my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;") : "&nbsp;";
     $column_data{debit} =
       "<td align=right>$debit</td>";
     my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;") : "&nbsp;";
     $column_data{debit} =
       "<td align=right>$debit</td>";

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 5a1d2e3bc7f91257f303d6e6b66b70f9b1a2e95a..b68865a4fc0ed377996baa641548d22249b98531 100644 (file)
--- a/bin/mozilla/cp.pl
+++ b/bin/mozilla/cp.pl
@@ -36,7 +36,7 @@ use SL::OP;
 use SL::IS;
 use SL::IR;
 
 use SL::IS;
 use SL::IR;
 

-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";

 require "bin/mozilla/common.pl";
 
 1;
 require "bin/mozilla/common.pl";
 
 1;


@@ -467,7 +467,6 @@ sub form_footer {
 </table>
 <input type=hidden name=rowcount value=$form->{rowcount}>
 
 </table>
 <input type=hidden name=rowcount value=$form->{rowcount}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -724,7 +723,7 @@ sub print {
 
   if ($form->{media} ne 'screen') {
     $form->{callback} =
 
   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!'));
 
     $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 5bffd7c2961ab5bdee141c49592c2a1bad199d91..fe166c52015498fcdbf5f112510ff9897e72987a 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -54,7 +54,7 @@ sub add {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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);
     unless $form->{callback};
 
   CT->populate_drop_down_boxes(\%myconfig, \%$form);


@@ -199,7 +199,6 @@ sub search {
 
 <input type=hidden name=nextsub value=list_names>
 
 
 <input type=hidden name=nextsub value=list_names>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -313,7 +312,6 @@ sub search_delivery {
 
 <input type=hidden name=nextsub value=list_names>
 
 
 <input type=hidden name=nextsub value=list_names>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -334,7 +332,7 @@ sub list_names {
   CT->search(\%myconfig, \%$form);
 
   $callback =
   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 =
   $href = $callback;
 
   @columns =


@@ -496,7 +494,7 @@ sub list_names {
         (invnumber, ordnumber, quonumber);
 
       $column_data{name} =
         (invnumber, ordnumber, quonumber);
 
       $column_data{name} =

-        "<td align=left><a href=$form->{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}&nbsp;</td>";
+        "<td align=left><a href=$form->{script}?action=edit&id=$ref->{id}&db=$form->{db}&login=$form->{login}&password=$form->{password}&status=$form->{status}&callback=$callback>$ref->{name}&nbsp;</td>";

 
       if ($ref->{email}) {
         $email = $ref->{email};
 
       if ($ref->{email}) {
         $email = $ref->{email};


@@ -511,17 +509,17 @@ sub list_names {
 
     if ($ref->{formtype} eq 'invoice') {
       $column_data{invnumber} =
 
     if ($ref->{formtype} eq 'invoice') {
       $column_data{invnumber} =

-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}&nbsp;</td>";

     }
 
     if ($ref->{formtype} eq 'order') {
       $column_data{ordnumber} =
     }
 
     if ($ref->{formtype} eq 'order') {
       $column_data{ordnumber} =

-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$ordertype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}&nbsp;</td>";

     }
 
     if ($ref->{formtype} eq 'quotation') {
       $column_data{quonumber} =
     }
 
     if ($ref->{formtype} eq 'quotation') {
       $column_data{quonumber} =

-        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}&nbsp;</td>";
+        "<td><a href=$ref->{module}.pl?action=edit&id=$ref->{invid}&type=$quotationtype&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}&nbsp;</td>";

     }
 
     $i++;
     }
 
     $i++;


@@ -555,7 +553,6 @@ sub list_names {
 <input name=callback type=hidden value="$form->{callback}">
 <input name=db type=hidden value=$form->{db}>
 
 <input name=callback type=hidden value="$form->{callback}">
 <input name=db type=hidden value=$form->{db}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -661,7 +658,7 @@ sub form_header {
 |;
 
   $get_contact_url =
 |;
 
   $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} = "<option value=0></option>";
 
   my $pjx = new CGI::Ajax( 'get_contact' => $get_contact_url );
   $form->{selectcontact} = "<option value=0></option>";


@@ -685,7 +682,7 @@ sub form_header {
                <input type=hidden name=selectcontact value="$form->{selectcontact}">
              </tr>|;
   $get_shipto_url =
                <input type=hidden name=selectcontact value="$form->{selectcontact}">
              </tr>|;
   $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} = "<option value=0></option>";
 
   my $pjy = new CGI::Ajax( 'get_shipto' => $get_shipto_url );
   $form->{selectshipto} = "<option value=0></option>";


@@ -713,7 +710,7 @@ sub form_header {
 
 
   $get_delivery_url =
 
 
   $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 );
 
 
   my $pjz = new CGI::Ajax( 'get_delivery' => $get_delivery_url );
 


@@ -1195,7 +1192,6 @@ sub form_footer {
 <input name=business_save type=hidden value="$form->{selectbusiness}">
 <input name=title_save type=hidden value="$form->{title}">
 
 <input name=business_save type=hidden value="$form->{selectbusiness}">
 <input name=title_save type=hidden value="$form->{title}">
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1269,7 +1265,7 @@ sub add_transaction {
   $name = $form->escape("$form->{name}", 1);
 
   $form->{callback} =
   $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();
   $form->redirect;
 
   $lxdebug->leave_sub();

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index a21125308e0c8a009791a24b2526f97dc616b894..a98a9529f5d545aa0b7915eeca9fa3140938b0a0 100644 (file)
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -113,7 +113,6 @@ sub export {
 
 <input type=hidden name=nextsub value=export2>
 
 
 <input type=hidden name=nextsub value=export2>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -248,7 +247,6 @@ sub export_bewegungsdaten {
 
 <input type=hidden name=nextsub value=export3>
 
 
 <input type=hidden name=nextsub value=export3>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -314,7 +312,6 @@ sub export_stammdaten {
 
 <input type=hidden name=nextsub value=export3>
 
 
 <input type=hidden name=nextsub value=export3>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -336,7 +333,7 @@ sub export3 {
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
   my $link = $form->{"script"} . "?";
   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}) {
   $link .= "action=download";
 
   if ($form->{kne}) {

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index 88b2cb339bca3071eb1d770cf91724cc75b95531..b91456aba1ab6770887ef0212451f656b36d6f51 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -36,8 +36,8 @@ use SL::PE;
 use SL::DN;
 use Data::Dumper;
 
 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;
 
 
 1;
 


@@ -51,7 +51,7 @@ sub edit_config {
   $form->{title} = $locale->text('Edit Dunning Process Config');
   
   $form->{callback} =
   $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);
     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 {
 <input name=callback type=hidden value="$form->{callback}">
 <input name=rowcount type=hidden value="$form->{rowcount}">
 
 <input name=callback type=hidden value="$form->{callback}">
 <input name=rowcount type=hidden value="$form->{rowcount}">
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -348,7 +347,6 @@ sub add {
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -386,7 +384,7 @@ sub show_invoices {
   $form->{nextsub} = "save_dunning";
   
   $form->{callback} =
   $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}&notes=$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}&notes=$form->{notes}"

     unless $form->{callback};
 
   @column_index = qw(dunning_description active email customername invnumber invdate inv_duedate invamount next_duedate fee interest );
     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 {
 <input name=groupinvoices type=hidden value="$form->{groupinvoices}">
 
 
 <input name=groupinvoices type=hidden value="$form->{groupinvoices}">
 
 

-<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="action">
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 <input type="hidden" name="action">


@@ -627,7 +624,7 @@ sub set_email {
 
   my $callback = "$form->{script}?action=set_email&";
   map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
 
   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";
 
   if ($form->{email_attachment}) {
     $form->{email_attachment} = "checked";


@@ -798,7 +795,6 @@ sub search {
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 
 
 <input type=hidden name=nextsub value=$form->{nextsub}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -830,7 +826,7 @@ sub show_dunning {
 
   
   $form->{callback} =
 
   
   $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}&notes=$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}&notes=$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 );
     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|<td><a href="dn.pl?action=print_dunning&format=pdf&media=screen&| .
         qq|dunning_id=| . E($ref->{dunning_id}) .
       $column_data{dunning_description} =
         qq|<td><a href="dn.pl?action=print_dunning&format=pdf&media=screen&| .
         qq|dunning_id=| . E($ref->{dunning_id}) .

-        join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) .
+        join(map({ "&${_}=" . E($form->{$_}) } qw(login password callback))) .

         qq|">| . H($ref->{dunning_description}) . qq|</a></td>|;
     } else {
       $column_data{dunning_description} = qq|<td>&nbsp;</td>|;
         qq|">| . H($ref->{dunning_description}) . qq|</a></td>|;
     } else {
       $column_data{dunning_description} = qq|<td>&nbsp;</td>|;


@@ -946,7 +942,7 @@ sub show_dunning {
     $column_data{invnumber} =
       qq|<td><a href="| . ($ref->{invoice} ? "is.pl" : "ar.pl" ) .
       qq|?action=edit&id=| . H($ref->{id}) .
     $column_data{invnumber} =
       qq|<td><a href="| . ($ref->{invoice} ? "is.pl" : "ar.pl" ) .
       qq|?action=edit&id=| . H($ref->{id}) .

-      join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) .
+      join(map({ "&${_}=" . E($form->{$_}) } qw(login password callback))) .

       qq|">| . H($ref->{invnumber}) . qq|</a></td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
       qq|">| . H($ref->{invnumber}) . qq|</a></td>|;
 
     map { print "$column_data{$_}\n" } @column_index;


@@ -975,7 +971,6 @@ sub show_dunning {
 <input name=nextsub type=hidden value="$form->{nextsub}">
 
 
 <input name=nextsub type=hidden value="$form->{nextsub}">
 
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index e3a7a471e53725836030e1d60d082ba8be6061fd..faaad58280a10c687612e0da15401241730be696 100644 (file)
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -34,7 +34,7 @@
 use SL::GL;
 use SL::PE;
 
 use SL::GL;
 use SL::PE;
 

-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";

 require "bin/mozilla/common.pl";
 
 1;
 require "bin/mozilla/common.pl";
 
 1;


@@ -75,7 +75,7 @@ sub add {
   $form->{title} = "Add";
 
   $form->{callback} =
   $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
     unless $form->{callback};
 
   # we use this only to set a default date


@@ -364,7 +364,6 @@ $jsscript
 
 <input type=hidden name=nextsub value=generate_report>
 
 
 <input type=hidden name=nextsub value=generate_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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -387,7 +386,7 @@ sub generate_report {
   GL->all_transactions(\%myconfig, \%$form);
 
   $callback =
   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;
 
 
   $href = $callback;
 


@@ -768,7 +767,7 @@ sub generate_report {
     $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";
     $column_data{transdate}    = "<td align=center>$transdate</td>";
     $column_data{reference} =
     $column_data{id}        = "<td align=right>&nbsp;$ref->{id}&nbsp;</td>";
     $column_data{transdate}    = "<td align=center>$transdate</td>";
     $column_data{reference} =

-      "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";
+      "<td align=center><a href=$ref->{module}.pl?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{reference}</td>";

     $column_data{description}  = "<td align=center>$ref->{description}&nbsp;</td>";
     $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
     $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";
     $column_data{description}  = "<td align=center>$ref->{description}&nbsp;</td>";
     $column_data{source}       = "<td align=center>$ref->{source}&nbsp;</td>";
     $column_data{notes}        = "<td align=center>$ref->{notes}&nbsp;</td>";


@@ -871,7 +870,6 @@ sub generate_report {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1455,7 +1453,6 @@ sub form_footer {
   </tr>
 </table>
 
   </tr>
 </table>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index f3b5d84b848719bc8f7febd360ebd936a8305fa4..b4ad1b6375cc3f519add6eae9c2dda0b3a0095a1 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -36,7 +36,7 @@ use SL::IC;
 
 #use SL::PE;
 
 
 #use SL::PE;
 

-require "$form->{path}/io.pl";
+require "bin/mozilla/io.pl";

 require "bin/mozilla/common.pl";
 
 1;
 require "bin/mozilla/common.pl";
 
 1;


@@ -49,7 +49,7 @@ sub add {
   $form->{title} = $locale->text('Add ' . ucfirst $form->{item});
 
   $form->{callback} =
   $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;
     unless $form->{callback};
 
   $form->{"unit_changeable"} = 1;


@@ -375,7 +375,6 @@ $jsscript
 
 <input type=hidden name=nextsub value=generate_report>
 
 
 <input type=hidden name=nextsub value=generate_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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -559,7 +558,6 @@ sub search_update_prices {
 <input type=hidden name=nextsub value=confirm_price_update>
 <input type=hidden name=price_rows value=$form->{price_rows}>
 
 <input type=hidden name=nextsub value=confirm_price_update>
 <input type=hidden name=price_rows value=$form->{price_rows}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -658,7 +656,6 @@ sub choice {
 
   print qq|
 
 
   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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -805,7 +802,6 @@ sub list {
 <br>
 
 
 <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}>
 
 <input type=hidden name=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -926,7 +922,7 @@ sub addtop100 {
   }    #fi
 
   $callback =
   }    #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
     . $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')
 
     $column_data{invnumber} =
       ($ref->{module} ne 'oe')

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"

       : "<td>$ref->{invnumber}</td>";
     $column_data{ordnumber} =
       ($ref->{module} eq 'oe')
       : "<td>$ref->{invnumber}</td>";
     $column_data{ordnumber} =
       ($ref->{module} eq 'oe')

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"

       : "<td>$ref->{ordnumber}</td>";
     $column_data{quonumber} =
       ($ref->{module} eq 'oe' && !$ref->{ordnumber})
       : "<td>$ref->{ordnumber}</td>";
     $column_data{quonumber} =
       ($ref->{module} eq 'oe' && !$ref->{ordnumber})

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"

       : "<td>$ref->{quonumber}</td>";
 
     $column_data{name} = "<td>$ref->{name}</td>";
       : "<td>$ref->{quonumber}</td>";
 
     $column_data{name} = "<td>$ref->{name}</td>";


@@ -1436,7 +1432,6 @@ sub addtop100 {
 
 <form method=post action=$form->{script}>
 
 
 <form method=post action=$form->{script}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>
 


@@ -1500,7 +1495,7 @@ sub generate_report {
   }    #fi
 
   $callback =
   }    #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
     . $form->escape($form->{title}, 1);
 
   # if we have a serialnumber limit search


@@ -1841,8 +1836,8 @@ sub generate_report {
 /<br>/g;
 
     $column_data{partnumber} =
 /<br>/g;
 
     $column_data{partnumber} =

-      "<td align=$align><a href=$form->{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber}&nbsp;</a></td>";
-    $column_data{description} = "<td><a href=$form->{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}&nbsp;</a></td>";
+      "<td align=$align><a href=$form->{script}?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber}&nbsp;</a></td>";
+    $column_data{description} = "<td><a href=$form->{script}?action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}&nbsp;</a></td>";

     $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
 
     $column_data{onhand} =
     $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
 
     $column_data{onhand} =


@@ -1896,15 +1891,15 @@ sub generate_report {
 
     $column_data{invnumber} =
       ($ref->{module} ne 'oe')
 
     $column_data{invnumber} =
       ($ref->{module} ne 'oe')

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"

       : "<td>$ref->{invnumber}</td>";
     $column_data{ordnumber} =
       ($ref->{module} eq 'oe')
       : "<td>$ref->{invnumber}</td>";
     $column_data{ordnumber} =
       ($ref->{module} eq 'oe')

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"

       : "<td>$ref->{ordnumber}</td>";
     $column_data{quonumber} =
       ($ref->{module} eq 'oe' && !$ref->{ordnumber})
       : "<td>$ref->{ordnumber}</td>";
     $column_data{quonumber} =
       ($ref->{module} eq 'oe' && !$ref->{ordnumber})

-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"

       : "<td>$ref->{quonumber}</td>";
 
     $column_data{name} = "<td>$ref->{name}</td>";
       : "<td>$ref->{quonumber}</td>";
 
     $column_data{name} = "<td>$ref->{name}</td>";


@@ -1986,7 +1981,6 @@ sub generate_report {
 
 <input type=hidden name=item value=$form->{searchitems}>
 
 
 <input type=hidden name=item value=$form->{searchitems}>
 

-<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=login value=$form->{login}>
 <input type=hidden name=password value=$form->{password}>|;
 


@@ -2650,7 +2644,6 @@ sub form_footer {
   }
 
   print qq|
   }
 
   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}>
       <input type=hidden name=callback value="$form->{callback}">
       <input type=hidden name=login value=$form->{login}>
       <input type=hidden name=password value=$form->{password}>
       <input type=hidden name=callback value="$form->{callback}">


@@ -2707,7 +2700,7 @@ sub form_footer {
 
   if (!$form->{previousform}) {
     if ($form->{menubar}) {
 
   if (!$form->{previousform}) {
     if ($form->{menubar}) {

-      require "$form->{path}/menu.pl";
+      require "bin/mozilla/menu.pl";

       &menubar;
     }
   }
       &menubar;
     }
   }


@@ -2888,7 +2881,7 @@ sub assembly_row {
 
       } else {
         $href =
 
       } 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|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"><a href=$href>$form->{"partnumber_$i"}</a></td>|;
         $column_data{runningnumber} =
         $column_data{partnumber} =
           qq|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"><a href=$href>$form->{"partnumber_$i"}</a></td>|;
         $column_data{runningnumber} =


@@ -3239,7 +3232,7 @@ sub parts_language_selection {
 
   my $callback = "$form->{script}?action=parts_language_selection&";
   map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
 
   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"),
 
   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 01f290bb19e1bd370c4187d1d9aaa0e7ea6f65e3..fa19d2547e74f97be02b1602e40c91de85dc831b 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -38,14 +38,14 @@ use SL::IC;
 use CGI::Ajax;
 use CGI;
 
 use CGI::Ajax;
 use CGI;
 

-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";

 
 # any custom scripts for this one
 
 # 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;
 }
 
 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->{$_})); } 
     . $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});
      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;
 
 
   $form->{cp_id} *= 1;
 

-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";

   my $script = $form->{"script"};
   $script =~ s|.*/||;
   $script =~ s|.pl$||;
   my $script = $form->{"script"};
   $script =~ s|.*/||;
   $script =~ s|.pl$||;


@@ -1214,7 +1214,7 @@ sub quotation {
 
   $form->{rowcount}--;
 
 
   $form->{rowcount}--;
 

-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";

 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 


@@ -1425,7 +1425,7 @@ sub send_email {
 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); }
 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); }

-      qw(login password path type id));
+      qw(login password type id));

 
   print_form("return");
 
 
   print_form("return");
 


@@ -2191,7 +2191,7 @@ sub new_license {
   map { $form->{$_} = $form->escape($form->{$_}, 1) }
     qw(partnumber description);
   $form->{callback} =
   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();
   $form->redirect;
 
   $lxdebug->leave_sub();

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 67456a3ce414a7989da0d33d6f80d9b8a3945fa7..64a9093f098f538c9d08e67be469f95cc5a1f0f7 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -35,9 +35,9 @@ use SL::IR;
 use SL::IS;
 use SL::PE;
 
 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;
 require "bin/mozilla/drafts.pl";
 
 1;


@@ -833,8 +833,6 @@ sub form_footer {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 |
   . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 <input type=hidden name=password value=$form->{password}>
 |
   . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 3d4857276e6f51984029a1f814e3f02a0ee7099a..10dc43ef1574bb0c4ef6777295c3773c87f85b87 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -35,8 +35,8 @@ use SL::IS;
 use SL::PE;
 use Data::Dumper;
 
 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;
 require "bin/mozilla/drafts.pl";
 
 1;


@@ -61,7 +61,7 @@ sub add {
 
 
   $form->{callback} =
 
 
   $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";
     unless $form->{callback};
 
   $form{jsscript} = "date";


@@ -329,7 +329,7 @@ sub form_header {
   }
 
   my $set_duedate_url =
   }
 
   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);
 
   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}]);
 $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|
 </form>
 
 print qq|
 </form>
 


@@ -1487,7 +1487,7 @@ sub storno {
   }
 
   map({ my $key = $_; delete($form->{$key})
   }
 
   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;
       keys(%{ $form }));
 
   &invoice_links;

diff --git a/bin/mozilla/kopf.pl b/bin/mozilla/kopf.pl
index f812390acfe07577135fc27a2f8cb8832ab2338e..c5de93484c795e40af115f3b4311a0dbe80eec6b 100644 (file)
--- a/bin/mozilla/kopf.pl
+++ b/bin/mozilla/kopf.pl
@@ -15,9 +15,7 @@ foreach (@felder) {
 }
 $login =
     "[" . $login
 }
 $login =
     "[" . $login

-  . " - <a href=\"login.pl?path="
-  . $form->{"path"}
-  . "&password="
+  . " - <a href=\"login.pl?password="

   . $form->{"password"}
   . "&action=logout\" target=\"_top\">"
   . $locale->text('Logout')
   . $form->{"password"}
   . "&action=logout\" target=\"_top\">"
   . $locale->text('Logout')

diff --git a/bin/mozilla/licenses.pl b/bin/mozilla/licenses.pl
index 218de1fb40e18a9f0c04722317e86c39051a429d..fd8f01d9f514e8c24f914a8d26882a4978671315 100644 (file)
--- a/bin/mozilla/licenses.pl
+++ b/bin/mozilla/licenses.pl
@@ -58,7 +58,7 @@ sub form_header {
 
 sub form_footer {
   $lxdebug->enter_sub();
 
 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("<input type=hidden name=$_ value=\"" . quot($form->{$_}) . "\">\n"
   push(@items, @{ $form->{"hidden"} });
   map({
       print("<input type=hidden name=$_ value=\"" . quot($form->{$_}) . "\">\n"


@@ -501,13 +501,8 @@ sub do_search {
   LICENSES->search(\%myconfig, $form);
 
   $callback = "";
   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;
   $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 f09b8825835462c1d0e0639216ee57c999774fdf..39890982d56b9c5501814ab7e1a48b8cb6f6b778 100644 (file)
--- a/bin/mozilla/login.pl
+++ b/bin/mozilla/login.pl
@@ -38,14 +38,14 @@ $form = new Form;
 $locale = new Locale $language, "login";
 
 # customization
 $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
   $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 ($@);
 }
 
   $form->error($@) if ($@);
 }
 


@@ -107,7 +107,6 @@ sub login_screen {
                <th align=right>| . $locale->text('Password') . qq|</th>
                <td><input class=login type=password name=password size=30 tabindex="2"></td>
              </tr>
                <th align=right>| . $locale->text('Password') . qq|</th>
                <td><input class=login type=password name=password size=30 tabindex="2"></td>
              </tr>

-             <input type=hidden name=path value=$form->{path}>

            </table>
 
            <br>
            </table>
 
            <br>


@@ -153,13 +152,13 @@ sub login {
   # made it this far, execute the menu
   if ($user->{menustyle} eq "v3") {
     $form->{callback} =
   # 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} =
   } 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} =
   } 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;
   }
 
   $form->redirect;


@@ -173,7 +172,7 @@ sub logout {
   unlink "$userspath/$form->{login}.conf";
 
   # remove the callback to display the message
   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();
   $form->redirect($locale->text('You are logged out!'));
 
   $lxdebug->leave_sub();

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 85efc5c370af07d8616cd4ff20757fa1523e395c..3da92a906b0b683553b8bc0429b108073558b641 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -52,10 +52,10 @@ sub display {
 
   print qq|
 <frameset rows="28px,*" cols="*" framespacing="0" frameborder="0">
 
   print qq|
 <frameset rows="28px,*" cols="*" framespacing="0" frameborder="0">

-  <frame  src="kopf.pl?login=$form->{login}&password=$form->{password}&path=$form->{path}" name="kopf"  scrolling="NO">
+  <frame  src="kopf.pl?login=$form->{login}&password=$form->{password}" name="kopf"  scrolling="NO">

   <frameset cols="$framesize,*" framespacing="0" frameborder="0" border="0" >
   <frameset cols="$framesize,*" framespacing="0" frameborder="0" border="0" >

-    <frame src="$form->{script}?login=$form->{login}&password=$form->{password}&action=acc_menu&path=$form->{path}" name="acc_menu"  scrolling="auto" noresize marginwidth="0">
-    <frame src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo&path=$form->{path}" name="main_window" scrolling="auto">
+    <frame src="$form->{script}?login=$form->{login}&password=$form->{password}&action=acc_menu" name="acc_menu"  scrolling="auto" noresize marginwidth="0">
+    <frame src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo" name="main_window" scrolling="auto">

   </frameset>
   <noframes>
   You need a browser that can read frames to see this page.
   </frameset>
   <noframes>
   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
       } 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|;
         &section_menu($menu, $item);
 
         #print qq|<br>\n|;

diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index 6b74be731a80002a2c368582b6af04f3d941355b..1e05b801a9e695f235be71ac74ad30ebb128069b 100644 (file)
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -52,7 +52,7 @@ sub display {
   &acc_menu;
 
   print qq|
   &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>
 <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
 </p>
 </iframe>


@@ -65,14 +65,12 @@ sub display {
 
 sub clock_line {
 
 
 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}
   $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')
     . $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|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|;
         &section_menu($menu, $item);
 
         #print qq|<br>\n|;

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index aedb881a26b9918c429a9bcedc4f4ee85cb6004d..2837a30ca2e8006d98457ceacaff568dbae0c715 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -57,7 +57,7 @@ sub display {
 
 <div style="clear: both;"></div>
 
 
 <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>
 <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
 </p>
 </iframe>


@@ -70,14 +70,12 @@ sub display {
 
 sub clock_line {
 
 
 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}
   $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')
     . $form->{"password"}
     . "&action=logout\" target=\"_top\">"
     . $locale->text('Logout')

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 1e0c8a6c6d38833db7f2bb6de4de3b376f1c8d84..e076691a1b326263f13d93e0606ddbc42ec78d2c 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -37,8 +37,8 @@ use SL::IR;
 use SL::IS;
 use SL::PE;
 
 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;
 
 
 1;
 


@@ -98,7 +98,7 @@ sub add {
   set_headings("add");
 
   $form->{callback} =
   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;
     unless $form->{callback};
 
   &order_links;


@@ -1153,7 +1153,6 @@ sub form_footer {
 
 <input name=callback type=hidden value="$form->{callback}">
 
 
 <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}>
 
 <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>
 
 <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}>
 <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 =
 
   # 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);
 
   # construct callback
   $number     = $form->escape($form->{$ordnumber},    1);


@@ -1560,7 +1558,7 @@ sub orders {
   $department = $form->escape($form->{department},    1);
 
   $callback =
   $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",
 
   @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} =
     $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>";
     $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|
 
   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">
   <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=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}>
 
 <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";
 
   # locale messages
   $locale = new Locale "$myconfig{countrycode}", "$script";
 

-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";

 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 


@@ -2320,7 +2316,6 @@ sub backorder_exchangerate {
 
   print qq|
 
 
   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}>
 
 <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 6bcb0f53e8576ecc753f466c31d18098292a314b..ef3a5a06471cf947a36ee8049d6459ef1c795205 100644 (file)
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -47,7 +47,7 @@ sub add {
 
   # construct callback
   $form->{callback} =
 
   # 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");
     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=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}>
 
 <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 =
   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;
 
     E($form->{active});
   $href = $callback;
 


@@ -278,7 +277,7 @@ sub project_report {
 |;
 
     $column_data{projectnumber} =
 |;
 
     $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>| .
     $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=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}>
 
 <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 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}>
 
 <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 =
   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');
 
   if ($form->{status} eq 'all') {
     $option = $locale->text('All');


@@ -570,7 +567,7 @@ sub partsgroup_report {
 |;
 
     $column_data{partsgroup} =
 |;
 
     $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 "
     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=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}>
 
 <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 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}>
 
 <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 =
   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');
 
   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} =
         <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;
 
 
     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=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}>
 
 <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 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}>
 
 <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 12c87c4816ac43b95f18288ef6f04231bdb16f2d..4df612cc57ad353a70d0230d29fb5184402512d9 100644 (file)
--- 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>
 
 <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}>
 
 <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=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}>
 
 <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} =
   $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);
 
 
   $form->error($locale->text('Out of balance!')) if ($form->{difference} *= 1);
 

diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index 56e7f49ad27e0738198186fcacdcb6724430a280..209e082ff798c2aa23bde5b8562cb3d683ec8a66 100644 (file)
--- 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;
 require "bin/mozilla/common.pl";
 
 use SL::PE;


@@ -976,7 +976,6 @@ $jsscript
 </table>
 
 <br>
 </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}>
 
 <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 =
     $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;
 
 
     $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1;
 


@@ -1522,7 +1521,7 @@ sub generate_ar_aging {
   $form->{arap} = "ar";
 
   $form->{callback} =
   $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;
 
   RP->aging(\%myconfig, \%$form);
   &aging;


@@ -1542,7 +1541,7 @@ sub generate_ap_aging {
   $form->{arap} = "ap";
 
   $form->{callback} =
   $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;
 
   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 =
     $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>|;
       . $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=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}>
 
 <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 =
 
   # 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    =
 
   # 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";
 
   $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} =
 
     $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>|;
 
     $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 =
   $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);
 
   # construct callback
   $account    = $form->escape($form->{account},    1);


@@ -2419,7 +2417,7 @@ sub list_payments {
   $memo       = $form->escape($form->{memo},       1);
 
   $form->{callback} =
   $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} =
   $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 =
       $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} =
 
       $column_data{name}      = "<td>$payment->{name}&nbsp;</td>";
       $column_data{reference} =

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 8a5be4396b1367e5996bf0f19681c3fd69fff7b1..3e353e832d3d4a841f245a974eee02971c30afad 100644 (file)
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -24,7 +24,7 @@
 # German Tax authority Module and later ELSTER Interface
 #======================================================================
 
 # 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;
 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|
 
   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>|;
       . 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|$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') 
         . 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}|
 
   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>|;
       . 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}"|
     $callback =  qq|$form->{cbscript}|
                 .qq|?action="config_step1"|
                 .qq|&login="$form->{cblogin}"|

-                .qq|&path="$form->{cbpath}"|

                 .qq|&root="$form->{cbroot}"|
                 .qq|&rpw="$form->{cbrpw}"|;
   }
                 .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
     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) {
   );
 
   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 
     FA_steuerberater_city   FA_steuerberater_tel
     FA_voranmeld            method
     FA_dauerfrist           FA_71 

-    elster                  path 
+    elster                  

     login                   password 
     type                    elster_init 
     saved                   callback
     login                   password 
     type                    elster_init 
     saved                   callback

diff --git a/doc/programmierstilrichtlinien.txt b/doc/programmierstilrichtlinien.txt
index aec999fed81a1664a9d259fd2d1b1cc0bfc354ad..d2982c5f13029e5feec51bb1784f846586904e22 100644 (file)
--- a/doc/programmierstilrichtlinien.txt
+++ b/doc/programmierstilrichtlinien.txt
@@ -43,7 +43,7 @@ sind, muss der Programmierer selbst f
 
    oder
 
 
    oder
 

-   if ($form->{"path"} eq "bin/mozilla") {
+   if ($form->{item_rows} > 0) {

      ...
    }
 
      ...
    }
 

diff --git a/doc/ustva.html b/doc/ustva.html
index 0f279249a18fe61b90aa1e0f8aad03c8dac89ae3..85e6c82c9f1ae2c53a984e28e4fa6208f80ecc3f 100755 (executable)
--- a/doc/ustva.html
+++ b/doc/ustva.html
@@ -66,7 +66,7 @@ A.help:hover {color: blue; text-decoration: none;}
 <br />\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br />\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r


@@ -98,7 +98,7 @@ die Lx XML-Datei dann hineingespeichert werden.</p>
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r


@@ -130,7 +130,7 @@ Benutzernamen zu &auml;ndern und zu speichern.)</p>
 <br />\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br />\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r


@@ -151,7 +151,7 @@ Benutzernamen zu &auml;ndern und zu speichern.)</p>
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r


@@ -334,7 +334,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r


@@ -424,7 +424,7 @@ werden zur Orientierung auch die aktuellen Werte angezeigt.</p>
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r
 <br>\r
 <table bgcolor="lightgrey" width="100%">\r
 <tr align="right" valign="bottom">\r

- <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>\r
+ <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>\r

  </td>\r
 </tr>\r
 </table>\r
  </td>\r
 </tr>\r
 </table>\r

diff --git a/js/calculate_qty.js b/js/calculate_qty.js
index 2c992a741306086ac4eaaf9f2cebd8ca4d85f6ef..048346c1a2716edc27eb0ffb7b63740b86555dba 100644 (file)
--- 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) + "&" +
     "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) + "&" +
     "name=" + escape(name) + "&" +
     "input_name=" + escape(input_name) + "&" +
     "description=" + escape(description) + "&" +

diff --git a/js/common.js b/js/common.js
index 15a507113cd0f557f0d5cb01c244d03c96a2b762..7976194482c122510f76236ecc8f84c266bd74e5 100644 (file)
--- 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) + "&" +
     "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);
     "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 83b226d026daa809fbe24a5b687452a218647115..a94f3c06753725a11c7ba246bc3702af156b2fb1 100644 (file)
--- 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) + "&" +
     "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)
     "name=" + escape(name) + "&" +
     "input_name=" + escape(input_name) + "&" +
     "input_id=" + escape(input_id)

diff --git a/js/dunning.js b/js/dunning.js
index 2639ab84de95baeadc0fb267dddef926b61cf704..7853d21657af9d4dba430215933bdc44a962357a 100644 (file)
--- 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) + "&" +
     "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) + "&" +
     "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 031788bca6b017a2998f1985529155f5092c5bce..0a0dc0d8bbcb1b1f7a5b6dc55551071201de5826 100644 (file)
--- 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) + "&" +
     "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) + "&" +
     "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 9d95dfacc2d52b7dc059da5383324c7f975f5f11..137e2193e505ffd23a90f4ad1862b6f65f535371 100644 (file)
--- 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) + "&" +
     "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);
     "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 f28ac516d3fed2d04cbbf29d2156fd18ab3b6b00..19e232d4e70ea76ad3aa3e8858e9786ddec11675 100644 (file)
--- 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) + "&" +
     "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)
     "name=" + escape(name) + "&" +
     "input_name=" + escape(input_name) + "&" +
     "input_id=" + escape(input_id)

diff --git a/locale/de/all b/locale/de/all
index 79ca87c173b4ad7a8d3cb80fb4df45ebc84c80b3..b344b7239ec236b3de972585456915ad646f95b6 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -483,6 +483,7 @@ gestartet',
   'Extended'                    => 'Gesamt',
   'Extension Of Time'           => 'Dauerfristverlängerung',
   'Factor'                      => 'Faktor',
   'Extended'                    => 'Gesamt',
   'Extension Of Time'           => 'Dauerfristverlängerung',
   'Factor'                      => 'Faktor',

+  'Falsches Datumsformat!'      => '',

   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',


@@ -527,6 +528,7 @@ gestartet',
   'Hostname missing!'           => 'Computername fehlt!',
   'I'                           => 'I',
   'ID'                          => 'Buchungsnummer',
   'Hostname missing!'           => 'Computername fehlt!',
   'I'                           => 'I',
   'ID'                          => 'Buchungsnummer',

+  'ID-Nummer'                   => '',

   'II'                          => 'II',
   'III'                         => 'III',
   'IV'                          => 'IV',
   'II'                          => 'II',
   'III'                         => 'III',
   'IV'                          => 'IV',


@@ -1280,6 +1282,7 @@ gestartet',
   'von'                         => 'von',
   'website'                     => 'Webseite',
   'winston_export'              => 'Winston-Export',
   'von'                         => 'von',
   'website'                     => 'Webseite',
   'winston_export'              => 'Winston-Export',

+  'wrongformat'                 => '',

 };
 
 1;
 };
 
 1;

diff --git a/locale/de/ap b/locale/de/ap
index 8d6b7583270c4e5c943caf9db11b2ef7b020055a..869d132cd222cd720c55a8bdf9c40a9618889db9 100644 (file)
--- 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!',
   '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',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'From'                        => 'Von',


@@ -157,6 +158,7 @@ $self->{texts} = {
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/ar b/locale/de/ar
index e0730f7f668401eae530c0d971567983c4283a2f..81b24d4fc0b772e4c2ef806be52a11646168b7c0 100644 (file)
--- 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!',
   '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',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'From'                        => 'Von',


@@ -164,6 +165,7 @@ $self->{texts} = {
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/bp b/locale/de/bp
index ca95594eb188402ff10a84e17bae48f0e7dd8f6f..1cec1668e109f580e00c6a761834b2ce7658b38c 100644 (file)
--- 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',
   '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',
   'From'                        => 'Von',
   'History'                     => 'Historie',
   'Invoice'                     => 'Rechnung',


@@ -89,6 +90,7 @@ $self->{texts} = {
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/cp b/locale/de/cp
index f54cf9be8055292938d7cb0ab8c5a79af0d490ae..2352bbf714a0bd4c033880e5780f4ad0c6bbaf62 100644 (file)
--- 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!',
   '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',
   'History'                     => 'Historie',
   'Invoice'                     => 'Rechnung',
   'Invoices'                    => 'Rechnungen',


@@ -100,6 +101,7 @@ $self->{texts} = {
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/dn b/locale/de/dn
index 540d7549a6b1050753dd401b9cba5ef1c51b0c6d..c88bd16b590b67a21ae58a10623820349fbd6fac 100644 (file)
--- 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',
   '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',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',


@@ -224,6 +225,7 @@ gestartet',
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/gl b/locale/de/gl
index cfeae2e02ebccac51f4405b4ea801c5ad2c8c957..02bf01e78447d093289b13d6fe6fc941938363e3 100644 (file)
--- 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',
   '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',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'From'                        => 'Von',


@@ -156,6 +157,7 @@ $self->{texts} = {
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',
   'request_quotation'           => 'Angebotsanforderung',
   'sales_order'                 => 'Kundenauftrag',
   'sales_quotation'             => 'Verkaufsangebot',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/ir b/locale/de/ir
index 8459a88deaa5bdefce0f7e2f2b944f5647f3877c..261a8999b2710023820a33a63cbb83a7badde3c5 100644 (file)
--- 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',
   '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',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',


@@ -232,6 +233,7 @@ $self->{texts} = {
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/is b/locale/de/is
index 04ac9c67c83d5c8f95f2c45ba19b6438fa55e43c..b3fd7e128e8868564179a99ac547fd78364bc382 100644 (file)
--- 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',
   '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',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',


@@ -257,6 +258,7 @@ $self->{texts} = {
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'sales_quotation'             => 'Verkaufsangebot',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/locales.pl b/locale/de/locales.pl
index 151db6fc567680ee382f700a7b12491835fc8cec..f12001ce0fdfc03354d02f138e7469429f4f7b82 100755 (executable)
--- 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//;
       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;
         $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 341bf43fe73ba8dcb1bcd1828e72b1fefbf8d053..4773bf208bc8ed47762e26edaf21f68e6f244caf 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -87,6 +87,7 @@ $self->{texts} = {
   'Exchangerate'                => 'Wechselkurs',
   'Exchangerate missing!'       => 'Es fehlt der Wechselkurs!',
   'Extended'                    => 'Gesamt',
   'Exchangerate'                => 'Wechselkurs',
   'Exchangerate missing!'       => 'Es fehlt der Wechselkurs!',
   'Extended'                    => 'Gesamt',

+  'Falsches Datumsformat!'      => 'Falsches Datumsformat!',

   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Fax'                         => 'Fax',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',


@@ -266,6 +267,7 @@ $self->{texts} = {
   'saved!'                      => 'gespeichert',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',
   'saved!'                      => 'gespeichert',
   'sent'                        => 'gesendet',
   'sent to printer'             => 'an Drucker geschickt',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/locale/de/rc b/locale/de/rc
index 57c2fa938e1ea9a7323e0bbcb975f6f58af1b760..5bba303c498bd5907063825f534f3dda8539cc30 100644 (file)
--- 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',
   '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',
   'From'                        => 'Von',
   'History'                     => 'Historie',
   'Increase'                    => 'Erhöhen',

diff --git a/locale/de/rp b/locale/de/rp
index 0f212eb909b1def8a42c702dab23473ce50344b4..741d3a8e1141a3903272f75aac1638fdda4e9e55 100644 (file)
--- 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',
   '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',
   'Feb'                         => 'Feb',
   'February'                    => 'Februar',
   'Free report period'          => 'Freier Zeitraum',


@@ -170,6 +171,7 @@ $self->{texts} = {
   'sales_quotation'             => 'Verkaufsangebot',
   'ustva'                       => 'UStVA',
   'winston_export'              => 'Winston-Export',
   'sales_quotation'             => 'Verkaufsangebot',
   'ustva'                       => 'UStVA',
   'winston_export'              => 'Winston-Export',

+  'wrongformat'                 => 'wrongformat',

 };
 
 $self->{subs} = {
 };
 
 $self->{subs} = {

diff --git a/login.pl b/login.pl
index f49163362bcb29926ca22976af92a6cc1b0c9548..f761de800eac940a1bd393d7d4fcd85e37cc4b3b 100755 (executable)
--- a/login.pl
+++ b/login.pl
@@ -81,54 +81,8 @@ Login disabled!\n";
 require "bin/mozilla/installationcheck.pl";
 verify_installation();
 
 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
 
 
 # end of main
 

diff --git a/lx-erp.conf b/lx-erp.conf
index 6818572e11ec9a512f901865bd0682ff89a0de96..85291943a5a6fa8c9b1e74a43d84e0a23767a2ce 100644 (file)
--- a/lx-erp.conf
+++ b/lx-erp.conf
@@ -81,7 +81,7 @@ $dbcharset = "ISO-8859-15";
 #
 # Beipiel: 
 #   $LXDebug::global_level = LXDebug::TRACE | LXDebug::QUERY;
 #
 # Beipiel: 
 #   $LXDebug::global_level = LXDebug::TRACE | LXDebug::QUERY;

-$LXDebug::global_level = LXDebug::NONE;
+$LXDebug::global_level = LXDebug::ALL;

 
 1;
 
 
 1;
 

diff --git a/scripts/spawn_oo.pl b/scripts/spawn_oo.pl
index 03e5afd562842c78867fe21227902b72b86c850e..9e2f80739d989aacda1268df9f134af6c875fee4 100755 (executable)
--- 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 = new Form;
 $form->{"script"} = "oe.pl";

-$form->{"path"} = "bin/mozilla";
-

 
 $ENV{'HOME'} = getcwd() . "/$userspath";
 
 
 $ENV{'HOME'} = getcwd() . "/$userspath";
 

diff --git a/t/demolx/AllTests.t b/t/demolx/AllTests.t
index 89951e92e13ece4e90d8aeaaa8e72c303799aa37..aafd346679df712857299c90a5d3d62676be44e8 100644 (file)
--- 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");
 
   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 f5a0d552d4e817915ee7793cfc8327e408e2051b..7e6bf6deab5c40dca08a8aeca3f0a2088c83682c 100644 (file)
--- a/t/demolx/cleanup.pl
+++ b/t/demolx/cleanup.pl
@@ -59,7 +59,7 @@
   $lxtest->{testuserlogin}   = $lxtest->{testlogin};
   $lxtest->{db}              = $lxtest->{db};
 
   $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},
 
   eval { $sel = WWW::Selenium->new(
     host => $lxtest->{seleniumhost},

diff --git a/t/lxtest.conf.default b/t/lxtest.conf.default
index b7fc7de23127b3e0746b1d99d86103fda9206e3e..d570cf54b7df389dd1c4b7c2fb137db7cc716f36 100644 (file)
--- 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",
     #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...
 
 
     # 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 3c6acf66a722a678f948692fbf486f1fad643492..6c161f6c1560fbdc7e4cfa144f20818798d9439b 100644 (file)
--- 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");
 
   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 f5a0d552d4e817915ee7793cfc8327e408e2051b..7e6bf6deab5c40dca08a8aeca3f0a2088c83682c 100644 (file)
--- a/t/selenium/cleanup.pl
+++ b/t/selenium/cleanup.pl
@@ -59,7 +59,7 @@
   $lxtest->{testuserlogin}   = $lxtest->{testlogin};
   $lxtest->{db}              = $lxtest->{db};
 
   $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},
 
   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 1a79606fa6fa96e328eac0cd2eb833060ae7ac7a..ed71333dae02be79ada3a8e657e6f87d82caadec 100644 (file)
--- 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>
 </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>
        <td></td>
 </tr>
 <tr>


@@ -2007,7 +2007,7 @@
 </tr>
 <tr>
        <td>open</td>
 </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>
        <td></td>
 </tr>
 <tr>

diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html
index 20699ab17c3433890ae1c74eba49f39a54210eeb..ca8d4e721223fa299cb6a9ddaf9041bb05300f5d 100644 (file)
--- 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>">
 
 
  <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="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 da1c7e40ae101bbe11c710ca97e939d53d84d87d..a65b6904a84cbb0c9a4c78f858f5659ee44a131c 100644 (file)
--- 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>">
 
 
  <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="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 5ca9837f734dbdd30a6f668986b0977f98d7c27e..f683eea5c9d14fa4f66532c302a20c33b71af149 100644 (file)
--- 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>">
 
 
 <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">
 <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 5b6b18e72055d85ef9ff36a826666b398bda71dd..166d00809312872628469123a077e4064354c30a 100644 (file)
--- 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>">
 
 
 <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">
 <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 8c4af80d2076f07d0be17202e66fe0838390473e..b74652f8fa2261984cfb857ac26dfeb4895d42d4 100644 (file)
--- a/templates/webpages/common/show_history_de.html
+++ b/templates/webpages/common/show_history_de.html
@@ -1,5 +1,4 @@
 <form>
 <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> 
 <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>
                        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>">
        </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=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>
        </tr>   
 </TMPL_LOOP>
 </table>

diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index b5e4309ddeaed25a946cb8415e91e1530a7eb9b4..08dbaf2d56f559a898dda5feb8670b07122ce11b 100644 (file)
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,5 +1,4 @@
 <form>
 <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> 
 <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 32e09e50ea1ae2d054da4f4ca0be44419fc9e598..da29ef7b5135599c41f6a3e299653f4a8a4e7c99 100644 (file)
--- 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">
 
 
 <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">
  <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 1876df4e6a4d2b097f9e7c8eb4123f2f70beb341..170c5a57584a5e2a7ec7358c07493dd1b3aa63cc 100644 (file)
--- 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">
 
 
 <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">
  <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 452047e3b0f17396412732af9a6b31da565aa852..593ffa6279ad12f9f90f87cc6423030ae7d50090 100644 (file)
--- 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">
 
 
 <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">
  <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 6f4e949ae39bd443309bc729c6b9173df5994af9..3ae56c94e796fe1be3958109eb9c0c3192fa13c4 100644 (file)
--- 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">
 
 
 <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">
  <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 b2659ceb30efd69f059f04b6b2db1c3a361a3fa8..4489dbd66c990ce65a46799bb7e3c170b815588f 100644 (file)
--- 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">
 
 
 <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">
  <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 6847d6ef5aff003694cfef2cb4a4073cffa9ad50..731fa8da7eb9da93e186e541cc70daea771ab48c 100644 (file)
--- 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">
 
 
 <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">
  <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 a7f48bc6d5b6fa150c263c0179b3627739755198..6379936b4a8fccc92c089d8b8ab3536872e3a20a 100644 (file)
--- 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">
 
 
 <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">
  <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 61eabac9e0147e93015f223dc73c92fd121bab12..2bc5acaecacaa0ae29d817efadb9de1409a634c8 100644 (file)
--- 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">
 
 
 <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">
  <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 18ea036bfacd7944450323a58f9414d06196cdaa..4230911a0de71036c056ef36b2bf56e0bdd24209 100644 (file)
--- 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="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>
  <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 dbe31509dea35353bfca59cc2324e9584db18e8d..c26603f18be14f132c0cb4a707ea3cb8ab1cfaf0 100644 (file)
--- 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="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>
  <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 ea13345f7fbeafc801cf8f5993875492c2b512d5..b7994537341f47eeb7be5d5bbdc865a309c08197 100644 (file)
--- 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">
 
 
 <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">
  <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 386ee5a7acad9f0e906b3e8f820ccf06b71d6315..663088f11805806487407328948d46719bdc02b7 100644 (file)
--- 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">
 
 
 <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">
  <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 2a2ec5287545ae933a49288ef8a812ad1499ebda..1d8f412695b5b042c7500923cc0e06eac586945c 100644 (file)
--- 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">
 
 
 <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">
  <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 211d96d37a98e9a8642921c7c3ada565bde0eec9..99a0858aa7da94045c0589d8734509b2113d0a67 100644 (file)
--- 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">
 
 
 <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">
  <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 be8ffd92ff915167efb76d2f1bc6953e6bb2ec08..9622469b1ff713c78265d99278f6f7b66caadd05 100644 (file)
--- 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">
 
 
 <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">
  <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 a93d5aa716649b2e014a9e9c3f7fa8779f6e0708..6b0b1e27375cb2d22c5b11bd62f05fc50034432e 100644 (file)
--- 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">
 
 
 <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">
  <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 8452c4fbb412bff3cdc963f14012a95f0094cda8..bed20b8246bed80149eaab26dba25fa0c5e7b0b2 100644 (file)
--- 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">
 
 
 <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">
  <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 16ceed64a8fcf2502c7e9fee4af96511382e1761..b2600bc1a1601ca2ee5b620531f854a9d0d477fe 100644 (file)
--- 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">
 
 <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">
  <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 edd78039fe9e3abf3c87187c202a127c7fad125c..ac00dd4adcc64038d6c7d9d77974cced1a77ebab 100644 (file)
--- 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">
 
 <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">
  <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 95eb33f7c4c543eb877c9931f7597cb8b345c07a..e3c77e775ba18f6390245e6ece8612d3d93f3066 100644 (file)
--- 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>">
  <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>">
   <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>
        <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>
         <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 6f42c6d0a8d28c214b64c5e5e7efe631fa9006b1..7ff8c3f2ff7951243c9e2a90602f75649e8bac30 100644 (file)
--- 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>">
  <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>">
   <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>
        <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>
         <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 1e71f4bfdb1bb218a816775afd91d9d8c64be641..804b00dd95745053e76125e506cba69143600b19 100644 (file)
--- 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>">
  <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>">
   <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 0e266740880691ae38401a8f710b87a60f0f7a35..41e5273647dacf12a04613d7be2024c852a57621 100644 (file)
--- 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>">
  <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>">
   <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 1506fe090f13bb9c4c5ebdf261e2683ca937fc30..2411b4ddea1d44704d380303e6a622e75285331e 100644 (file)
--- 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="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%">
   <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 61bc22492909c9b696b64560781a8eb21ac1ecc8..9f195539e875aa188378513493d4f00bb94cd497 100644 (file)
--- 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="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%">
   <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
+