pngcrush.sh

[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
old mode 100644 (file)
new mode 100755 (executable)
index 870e12a..1c1e99a
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -1,5 +1,7 @@
 <?php
 class Af_Zz_ImgProxy extends Plugin {
+
+       /* @var PluginHost $host */
        private $host;
 
        function about() {
@@ -40,7 +42,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
        public function imgproxy() {
 
-               $url = rewrite_relative_url(SELF_URL_PATH, $_REQUEST["url"]);
+               $url = rewrite_relative_url(get_self_url_prefix(), $_REQUEST["url"]);
 
                // called without user context, let's just redirect to original URL
                if (!$_SESSION["uid"]) {
@@ -55,15 +57,11 @@ class Af_Zz_ImgProxy extends Plugin {
                header("Content-Disposition: inline; filename=\"".basename($local_filename)."\"");
 
                if (file_exists($local_filename)) {
-                       $mimetype = mime_content_type($local_filename);
-                       header("Content-type: $mimetype");
 
-                       $stamp = gmdate("D, d M Y H:i:s", filemtime($local_filename)). " GMT";
-                       header("Last-Modified: $stamp", true);
+                       send_local_file($local_filename);
 
-                       readfile($local_filename);
                } else {
-                       $data = fetch_file_contents(array("url" => $url));
+                       $data = fetch_file_contents(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
 
                        if ($data) {
 
@@ -117,7 +115,7 @@ class Af_Zz_ImgProxy extends Plugin {
 
                if ($all_remote) {
                        $host = parse_url($url, PHP_URL_HOST);
-                       $self_host = parse_url(SELF_URL_PATH, PHP_URL_HOST);
+                       $self_host = parse_url(get_self_url_prefix(), PHP_URL_HOST);
 
                        $is_remote = $host != $self_host;
                } else {
@@ -199,7 +197,7 @@ class Af_Zz_ImgProxy extends Plugin {
                        }
                }
 
-               if ($need_saving) $article["content"] = $doc->saveXML();
+               if ($need_saving) $article["content"] = $doc->saveHTML();
 
                return $article;
        }
@@ -245,8 +243,8 @@ class Af_Zz_ImgProxy extends Plugin {
        }
 
        function save() {
-               $proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]) == "true";
-               $disable_cache = checkbox_to_sql_bool($_POST["disable_cache"]) == "true";
+               $proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]);
+               $disable_cache = checkbox_to_sql_bool($_POST["disable_cache"]);
 
                $this->host->set($this, "proxy_all", $proxy_all, false);
                $this->host->set($this, "disable_cache", $disable_cache);
@@ -257,4 +255,4 @@ class Af_Zz_ImgProxy extends Plugin {
        function api_version() {
                return 2;
        }
-}
\ No newline at end of file
+}