servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-30 12:30:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

Browse Source
This commit is contained in:
Andrew Dolgov 2009-12-16 16:40:22 +03:00
commit d960219b0f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/index.php
View File

@ -12,6 +12,12 @@
$session_expire = SESSION_EXPIRE_TIME; //seconds
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid_api" : TTRSS_SESSION_NAME . "_api";
session_name($session_name);
if ($_REQUEST["sid"]) {
session_id($_REQUEST["sid"]);
}
session_start();
if (!$link) {
@ -57,7 +63,7 @@
if (get_pref($link, "ENABLE_API_ACCESS", $uid)) {
if (authenticate_user($link, $login, $password)) {
print json_encode(array("uid" => $_SESSION["uid"]));
print json_encode(array("session_id" => session_id()));
} else {
print json_encode(array("error" => "LOGIN_ERROR"));
}
@ -68,7 +74,7 @@
break;
case "logout":
logout_user();
print json_encode(array("uid" => 0));
print json_encode(array("status" => "OK"));
break;
case "isLoggedIn":
print json_encode(array("status" => $_SESSION["uid"] != ''));