sub export {
$lxdebug->enter_sub();
+ $auth->assert('datev_export');
+
$form->{title} = $locale->text("DATEX - Export Assistent");
DATEV->get_datev_stamm(\%myconfig, \%$form);
<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>
<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|">
sub export2 {
$lxdebug->enter_sub();
+ $auth->assert('datev_export');
+
if ($form->{exporttype} == 0) {
&export_bewegungsdaten();
} else {
sub export_bewegungsdaten {
$lxdebug->enter_sub();
+ $auth->assert('datev_export');
+
$form->{title} = $locale->text("DATEX - Export Assistent");
$form->{allemonate} =
<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|">
sub export_stammdaten {
$lxdebug->enter_sub();
+ $auth->assert('datev_export');
+
$form->{title} = $locale->text("DATEX - Export Assistent");
$form->header;
<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|">
sub export3 {
$lxdebug->enter_sub();
+ $auth->assert('datev_export');
+
+ DATEV::clean_temporary_directories();
+
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&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>");
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()));
+ 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ü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");
unlink($tmp_name);
+ DATEV::clean_temporary_directories();
+
$lxdebug->leave_sub();
}