checkbox to sql bool related changes, some more boolean fixes

[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 5fab3b7b8940df1461584524de1e03359f536eff..a6f0083245673ea8b1bf26f9f4e876e663fb6f2b 100644 (file)
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -40,7 +40,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,20 +55,21 @@ 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));
 
                        if ($data) {
-                               if (file_put_contents($local_filename, $data)) {
-                                       $mimetype = mime_content_type($local_filename);
-                                       header("Content-type: $mimetype");
+
+                               $disable_cache = $this->host->get($this, "disable_cache");
+
+                               if (!$disable_cache && strlen($data) > MIN_CACHE_FILE_SIZE) {
+                                       if (file_put_contents($local_filename, $data)) {
+                                               $mimetype = mime_content_type($local_filename);
+                                               header("Content-type: $mimetype");
+                                       }
                                }
 
                                print $data;
@@ -80,7 +81,7 @@ class Af_Zz_ImgProxy extends Plugin {
                                if (function_exists("imagecreate") && !isset($_REQUEST["text"])) {
                                        $img = imagecreate(450, 75);
 
-                                       $bg = imagecolorallocate($img, 255, 255, 255);
+                                       /*$bg =*/ imagecolorallocate($img, 255, 255, 255);
                                        $textcolor = imagecolorallocate($img, 255, 0, 0);
 
                                        imagerectangle($img, 0, 0, 450-1, 75-1, $textcolor);
@@ -112,7 +113,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 {
@@ -124,10 +125,14 @@ class Af_Zz_ImgProxy extends Plugin {
                                $parts = parse_url($url);
 
                                foreach (explode(" " , $this->ssl_known_whitelist) as $host) {
-                                       if (strpos($parts['host'], $host) !== FALSE) {
+                                       if (substr(strtolower($parts['host']), -strlen($host)) === strtolower($host)) {
                                                $parts['scheme'] = 'https';
-
-                                               return build_url($parts);
+                                               $url = build_url($parts);
+                                               if ($all_remote && $is_remote) {
+                                                       break;
+                                               } else {
+                                                       return $url;
+                                               }
                                        }
                                }
 
@@ -139,6 +144,9 @@ class Af_Zz_ImgProxy extends Plugin {
                return $url;
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        function hook_render_article_cdm($article, $api_mode = false) {
 
                $need_saving = false;
@@ -187,7 +195,7 @@ class Af_Zz_ImgProxy extends Plugin {
                        }
                }
 
-               if ($need_saving) $article["content"] = $doc->saveXML();
+               if ($need_saving) $article["content"] = $doc->saveHTML();
 
                return $article;
        }
@@ -219,8 +227,11 @@ class Af_Zz_ImgProxy extends Plugin {
 
                $proxy_all = $this->host->get($this, "proxy_all");
                print_checkbox("proxy_all", $proxy_all);
+               print "&nbsp;<label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label><br/>";
 
-               print "&nbsp;<label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label>";
+               $disable_cache = $this->host->get($this, "disable_cache");
+               print_checkbox("disable_cache", $disable_cache);
+               print "&nbsp;<label for=\"disable_cache\">" . __("Don't cache files locally.") . "</label>";
 
                print "<p>"; print_button("submit", __("Save"));
 
@@ -230,9 +241,11 @@ class Af_Zz_ImgProxy extends Plugin {
        }
 
        function save() {
-               $proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]) == "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);
+               $this->host->set($this, "proxy_all", $proxy_all, false);
+               $this->host->set($this, "disable_cache", $disable_cache);
 
                echo __("Configuration saved");
        }
@@ -240,4 +253,4 @@ class Af_Zz_ImgProxy extends Plugin {
        function api_version() {
                return 2;
        }
-}
\ No newline at end of file
+}