Merge branch 'imgproxy_ssl_whitelist_tweaks' into 'master'

af_zz_imgproxy optional SSL whitelist tweaks

See merge request !51

diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 5fab3b7b8940df1461584524de1e03359f536eff..86f79c6946875bc4b142145b474d871a14903b09 100644 (file)
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -124,10 +124,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;
+                                               }
                                        }
                                }