move Zoom stylesheet to a separate file

[tt-rss.git] / include / functions.php
diff --git a/include/functions.php b/include/functions.php

index cf9b0510ffa9976757e9e527ca9405eb37ce5e30..6c6bf2661c8e97f8637d04d2651b9df6aa2733b7 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -80,7 +80,7 @@
                                         "pt_BR" => "Portuguese/Brazil",
                                         "zh_CN" => "Simplified Chinese",
                                         "sv_SE" => "Svenska",
-                                       "fi_FI" => "Suomi",                                     
+                                       "fi_FI" => "Suomi",
                                         "tr_TR" => "Türkçe");
  
                 return $tr;
@@ -692,6 +692,12 @@
                                 $_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
                                 $_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
                 }
+               if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
+                       return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
+                               $_SERVER["SSL_CLIENT_V_START"] .
+                               $_SERVER["SSL_CLIENT_V_END"] .
+                               $_SERVER["SSL_CLIENT_S_DN"]);
+               }
                 return "";
         }
  
@@ -721,7 +727,7 @@
  
                                 $_SESSION["name"] = db_fetch_result($result, 0, "login");
                                 $_SESSION["access_level"] = db_fetch_result($result, 0, "access_level");
-                               $_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
+                               $_SESSION["csrf_token"] = uniqid(rand(), true);
  
                                 db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
                                         $_SESSION["uid"]);
@@ -751,7 +757,7 @@
                         $_SESSION["auth_module"] = false;
  
                         if (!$_SESSION["csrf_token"]) {
-                               $_SESSION["csrf_token"] = sha1(uniqid(rand(), true));
+                               $_SESSION["csrf_token"] = uniqid(rand(), true);
                         }
  
                         $_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
@@ -2825,10 +2831,13 @@
  
                         if ($site_url) {
  
-                               if ($entry->hasAttribute('href'))
+                               if ($entry->hasAttribute('href')) {
                                         $entry->setAttribute('href',
                                                 rewrite_relative_url($site_url, $entry->getAttribute('href')));
  
+                                       $entry->setAttribute('rel', 'noreferrer');
+                               }
+
                                 if ($entry->hasAttribute('src')) {
                                         $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
  
@@ -3251,8 +3260,10 @@
                                 header("Content-Type: text/html");
                                 $rv['content'] .= "<html><head>
                                                 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-                                               <title>Tiny Tiny RSS - ".$line["title"]."</title>
-                                               <link rel=\"stylesheet\" type=\"text/css\" href=\"css/tt-rss.css\">
+                                               <title>Tiny Tiny RSS - ".$line["title"]."</title>".
+                                               stylesheet_tag("css/tt-rss.css").
+                                               stylesheet_tag("css/zoom.css")."
+
                                                 <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
                                                 <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
  
@@ -3747,7 +3758,7 @@
                 if (db_num_rows($result) == 1) {
                         return db_fetch_result($result, 0, "access_key");
                 } else {
-                       $key = db_escape_string(sha1(uniqid(rand(), true)));
+                       $key = db_escape_string(uniqid(base_convert(rand(), 10, 36)));
  
                         $result = db_query("INSERT INTO ttrss_access_keys
                                 (access_key, feed_id, is_cat, owner_uid)
@@ -4297,7 +4308,7 @@
         function stylesheet_tag($filename) {
                 $timestamp = filemtime($filename);
  
-               echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
+               return "<link rel=\"stylesheet\" type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
         }
  
         function javascript_tag($filename) {
@@ -4312,7 +4323,7 @@
  
                 if ($query) $timestamp .= "&$query";
  
-               echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+               return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
         }
  
         function calculate_dep_timestamp() {