public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 01:25:55 +00:00
Code Issues Releases Wiki Activity

use CURL when it is available, remove option USE_CURL

Browse Source
This commit is contained in:
Andrew Dolgov
2011-03-17 19:16:44 +03:00
parent 8d505d78e3
commit 014d3ad823
4 changed files with 9 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sanity_check.php
View File

@@ -5,7 +5,7 @@
define('SCHEMA_VERSION', 81);
if (!file_exists("config.php")) {
print "<b>Fatal Error</b>: You forgot to copy
print "<b>Fatal Error</b>: You forgot to copy
<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
exit;
}
@@ -41,7 +41,7 @@
if (file_exists("xml-export.php") || file_exists("xml-import.php")) {
print "<b>Fatal Error</b>: XML Import/Export tools (<b>xml-export.php</b>
and <b>xml-import.php</b>) could be used maliciously. Please remove them
and <b>xml-import.php</b>) could be used maliciously. Please remove them
from your TT-RSS instance.\n";
exit;
}
@@ -52,12 +52,6 @@
exit;
}
if (USE_CURL && ! function_exists("curl_init")) {
print "<b>Fatal Error</b>: You have enabled USE_CURL, but your PHP
doesn't seem to support CURL functions.";
exit;
}
if (!defined('SESSION_EXPIRE_TIME')) {
$err_msg = "config: SESSION_EXPIRE_TIME is undefined";
}
@@ -89,7 +83,7 @@
if ($link) {
$result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1");
if (db_num_rows($result) != 1) {
if (db_num_rows($result) != 1) {
$err_msg = "config: SINGLE_USER_MODE is enabled but default admin account (UID=1) is not found.";
}
}
@@ -114,7 +108,7 @@
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.";
$err_msg = "config: DEFAULT_UPDATE_METHOD should be either 0 or 1.";
}
if (!is_writable(ICONS_DIR)) {
@@ -149,10 +143,6 @@
$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 (defined('USE_CURL_FOR_ICONS')) {
$err_msg = "config: USE_CURL_FOR_ICONS has been renamed to USE_CURL.";
}
if ($err_msg) {
print "<b>Fatal Error</b>: $err_msg\n";
exit;