Changeset 3350:7faafc3b6250 for inc

Timestamp:

09/21/16 00:45:15 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Better this way (using closure → less code)

File:

• inc/core/class.dc.update.php (modified) (3 diffs)

inc/core/class.dc.update.php

@@ -104 +104 @@
           {
                $path = '';
-               $client = netHttp::initClient($this->url,$path);
-               if ($client !== false) {
-                    $client->setTimeout(4);
-                    $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
-                    $client->get($path);
-                    $status = (int) $client->getStatus();
-
-                    if ($status >= 400) {
-                         // If original URL uses HTTPS, try with HTTP
-                         $url_parts = parse_url($client->getRequestURL());
-                         if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
-
-                              // Replace https by http in url
-                              $this->url = preg_replace('/^https(?=:\/\/)/i','http',$this->url);
-
-                              $client = netHttp::initClient($this->url,$path);
-                              if ($client !== false) {
-                                   $client->setTimeout(4);
-                                   $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
-                                   $client->get($path);
-                                   $status = (int) $client->getStatus();
-                              }
-                         }
+               $status = 0;
+
+               $http_get = function ($http_url) use (&$status,$path) {
+                    $client = netHttp::initClient($http_url,$path);
+                    if ($client !== false) {
+                         $client->setTimeout(4);
+                         $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
+                         $client->get($path);
+                         $status = (int) $client->getStatus();
                     }
-
-                    if (!$status || $status >= 400) {
-                         return;
+                    return $client;
+               };
+
+               $client = $http_get($this->url);
+               if ($status >= 400) {
+                    // If original URL uses HTTPS, try with HTTP
+                    $url_parts = parse_url($client->getRequestURL());
+                    if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
+                         // Replace https by http in url
+                         $this->url = preg_replace('/^https(?=:\/\/)/i','http',$this->url);
+                         $client = $http_get($this->url);
                     }
-                    $this->readVersion($client->getContent());
-               }
-          }
-          catch (Exception $e) {}
+               }
+               if (!$status || $status >= 400) {
+                    throw new Exception();
+               }
+               $this->readVersion($client->getContent());
+          }
+          catch (Exception $e) {
+               return;
+          }
 
           # Create cache
@@ -224 +223 @@
           try
           {
-               $client = netHttp::initClient($url,$path);
-               $client->setTimeout(4);
-               $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
-               $client->useGzip(false);
-               $client->setPersistReferers(false);
-               $client->setOutput($dest);
-               $client->get($path);
-               $status = (int) $client->getStatus();
-
-               if ($status >= 400) {
-                    // If original URL uses HTTPS, try with HTTP
-                    $url_parts = parse_url($client->getRequestURL());
-                    if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
-
-                         // Replace https by http in url
-                         $url = preg_replace('/^https(?=:\/\/)/i','http',$url);
-
-                         $client = netHttp::initClient($url,$path);
+               $path = '';
+               $status = 0;
+
+               $http_get = function ($http_url) use (&$status,$dest,$path) {
+                    $client = netHttp::initClient($http_url,$path);
+                    if ($client !== false) {
                          $client->setTimeout(4);
                          $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
@@ -250 +237 @@
                          $status = (int) $client->getStatus();
                     }
-               }
-
+                    return $client;
+               };
+
+               $client = $http_get($url);
+               if ($status >= 400) {
+                    // If original URL uses HTTPS, try with HTTP
+                    $url_parts = parse_url($client->getRequestURL());
+                    if (isset($url_parts['scheme']) && $url_parts['scheme'] == 'https') {
+                         // Replace https by http in url
+                         $url = preg_replace('/^https(?=:\/\/)/i','http',$url);
+                         $client = $http_get($url);
+                    }
+               }
                if ($status != 200) {
                     @unlink($dest);