new CONFIG_VERSION configuration option

diff --git a/backend.php b/backend.php
index 482874d21e6c117977a25fc55db6d753fe88716c..8acf268685a75d53215b45f9ec7896aaed4dbd96 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -4120,11 +4120,20 @@
 
        function check_configuration_variables() {
                if (!defined('SESSION_EXPIRE_TIME')) {
-                       return "SESSION_EXPIRE_TIME is undefined";
+                       return "config: SESSION_EXPIRE_TIME is undefined";
                }
 
                if (SESSION_EXPIRE_TIME < 60) {
-                       return "SESSION_EXPIRE_TIME is too low (less than 60)";
+                       return "config: SESSION_EXPIRE_TIME is too low (less than 60)";
+               }
+
+               if (SESSION_EXPIRE_TIME < SESSION_COOKIE_LIFETIME_REMEMBER) {
+                       return "config: SESSION_EXPIRE_TIME should be greater or equal to" .
+                               "SESSION_COOKIE_LIFETIME_REMEMBER";
+               }
+
+               if (defined('DISABLE_SESSIONS') && DISABLE_SESSIONS) {
+                       return "config: you have enabled DISABLE_SESSIONS. Please disable this option.";
                }
 
                return false;

diff --git a/config.php-dist b/config.php-dist
index 94437041aa825f64fc48bcbae896eddc51865cd3..fa7376af75c1a78d41332d54b6c883db610e55df 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -119,5 +119,9 @@
        // Hard expiration limit for sessions. Should be
        // >= SESSION_COOKIE_LIFETIME_REMEMBER
 
+       define('CONFIG_VERSION', 1);
+       // Expected config version. Please updated this option in config.php
+       // if necessary (after migrating all new options from this file).
+
        // vim:ft=php
 ?>

diff --git a/sanity_check.php b/sanity_check.php
index 21fc08199591495323083230c3aec2188d53aee5..e8b1ca34cc1f3cadc879b40af0a2de8f679e74a1 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,10 +1,19 @@
 <?
+       define('EXPECTED_CONFIG_VERSION', 1);
+
        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.";
                exit;
        }
 
+       if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
+                       print "<b>Fatal Error</b>: Your configuration file has
+                       wrong version. Please copy new options from <b>config.php-dist</b> and
+                       update CONFIG_VERSION directive.";
+               exit;   
+       }
+
        if (!file_exists("magpierss/rss_fetch.inc")) {
                print "<b>Fatal Error</b>: You forgot to place 
                <a href=\"http://magpierss.sourceforge.net\">MagpieRSS</a>
@@ -13,6 +22,10 @@
                exit;
        }
 
+               if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
+                       return "config: your config file version is incorrect. See config.php-dist.";
+               }
+
        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