diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/db.php | 4 | ||||
-rw-r--r-- | include/functions.php | 28 | ||||
-rw-r--r-- | include/rssfuncs.php | 8 | ||||
-rw-r--r-- | include/sanity_check.php | 226 | ||||
-rw-r--r-- | include/sanity_config.php | 6 | ||||
-rw-r--r-- | include/sessions.php | 2 |
6 files changed, 117 insertions, 157 deletions
diff --git a/include/db.php b/include/db.php index 1401c089b..7b2bd2a77 100644 --- a/include/db.php +++ b/include/db.php @@ -22,7 +22,7 @@ function db_connect($host, $user, $pass, $db) { $link = pg_connect($string); if (!$link) { - die("Connection failed: " . pg_last_error($link)); + die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error()); } return $link; @@ -36,7 +36,7 @@ function db_connect($host, $user, $pass, $db) { } return $link; } else { - die("Connection failed: " . mysql_error($link)); + die("Unable to connect to database (as $user to $host, database $db): " . mysql_error()); } } } diff --git a/include/functions.php b/include/functions.php index 2118858ca..ec31a1f16 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2639,9 +2639,7 @@ require_once 'lib/phpmailer/class.phpmailer.php'; - if (!DIGEST_ENABLE) return false; - - $user_limit = DIGEST_EMAIL_LIMIT; + $user_limit = 15; // amount of users to process (e.g. emails to send out) $days = 1; print "Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit\n\n"; @@ -2677,16 +2675,16 @@ $mail->CharSet = "UTF-8"; - $mail->From = DIGEST_FROM_ADDRESS; - $mail->FromName = DIGEST_FROM_NAME; + $mail->From = SMTP_FROM_ADDRESS; + $mail->FromName = SMTP_FROM_NAME; $mail->AddAddress($line["email"], $line["login"]); - if (DIGEST_SMTP_HOST) { - $mail->Host = DIGEST_SMTP_HOST; + if (SMTP_HOST) { + $mail->Host = SMTP_HOST; $mail->Mailer = "smtp"; - $mail->SMTPAuth = DIGEST_SMTP_LOGIN != ''; - $mail->Username = DIGEST_SMTP_LOGIN; - $mail->Password = DIGEST_SMTP_PASSWORD; + $mail->SMTPAuth = SMTP_LOGIN != ''; + $mail->Username = SMTP_LOGIN; + $mail->Password = SMTP_PASSWORD; } $mail->IsHTML(true); @@ -3288,12 +3286,10 @@ onclick=\"editArticleNote($id)\" alt='PubNote' title='".__('Edit article note')."'>"; - if (DIGEST_ENABLE) { - $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\" - class='tagsPic' style=\"cursor : pointer\" - onclick=\"emailArticle($id)\" - alt='Zoom' title='".__('Forward by email')."'>"; - } + $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\" + class='tagsPic' style=\"cursor : pointer\" + onclick=\"emailArticle($id)\" + alt='Zoom' title='".__('Forward by email')."'>"; if (ENABLE_TWEET_BUTTON) { $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\" diff --git a/include/rssfuncs.php b/include/rssfuncs.php index 3dbcb34b2..7588428de 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -1,4 +1,8 @@ <?php + define('DAEMON_UPDATE_LOGIN_LIMIT', 30); + define('DAEMON_FEED_LIMIT', 100); + define('DAEMON_SLEEP_INTERVAL', 120); + function update_feedbrowser_cache($link) { $result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers @@ -57,7 +61,7 @@ // Process all other feeds using last_updated and interval parameters // Test if the user has loggued in recently. If not, it does not update its feeds. - if (DAEMON_UPDATE_LOGIN_LIMIT > 0) { + if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) { if (DB_TYPE == "pgsql") { $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'"; } else { @@ -143,7 +147,7 @@ } // Send feed digests by email if needed. - if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link); + send_headlines_digests($link); } // function update_daemon_common diff --git a/include/sanity_check.php b/include/sanity_check.php index 2769b4b59..aebe4f89d 100644 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -2,174 +2,134 @@ require_once "functions.php"; if (!file_exists("config.php")) { - print "<b>Fatal Error</b>: You forgot to copy - <b>config.php-dist</b> to <b>config.php</b> and edit it.\n"; - exit; - } - - define('EXPECTED_CONFIG_VERSION', 23); - define('SCHEMA_VERSION', 86); - - require_once "config.php"; - require_once "sanity_config.php"; - - if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) { - $err_msg = "config: your config file version is incorrect. See config.php-dist.\n"; - } - - $purifier_cache_dir = CACHE_DIR . "/htmlpurifier"; + $err_msg = "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it."; + } else { - if (!is_writable($purifier_cache_dir)) { - $err_msg = "config: HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)"; - } + define('EXPECTED_CONFIG_VERSION', 24); + define('SCHEMA_VERSION', 86); - if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) { - $err_msg = "config: your sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh"; - } + require_once "config.php"; + require_once "sanity_config.php"; - foreach ($requred_defines as $d) { - if (!defined($d)) { - $err_msg = "config: required constant $d is not defined. Please check config.php"; + if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) { + $err_msg = "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value."; } - } - - if (defined('RSS_BACKEND_TYPE')) { - print "<b>Fatal error</b>: RSS_BACKEND_TYPE is deprecated. Please remove this - option from config.php\n"; - exit; - } - - 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 - from your TT-RSS instance.\n"; - exit; - } - - if (SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) { - print "<b>Fatal Error</b>: Please set DAEMON_UPDATE_LOGIN_LIMIT - to 0 in single user mode.\n"; - exit; - } - if (!defined('SESSION_EXPIRE_TIME')) { - $err_msg = "config: SESSION_EXPIRE_TIME is undefined"; - } + $purifier_cache_dir = CACHE_DIR . "/htmlpurifier"; - if (SESSION_EXPIRE_TIME < 60) { - $err_msg = "config: SESSION_EXPIRE_TIME is too low (less than 60)"; - } + if (!is_writable($purifier_cache_dir)) { + $err_msg = "HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)"; + } - if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) { - $err_msg = "config: SESSION_EXPIRE_TIME should be greater or equal to" . - "SESSION_COOKIE_LIFETIME"; - } + if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) { + $err_msg = "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh"; + } -/* if (defined('DISABLE_SESSIONS')) { - $err_msg = "config: you have enabled DISABLE_SESSIONS. Please disable this option."; -} */ + foreach ($requred_defines as $d) { + if (!defined($d)) { + $err_msg = "Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist."; + } + } - if (DATABASE_BACKED_SESSIONS && SINGLE_USER_MODE) { - $err_msg = "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE"; - } + if (SESSION_EXPIRE_TIME < 60) { + $err_msg = "SESSION_EXPIRE_TIME set in config.php is too low, please set it to an integer value >= 60"; + } - if (DATABASE_BACKED_SESSIONS && DB_TYPE == "mysql") { - $err_msg = "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"; - } + if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) { + $err_msg = "SESSION_EXPIRE_TIME set in config.php should be >= to SESSION_COOKIE_LIFETIME"; + } - if (SINGLE_USER_MODE) { - $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); + 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"); + if ($link) { + $result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1"); - if (db_num_rows($result) != 1) { - $err_msg = "config: SINGLE_USER_MODE is enabled but default admin account (UID=1) is not found."; + if (db_num_rows($result) != 1) { + $err_msg = "SINGLE_USER_MODE is enabled in config.php but default admin account is not found."; + } } } - } - - if (defined('MAIL_FROM')) { - $err_msg = "config: MAIL_FROM has been split into DIGEST_FROM_NAME and DIGEST_FROM_ADDRESS"; - } - - if (!defined('COUNTERS_MAX_AGE')) { - $err_msg = "config: option COUNTERS_MAX_AGE expected, but not defined"; - } - if (defined('DAEMON_REFRESH_ONLY')) { - $err_msg = "config: option DAEMON_REFRESH_ONLY is obsolete. Please remove this option and read about other ways to update feeds on the <a href='http://tt-rss.org/wiki/UpdatingFeeds'>wiki</a>."; + if (SELF_URL_PATH == "http://yourserver/tt-rss/") { + if ($_SERVER['HTTP_REFERER']) { + $err_msg = "Please set SELF_URL_PATH to the correct value for your server (possible value: <b>" . $_SERVER['HTTP_REFERER'] . "</b>)"; + } else { + $err_msg = "Please set SELF_URL_PATH to the correct value for your server."; + } + } - } + if (!is_writable(ICONS_DIR)) { + $err_msg = "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n"; + } - if (defined('ENABLE_SIMPLEPIE')) { - $err_msg = "config: ENABLE_SIMPLEPIE is obsolete and replaced with DEFAULT_UPDATE_METHOD. Please adjust your config.php."; - } + if (ini_get("open_basedir")) { + $err_msg = "PHP configuration option open_basedir is not supported. Please disable this in PHP settings file (php.ini)."; + } - 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."; - } + if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) { + $err_msg = "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 (SELF_URL_PATH == "http://yourserver/tt-rss/") { - $err_msg = "config: please set SELF_URL_PATH to the correct value."; - } + if (!function_exists("json_encode")) { + $err_msg = "PHP support for JSON is required, but was not found."; + } - if (!is_writable(ICONS_DIR)) { - $err_msg = "config: your ICONS_DIR (" . ICONS_DIR . ") is not writable.\n"; - } + if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) { + $err_msg = "PHP support for MySQL is required for configured DB_TYPE in config.php."; + } - if (ini_get("open_basedir")) { - $err_msg = "php.ini: open_basedir is not supported."; - } + if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) { + $err_msg = "PHP support for PostgreSQL is required for configured DB_TYPE in config.php"; + } - if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) { - $err_msg = "php.ini: either allow_url_fopen or CURL needs to be enabled."; - } + if (!function_exists("mb_strlen")) { + $err_msg = "PHP support for mbstring functions is required, but was not found."; + } - if (!function_exists("json_encode")) { - $err_msg = "PHP: json functions not found."; - } + if (!function_exists("ctype_lower")) { + $err_msg = "PHP support for ctype functions are required by HTMLPurifier."; + } - if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) { - $err_msg = "PHP: MySQL functions not found."; - } + if (ini_get("safe_mode")) { + $err_msg = "PHP safe mode setting is not supported."; + } - if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) { - $err_msg = "PHP: PostgreSQL functions not found."; - } + if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) { + $err_msg = "PHP support for CURL is required for PubSubHubbub."; + } - if (!function_exists("mb_strlen")) { - $err_msg = "PHP: mbstring functions not found."; + if (!class_exists("DOMDocument")) { + $err_msg = "PHP support for DOMDocument is required, but was not found."; + } } - if (!function_exists("ctype_lower")) { - $err_msg = "PHP: ctype functions not found (required for HTMLPurifier)."; - } + if ($err_msg) { ?> + <html> + <head> + <title>Fatal error</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <link rel="stylesheet" type="text/css" href="utility.css"> + </head> - if (ini_get("safe_mode")) { - $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."; - } + <div class="floatingLogo"><img src="images/logo_wide.png"></div> - if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) { - $err_msg = "CURL is required for PubSubHubbub support."; - } + <h1>Fatal error</h1> - if (!class_exists("DOMDocument")) { - $err_msg = "PHP: DOMDocument extension not found."; - } + <p>Tiny Tiny RSS was unable to initialize properly. This usually means a misconfiguration or an incomplete upgrade. Please fix + the error indicated by the following message:</p> - if (SELF_URL_PATH == "http://local.host/tt-rss") { - $err_msg = "config: please set SELF_URL_PATH to the correct value"; - } + <p>You might want to check tt-rss <a href="http://tt-rss.org/wiki">wiki</a> or the + <a href="http://tt-rss.org/forum">forums</a> for more information. Please search the forums before creating new topic + for your question.</p> - if (!ISCONFIGURED) { - $err_msg = "config: please read config.php completely."; - } + <body> + <?php echo format_error($err_msg) ?> + </body> + </html> - if ($err_msg) { - print "<b>Fatal Error</b>: $err_msg\n"; - exit; + <?php + die; } ?> diff --git a/include/sanity_config.php b/include/sanity_config.php index 51c9d52be..5ed49de51 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ -<?php # This file has been generated at: Tue Apr 26 18:40:48 MSD 2011 -define('GENERATED_CONFIG_CHECK', 23); -$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'CACHE_DIR', 'SIMPLEPIE_CACHE_IMAGES', 'ICONS_DIR', 'ICONS_URL', 'TMP_DIRECTORY', 'DAEMON_SLEEP_INTERVAL', 'DATABASE_BACKED_SESSIONS', 'SESSION_CHECK_ADDRESS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'DAEMON_UPDATE_LOGIN_LIMIT', 'CHECK_FOR_NEW_VERSION', 'DIGEST_ENABLE', 'DIGEST_EMAIL_LIMIT', 'DAEMON_SENDS_DIGESTS', 'MYSQL_CHARSET', 'DEFAULT_UPDATE_METHOD', 'COUNTERS_MAX_AGE', 'DIGEST_FROM_NAME', 'DIGEST_FROM_ADDRESS', 'DIGEST_SUBJECT', 'DIGEST_SMTP_HOST', 'DIGEST_SMTP_LOGIN', 'DIGEST_SMTP_PASSWORD', 'DAEMON_FEED_LIMIT', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'AUTO_CREATE_USER', 'LOCK_DIRECTORY', 'ENABLE_GZIP_OUTPUT', 'PHP_EXECUTABLE', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'FEEDBACK_URL', 'FORCE_ARTICLE_PURGE', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'ISCONFIGURED', 'CONFIG_VERSION'); ?> +<?php # This file has been generated at: Tue Dec 13 18:57:11 MSK 2011 +define('GENERATED_CONFIG_CHECK', 24); +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'TMP_DIRECTORY', 'ICONS_DIR', 'ICONS_URL', 'SIMPLEPIE_CACHE_IMAGES', 'DEFAULT_UPDATE_METHOD', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ALLOW_REMOTE_USER_AUTH', 'AUTO_LOGIN', 'AUTO_CREATE_USER', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'ENABLE_TWEET_BUTTON', 'CONSUMER_KEY', 'CONSUMER_SECRET', 'CHECK_FOR_NEW_VERSION', 'COUNTERS_MAX_AGE', 'ENABLE_GZIP_OUTPUT', 'FEEDBACK_URL', 'CONFIG_VERSION'); ?> diff --git a/include/sessions.php b/include/sessions.php index 8588f5807..5aeda62ff 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -96,7 +96,7 @@ db_query($session_connection, $query); } - if (DATABASE_BACKED_SESSIONS) { + if (!SINGLE_USER_MODE && DB_TYPE == "pgsql") { session_set_save_handler("ttrss_open", "ttrss_close", "ttrss_read", "ttrss_write", "ttrss_destroy", "ttrss_gc"); |