diff options
| -rw-r--r-- | functions.php | 6 | ||||
| -rw-r--r-- | login.php | 2 | ||||
| -rw-r--r-- | mobile/functions.php | 1 | ||||
| -rw-r--r-- | mobile/login.php | 4 | ||||
| -rw-r--r-- | mobile/logout.php | 3 | ||||
| -rw-r--r-- | mobile/tt-rss.php | 3 | ||||
| -rw-r--r-- | sessions.php | 3 |
7 files changed, 15 insertions, 7 deletions
diff --git a/functions.php b/functions.php index 0c1a959a7..c97be42c8 100644 --- a/functions.php +++ b/functions.php @@ -940,7 +940,7 @@ function basic_nosid_redirect_check() { if (!SINGLE_USER_MODE) { - if (!$_COOKIE["ttrss_sid"]) { + if (!$_COOKIE[get_session_cookie_name()]) { $redirect_uri = get_login_redirect(); $return_to = preg_replace('/.*?\//', '', $_SERVER["REQUEST_URI"]); header("Location: $redirect_uri?rt=$return_to"); @@ -1684,4 +1684,8 @@ } } + + function get_session_cookie_name() { + return ((!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME); + } ?> @@ -20,7 +20,7 @@ $password = $_POST["password"]; $return_to = $_POST["rt"]; - if ($_COOKIE["ttrss_sid"]) { + if ($_COOKIE[get_session_cookie_name()]) { require_once "sessions.php"; if ($_SESSION["uid"]) { initialize_user_prefs($link, $_SESSION["uid"]); diff --git a/mobile/functions.php b/mobile/functions.php index 6169a352f..c3d7cdb8c 100644 --- a/mobile/functions.php +++ b/mobile/functions.php @@ -1,5 +1,6 @@ <? define('MOBILE_FEEDLIST_ENABLE_ICONS', false); + define('TTRSS_SESSION_NAME', 'ttrss_m_sid'); function render_feeds_list($link) { diff --git a/mobile/login.php b/mobile/login.php index 051a9eb5d..418a04bd8 100644 --- a/mobile/login.php +++ b/mobile/login.php @@ -1,5 +1,5 @@ <? -// require_once "sessions.php"; + require_once "functions.php"; require_once "../version.php"; require_once "../config.php"; @@ -19,7 +19,7 @@ $password = $_POST["password"]; $return_to = $_POST["rt"]; - if ($_COOKIE["ttrss_sid"]) { + if ($_COOKIE[get_session_cookie_name()]) { require_once "../sessions.php"; if ($_SESSION["uid"]) { initialize_user_prefs($link, $_SESSION["uid"]); diff --git a/mobile/logout.php b/mobile/logout.php index 74e7a228d..f23fd9bb3 100644 --- a/mobile/logout.php +++ b/mobile/logout.php @@ -1,8 +1,9 @@ <? - require_once "../sessions.php"; + require_once "functions.php"; require_once "../config.php"; require_once "../functions.php"; + require_once "../sessions.php"; logout_user(); diff --git a/mobile/tt-rss.php b/mobile/tt-rss.php index bd799dc65..f13a83105 100644 --- a/mobile/tt-rss.php +++ b/mobile/tt-rss.php @@ -1,6 +1,7 @@ <? - require_once "../functions.php"; + require_once "../config.php"; require_once "functions.php"; + require_once "../functions.php"; basic_nosid_redirect_check(); diff --git a/sessions.php b/sessions.php index 4fe1a5845..c64455b61 100644 --- a/sessions.php +++ b/sessions.php @@ -5,9 +5,10 @@ require_once "db.php"; $session_expire = SESSION_EXPIRE_TIME; //seconds + $session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME; ini_set("session.gc_probability", 50); - ini_set("session.name", "ttrss_sid"); + ini_set("session.name", $session_name); ini_set("session.use_only_cookies", true); ini_set("session.gc_maxlifetime", SESSION_EXPIRE_TIME); |