remove $link

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

diff --git a/include/sanity_check.php b/include/sanity_check.php
index 69309290e643aa58518ced268f9bf7a4e1beaa3b..0477efd5077fb37d81ea5a7385fe1e061c0b0fe5 100644 (file)
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -21,7 +21,7 @@
                return $url_path;
        }
 
-       function initial_sanity_check($link) {
+       function initial_sanity_check() {
 
                $errors = array();
 
@@ -67,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");
@@ -80,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.");
                                }
                        }
 
@@ -194,6 +198,6 @@
                }
        }
 
-       initial_sanity_check($link);
+       initial_sanity_check();
 
 ?>