X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=6d89a21b911823c3ee1b751ee9833f060297cfb8;hb=09685616f65f95b3189049855dfc53d2bf1ef271;hp=9944abfba13e699fe72a2e19c69aaf32c5402082;hpb=a14a3ff56b00e22c39a2cfb0e465f8c7764a4cd4;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 9944abfba..6d89a21b9 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -35,11 +35,15 @@ use SL::DATEV;
 
 # end of main
 
-sub continue { &{ $form->{nextsub} } }
+require "bin/mozilla/common.pl";
+
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub export {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   DATEV->get_datev_stamm(\%myconfig, \%$form);
@@ -80,7 +84,7 @@ sub export {
 	  <td align=left nowrap>| . $locale->text("Mandantennummer") . qq|</td>
 	  <td><input name=mandantennr size=10 maxlength=5 value="$form->{mandantennr}"></td>
 
-	  <td align=left nowrap>| . $locale->text("Datenträgernummer") . qq|</td>
+	  <td align=left nowrap>| . $locale->text("Medium Number") . qq|</td>
 	  <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
 	</tr>
 	<tr>
@@ -111,10 +115,6 @@ sub export {
 
 <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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -129,6 +129,8 @@ sub export {
 sub export2 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
@@ -140,6 +142,8 @@ sub export2 {
 sub export_bewegungsdaten {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   $form->{allemonate} =
@@ -246,10 +250,6 @@ sub export_bewegungsdaten {
 
 <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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -265,6 +265,8 @@ sub export_bewegungsdaten {
 sub export_stammdaten {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
   $form->header;
@@ -312,10 +314,6 @@ sub export_stammdaten {
 
 <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}>
-
 <br>
 <input type=submit class=submit name=action value="|
     . $locale->text('Continue') . qq|">
@@ -331,11 +329,11 @@ sub export_stammdaten {
 sub export3 {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
-  my $link = $form->{"script"} . "?";
-  map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(path login password));
-  $link .= "action=download";
+  my $link = "datev.pl?action=download";
 
   if ($form->{kne}) {
     my @filenames = DATEV->kne_export(\%myconfig, \%$form);
@@ -365,6 +363,8 @@ sub export3 {
 sub download {
   $lxdebug->enter_sub();
 
+  $auth->assert('datev_export');
+
   my $tmp_name = Common->tmpname();
   my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip",
                           localtime(time()));