X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdatev.pl;h=8f0bdd8c50ea223345d4b7b5fb9d6b60f27ae5bc;hb=e2b9e1737230c4e4209904784808dcaec723f730;hp=a98a9529f5d545aa0b7915eeca9fa3140938b0a0;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index a98a9529f..8f0bdd8c5 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -31,16 +31,24 @@ use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 use SL::Common;
 use SL::DATEV;
 
+use strict;
+
 1;
 
 # end of main
 
 require "bin/mozilla/common.pl";
 
-sub continue { call_sub($form->{"nextsub"}); }
+sub continue { call_sub($main::form->{"nextsub"}); }
 
 sub export {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -82,7 +90,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>
@@ -113,9 +121,6 @@ sub export {
 
 <input type=hidden name=nextsub value=export2>
 
-<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|">
@@ -124,22 +129,32 @@ sub export {
 </body>
 </html>
 |;
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export2 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  $main::auth->assert('datev_export');
 
   if ($form->{exporttype} == 0) {
     &export_bewegungsdaten();
   } else {
     &export_stammdaten();
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_bewegungsdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -247,9 +262,6 @@ sub export_bewegungsdaten {
 
 <input type=hidden name=nextsub value=export3>
 
-<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|">
@@ -259,11 +271,16 @@ sub export_bewegungsdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export_stammdaten {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   $form->{title} = $locale->text("DATEX - Export Assistent");
 
@@ -312,9 +329,6 @@ sub export_stammdaten {
 
 <input type=hidden name=nextsub value=export3>
 
-<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|">
@@ -324,62 +338,84 @@ sub export_stammdaten {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub export3 {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
+
+  DATEV::clean_temporary_directories();
 
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
-  my $link = $form->{"script"} . "?";
-  map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(login password));
-  $link .= "action=download";
+  my $link = "datev.pl?action=download&download_token=";
 
   if ($form->{kne}) {
-    my @filenames = DATEV->kne_export(\%myconfig, \%$form);
-    if (@filenames) {
-      print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br>|);
-      $link .= "&filenames=" . $form->escape(join(":", @filenames));
-      print(qq|<br><a href="$link">Download</a>|);
+    my $result = DATEV->kne_export(\%myconfig, \%$form);
+    if ($result && @{ $result->{filenames} }) {
+      $link .= Q($result->{download_token});
+
+      print(qq|<br><b>| . $locale->text('KNE-Export erfolgreich!') . qq|</b><br><br><a href="$link">Download</a>|);
+
     } else {
       $form->error("KNE-Export schlug fehl.");
     }
   } else {
-    my @filenames = DATEV->obe_export(\%myconfig, \%$form);
-    if (@filenames) {
-      print(qq|<br><b>| . $locale->text('OBE-Export erfolgreich!') . qq|</b><br>|);
-      $link .= "&filenames=" . $form->escape(join(":", @filenames));
-      print(qq|<br><a href="$link">Download</a>|);
-    } else {
-      $form->error("OBE-Export schlug fehl.");
-    }
+    # OBE-Export nicht implementiert.
+
+    # my @filenames = DATEV->obe_export(\%myconfig, \%$form);
+    # if (@filenames) {
+    #   print(qq|<br><b>| . $locale->text('OBE-Export erfolgreich!') . qq|</b><br>|);
+    #   $link .= "&filenames=" . $form->escape(join(":", @filenames));
+    #   print(qq|<br><a href="$link">Download</a>|);
+    # } else {
+    #   $form->error("OBE-Export schlug fehl.");
+    # }
   }
 
   print("</body></html>");
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub download {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('datev_export');
 
   my $tmp_name = Common->tmpname();
-  my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip",
-                          localtime(time()));
+  my $zip_name = strftime("lx-office-datev-export-%Y%m%d.zip", localtime(time()));
 
   my $cwd = getcwd();
-  chdir("users") || die("chdir users");
 
-  my @filenames = split(/:/, $form->{"filenames"});
-  map({ s|.*/||; $form->error("Eine der KNE-Exportdateien wurde nicht " .
-                              "gefunden. Wurde der Export bereits " .
-                              "durchgef&uuml;hrt?") unless (-f $_); }
-      @filenames);
+  my $path = DATEV::get_path_for_download_token($form->{download_token});
+  if (!$path) {
+    $form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
+  }
+
+  chdir($path) || die("chdir $path");
+
+  my @filenames = glob "*";
+
+  if (!@filenames) {
+    chdir($cwd);
+    DATEV::clean_temporary_directories();
+    $form->error($locale->text("Your download does not exist anymore. Please re-run the DATEV export assistant."));
+  }
 
   my $zip = Archive::Zip->new();
-  map({ $zip->addFile($_); } @filenames);
+  map { $zip->addFile($_); } @filenames;
   $zip->writeToFileNamed($tmp_name);
+
   chdir($cwd);
 
   open(IN, $tmp_name) || die("open $tmp_name");
@@ -392,5 +428,7 @@ sub download {
 
   unlink($tmp_name);
 
-  $lxdebug->leave_sub();
+  DATEV::clean_temporary_directories();
+
+  $main::lxdebug->leave_sub();
 }