valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sanity checks: use better CLI detection, shorten most of the text

This commit is contained in:
Andrew Dolgov 2021-02-08 08:49:21 +03:00
parent 5d0f65358f
commit 942afb43a1
2 changed files with 24 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/sanity_check.php
View File

@ -1,18 +1,5 @@
<?php <?php
/* WARNING! /* WARNING! If you modify this file, you are ON YOUR OWN! */
*
* 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() { function make_self_url() {
$proto = is_server_https() ? 'https' : 'http'; $proto = is_server_https() ? 'https' : 'http';
@ -45,9 +32,6 @@
return $bad_tables; return $bad_tables;
} }
/**
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
function initial_sanity_check() { function initial_sanity_check() {
$errors = array(); $errors = array();
@ -116,23 +100,25 @@
} }
} }
$ref_self_url_path = make_self_url_path(); if (php_sapi_name() != "cli") {
$ref_self_url_path = make_self_url_path();
if ($ref_self_url_path) { if ($ref_self_url_path) {
$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path); $ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
} }
if (SELF_URL_PATH == "http://example.org/tt-rss/") { if (SELF_URL_PATH == "http://example.org/tt-rss/") {
$hint = $ref_self_url_path ? "(possible value: <b>$ref_self_url_path</b>)" : ""; $hint = $ref_self_url_path ? "(possible value: <b>$ref_self_url_path</b>)" : "";
array_push($errors, array_push($errors,
"Please set SELF_URL_PATH to the correct value for your server: $hint"); "Please set SELF_URL_PATH to the correct value for your server: $hint");
} }
if ($ref_self_url_path && if ($ref_self_url_path &&
(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) && (!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) { SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
array_push($errors, 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>" . SELF_URL_PATH . "</b>)"); "Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b> (you're using: <b>" . SELF_URL_PATH . "</b>)");
}
} }
if (!is_writable(ICONS_DIR)) { if (!is_writable(ICONS_DIR)) {
@ -207,7 +193,7 @@
} }
} }
if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?> if (count($errors) > 0 && php_sapi_name() != "cli") { ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
@ -240,7 +226,7 @@
echo "Please fix errors indicated by the following messages:\n\n"; echo "Please fix errors indicated by the following messages:\n\n";
foreach ($errors as $error) { foreach ($errors as $error) {
echo " * $error\n"; echo " * " . strip_tags($error)."\n";
} }
echo "\nYou might want to check tt-rss wiki or the forums for more information.\n"; echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";

33
update.php
View File

@ -72,9 +72,6 @@
return $tags_deleted; return $tags_deleted;
} }
if (!defined('PHP_EXECUTABLE'))
define('PHP_EXECUTABLE', '/usr/bin/php');
$pdo = Db::pdo(); $pdo = Db::pdo();
init_plugins(); init_plugins();
@ -106,34 +103,14 @@
array_push($longopts, $command . $data["suffix"]); array_push($longopts, $command . $data["suffix"]);
} }
$options = getopt("", $longopts); if (php_sapi_name() != "cli") {
header("Content-type: text/plain");
if (!is_array($options)) { print "Please run this script from the command line.\n";
die("error: getopt() failed. ".
"Most probably you are using PHP CGI to run this script ".
"instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
"additional information.\n");
}
if (count($options) == 0 && !defined('STDIN')) {
?>
<!DOCTYPE html>
<html>
<head>
<title>Tiny Tiny RSS data update script.</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<h1><?php echo __("Tiny Tiny RSS data update script.") ?></h1>
<?php print_error("Please run this script from the command line. Use option \"--help\" to display command help if this error is displayed erroneously."); ?>
</body></html>
<?php
exit; exit;
} }
$options = getopt("", $longopts);
if (count($options) == 0 || isset($options["help"]) ) { if (count($options) == 0 || isset($options["help"]) ) {
print "Tiny Tiny RSS data update script.\n\n"; print "Tiny Tiny RSS data update script.\n\n";
print "Options:\n"; print "Options:\n";