From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 23 May 2006 05:07:38 +0000 (+0100)
Subject: mobile version uses separate sid
X-Git-Tag: 1.2.0~35
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3dd46f19db3d6ce71a65ea7c1013e16125a24ccc;p=tt-rss.git

mobile version uses separate sid
---

diff --git a/functions.php b/functions.php
index 0c1a959a..c97be42c 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);
+	}
 ?>
diff --git a/login.php b/login.php
index 06b95353..a7b6ca42 100644
--- a/login.php
+++ b/login.php
@@ -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 6169a352..c3d7cdb8 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 051a9eb5..418a04bd 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 74e7a228..f23fd9bb 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 bd799dc6..f13a8310 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 4fe1a584..c64455b6 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);