move HTMLPurifier cache inside CACHE_DIR/htmlpurifier

[tt-rss.git] / sanity_check.php

diff --git a/sanity_check.php b/sanity_check.php
index 96f4e839c7d524b94833a844c758210cff32b4c1..ce755f4028b2fe9e0237e067c25496f4b4ecb382 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,8 +1,8 @@
 <?php
        require_once "functions.php";
 
-       define('EXPECTED_CONFIG_VERSION', 21);
-       define('SCHEMA_VERSION', 82);
+       define('EXPECTED_CONFIG_VERSION', 22);
+       define('SCHEMA_VERSION', 83);
 
        if (!file_exists("config.php")) {
                print "<b>Fatal Error</b>: You forgot to copy
@@ -17,7 +17,7 @@
                $err_msg = "config: your config file version is incorrect. See config.php-dist.\n";
        }
 
-       $purifier_cache_dir = "lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer";
+       $purifier_cache_dir = CACHE_DIR . "/htmlpurifier";
 
        if (!is_writable($purifier_cache_dir)) {
                $err_msg = "config: HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)";
@@ -143,6 +143,18 @@
                $err_msg = "php.ini: Safe mode is not supported. If you wish to continue, remove this test from sanity_check.php and proceeed at your own risk. Please note that your bug reports will not be accepted or reviewed.";
        }
 
+       if (PUBSUBHUBBUB_HUB && !function_exists("curl_init")) {
+               $err_msg = "PUBSUBHUBBUB_HUB is defined, but CURL functions are not found. CURL is required for PubSubHubbub support.";
+       }
+
+       if (!class_exists("DOMDocument")) {
+               $err_msg = "PHP: DOMDocument extension not found.";
+       }
+
+       if (!ISCONFIGURED) {
+               $err_msg = "config: please read config.php completely.";
+       }
+
        if ($err_msg) {
                print "<b>Fatal Error</b>: $err_msg\n";
                exit;