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

simplify default global config, expand sanity_check messages

This commit is contained in:
Andrew Dolgov 2011-12-13 19:20:26 +04:00
parent a3b5394aaf
commit 09e8bdfd18
12 changed files with 283 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -715,12 +715,10 @@ class Feeds extends Protected_Handler {
onclick=\"editArticleNote($id)\" onclick=\"editArticleNote($id)\"
alt='PubNote' title='".__('Edit article note')."'>"; alt='PubNote' title='".__('Edit article note')."'>";
if (DIGEST_ENABLE) {
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\" $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"emailArticle($id)\" onclick=\"emailArticle($id)\"
alt='Zoom' title='".__('Forward by email')."'>"; alt='Zoom' title='".__('Forward by email')."'>";
}
if (ENABLE_TWEET_BUTTON) { if (ENABLE_TWEET_BUTTON) {
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\" $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"

14
classes/pref_users.php
View File

@ -308,16 +308,16 @@ class Pref_Users extends Protected_Handler {
$mail->CharSet = "UTF-8"; $mail->CharSet = "UTF-8";
$mail->From = DIGEST_FROM_ADDRESS; $mail->From = SMTP_FROM_ADDRESS;
$mail->FromName = DIGEST_FROM_NAME; $mail->FromName = SMTP_FROM_NAME;
$mail->AddAddress($email, $login); $mail->AddAddress($email, $login);
if (DIGEST_SMTP_HOST) { if (SMTP_HOST) {
$mail->Host = DIGEST_SMTP_HOST; $mail->Host = SMTP_HOST;
$mail->Mailer = "smtp"; $mail->Mailer = "smtp";
$mail->SMTPAuth = DIGEST_SMTP_LOGIN != ''; $mail->SMTPAuth = SMTP_LOGIN != '';
$mail->Username = DIGEST_SMTP_LOGIN; $mail->Username = SMTP_LOGIN;
$mail->Password = DIGEST_SMTP_PASSWORD; $mail->Password = SMTP_PASSWORD;
} }
$mail->IsHTML(false); $mail->IsHTML(false);

12
classes/rpc.php
View File

@ -570,7 +570,7 @@ class RPC extends Protected_Handler {
$reply = array(); $reply = array();
if (DIGEST_ENABLE && $_SESSION['email_secretkey'] && if ($_SESSION['email_secretkey'] &&
$secretkey == $_SESSION['email_secretkey']) { $secretkey == $_SESSION['email_secretkey']) {
$_SESSION['email_secretkey'] = ''; $_SESSION['email_secretkey'] = '';
@ -593,12 +593,12 @@ class RPC extends Protected_Handler {
$mail->FromName = $fromname; $mail->FromName = $fromname;
$mail->AddAddress($destination); $mail->AddAddress($destination);
if (DIGEST_SMTP_HOST) { if (SMTP_HOST) {
$mail->Host = DIGEST_SMTP_HOST; $mail->Host = SMTP_HOST;
$mail->Mailer = "smtp"; $mail->Mailer = "smtp";
$mail->SMTPAuth = DIGEST_SMTP_LOGIN != ''; $mail->SMTPAuth = SMTP_LOGIN != '';
$mail->Username = DIGEST_SMTP_LOGIN; $mail->Username = SMTP_LOGIN;
$mail->Password = DIGEST_SMTP_PASSWORD; $mail->Password = SMTP_PASSWORD;
} }
$mail->IsHTML(false); $mail->IsHTML(false);

223
config.php-dist
View File

@ -1,5 +1,8 @@
<?php <?php
// Database server configuration // *******************************************
// *** Database configuration (important!) ***
// *******************************************
define('DB_TYPE', "pgsql"); // or mysql define('DB_TYPE', "pgsql"); // or mysql
define('DB_HOST', "localhost"); define('DB_HOST', "localhost");
define('DB_USER', "fox"); define('DB_USER', "fox");
@ -7,24 +10,40 @@
define('DB_PASS', "XXXXXX"); define('DB_PASS', "XXXXXX");
//define('DB_PORT', '5432'); // when neeeded, PG-only //define('DB_PORT', '5432'); // when neeeded, PG-only
define('MYSQL_CHARSET', 'UTF8');
// Connection charset for MySQL. If you have a legacy database and/or experience
// garbage unicode characters with this option, try setting it to a blank string.
// ***********************************
// *** Basic settings (important!) ***
// ***********************************
define('SELF_URL_PATH', 'http://yourserver/tt-rss/'); define('SELF_URL_PATH', 'http://yourserver/tt-rss/');
// Full URL of your tt-rss installation. This should be set to the // Full URL of your tt-rss installation. This should be set to the
// location of tt-rss directory, e.g. http://yourserver/tt-rss/ // location of tt-rss directory, e.g. http://yourserver/tt-rss/
// You need to set this option correctly otherwise several features // You need to set this option correctly otherwise several features
// including PUSH, bookmarklets and browser integration will not work properly. // including PUSH, bookmarklets and browser integration will not work properly.
define('SINGLE_USER_MODE', true); define('SINGLE_USER_MODE', false);
// Operate in single user mode, disables all functionality related to // Operate in single user mode, disables all functionality related to
// multiple users. // multiple users.
// *****************************
// *** Files and directories ***
// *****************************
define('PHP_EXECUTABLE', '/usr/bin/php');
// Path to PHP executable, used for various command-line tt-rss programs
define('LOCK_DIRECTORY', 'lock');
// Directory for lockfiles, must be writable to the user you run
// daemon process or cronjobs under.
define('CACHE_DIR', 'cache'); define('CACHE_DIR', 'cache');
// Local cache directory for RSS feed content. // Local cache directory for RSS feed content.
define('SIMPLEPIE_CACHE_IMAGES', false); define('TMP_DIRECTORY', '/tmp');
// Allow caching feed images when using SimplePie, to bypass hotlink // Directory for temporary files
// prevention and such at expense of local disk space and bandwidth.
// Note that you (or your users) also have to enable image caching
// in feed editor.
define('ICONS_DIR', "feed-icons"); define('ICONS_DIR', "feed-icons");
define('ICONS_URL', "feed-icons"); define('ICONS_URL', "feed-icons");
@ -32,82 +51,51 @@
// Unless you really know what you're doing, please keep those relative // Unless you really know what you're doing, please keep those relative
// to tt-rss main directory. // to tt-rss main directory.
define('TMP_DIRECTORY', '/tmp'); // *********************
// Directory for temporary files // *** Feed settings ***
// *********************
define('DAEMON_SLEEP_INTERVAL', 120); define('SIMPLEPIE_CACHE_IMAGES', false);
// Interval between update daemon update runs // Allow caching feed images when using SimplePie, to bypass hotlink
// prevention and such at expense of local disk space and bandwidth.
define('DATABASE_BACKED_SESSIONS', false); // Note that you (or your users) also have to enable image caching
// Store session information in a database, recommended for multiuser // in feed editor.
// configurations. Doesn't seem to work for everyone, so enable with caution.
// tt-rss uses default PHP session storing mechanism if disabled.
define('SESSION_CHECK_ADDRESS', 1);
// Check client IP address when validating session:
// 0 - disable checking
// 1 - check first 3 octets of an address (recommended)
// 2 - check first 2 octets of an address
// 3 - check entire address
define('SESSION_COOKIE_LIFETIME', 0);
// Default lifetime of a session (e.g. login) cookie. In seconds,
// 0 means cookie will be deleted when browser closes.
define('SESSION_EXPIRE_TIME', 86400);
// Hard expiration limit for sessions. Should be
// greater or equal to SESSION_COOKIE_LIFETIME
define('DAEMON_UPDATE_LOGIN_LIMIT', 0);
// Stop updating feeds of user who haven't logged in specified
// amount of days. 0 disables.
define('CHECK_FOR_NEW_VERSION', true);
// Check for new versions of tt-rss automatically.
define('DIGEST_ENABLE', true);
// Global option to enable daily digests. Also toggles the ability of users
// to forward articles by email.
define('DIGEST_EMAIL_LIMIT', 10);
// The maximum amount of emails sent in one digest batch
define('DAEMON_SENDS_DIGESTS', true);
// If update daemon and update_feeds should send digests
// Disable if you prefer querying special URL (see wiki)
define('MYSQL_CHARSET', 'UTF8');
// Connection charset for MySQL. If you have a legacy database and/or experience
// garbage unicode characters with this option, try setting it to a blank string.
define('DEFAULT_UPDATE_METHOD', 0); define('DEFAULT_UPDATE_METHOD', 0);
// Which feed parsing library to use as default: // Which feed parsing library to use as default:
// 0 - Magpie // 0 - Magpie
// 1 - SimplePie // 1 - SimplePie
define('COUNTERS_MAX_AGE', 365); define('FORCE_ARTICLE_PURGE', 0);
// Hard limit for unread counters calculation. Try tweaking this // When this option is not 0, users ability to control feed purging
// parameter to speed up tt-rss when having a huge number of articles // intervals is disabled and all articles (which are not starred)
// in the database (better yet, enable purging!) // older than this amount of days are purged.
define('DIGEST_FROM_NAME', 'Tiny Tiny RSS'); // *** PubSubHubbub settings ***
define('DIGEST_FROM_ADDRESS', 'noreply@your.domain.dom');
// Name, address and subject for sending outgoing mail. This applies
// to password reset notifications, digest emails and any other mail.
define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours'); define('PUBSUBHUBBUB_HUB', '');
// Subject line for email digests // URL to a PubSubHubbub-compatible hub server. If defined, "Published
// articles" generated feed would automatically become PUSH-enabled.
define('DIGEST_SMTP_HOST', ''); define('PUBSUBHUBBUB_ENABLED', true);
// SMTP Host to send outgoing mail. Blank - use system MTA. // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
// won't try to subscribe to PUSH feed updates.
define('DIGEST_SMTP_LOGIN', ''); // *********************
define('DIGEST_SMTP_PASSWORD', ''); // *** Sphinx search ***
// These two options enable SMTP authentication when sending // *********************
// outgoing mail. Require DIGEST_SMTP_HOST.
define('DAEMON_FEED_LIMIT', 100); define('SPHINX_ENABLED', false);
// Limits the amount of feeds daemon (or a cronjob) updates on one run // Enable fulltext search using Sphinx (http://www.sphinxsearch.com)
// Please see http://tt-rss.org/wiki/SphinxSearch for more information.
define('SPHINX_INDEX', 'ttrss');
// Index name in Sphinx configuration. You can specify multiple indexes
// as a comma-separated string.
// **********************
// *** Authentication ***
// **********************
define('ALLOW_REMOTE_USER_AUTH', false); define('ALLOW_REMOTE_USER_AUTH', false);
// Set to 'true' if you trust your web server's REMOTE_USER // Set to 'true' if you trust your web server's REMOTE_USER
@ -127,16 +115,9 @@
// You want new users to be automaticaly created in tt-rss database // You want new users to be automaticaly created in tt-rss database
// on first login // on first login
define('LOCK_DIRECTORY', 'lock'); // ***********************************
// Directory for lockfiles, must be writable to the user you run // *** Self-registrations by users ***
// daemon process or cronjobs under. // ***********************************
define('ENABLE_GZIP_OUTPUT', false);
// Selectively gzip output to improve wire performance. This requires
// PHP Zlib extension on the server.
define('PHP_EXECUTABLE', '/usr/bin/php');
// Path to PHP executable
define('ENABLE_REGISTRATION', false); define('ENABLE_REGISTRATION', false);
// Allow users to register themselves. Please be vary that allowing // Allow users to register themselves. Please be vary that allowing
@ -151,22 +132,48 @@
// Maximum amount of users which will be allowed to register on this // Maximum amount of users which will be allowed to register on this
// system. 0 - no limit. // system. 0 - no limit.
define('FEEDBACK_URL', ''); // **********************************
// Displays an URL for users to provide feedback or comments regarding // *** Cookies and login sessions ***
// this instance of tt-rss. Can lead to a forum, contact email, etc. // **********************************
define('FORCE_ARTICLE_PURGE', 0); define('SESSION_COOKIE_LIFETIME', 0);
// When this option is not 0, users ability to control feed purging // Default lifetime of a session (e.g. login) cookie. In seconds,
// intervals is disabled and all articles (which are not starred) // 0 means cookie will be deleted when browser closes.
// older than this amount of days are purged.
define('SPHINX_ENABLED', false); define('SESSION_EXPIRE_TIME', 86400);
// Enable fulltext search using Sphinx (http://www.sphinxsearch.com) // Hard expiration limit for sessions. Should be
// Please see http://tt-rss.org/wiki/SphinxSearch for more information. // greater or equal to SESSION_COOKIE_LIFETIME
define('SPHINX_INDEX', 'ttrss'); define('SESSION_CHECK_ADDRESS', 1);
// Index name in Sphinx configuration. You can specify multiple indexes // Check client IP address when validating session:
// as a comma-separated string. // 0 - disable checking
// 1 - check first 3 octets of an address (recommended)
// 2 - check first 2 octets of an address
// 3 - check entire address
// *********************************
// *** Email and digest settings ***
// *********************************
define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
define('SMTP_FROM_ADDRESS', 'noreply@your.domain.dom');
// Name, address and subject for sending outgoing mail. This applies
// to password reset notifications, digest emails and any other mail.
define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
// Subject line for email digests
define('SMTP_HOST', '');
// SMTP Host to send outgoing mail. Blank - use system MTA.
define('SMTP_LOGIN', '');
define('SMTP_PASSWORD', '');
// These two options enable SMTP authentication when sending
// outgoing mail. Only used with SMTP_HOST
// ************************************
// *** Twitter integration settings ***
// ************************************
define('ENABLE_TWEET_BUTTON', false); define('ENABLE_TWEET_BUTTON', false);
// Enable 'tweet this' button for articles // Enable 'tweet this' button for articles
@ -176,19 +183,27 @@
// Your OAuth instance authentication information for Twitter, visit // Your OAuth instance authentication information for Twitter, visit
// http://twitter.com/oauth_clients to register your instance. // http://twitter.com/oauth_clients to register your instance.
define('PUBSUBHUBBUB_HUB', ''); // ***************************************
// URL to a PubSubHubbub-compatible hub server. If defined, "Published // *** Other settings (less important) ***
// articles" generated feed would automatically become PUSH-enabled. // ***************************************
define('PUBSUBHUBBUB_ENABLED', true); define('CHECK_FOR_NEW_VERSION', true);
// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss // Check for new versions of tt-rss automatically.
// won't try to subscribe to PUSH feed updates.
define('ISCONFIGURED', false); define('COUNTERS_MAX_AGE', 365);
// Please set this to true if you have read everything above and // Hard limit for unread counters calculation. Try tweaking this
// finished setting configuration options. // parameter to speed up tt-rss when having a huge number of articles
// in the database (better yet, enable purging!)
define('CONFIG_VERSION', 23); define('ENABLE_GZIP_OUTPUT', false);
// Selectively gzip output to improve wire performance. This requires
// PHP Zlib extension on the server.
define('FEEDBACK_URL', '');
// Displays an URL for users to provide feedback or comments regarding
// this instance of tt-rss. Can lead to a forum, contact email, etc.
define('CONFIG_VERSION', 24);
// Expected config version. Please update this option in config.php // Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file). // if necessary (after migrating all new options from this file).

4
include/db.php
View File

@ -22,7 +22,7 @@ function db_connect($host, $user, $pass, $db) {
$link = pg_connect($string); $link = pg_connect($string);
if (!$link) { 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; return $link;
@ -36,7 +36,7 @@ function db_connect($host, $user, $pass, $db) {
} }
return $link; return $link;
} else { } else {
die("Connection failed: " . mysql_error($link)); die("Unable to connect to database (as $user to $host, database $db): " . mysql_error());
} }
} }
} }

20
include/functions.php
View File

@ -2639,9 +2639,7 @@
require_once 'lib/phpmailer/class.phpmailer.php'; require_once 'lib/phpmailer/class.phpmailer.php';
if (!DIGEST_ENABLE) return false; $user_limit = 15; // amount of users to process (e.g. emails to send out)
$user_limit = DIGEST_EMAIL_LIMIT;
$days = 1; $days = 1;
print "Sending digests, batch of max $user_limit users, days = $days, headline limit = $limit\n\n"; 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->CharSet = "UTF-8";
$mail->From = DIGEST_FROM_ADDRESS; $mail->From = SMTP_FROM_ADDRESS;
$mail->FromName = DIGEST_FROM_NAME; $mail->FromName = SMTP_FROM_NAME;
$mail->AddAddress($line["email"], $line["login"]); $mail->AddAddress($line["email"], $line["login"]);
if (DIGEST_SMTP_HOST) { if (SMTP_HOST) {
$mail->Host = DIGEST_SMTP_HOST; $mail->Host = SMTP_HOST;
$mail->Mailer = "smtp"; $mail->Mailer = "smtp";
$mail->SMTPAuth = DIGEST_SMTP_LOGIN != ''; $mail->SMTPAuth = SMTP_LOGIN != '';
$mail->Username = DIGEST_SMTP_LOGIN; $mail->Username = SMTP_LOGIN;
$mail->Password = DIGEST_SMTP_PASSWORD; $mail->Password = SMTP_PASSWORD;
} }
$mail->IsHTML(true); $mail->IsHTML(true);
@ -3288,12 +3286,10 @@
onclick=\"editArticleNote($id)\" onclick=\"editArticleNote($id)\"
alt='PubNote' title='".__('Edit article note')."'>"; alt='PubNote' title='".__('Edit article note')."'>";
if (DIGEST_ENABLE) {
$rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\" $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\"
class='tagsPic' style=\"cursor : pointer\" class='tagsPic' style=\"cursor : pointer\"
onclick=\"emailArticle($id)\" onclick=\"emailArticle($id)\"
alt='Zoom' title='".__('Forward by email')."'>"; alt='Zoom' title='".__('Forward by email')."'>";
}
if (ENABLE_TWEET_BUTTON) { if (ENABLE_TWEET_BUTTON) {
$rv['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\" $rv['content'] .= "<img src=\"".theme_image($link, 'images/art-tweet.png')."\"

8
include/rssfuncs.php
View File

@ -1,4 +1,8 @@
<?php <?php
define('DAEMON_UPDATE_LOGIN_LIMIT', 30);
define('DAEMON_FEED_LIMIT', 100);
define('DAEMON_SLEEP_INTERVAL', 120);
function update_feedbrowser_cache($link) { function update_feedbrowser_cache($link) {
$result = db_query($link, "SELECT feed_url, site_url, title, COUNT(id) AS subscribers $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 // 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. // 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") { if (DB_TYPE == "pgsql") {
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'"; $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
} else { } else {
@ -143,7 +147,7 @@
} }
// Send feed digests by email if needed. // Send feed digests by email if needed.
if (DAEMON_SENDS_DIGESTS) send_headlines_digests($link); send_headlines_digests($link);
} // function update_daemon_common } // function update_daemon_common

142
include/sanity_check.php
View File

@ -2,79 +2,41 @@
require_once "functions.php"; require_once "functions.php";
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print "<b>Fatal Error</b>: You forgot to copy $err_msg = "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.";
<b>config.php-dist</b> to <b>config.php</b> and edit it.\n"; } else {
exit;
}
define('EXPECTED_CONFIG_VERSION', 23); define('EXPECTED_CONFIG_VERSION', 24);
define('SCHEMA_VERSION', 86); define('SCHEMA_VERSION', 86);
require_once "config.php"; require_once "config.php";
require_once "sanity_config.php"; require_once "sanity_config.php";
if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) { if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
$err_msg = "config: your config file version is incorrect. See config.php-dist.\n"; $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.";
} }
$purifier_cache_dir = CACHE_DIR . "/htmlpurifier"; $purifier_cache_dir = CACHE_DIR . "/htmlpurifier";
if (!is_writable($purifier_cache_dir)) { if (!is_writable($purifier_cache_dir)) {
$err_msg = "config: HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)"; $err_msg = "HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)";
} }
if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) { 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"; $err_msg = "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh";
} }
foreach ($requred_defines as $d) { foreach ($requred_defines as $d) {
if (!defined($d)) { if (!defined($d)) {
$err_msg = "config: required constant $d is not defined. Please check config.php"; $err_msg = "Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.";
} }
} }
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";
}
if (SESSION_EXPIRE_TIME < 60) { if (SESSION_EXPIRE_TIME < 60) {
$err_msg = "config: SESSION_EXPIRE_TIME is too low (less than 60)"; $err_msg = "SESSION_EXPIRE_TIME set in config.php is too low, please set it to an integer value >= 60";
} }
if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) { if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME) {
$err_msg = "config: SESSION_EXPIRE_TIME should be greater or equal to" . $err_msg = "SESSION_EXPIRE_TIME set in config.php should be >= to SESSION_COOKIE_LIFETIME";
"SESSION_COOKIE_LIFETIME";
}
/* if (defined('DISABLE_SESSIONS')) {
$err_msg = "config: you have enabled DISABLE_SESSIONS. Please disable this option.";
} */
if (DATABASE_BACKED_SESSIONS && SINGLE_USER_MODE) {
$err_msg = "config: DATABASE_BACKED_SESSIONS is incompatible with SINGLE_USER_MODE";
}
if (DATABASE_BACKED_SESSIONS && DB_TYPE == "mysql") {
$err_msg = "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL";
} }
if (SINGLE_USER_MODE) { if (SINGLE_USER_MODE) {
@ -84,92 +46,90 @@
$result = db_query($link, "SELECT id FROM ttrss_users WHERE id = 1"); $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."; $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 (defined('ENABLE_SIMPLEPIE')) {
$err_msg = "config: ENABLE_SIMPLEPIE is obsolete and replaced with DEFAULT_UPDATE_METHOD. Please adjust your config.php.";
}
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 (SELF_URL_PATH == "http://yourserver/tt-rss/") { if (SELF_URL_PATH == "http://yourserver/tt-rss/") {
$err_msg = "config: please set SELF_URL_PATH to the correct value."; 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)) { if (!is_writable(ICONS_DIR)) {
$err_msg = "config: your ICONS_DIR (" . ICONS_DIR . ") is not writable.\n"; $err_msg = "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n";
} }
if (ini_get("open_basedir")) { if (ini_get("open_basedir")) {
$err_msg = "php.ini: open_basedir is not supported."; $err_msg = "PHP configuration option open_basedir is not supported. Please disable this in PHP settings file (php.ini).";
} }
if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) { if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
$err_msg = "php.ini: either allow_url_fopen or CURL needs to be enabled."; $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 (!function_exists("json_encode")) { if (!function_exists("json_encode")) {
$err_msg = "PHP: json functions not found."; $err_msg = "PHP support for JSON is required, but was not found.";
} }
if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) { if (DB_TYPE == "mysql" && !function_exists("mysql_connect")) {
$err_msg = "PHP: MySQL functions not found."; $err_msg = "PHP support for MySQL is required for configured DB_TYPE in config.php.";
} }
if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) { if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
$err_msg = "PHP: PostgreSQL functions not found."; $err_msg = "PHP support for PostgreSQL is required for configured DB_TYPE in config.php";
} }
if (!function_exists("mb_strlen")) { if (!function_exists("mb_strlen")) {
$err_msg = "PHP: mbstring functions not found."; $err_msg = "PHP support for mbstring functions is required, but was not found.";
} }
if (!function_exists("ctype_lower")) { if (!function_exists("ctype_lower")) {
$err_msg = "PHP: ctype functions not found (required for HTMLPurifier)."; $err_msg = "PHP support for ctype functions are required by HTMLPurifier.";
} }
if (ini_get("safe_mode")) { 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."; $err_msg = "PHP safe mode setting is not supported.";
} }
if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) { if ((PUBSUBHUBBUB_HUB || PUBSUBHUBBUB_ENABLED) && !function_exists("curl_init")) {
$err_msg = "CURL is required for PubSubHubbub support."; $err_msg = "PHP support for CURL is required for PubSubHubbub.";
} }
if (!class_exists("DOMDocument")) { if (!class_exists("DOMDocument")) {
$err_msg = "PHP: DOMDocument extension not found."; $err_msg = "PHP support for DOMDocument is required, but was not found.";
}
} }
if (SELF_URL_PATH == "http://local.host/tt-rss") { if ($err_msg) { ?>
$err_msg = "config: please set SELF_URL_PATH to the correct value"; <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 (!ISCONFIGURED) { <div class="floatingLogo"><img src="images/logo_wide.png"></div>
$err_msg = "config: please read config.php completely.";
}
if ($err_msg) { <h1>Fatal error</h1>
print "<b>Fatal Error</b>: $err_msg\n";
exit; <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>
<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>
<body>
<?php echo format_error($err_msg) ?>
</body>
</html>
<?php
die;
} }
?> ?>

6
include/sanity_config.php
View File

@ -1,3 +1,3 @@
<?php # This file has been generated at: Tue Apr 26 18:40:48 MSD 2011 <?php # This file has been generated at: Tue Dec 13 18:57:11 MSK 2011
define('GENERATED_CONFIG_CHECK', 23); define('GENERATED_CONFIG_CHECK', 24);
$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'); ?> $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'); ?>

