X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FShop.pm;h=bcae3214d31ab7427ba25092b0016318a7f561e7;hb=c39e831b3bceef01a851a0825ce6b19d1ddc3eda;hp=0018de693cd273df2731589aadd743ad5231befa;hpb=f263e30a0aecad0e08d63a587cea1b83516d668b;p=kivitendo-erp.git

diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index 0018de693..bcae3214d 100644
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -21,16 +21,19 @@ sub validate {
   push @errors, $::locale->text('The path is missing.')        unless $self->{path};
   push @errors, $::locale->text('The Host Name is missing')    unless $self->{server};
   push @errors, $::locale->text('The Host Name seems invalid') unless $self->{server} =~ m/[0-9A-Za-z].\.[0-9A-Za-z]/;
+  push @errors, $::locale->text('The Protocol for Host Name seems invalid (expected: http:// or https://)!')
+                                                               if ($self->{server} =~ m/:/ && $self->{server} !~ m/(^https:\/\/|^http:\/\/)/);
+  push @errors, $::locale->text('The Proxy Name seems invalid') . $self->{proxy} . ':' unless !$self->{proxy} ||  $self->{proxy} =~ m/[0-9A-Za-z].\.[0-9A-Za-z]/;
   push @errors, $::locale->text('Orders to fetch neeeds a positive Integer')
                                                                unless $self->{orders_to_fetch} > 0;
 
   # not yet implemented checks
-  push @errors, $::locale->text('Transaction Description is not yet implemented')    if $self->{transaction_description};
   if ($self->{connector} eq 'shopware6') {
+    push @errors, $::locale->text('Transaction Description is not yet implemented')  if $self->{transaction_description};
     push @errors, $::locale->text('Shipping cost article is not implemented')        if $self->{shipping_costs_parts_id};
     push @errors, $::locale->text('Fetch from last order number is not implemented') if $self->{last_order_number};
   } else {
-    push @errors, $::locale->text('Use Long Description from Parts is only for Shopware6  implemented')
+    push @errors, $::locale->text('Use Long Description from Parts is only for Shopware6 implemented')
       if $self->{use_part_longdescription};
   }
   return @errors;