X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=5dde28db1608161fc8efce9f0bd644bcf174b2d7;hb=4f3393f4faf9b531d48bb97056468eaf5d0676c8;hp=01f290bb19e1bd370c4187d1d9aaa0e7ea6f65e3;hpb=8cef58b276ce4005c0e2ada350fecd5d7a103e89;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 01f290bb1..5dde28db1 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -38,14 +38,14 @@ use SL::IC;
 use CGI::Ajax;
 use CGI;
 
-require "$form->{path}/common.pl";
+require "bin/mozilla/common.pl";
 
 # any custom scripts for this one
-if (-f "$form->{path}/custom_io.pl") {
-  eval { require "$form->{path}/custom_io.pl"; };
+if (-f "bin/mozilla/custom_io.pl") {
+  eval { require "bin/mozilla/custom_io.pl"; };
 }
-if (-f "$form->{path}/$form->{login}_io.pl") {
-  eval { require "$form->{path}/$form->{login}_io.pl"; };
+if (-f "bin/mozilla/$form->{login}_io.pl") {
+  eval { require "bin/mozilla/$form->{login}_io.pl"; };
 }
 
 1;
@@ -822,7 +822,7 @@ sub new_item {
     . $locale->text('Service');
 print $cgi->hidden("-name" => "previousform", "-value" => $previousform);
 map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } 
-     ("rowcount", "vc", "path", "login", "password"));
+     qw(rowcount vc login password));
      map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); }
      ("partnumber", "description"));
 print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts});
