add Twig & refactor poche

[github/wallabag/wallabag.git] / inc / poche / pocheTool.class.php

diff --git a/inc/pocheTool.class.php b/inc/poche/pocheTool.class.php
similarity index 64%
rename from inc/pocheTool.class.php
rename to inc/poche/pocheTool.class.php
index 9aab76b9021d556edaf98aeb70b1532ad19f8a5e..cade115e598b811063a5f3df1e832fc0e80088e6 100644 (file)
--- a/inc/pocheTool.class.php
+++ b/inc/poche/pocheTool.class.php
@@ -38,8 +38,7 @@ class pocheTools
 
     public static function isUrl($url)
     {
-        // http://neo22s.com/check-if-url-exists-and-is-online-php/
-        $pattern='|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i';
+        $pattern = '|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i';
 
         return preg_match($pattern, $url);
     }
@@ -65,37 +64,61 @@ class pocheTools
             . $_SERVER["SERVER_NAME"] . $serverport . $scriptname;
     }
 
-    public static function renderJson($data)
+    public static function redirect($url = '')
     {
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        header('Content-type: application/json; charset=UTF-8');
-
-        echo json_encode($data);
-        exit();
-    }
-
-    public static function redirect($rurl = '')
-    {
-        if ($rurl === '') {
-            $rurl = (empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']);
+        if ($url === '') {
+            $url = (empty($_SERVER['HTTP_REFERER'])?'?':$_SERVER['HTTP_REFERER']);
             if (isset($_POST['returnurl'])) {
-                $rurl = $_POST['returnurl'];
+                $url = $_POST['returnurl'];
             }
         }
 
-        // prevent loop
-        if (empty($rurl) || parse_url($rurl, PHP_URL_QUERY) === $_SERVER['QUERY_STRING']) {
-            $rurl = pocheTool::getUrl();
+        # prevent loop
+        if (empty($url) || parse_url($url, PHP_URL_QUERY) === $_SERVER['QUERY_STRING']) {
+            $url = pocheTool::getUrl();
         }
 
-        if (substr($rurl, 0, 1) !== '?') {
+        if (substr($url, 0, 1) !== '?') {
             $ref = pocheTool::getUrl();
-            if (substr($rurl, 0, strlen($ref)) !== $ref) {
-                $rurl = $ref;
+            if (substr($url, 0, strlen($ref)) !== $ref) {
+                $url = $ref;
             }
         }
-        header('Location: '.$rurl);
+        header('Location: '.$url);
         exit();
     }
+
+    public static function cleanURL($url)
+    {
+
+        $url = html_entity_decode(trim($url));
+
+        $stuff = strpos($url,'&utm_source=');
+        if ($stuff !== FALSE)
+            $url = substr($url, 0, $stuff);
+        $stuff = strpos($url,'?utm_source=');
+        if ($stuff !== FALSE)
+            $url = substr($url, 0, $stuff);
+        $stuff = strpos($url,'#xtor=RSS-');
+        if ($stuff !== FALSE)
+            $url = substr($url, 0, $stuff);
+
+        return $url;
+    }
+
+    public static function renderJson($data)
+    {
+        header('Cache-Control: no-cache, must-revalidate');
+        header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
+        header('Content-type: application/json; charset=UTF-8');
+
+        echo json_encode($data);
+        exit();
+    }
+
+    public static function logm($message)
+    {
+        $t = strval(date('Y/m/d_H:i:s')).' - '.$_SERVER["REMOTE_ADDR"].' - '.strval($message)."\n";
+        file_put_contents('./log.txt',$t,FILE_APPEND);
+    }
 }
\ No newline at end of file