disable version checking for night.css

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index 866c92ec90b0a3931d753c33ebbdc7b4a70be86e..669bbe038634c83cddd42532b13f623f6041d3b9 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -17,7 +17,10 @@
                $params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY");
                $params["bw_limit"] = (int) $_SESSION["bw_limit"];
                $params["label_base_index"] = (int) LABEL_BASE_INDEX;
-               $params["theme"] = get_pref("USER_CSS_THEME", false, false);
+
+               $theme = get_pref( "USER_CSS_THEME", false, false);
+               $params["theme"] = theme_valid("$theme") ? $theme : "";
+
                $params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
 
                $params["php_platform"] = PHP_OS;
@@ -911,8 +914,13 @@
                foreach ($entries as $entry) {
                        if (!iframe_whitelisted($entry)) {
                                $entry->setAttribute('sandbox', 'allow-scripts');
+                       } else {
+                               if ($_SERVER['HTTPS'] == "on") {
+                                       $entry->setAttribute("src",
+                                               str_replace("http://", "https://",
+                                                       $entry->getAttribute("src")));
+                               }
                        }
-
                }
 
                $allowed_elements = array('a', 'address', 'audio', 'article', 'aside',
@@ -1975,8 +1983,8 @@
        }
 
        function getLastArticleId() {
-               $result = db_query("SELECT MAX(ref_id) AS id FROM ttrss_user_entries
-                       WHERE owner_uid = " . $_SESSION["uid"]);
+               $result = db_query("SELECT ref_id AS id FROM ttrss_user_entries
+                       WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY ref_id DESC LIMIT 1");
 
                if (db_num_rows($result) == 1) {
                        return db_fetch_result($result, 0, "id");
@@ -2417,4 +2425,21 @@
                return LABEL_BASE_INDEX - 1 + abs($feed);
        }
 
+       function theme_valid($file) {
+               if ($file == "default.css" || $file == "night.css") return true; // needed for array_filter
+               $file = "themes/" . basename($file);
+
+               if (file_exists($file) && is_readable($file)) {
+                       $fh = fopen($file, "r");
+
+                       if ($fh) {
+                               $header = fgets($fh);
+                               fclose($fh);
+
+                               return strpos($header, "supports-version:" . VERSION_STATIC) !== FALSE;
+                       }
+               }
+
+               return false;
+       }
 ?>