Shop: Servernamen entweder mit Protokoll speichern oder Protokoll ergänzen

diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index 55f81e55102ffad9043166faaeaad0d00d24e6a2..c5e652aaeef01b2c4c9219fca19a246caa212ecd 100644 (file)
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -21,7 +21,8 @@ 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 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;
   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;

diff --git a/SL/ShopConnector/Shopware6.pm b/SL/ShopConnector/Shopware6.pm
index 38ec37f97911d41a661cb763caa0720429c4fa41..bd54329142d175de2668a75b32ee06ef7f066af0 100644 (file)
--- a/SL/ShopConnector/Shopware6.pm
+++ b/SL/ShopConnector/Shopware6.pm
@@ -709,10 +709,10 @@ sub set_orderstatus {
 sub init_connector {
   my ($self) = @_;
 
 sub init_connector {
   my ($self) = @_;
 

-  my $client = REST::Client->new(host => $self->config->server);
+  my $protocol = $self->config->server =~ /(^https:\/\/|^http:\/\/)/ ? '' : $self->config->protocol . '://';
+  my $client   = REST::Client->new(host => $protocol . $self->config->server);

 
   $client->getUseragent()->proxy([$self->config->protocol], $self->config->proxy) if $self->config->proxy;
 
   $client->getUseragent()->proxy([$self->config->protocol], $self->config->proxy) if $self->config->proxy;

-

   $client->addHeader('Content-Type', 'application/json');
   $client->addHeader('charset',      'UTF-8');
   $client->addHeader('Accept',       'application/json');
   $client->addHeader('Content-Type', 'application/json');
   $client->addHeader('charset',      'UTF-8');
   $client->addHeader('Accept',       'application/json');