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 2195945be8b982aefd4bf2dd75c4485c6cde1175..46e9e9d80b998d9d811775a2c483930b9c0f0103 100644 (file)
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -1,5 +1,6 @@
 <?php
-       require_once "functions.php";
+       // WARNING: Don't ask for help on tt-rss.org forums or the bugtracker if you have
+       // modified this file.
 
        function initial_sanity_check($link) {
 
@@ -9,18 +10,26 @@
                        array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
                } else {
 
-                       define('EXPECTED_CONFIG_VERSION', 25);
-                       define('SCHEMA_VERSION', 92);
-
-                       require_once "config.php";
                        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");
+                       }
+
                        if (function_exists('posix_getuid') && posix_getuid() == 0) {
                                array_push($errors, "Please don't run this script as root.");
                        }
 
+                       if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                               array_push($errors, "PHP version 5.3.0 or newer required.");
+                       }
+
                        if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-                               $array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
+                               array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
                        }
 
                        if (!is_writable(CACHE_DIR . "/images")) {
@@ -31,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");
@@ -112,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.");
                        }
@@ -133,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>
 
@@ -145,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>
 
@@ -158,7 +178,7 @@
                                echo " * $error\n";
                        }
 
-                       echo "\nYou might want to check tt-rss wik or the forums for more information.\n";
+                       echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
                        echo "Please search the forums before creating new topic for your question.\n";
 
                        exit(-1);