sanity_check: config.php is now optional, also cleanup some error messages

1 files changed, 87 insertions, 96 deletions

diff --git a/include/sanity_check.php b/include/sanity_check.php
index 4831209ba..3d6a496b5 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -36,134 +36,125 @@
 
 		$errors = array();
 
-		if (!file_exists("config.php")) {
-			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
-		} else {
-
-			if (!file_exists("config.php")) {
-				array_push($errors, "Please copy config.php-dist to config.php");
-			}
-
-			if (strpos(Config::get(Config::PLUGINS), "auth_") === false) {
-				array_push($errors, "Please enable at least one authentication module via Config::get(Config::PLUGINS) constant in config.php");
-			}
+		if (strpos(Config::get(Config::PLUGINS), "auth_") === false) {
+			array_push($errors, "Please enable at least one authentication module via Config::get(Config::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 (function_exists('posix_getuid') && posix_getuid() == 0) {
+			array_push($errors, "Please don't run this script as root.");
+		}
 
-			if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-				array_push($errors, "PHP version 7.0.0 or newer required. You're using " . PHP_VERSION . ".");
-			}
+		if (version_compare(PHP_VERSION, '7.1.0', '<')) {
+			array_push($errors, "PHP version 7.1.0 or newer required. You're using " . PHP_VERSION . ".");
+		}
 
-			if (!class_exists("UConverter")) {
-				array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
-			}
+		if (!class_exists("UConverter")) {
+			array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
+		}
 
-			if (!is_writable(Config::get(Config::CACHE_DIR) . "/images")) {
-				array_push($errors, "Image cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/images)");
-			}
+		if (!is_writable(Config::get(Config::CACHE_DIR) . "/images")) {
+			array_push($errors, "Image cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/images)");
+		}
 
-			if (!is_writable(Config::get(Config::CACHE_DIR) . "/upload")) {
-				array_push($errors, "Upload cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/upload)");
-			}
+		if (!is_writable(Config::get(Config::CACHE_DIR) . "/upload")) {
+			array_push($errors, "Upload cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/upload)");
+		}
 
-			if (!is_writable(Config::get(Config::CACHE_DIR) . "/export")) {
-				array_push($errors, "Data export cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/export)");
-			}
+		if (!is_writable(Config::get(Config::CACHE_DIR) . "/export")) {
+			array_push($errors, "Data export cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/export)");
+		}
 
-			if (Config::get(Config::SINGLE_USER_MODE) && class_exists("PDO")) {
-			    $pdo = Db::pdo();
+		if (Config::get(Config::SINGLE_USER_MODE) && class_exists("PDO")) {
+				$pdo = Db::pdo();
 
-				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
+			$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 
-				if (!$res->fetch()) {
-					array_push($errors, "Config::get(Config::SINGLE_USER_MODE) is enabled in config.php but default admin account is not found.");
-				}
+			if (!$res->fetch()) {
+				array_push($errors, "SINGLE_USER_MODE is enabled but default admin account is not found.");
 			}
+		}
 
-			if (php_sapi_name() != "cli") {
-				$ref_self_url_path = make_self_url_path();
-
-				if ($ref_self_url_path) {
-					$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
-				}
-
-				if (Config::get(Config::SELF_URL_PATH) == "http://example.org/tt-rss/") {
-					$hint = $ref_self_url_path ? "(possible value: <b>$ref_self_url_path</b>)" : "";
-					array_push($errors,
-							"Please set Config::get(Config::SELF_URL_PATH) to the correct value for your server: $hint");
-				}
+		if (php_sapi_name() != "cli") {
+			$ref_self_url_path = make_self_url_path();
 
-				if ($ref_self_url_path &&
-					(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
-					Config::get(Config::SELF_URL_PATH) != $ref_self_url_path && Config::get(Config::SELF_URL_PATH) != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
-					array_push($errors,
-						"Please set Config::get(Config::SELF_URL_PATH) to the correct value detected for your server: <b>$ref_self_url_path</b> (you're using: <b>" . Config::get(Config::SELF_URL_PATH) . "</b>)");
-				}
+			if ($ref_self_url_path) {
+				$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
 			}
 
-			if (!is_writable(Config::get(Config::ICONS_DIR))) {
-				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".Config::get(Config::ICONS_DIR).").\n");
+			if (Config::get(Config::SELF_URL_PATH) == "http://example.org/tt-rss/") {
+				$hint = $ref_self_url_path ? "(possible value: <b>$ref_self_url_path</b>)" : "";
+				array_push($errors,
+						"Please set SELF_URL_PATH to the correct value for your server: $hint");
 			}
 
-			if (!is_writable(Config::get(Config::LOCK_DIRECTORY))) {
-				array_push($errors, "Config::get(Config::LOCK_DIRECTORY) defined in config.php is not writable (chmod -R 777 ".Config::get(Config::LOCK_DIRECTORY).").\n");
+			if ($ref_self_url_path &&
+				(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
+				Config::get(Config::SELF_URL_PATH) != $ref_self_url_path && Config::get(Config::SELF_URL_PATH) != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
+				array_push($errors,
+					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b> (you're using: <b>" . Config::get(Config::SELF_URL_PATH) . "</b>)");
 			}
+		}
 
-			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.");
-			}
+		if (!is_writable(Config::get(Config::ICONS_DIR))) {
+			array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".Config::get(Config::ICONS_DIR).").\n");
+		}
 
-			if (!function_exists("json_encode")) {
-				array_push($errors, "PHP support for JSON is required, but was not found.");
-			}
+		if (!is_writable(Config::get(Config::LOCK_DIRECTORY))) {
+			array_push($errors, "LOCK_DIRECTORY is not writable (chmod -R 777 ".Config::get(Config::LOCK_DIRECTORY).").\n");
+		}
 
-			if (!class_exists("PDO")) {
-				array_push($errors, "PHP support for PDO is required but was not found.");
-			}
+		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.");
+		}
 
-			if (!function_exists("mb_strlen")) {
-				array_push($errors, "PHP support for mbstring functions is required but was not found.");
-			}
+		if (!function_exists("json_encode")) {
+			array_push($errors, "PHP support for JSON is required, but was not found.");
+		}
 
-			if (!function_exists("hash")) {
-				array_push($errors, "PHP support for hash() function is required but was not found.");
-			}
+		if (!class_exists("PDO")) {
+			array_push($errors, "PHP support for PDO is required but was not found.");
+		}
 
-			if (ini_get("safe_mode")) {
-				array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-			}
+		if (!function_exists("mb_strlen")) {
+			array_push($errors, "PHP support for mbstring functions is required but was not found.");
+		}
 
-			if (!function_exists("mime_content_type")) {
-				array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
-			}
+		if (!function_exists("hash")) {
+			array_push($errors, "PHP support for hash() function is required but was not found.");
+		}
 
-			if (!class_exists("DOMDocument")) {
-				array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-			}
+		if (ini_get("safe_mode")) {
+			array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+		}
 
-			if (Config::get(Config::DB_TYPE) == "mysql") {
-				$bad_tables = check_mysql_tables();
+		if (!function_exists("mime_content_type")) {
+			array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
+		}
 
-				if (count($bad_tables) > 0) {
-					$bad_tables_fmt = [];
+		if (!class_exists("DOMDocument")) {
+			array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+		}
 
-					foreach ($bad_tables as $bt) {
-						array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
-					}
+		if (Config::get(Config::DB_TYPE) == "mysql") {
+			$bad_tables = check_mysql_tables();
 
-					$msg = "<p>The following tables use an unsupported MySQL engine: <b>" .
-						implode(", ", $bad_tables_fmt) . "</b>.</p>";
+			if (count($bad_tables) > 0) {
+				$bad_tables_fmt = [];
 
-					$msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
-						tt-rss.
-						Please backup your data (via OPML) and re-import the schema before continuing.</p>
-						<p><b>WARNING: importing the schema would mean LOSS OF ALL YOUR DATA.</b></p>";
+				foreach ($bad_tables as $bt) {
+					array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
+				}
 
+				$msg = "<p>The following tables use an unsupported MySQL engine: <b>" .
+					implode(", ", $bad_tables_fmt) . "</b>.</p>";
 
-					array_push($errors, $msg);
-				}
+				$msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
+					tt-rss.
+					Please backup your data (via OPML) and re-import the schema before continuing.</p>
+					<p><b>WARNING: importing the schema would mean LOSS OF ALL YOUR DATA.</b></p>";
+
+
+				array_push($errors, $msg);
 			}
 		}