remove $link

[tt-rss.git] / include / sanity_check.php

diff --git a/include/sanity_check.php b/include/sanity_check.php
index 1610cfeb043ad64ed034111ec59a59fc22b57b22..0477efd5077fb37d81ea5a7385fe1e061c0b0fe5 100644 (file)
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -1,6 +1,19 @@
 <?php
-       // WARNING: Don't ask for help on tt-rss.org forums or the bugtracker if you have
-       // modified this file.
+       /*
+        * WARNING!
+        *
+        * If you modify this file, you are ON YOUR OWN!
+        *
+        * Believe it or not, all of the checks below are required to succeed for
+        * tt-rss to actually function properly.
+        *
+        * If you think you have a better idea about what is or isn't required, feel
+        * free to modify the file, note though that you are therefore automatically
+        * disqualified from any further support by official channels, e.g. tt-rss.org
+        * issue tracker or the forums.
+        *
+        * If you come crying when stuff inevitably breaks, you will be mocked and told
+        * to get out. */
 
        function make_self_url_path() {
                $url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' :  'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
@@ -8,7 +21,7 @@
                return $url_path;
        }
 
-       function initial_sanity_check($link) {
+       function initial_sanity_check() {
 
                $errors = array();
 
@@ -42,6 +55,10 @@
                                array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
                        }
 
+                       if (!is_writable(CACHE_DIR . "/upload")) {
+                               array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
+                       }
+
                        if (!is_writable(CACHE_DIR . "/export")) {
                                array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
                        }
@@ -50,6 +67,14 @@
                                array_push($errors, "Javascript cache is not writable (chmod -R 777 ".CACHE_DIR."/js)");
                        }
 
+                       if (strlen(FEED_CRYPT_KEY) > 0 && strlen(FEED_CRYPT_KEY) != 24) {
+                               array_push($errors, "FEED_CRYPT_KEY should be exactly 24 characters in length.");
+                       }
+
+                       if (strlen(FEED_CRYPT_KEY) > 0 && !function_exists("mcrypt_decrypt")) {
+                               array_push($errors, "FEED_CRYPT_KEY requires mcrypt functions which are not found.");
+                       }
+
                        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");
@@ -63,14 +88,10 @@
                        }
 
                        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");
+                               $result = db_query( "SELECT id FROM ttrss_users WHERE id = 1");
 
-                                       if (db_num_rows($result) != 1) {
-                                               array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
-                                       }
+                               if (db_num_rows($result) != 1) {
+                                       array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
                                }
                        }
 
@@ -89,10 +110,6 @@
                                array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
                        }
 
-                       if (ini_get("open_basedir")) {
-                               array_push($errors, "PHP configuration option open_basedir is not supported. Please disable this in PHP settings file (php.ini).");
-                       }
-
                        if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
                                array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
                        }
@@ -181,6 +198,6 @@
                }
        }
 
-       initial_sanity_check($link);
+       initial_sanity_check();
 
 ?>