diff options
| author | Andrew Dolgov <[email protected]> | 2006-02-26 15:07:22 +0100 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2006-02-26 15:07:22 +0100 |
| commit | 59b8192f946cc44f6e88f2bb904d96dab2187c27 (patch) | |
| tree | 3b2c9819dcb80e6dda70244d44dbe5a2619915a5 /backend.php | |
| parent | 362698addb96983626a74d712e7547958771c93f (diff) | |
workaround for Opera cache of feeds/headlines panel; remove addheader param handling
Diffstat (limited to 'backend.php')
| -rw-r--r-- | backend.php | 111 |
1 files changed, 50 insertions, 61 deletions
diff --git a/backend.php b/backend.php index da9087f9c..b1b9e61f1 100644 --- a/backend.php +++ b/backend.php @@ -1,7 +1,7 @@ <? session_start(); - header("Cache-Control: no-cache"); + header("Cache-Control: no-cache, must-revalidate"); header("Pragma: no-cache"); header("Expires: -1"); @@ -898,8 +898,6 @@ SET unread = false,last_read = NOW() WHERE ref_id = '$id' AND feed_id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); - $addheader = $_GET["addheader"]; - $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id, SUBSTRING(updated,1,16) as updated, (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, @@ -908,30 +906,28 @@ FROM ttrss_entries,ttrss_user_entries WHERE id = '$id' AND ref_id = id"); - if ($addheader) { - print "<html><head> - <title>Tiny Tiny RSS : Article $id</title> - <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">"; - - $user_theme = $_SESSION["theme"]; - if ($user_theme) { - print "<link rel=\"stylesheet\" type=\"text/css\" - href=\"themes/$user_theme/theme.css\">"; - } + print "<html><head> + <title>Tiny Tiny RSS : Article $id</title> + <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">"; - if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { - print "<link rel=\"stylesheet\" type=\"text/css\" - href=\"tt-rss_compact.css\"/>"; - } else { - print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" - type=\"text/css\" href=\"tt-rss_compact.css\"/>"; - } + $user_theme = $_SESSION["theme"]; + if ($user_theme) { + print "<link rel=\"stylesheet\" type=\"text/css\" + href=\"themes/$user_theme/theme.css\">"; + } - print "<script type=\"text/javascript\" src=\"functions.js\"></script> - <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> - </head><body>"; + if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { + print "<link rel=\"stylesheet\" type=\"text/css\" + href=\"tt-rss_compact.css\"/>"; + } else { + print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" + type=\"text/css\" href=\"tt-rss_compact.css\"/>"; } + print "<script type=\"text/javascript\" src=\"functions.js\"></script> + <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> + </head><body>"; + if ($result) { $line = db_fetch_assoc($result); @@ -1035,9 +1031,7 @@ </script>"; } - if ($addheader) { - print "</body></html>"; - } + print "</body></html>"; } if ($op == "viewfeed") { @@ -1046,7 +1040,6 @@ $skip = $_GET["skip"]; $subop = $_GET["subop"]; $view_mode = $_GET["view"]; - $addheader = $_GET["addheader"]; $limit = $_GET["limit"]; if (!$feed) { @@ -1057,42 +1050,40 @@ if ($subop == "undefined") $subop = ""; - if ($addheader) { - print "<html><head> - <title>Tiny Tiny RSS : Feed $feed</title> - <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">"; - - $user_theme = $_SESSION["theme"]; - if ($user_theme) { - print "<link rel=\"stylesheet\" type=\"text/css\" - href=\"themes/$user_theme/theme.css\">"; - } + print "<html><head> + <title>Tiny Tiny RSS : Feed $feed</title> + <link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">"; - if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { - print "<link rel=\"stylesheet\" - type=\"text/css\" href=\"tt-rss_compact.css\"/>"; + $user_theme = $_SESSION["theme"]; + if ($user_theme) { + print "<link rel=\"stylesheet\" type=\"text/css\" + href=\"themes/$user_theme/theme.css\">"; + } - } else { - print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" - type=\"text/css\" href=\"tt-rss_compact.css\"/>"; - } + if (get_pref($link, 'USE_COMPACT_STYLESHEET')) { + print "<link rel=\"stylesheet\" + type=\"text/css\" href=\"tt-rss_compact.css\"/>"; - print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> - <script type=\"text/javascript\" src=\"functions.js\"></script> - <script type=\"text/javascript\" src=\"viewfeed.js\"></script> - <!--[if gte IE 5.5000]> - <script type=\"text/javascript\" src=\"pngfix.js\"></script> - <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss-ie.css\"> - <![endif]--> - </head><body> - <script type=\"text/javascript\"> - if (document.addEventListener) { - document.addEventListener(\"DOMContentLoaded\", init, null); - } - window.onload = init; - </script>"; + } else { + print "<link title=\"Compact Stylesheet\" rel=\"alternate stylesheet\" + type=\"text/css\" href=\"tt-rss_compact.css\"/>"; } + print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"> + <script type=\"text/javascript\" src=\"functions.js\"></script> + <script type=\"text/javascript\" src=\"viewfeed.js\"></script> + <!--[if gte IE 5.5000]> + <script type=\"text/javascript\" src=\"pngfix.js\"></script> + <link rel=\"stylesheet\" type=\"text/css\" href=\"tt-rss-ie.css\"> + <![endif]--> + </head><body> + <script type=\"text/javascript\"> + if (document.addEventListener) { + document.addEventListener(\"DOMContentLoaded\", init, null); + } + window.onload = init; + </script>"; + if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) { /* if (ENABLE_UPDATE_DAEMON) { @@ -1651,9 +1642,7 @@ } </script>'; - if ($addheader) { - print "</body></html>"; - } + print "</body></html>"; } if ($op == "pref-rpc") { |