Merge pull request #36 from kivitendo/master-partial_invoice-2

[mfinanz.git] / SL / DB / Shop.pm

diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index 6b00350670cbba1433903a00548b59d0fcc2a249..c5e652aaeef01b2c4c9219fca19a246caa212ecd 100644 (file)
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -21,7 +21,9 @@ 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 Proxy Name seems invalid') unless $self->{proxy} =~ 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;