Bugfix 624 und 93.

[mfinanz.git] / bin / mozilla / cp.pl

diff --git a/bin/mozilla/cp.pl b/bin/mozilla/cp.pl
index 5a1d2e3bc7f91257f303d6e6b66b70f9b1a2e95a..c7b85c60a25079c7581b8a4d3d7f13b973a97792 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;
 
-require "$form->{path}/arap.pl";
+require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 
 1;
@@ -467,7 +467,6 @@ sub form_footer {
 </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}>
 
@@ -696,11 +695,13 @@ sub print {
     $form->{pdf} = 1;
   }
 
+  delete $form->{OUT};
+
   if ($form->{media} eq 'printer') {
     $form->{OUT} = "| $myconfig{printer}";
   }
   if ($form->{media} eq 'queue') {
-    %queued = split / /, $form->{queued};
+    %queued = map { s|.*/|| } split / /, $form->{queued};
 
     if ($filename = $queued{ $form->{formname} }) {
       unlink "$spool/$filename";
@@ -724,7 +725,7 @@ sub print {
 
   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!'));