@@ -1109,7 +1109,7 @@ sub validate_items {
   $lxdebug->enter_sub();
 
   # check if items are valid
-  if ($form->{rowcount} == 1) {
+  if ($form->{rowcount} == 0) {
     &update;
     exit;
   }
@@ -1150,7 +1150,7 @@ sub order {
 
   $form->{cp_id} *= 1;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
   my $script = $form->{"script"};
   $script =~ s|.*/||;
   $script =~ s|.pl$||;
@@ -1214,7 +1214,7 @@ sub quotation {
 
   $form->{rowcount}--;
 
-  require "$form->{path}/$form->{script}";
+  require "bin/mozilla/$form->{script}";
 
   map { $form->{"select$_"} = "" } ($form->{vc}, currency);
 
@@ -1256,33 +1256,21 @@ sub edit_e_mail {
     $form->{print_and_post} = 0;
     $form->{resubmit}       = 0;
   }
-  if ($myconfig{role} eq 'admin') {
-    $bcc = qq|
-    <tr>
-      <th align="right" nowrap="true">| . $locale->text('Bcc') . qq|</th>
-      <td><input name="bcc" size="30" value="| . Q($form->{bcc}) . qq|"></td>
-    </tr>
-|;
-  }
 
-  if ($form->{formname} =~ /(pick|packing|bin)_list/) {
-    $form->{email} = $form->{shiptoemail} if $form->{shiptoemail};
-  }
+  $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/;
 
   if ($form->{"cp_id"} && !$form->{"email"}) {
     CT->get_contact(\%myconfig, $form);
     $form->{"email"} = $form->{"cp_email"};
   }
 
-  $name = $form->{ $form->{vc} };
-  $name =~ s/--.*//g;
-  $title = $locale->text('E-mail') . " $name";
+  $form->{ $form->{vc} } =~ /--/;
+  $title = $locale->text('E-mail') . " $`";
 
   $form->{oldmedia} = $form->{media};
   $form->{media}    = "email";
 
-  my %formname_translations =
-    (
+  my %formname_translations = (
      "bin_list" => $locale->text('Bin List'),
      "credit_note" => $locale->text('Credit Note'),
      "invoice" => $locale->text('Invoice'),
@@ -1295,7 +1283,7 @@ sub edit_e_mail {
      "sales_quotation" => $locale->text('Quotation'),
      "storno_invoice" => $locale->text('Storno Invoice'),
      "storno_packing_list" => $locale->text('Storno Packing List'),
-    );
+  );
 
   my $attachment_filename = $formname_translations{$form->{"formname"}};
   my $prefix;
@@ -1315,107 +1303,26 @@ sub edit_e_mail {
        $form->{"format"} =~ /opendocument/i ? ".odt" :
        $form->{"format"} =~ /html/i ? ".html" : "");
     $attachment_filename =~ s/ /_/g;
-    my %umlaute =
-      (
-       "ä" => "ae", "ö" => "oe", "ü" => "ue",
-       "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue",
-       "ß" => "ss"
-      );
-    map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute));
+    my %umlaute = ( "ä" => "ae", "ö" => "oe", "ü" => "ue", 
+                    "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", "ß" => "ss");
+    map { $attachment_filename =~ s/$_/$umlaute{$_}/g } keys %umlaute;
   } else {
     $attachment_filename = "";
   }
 
-  if ($form->{"email"}) {
-    $form->{"fokus"} = "Form.subject";
-  } else {
-    $form->{"fokus"} = "Form.email";
-  }
+  $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email";
   $form->header;
 
-  print qq|
-<body onload="fokus()">
-
-<form name="Form" method="post" action="$form->{script}">
+  my (@nh, %nh, @hiddenkeys);
+  @nh = qw(action email cc bcc subject message formname sendmode format header override); $nh{@nh} = (1)x@nh;
+  @hidden_keys = grep { !$nh{$_} } grep { !ref $form->{$_} } keys %$form;
 
-<table width="100%">
-  <tr class="listtop">
-    <th class="listtop">$title</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('To') . qq|</th>
-          <td><input name="email" size="30" value="| .
-          Q($form->{"email"}) . qq|"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Cc') . qq|</th>
-          <td><input name="cc" size="30" value="| .
-          Q($form->{"cc"}) . qq|"></td>
-        </tr>
-        $bcc
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Subject') . qq|</th>
-          <td><input name="subject" size="30" value="| .
-          Q($form->{"subject"}) . qq|"></td>
-        </tr>
-        <tr>
-          <th align="right" nowrap>| . $locale->text('Attachment name') .
-          qq|</th>
-          <td><input name="attachment_filename" size="30" value="| .
-          Q($attachment_filename) . qq|"></td>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align="left" nowrap>| . $locale->text('Message') . qq|</th>
-        </tr>
-        <tr>
-          <td><textarea name="message" rows="15" cols="60" wrap="soft">| .
-          H($form->{"message"}) . qq|</textarea></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-|;
-
-  print_options();
-
-  map { delete $form->{$_} }
-    qw(action email cc bcc subject message formname sendmode format header override);
-
-  # save all other variables
-  foreach $key (keys %$form) {
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type="hidden" name="$key" value="| . Q($form->{$key}) . qq|">\n|;
-  }
-
-  print qq|
-    </td>
-  </tr>
-  <tr>
-    <td><hr size="3" noshade></td>
-  </tr>
-</table>
-
-<input type="hidden" name="nextsub" value="send_email">
-
-<br>
-<input name="action" class="submit" type="submit" value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
+  print $form->parse_html_template('generic/edit_email', 
+                                  { title           => $title,
+                                    a_filename      => $attachment_filename,
+                                    _print_options_ => print_options('inline'),
+                                    HIDDEN          => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
+                                    SHOW_BCC        => $myconfig{role} eq 'admin' });
 
   $lxdebug->leave_sub();
 }
@@ -1425,7 +1332,7 @@ sub send_email {
 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); }
-      qw(login password path type id));
+      qw(login password type id));
 
   print_form("return");
 
@@ -2191,7 +2098,7 @@ sub new_license {
   map { $form->{$_} = $form->escape($form->{$_}, 1) }
     qw(partnumber description);
   $form->{callback} =
-    qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
+    qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|;
   $form->redirect;
 
   $lxdebug->leave_sub();