Changeset 3025:50e647316e34 for inc/core/class.dc.store.php

Timestamp:

07/01/15 14:23:38 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add  http:// scheme in not present in URL, better cope with netHttp::initClient() error, fixes #2091

File:

• inc/core/class.dc.store.php (modified) (1 diff)

inc/core/class.dc.store.php

@@ -195 +195 @@
      public function download($url, $dest)
      {
-          try {
-               $client = netHttp::initClient($url, $path);
-               $client->setUserAgent($this->user_agent);
-               $client->useGzip(false);
-               $client->setPersistReferers(false);
-               $client->setOutput($dest);
-               $client->get($path);
-               unset($client);
-          }
-          catch (Exception $e) {
-               unset($client);
+          // Check and add default protocol if necessary
+          if (!preg_match('%^http[s]?:\/\/%',$url)) {
+               $url = 'http://'.$url;
+          }
+          // Download package
+          if ($client = netHttp::initClient($url, $path)) {
+               try {
+                    $client->setUserAgent($this->user_agent);
+                    $client->useGzip(false);
+                    $client->setPersistReferers(false);
+                    $client->setOutput($dest);
+                    $client->get($path);
+                    unset($client);
+               }
+               catch (Exception $e) {
+                    unset($client);
+                    throw new Exception(__('An error occurred while downloading the file.'));
+               }
+          } else {
                throw new Exception(__('An error occurred while downloading the file.'));
           }