X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/b61db412d0d913a4fcecbce6678710ad0eb76cf6..39f3d12c0cc462f8b110966095cbc2ffef8ad8f6:/bin/mozilla/datev.pl

diff --git a/bin/mozilla/datev.pl b/bin/mozilla/datev.pl
index 62a1cf006..f1110e403 100644
--- a/bin/mozilla/datev.pl
+++ b/bin/mozilla/datev.pl
@@ -25,6 +25,10 @@
 #
 #======================================================================
 
+use POSIX qw(strftime getcwd);
+use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
+
+use SL::Common;
 use SL::DATEV;
 
 1;
@@ -80,13 +84,14 @@ sub export {
 	  <td><input name=datentraegernr size=5 maxlength=3 value="$form->{datentraegernr}"></td>
 	</tr>
 	<tr>
-	  <td><input checked name=kne type=checkbox class=checkbox value=1> |
-    . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+	  | . # OBE-Export noch nicht implementiert! <td><input checked name=kne type=checkbox class=checkbox value=1> | . $locale->text("Kontonummernerweiterung (KNE)") . qq|</td>
+    qq|<td><input type="hidden" name="kne" value="1"></td>
           <td></td>
 
 	  <td align=left nowrap>| . $locale->text("Abrechnungsnummer") . qq|</td>
 	  <td><input name=abrechnungsnr size=5 maxlength=3 value="$form->{abrechnungsnr}"></td>
 	</tr>
+
         <tr>
           <td><input name=exporttype type=radio class=radio value=0 checked> |
     . $locale->text("Export Buchungsdaten") . qq|</td>
@@ -321,14 +326,65 @@ sub export3 {
 
   DATEV->save_datev_stamm(\%myconfig, \%$form);
 
+  my $link = $form->{"script"} . "?";
+  map({ $link .= "${_}=" . $form->escape($form->{$_}) . "&"; } qw(path login password));
+  $link .= "action=download";
+
   if ($form->{kne}) {
-    if (DATEV->kne_export(\%myconfig, \%$form)) {
-      $form->redirect($locale->text('KNE Export erfolgreich!'));
+    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>|);
+    } else {
+      $form->error("KNE-Export schlug fehl.");
     }
   } else {
-    if (DATEV->obe_export(\%myconfig, \%$form)) {
-      $form->redirect($locale->text('OBE Export erfolgreich!'));
+    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();
+}
+
+sub download {
+  $lxdebug->enter_sub();
+
+  my $tmp_name = Common->tmpname();
+  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 $zip = Archive::Zip->new();
+  map({ $zip->addFile($_); } @filenames);
+  $zip->writeToFileNamed($tmp_name);
+  chdir($cwd);
+
+  open(IN, $tmp_name) || die("open $tmp_name");
+  print("Content-Type: application/zip\n");
+  print("Content-Disposition: attachment; filename=\"${zip_name}\"\n\n");
+  while (<IN>) {
+    print($_);
+  }
+  close(IN);
+
+  unlink($tmp_name);
+
   $lxdebug->leave_sub();
 }