remove local file extensions and generalize some method names for cached media

[tt-rss.git] / plugins / af_zz_imgproxy / init.php

diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index f326b8e07627c88500577c5050449e71a3ce5394..e0ec2f1745c8919d38dc6aefc130f2afd250cc2d 100644 (file)
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -26,7 +26,7 @@ class Af_Zz_ImgProxy extends Plugin {
                if (preg_match("/image/", $enc["content_type"]) || preg_match("/\.(jpe?g|png|gif|bmp)$/i", $enc["filename"])) {
                        $proxy_all = $this->host->get($this, "proxy_all");
 
-                       $enc["content_url"] = $this->rewrite_url_if_needed($enc["content_url"], 0, $proxy_all);
+                       $enc["content_url"] = $this->rewrite_url_if_needed($enc["content_url"], $proxy_all);
                }
 
                return $enc;
@@ -39,7 +39,6 @@ class Af_Zz_ImgProxy extends Plugin {
        public function imgproxy() {
 
                $url = rewrite_relative_url(SELF_URL_PATH, $_REQUEST["url"]);
-               $kind = (int) $_REQUEST["kind"]; // 1 = video
 
                // called without user context, let's just redirect to original URL
                if (!$_SESSION["uid"]) {
@@ -47,8 +46,7 @@ class Af_Zz_ImgProxy extends Plugin {
                        return;
                }
 
-               $extension = $kind == 1 ? '.mp4' : '.png';
-               $local_filename = CACHE_DIR . "/images/" . sha1($url) . $extension;
+               $local_filename = CACHE_DIR . "/images/" . sha1($url);
 
                if ($_REQUEST["debug"] == "1") { print $url . "\n" . $local_filename; die; }
 
@@ -107,7 +105,7 @@ class Af_Zz_ImgProxy extends Plugin {
                }
        }
 
-       function rewrite_url_if_needed($url, $kind, $all_remote = false) {
+       function rewrite_url_if_needed($url, $all_remote = false) {
                $scheme = parse_url($url, PHP_URL_SCHEME);
 
                if ($all_remote) {
@@ -121,7 +119,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
                if (($scheme != 'https' && $scheme != "") || $is_remote) {
                        if (strpos($url, "data:") !== 0) {
-                               $url = get_self_url_prefix() . "/public.php?op=pluginhandler&plugin=af_zz_imgproxy&pmethod=imgproxy&kind=$kind&url=" .
+                               $url = get_self_url_prefix() . "/public.php?op=pluginhandler&plugin=af_zz_imgproxy&pmethod=imgproxy&url=" .
                                        urlencode($url);
                        }
                }
@@ -140,7 +138,7 @@ class Af_Zz_ImgProxy extends Plugin {
                        $imgs = $xpath->query("//img[@src]");
 
                        foreach ($imgs as $img) {
-                               $new_src = $this->rewrite_url_if_needed($img->getAttribute("src"), 0, $proxy_all);
+                               $new_src = $this->rewrite_url_if_needed($img->getAttribute("src"), $proxy_all);
 
                                if ($new_src != $img->getAttribute("src")) {
                                        $img->setAttribute("src", $new_src);
@@ -154,7 +152,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
                        foreach ($vids as $vid) {
                                if ($vid->hasAttribute("poster")) {
-                                       $new_src = $this->rewrite_url_if_needed($vid->getAttribute("poster"), 0, $proxy_all);
+                                       $new_src = $this->rewrite_url_if_needed($vid->getAttribute("poster"), $proxy_all);
 
                                        if ($new_src != $vid->getAttribute("poster")) {
                                                $vid->setAttribute("poster", $new_src);
@@ -166,7 +164,7 @@ class Af_Zz_ImgProxy extends Plugin {
                                $vsrcs = $xpath->query("source", $vid);
 
                                foreach ($vsrcs as $vsrc) {
-                                       $new_src = $this->rewrite_url_if_needed($vsrc->getAttribute("src"), 1, $proxy_all);
+                                       $new_src = $this->rewrite_url_if_needed($vsrc->getAttribute("src"), $proxy_all);
 
                                        if ($new_src != $vsrc->getAttribute("src")) {
                                                $vid->setAttribute("src", $new_src);