prefs: expand feed tree if displaying search results

[tt-rss.git] / config.php-dist

diff --git a/config.php-dist b/config.php-dist
index c0729b61bf36d2d2368c79c695c14ae40bf5c799..7a076d97693c3b8d125b42536b61d335ffe90bf5 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -25,6 +25,11 @@
        // including PUSH, bookmarklets and browser integration will not work properly.
 
        define('FEED_CRYPT_KEY', '');
+       // WARNING: mcrypt is deprecated in php 7.1. This directive exists for backwards
+       // compatibility with existing installs, new passwords are NOT going to be encrypted.
+       // Use update.php --decrypt-feeds to decrypt existing passwords in the database while
+       // mcrypt is still available.
+
        // Key used for encryption of passwords for password-protected feeds
        // in the database. A string of 24 random characters. If left blank, encryption
        // is not used. Requires mcrypt functions.
@@ -94,16 +99,6 @@
        // intervals is disabled and all articles (which are not starred) 
        // older than this amount of days are purged.
 
-       // *** PubSubHubbub settings ***
-
-       define('PUBSUBHUBBUB_HUB', '');
-       // URL to a PubSubHubbub-compatible hub server. If defined, "Published
-       // articles" generated feed would automatically become PUSH-enabled.
-
-       define('PUBSUBHUBBUB_ENABLED', false);
-       // Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
-       // won't try to subscribe to PUSH feed updates.
-
        // ****************************
        // *** Sphinx search plugin ***
        // ****************************
@@ -141,13 +136,6 @@
        // Default lifetime of a session (e.g. login) cookie. In seconds, 
        // 0 means cookie will be deleted when browser closes.
 
-       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
-
        // *********************************
        // *** Email and digest settings ***
        // *********************************
@@ -180,12 +168,6 @@
        define('CHECK_FOR_UPDATES', true);
        // Check for updates automatically if running Git version
  
-       define('DETECT_ARTICLE_LANGUAGE', false);
-       // Detect article language when updating feeds, presently this is only
-       // used for hyphenation. This may increase amount of CPU time used by 
-       // update processes, disable if necessary (i.e. you are being billed
-       // for CPU time).
-
        define('ENABLE_GZIP_OUTPUT', false);
        // Selectively gzip output to improve wire performance. This requires
        // PHP Zlib extension on the server.
@@ -203,10 +185,12 @@
        // reset password link on the login form.
        
        define('LOG_DESTINATION', 'sql');
-       // Log destination to use. Possible values: sql (uses internal logging
+       // Error log destination to use. Possible values: sql (uses internal logging
        // you can read in Preferences -> System), syslog - logs to system log.
        // Setting this to blank uses PHP logging (usually to http server 
        // error.log).
+       // Note that feed updating daemons don't use this logging facility
+       // for normal output.
 
        define('CONFIG_VERSION', 26);
        // Expected config version. Please update this option in config.php