X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FTools.php;h=be29ab994ea95c5f73429e9639d07a47268e9c46;hb=4346a86068781f4acdeb574d7e2af08b77b58ea7;hp=c773af37dcebc7b815692c0c268ce7261d1fd5d1;hpb=b9ec99e25b5972bb3d0702919519382ebc37dacc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Helper/Tools.php b/src/Wallabag/CoreBundle/Helper/Tools.php
index c773af37..be29ab99 100755
--- a/src/Wallabag/CoreBundle/Helper/Tools.php
+++ b/src/Wallabag/CoreBundle/Helper/Tools.php
@@ -2,23 +2,21 @@
 
 namespace Wallabag\CoreBundle\Helper;
 
-use \RecursiveIteratorIterator;
-use \RecursiveDirectoryIterator;
-
 final class Tools
 {
     /**
-     * Download a file (typically, for downloading pictures on web server)
+     * Download a file (typically, for downloading pictures on web server).
      *
      * @param $url
+     *
      * @return bool|mixed|string
      */
     public static function getFile($url)
     {
         $timeout = 15;
-        $useragent = "Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/20100101 Firefox/18.0";
+        $useragent = 'Mozilla/5.0 (Windows NT 5.1; rv:18.0) Gecko/20100101 Firefox/18.0';
 
-        if (in_array ('curl', get_loaded_extensions())) {
+        if (in_array('curl', get_loaded_extensions())) {
             # Fetch feed from URL
             $curl = curl_init();
             curl_setopt($curl, CURLOPT_URL, $url);
@@ -30,12 +28,12 @@ final class Tools
             curl_setopt($curl, CURLOPT_HEADER, false);
 
             # for ssl, do not verified certificate
-            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
-            curl_setopt($curl, CURLOPT_AUTOREFERER, TRUE );
+            curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($curl, CURLOPT_AUTOREFERER, true);
 
             # FeedBurner requires a proper USER-AGENT...
             curl_setopt($curl, CURL_HTTP_VERSION_1_1, true);
-            curl_setopt($curl, CURLOPT_ENCODING, "gzip, deflate");
+            curl_setopt($curl, CURLOPT_ENCODING, 'gzip, deflate');
             curl_setopt($curl, CURLOPT_USERAGENT, $useragent);
 
             $data = curl_exec($curl);
@@ -48,13 +46,13 @@ final class Tools
                 array(
                     'http' => array(
                         'timeout' => $timeout,
-                        'header' => "User-Agent: " . $useragent,
-                        'follow_location' => true
+                        'header' => 'User-Agent: '.$useragent,
+                        'follow_location' => true,
                     ),
                     'ssl' => array(
                         'verify_peer' => false,
-                        'allow_self_signed' => true
-                    )
+                        'allow_self_signed' => true,
+                    ),
                 )
             );
 
@@ -62,13 +60,12 @@ final class Tools
             $data = @file_get_contents($url, false, $context, -1, 4000000);
 
             if (isset($http_response_header) and isset($http_response_header[0])) {
-                $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== FALSE) or (strpos($http_response_header[0], '301 Moved Permanently') !== FALSE));
+                $httpcodeOK = isset($http_response_header) and isset($http_response_header[0]) and ((strpos($http_response_header[0], '200 OK') !== false) or (strpos($http_response_header[0], '301 Moved Permanently') !== false));
             }
         }
 
         # if response is not empty and response is OK
         if (isset($data) and isset($httpcodeOK) and $httpcodeOK) {
-
             # take charset of page and get it
             preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
 
@@ -77,48 +74,33 @@ final class Tools
                 preg_match('#charset="?(.*)"#si', $meta[0], $encoding);
                 # if charset is found set it otherwise, set it to utf-8
                 $html_charset = (!empty($encoding[1])) ? strtolower($encoding[1]) : 'utf-8';
-                if (empty($encoding[1])) $encoding[1] = 'utf-8';
+                if (empty($encoding[1])) {
+                    $encoding[1] = 'utf-8';
+                }
             } else {
                 $html_charset = 'utf-8';
                 $encoding[1] = '';
             }
 
             # replace charset of url to charset of page
-            $data = str_replace('charset=' . $encoding[1], 'charset=' . $html_charset, $data);
+            $data = str_replace('charset='.$encoding[1], 'charset='.$html_charset, $data);
 
             return $data;
-        }
-        else {
-            return FALSE;
+        } else {
+            return false;
         }
     }
 
     /**
-     * Encode a URL by using a salt
+     * Encode a URL by using a salt.
      *
      * @param $string
+     *
      * @return string
      */
     public static function encodeString($string)
     {
-        return sha1($string . SALT);
-    }
-
-    /**
-     * Returns the correct header for a status code
-     *
-     * @param $status_code
-     */
-    private static function _status($status_code)
-    {
-        if (strpos(php_sapi_name(), 'apache') !== false) {
-
-            header('HTTP/1.0 '.$status_code);
-        }
-        else {
-
-            header('Status: '.$status_code);
-        }
+        return sha1($string.SALT);
     }
 
     public static function generateToken()
@@ -130,12 +112,10 @@ final class Tools
             } else {
                 $token = substr(base64_encode(file_get_contents('/dev/urandom', false, null, 0, 20)), 0, 15);
             }
-        }
-        else {
+        } else {
             $token = substr(base64_encode(uniqid(mt_rand(), true)), 0, 20);
         }
 
         return str_replace('+', '', $token);
     }
-
 }