diff options
| -rw-r--r-- | classes/pref/prefs.php | 2 | ||||
| -rw-r--r-- | classes/rpc.php | 2 | ||||
| -rw-r--r-- | config.php-dist | 4 | ||||
| -rw-r--r-- | include/functions.php | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 47f47ae68..35065ea7b 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -114,7 +114,7 @@ class Pref_Prefs extends Handler_Protected { if ($pref_name == "language") { if ($_SESSION["language"] != $value) { setcookie("ttrss_lang", $value, - time() + SESSION_COOKIE_LIFETIME); + time() + COOKIE_LIFETIME_LONG); $_SESSION["language"] = $value; $need_reload = true; diff --git a/classes/rpc.php b/classes/rpc.php index 62d884673..2b07bbf91 100644 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -479,7 +479,7 @@ class RPC extends Handler_Protected { $wide = (int) $_REQUEST["wide"]; setcookie("ttrss_widescreen", $wide, - time() + SESSION_COOKIE_LIFETIME); + time() + COOKIE_LIFETIME_LONG); print json_encode(array("wide" => $wide)); } diff --git a/config.php-dist b/config.php-dist index 72b6fd1b8..58218bab1 100644 --- a/config.php-dist +++ b/config.php-dist @@ -139,10 +139,6 @@ define('SESSION_COOKIE_LIFETIME', 86400); // Default lifetime of a session (e.g. login) cookie. In seconds, // 0 means cookie will be deleted when browser closes. - // Setting this to zero will affect several user preferences - // like widescreen mode not saving and disable "remember me". - // Note that if remember me is not checked, session cookie - // will always expire with browser session. define('SESSION_CHECK_ADDRESS', 1); // Check client IP address when validating session: diff --git a/include/functions.php b/include/functions.php index 5da657f2d..38c3eac32 100644 --- a/include/functions.php +++ b/include/functions.php @@ -5,6 +5,8 @@ define('LABEL_BASE_INDEX', -1024); define('PLUGIN_FEED_BASE_INDEX', -128); + define('COOKIE_LIFETIME_LONG', 86400*365); + $fetch_last_error = false; $fetch_last_error_code = false; $fetch_last_content_type = false; @@ -796,9 +798,9 @@ $_SESSION["last_login_update"] = time(); } - if ($_SESSION["uid"] && $_SESSION["language"] && SESSION_COOKIE_LIFETIME > 0) { + if ($_SESSION["uid"] && $_SESSION["language"]) { setcookie("ttrss_lang", $_SESSION["language"], - time() + SESSION_COOKIE_LIFETIME); + time() + COOKIE_LIFETIME_LONG); } if ($_SESSION["uid"]) { |