X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=inc%2Fpoche%2FTools.class.php;h=750553f1202637eeb4886a569c2586604530d547;hb=2ab37d6205d3e4f7bfacf702de6755a924931751;hp=c277035febdcb0b972d8c69f880a37b4141c3663;hpb=eb1af592194e225bf887e4893e697f0ab8dd9a26;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index c277035f..750553f1 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -41,20 +41,24 @@ class Tools
         $https = (!empty($_SERVER['HTTPS'])
                     && (strtolower($_SERVER['HTTPS']) == 'on'))
             || (isset($_SERVER["SERVER_PORT"])
-                    && $_SERVER["SERVER_PORT"] == '443'); // HTTPS detection.
+                    && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
+            || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection 
+                    && $_SERVER["SERVER_PORT"] == SSL_PORT);
+
         $serverport = (!isset($_SERVER["SERVER_PORT"])
             || $_SERVER["SERVER_PORT"] == '80'
             || ($https && $_SERVER["SERVER_PORT"] == '443')
+            || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
             ? '' : ':' . $_SERVER["SERVER_PORT"]);
 
         $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
 
-        if (!isset($_SERVER["SERVER_NAME"])) {
+        if (!isset($_SERVER["HTTP_HOST"])) {
             return $scriptname;
         }
 
         return 'http' . ($https ? 's' : '') . '://'
-            . $_SERVER["SERVER_NAME"] . $serverport . $scriptname;
+            . $_SERVER["HTTP_HOST"] . $serverport . $scriptname;
     }
 
     public static function redirect($url = '')
@@ -77,15 +81,16 @@ class Tools
                 $url = $ref;
             }
         }
+        self::logm('redirect to ' . $url);
         header('Location: '.$url);
         exit();
     }
 
     public static function getTplFile($view)
     {
-        $tpl_file = 'home.twig';
-        switch ($view)
-        {
+        $default_tpl = 'home.twig';
+        
+        switch ($view) {
             case 'install':
                 $tpl_file = 'install.twig';
                 break;
@@ -101,9 +106,20 @@ class Tools
             case 'view':
                 $tpl_file = 'view.twig';
                 break;
+            
+            case 'login':
+                $tpl_file = 'login.twig';
+                break;
+                
+            case 'error':
+                $tpl_file = 'error.twig';
+                break;
+                
             default:
-            break;
+                $tpl_file = $default_tpl;
+                break;
         }
+        
         return $tpl_file;
     }
 
@@ -117,7 +133,9 @@ class Tools
             $curl = curl_init();
             curl_setopt($curl, CURLOPT_URL, $url);
             curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+            if (!ini_get('open_basedir') && !ini_get('safe_mode')) {
+                curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+            }
             curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($curl, CURLOPT_HEADER, false);
 
@@ -169,6 +187,7 @@ 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';
             } else {
                 $html_charset = 'utf-8';
                 $encoding[1] = '';
@@ -197,7 +216,8 @@ class Tools
     {
         if (DEBUG_POCHE) {
             $t = strval(date('Y/m/d_H:i:s')) . ' - ' . $_SERVER["REMOTE_ADDR"] . ' - ' . strval($message) . "\n";
-            file_put_contents('./log.txt', $t, FILE_APPEND);
+            file_put_contents(CACHE . '/log.txt', $t, FILE_APPEND);
+            error_log('DEBUG POCHE : ' . $message);
         }
     }
 
@@ -205,4 +225,28 @@ class Tools
     {
         return sha1($string . SALT);
     }
-}
\ No newline at end of file
+
+    public static function checkVar($var, $default = '')
+    {
+        return ((isset ($_REQUEST["$var"])) ? htmlentities($_REQUEST["$var"]) : $default);
+    }
+
+    public static function getDomain($url)
+    {
+      return parse_url($url, PHP_URL_HOST);
+    }
+
+    public static function getReadingTime($text) {
+        $word = str_word_count(strip_tags($text));
+        $minutes = floor($word / 200);
+        $seconds = floor($word % 200 / (200 / 60));
+        $time = array('minutes' => $minutes, 'seconds' => $seconds);
+
+        return $minutes;
+    }
+
+    public static function getDocLanguage($userlanguage) {
+        $lang = explode('.', $userlanguage);
+        return str_replace('_', '-', $lang[0]);
+    }
+}