further stylesheet simplification related fixes

[tt-rss.git] / install / index.php
diff --git a/install/index.php b/install/index.php

index 4239f5893f949e84f84a9de47538204cf1f8bbcd..46a0fdecdfa6d3f146c130cd2b182e71c0f55cb6 100755 (executable)
--- a/install/index.php
+++ b/install/index.php
@@ -2,13 +2,12 @@
  <head>
         <title>Tiny Tiny RSS - Installer</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-       <link rel="stylesheet" type="text/css" href="../css/utility.css">
-       <link rel="stylesheet" type="text/css" href="../css/dijit.css">
+       <link rel="stylesheet" type="text/css" href="../css/default.css">
         <style type="text/css">
         textarea { font-size : 12px; }
         </style>
  </head>
-<body class="claro">
+<body class="claro ttrss_utility">
  
  <?php
  
@@ -180,7 +179,7 @@
         }
  
         function is_server_https() {
-               return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
+               return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https';
         }
  
         function make_self_url_path() {