tweak how utility.css-based stuff looks

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

index 2a39cfa42fcf28e5727f6d0db2b8fc83ce8450b1..46e9e9d80b998d9d811775a2c483930b9c0f0103 100644 (file)
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -12,6 +12,10 @@
  
                         require_once "sanity_config.php";
  
+                       if (file_exists("install") && !file_exists("config.php")) {
+                               array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
+                       }
+
                         if (strpos(PLUGINS, "auth_") === FALSE) {
                                 array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
                         }
@@ -20,7 +24,7 @@
                                 array_push($errors, "Please don't run this script as root.");
                         }
  
-                       if (version_compare("5.3.0", phpversion()) == 1) {
+                       if (version_compare(PHP_VERSION, '5.3.0', '<')) {
                                 array_push($errors, "PHP version 5.3.0 or newer required.");
                         }
  
@@ -36,6 +40,10 @@
                                 array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
                         }
  
+                       if (!is_writable(CACHE_DIR . "/js")) {
+                               array_push($errors, "Javascript cache is not writable (chmod -R 777 ".CACHE_DIR."/js)");
+                       }
+
                         if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
                                 array_push($errors,
                                         "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
@@ -117,10 +125,14 @@
                                 array_push($errors, "PHP support for ctype functions are required by HTMLPurifier.");
                         }
  
-                       if (ini_get("safe_mode")) {
-                               array_push($errors, "PHP safe mode setting is not supported.");
+                       if (!function_exists("iconv")) {
+                               array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
                         }
  
+                       /* if (ini_get("safe_mode")) {
+                               array_push($errors, "PHP safe mode setting is not supported.");
+                       } */
+
                         if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
                                 array_push($errors, "PHP support for CURL is required for PubSubHubbub.");
                         }
@@ -138,7 +150,8 @@
                                 <link rel="stylesheet" type="text/css" href="utility.css">
                         </head>
                 <body>
-               <div class="floatingLogo"><img src="images/logo_wide.png"></div>
+               <div class="floatingLogo"><img src="images/logo_small.png"></div>
+                       <div class="content">
  
                         <h1>Startup failed</h1>
  
@@ -150,6 +163,8 @@
                         <p>You might want to check tt-rss <a href="http://tt-rss.org/wiki">wiki</a> or the
                                 <a href="http://tt-rss.org/forum">forums</a> for more information. Please search the forums before creating new topic
                                 for your question.</p>
+
+               </div>
                 </body>
                 </html>