daemon2: unbreak spawn interval

[tt-rss.git] / sanity_check.php

diff --git a/sanity_check.php b/sanity_check.php
index 55df981415d06b21e29b37c792322f60d0b30e6a..b0d7477c75be36164f6d99ccd55a2836334c9242 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,8 +1,8 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 18);
-       define('SCHEMA_VERSION', 58);
+       define('EXPECTED_CONFIG_VERSION', 19);
+       define('SCHEMA_VERSION', 66);
 
        if (!file_exists("config.php")) {
                print "<b>Fatal Error</b>: You forgot to copy 
@@ -66,6 +66,18 @@
                $err_msg = "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL";
        }
 
+       if (SINGLE_USER_MODE) {
+               $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+
+               if ($link) {
+                       $result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1");
+
+                       if (db_num_rows($result) != 1) {        
+                               $err_msg = "config: SINGLE_USER_MODE is enabled but default admin account (UID=1) is not found.";
+                       }
+               }
+       }
+
        if (defined('MAIL_FROM')) {
                $err_msg = "config: MAIL_FROM has been split into DIGEST_FROM_NAME and DIGEST_FROM_ADDRESS";
        }
@@ -79,6 +91,15 @@
 
        }
 
+       if (defined('ENABLE_SIMPLEPIE')) {
+               $err_msg = "config: ENABLE_SIMPLEPIE is obsolete and replaced with DEFAULT_UPDATE_METHOD. Please adjust your config.php.";
+       }
+
+       if (!defined('DEFAULT_UPDATE_METHOD') || (DEFAULT_UPDATE_METHOD != 0 &&
+                       DEFAULT_UPDATE_METHOD != 1)) {
+               $err_msg = "config: DEFAULT_UPDATE_METHOD should be either 0 or 1.";            
+       }
+
        if ($err_msg) {
                print "<b>Fatal Error</b>: $err_msg\n";
                exit;