2
include/sessions.php
View File

@ -96,7 +96,7 @@
db_query($session_connection, $query); db_query($session_connection, $query);
} }
if (DATABASE_BACKED_SESSIONS) { if (!SINGLE_USER_MODE && DB_TYPE == "pgsql") {
session_set_save_handler("ttrss_open", session_set_save_handler("ttrss_open",
"ttrss_close", "ttrss_read", "ttrss_write", "ttrss_close", "ttrss_read", "ttrss_write",
"ttrss_destroy", "ttrss_gc"); "ttrss_destroy", "ttrss_gc");

24
register.php
View File

@ -311,15 +311,15 @@
$mail->CharSet = "UTF-8"; $mail->CharSet = "UTF-8";
$mail->From = DIGEST_FROM_ADDRESS; $mail->From = SMTP_FROM_ADDRESS;
$mail->FromName = DIGEST_FROM_NAME; $mail->FromName = SMTP_FROM_NAME;
$mail->AddAddress($email); $mail->AddAddress($email);
if (DIGEST_SMTP_HOST) { if (SMTP_HOST) {
$mail->Host = DIGEST_SMTP_HOST; $mail->Host = SMTP_HOST;
$mail->Mailer = "smtp"; $mail->Mailer = "smtp";
$mail->Username = DIGEST_SMTP_LOGIN; $mail->Username = SMTP_LOGIN;
$mail->Password = DIGEST_SMTP_PASSWORD; $mail->Password = SMTP_PASSWORD;
} }
// $mail->IsHTML(true); // $mail->IsHTML(true);
@ -345,15 +345,15 @@
$mail->CharSet = "UTF-8"; $mail->CharSet = "UTF-8";
$mail->From = DIGEST_FROM_ADDRESS; $mail->From = SMTP_FROM_ADDRESS;
$mail->FromName = DIGEST_FROM_NAME; $mail->FromName = SMTP_FROM_NAME;
$mail->AddAddress(REG_NOTIFY_ADDRESS); $mail->AddAddress(REG_NOTIFY_ADDRESS);
if (DIGEST_SMTP_HOST) { if (SMTP_HOST) {
$mail->Host = DIGEST_SMTP_HOST; $mail->Host = SMTP_HOST;
$mail->Mailer = "smtp"; $mail->Mailer = "smtp";
$mail->Username = DIGEST_SMTP_LOGIN; $mail->Username = SMTP_LOGIN;
$mail->Password = DIGEST_SMTP_PASSWORD; $mail->Password = SMTP_PASSWORD;
} }
// $mail->IsHTML(true); // $mail->IsHTML(true);

1
utility.css
View File

@ -60,7 +60,6 @@ div.error {
padding : 5px; padding : 5px;
margin : 0px 0px 5px 0px; margin : 0px 0px 5px 0px;
font-size : 9pt; font-size : 9pt;
width : 50%;
} }
h1 { h1 {