public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable-fetches

Browse Source
This commit is contained in:
Barak Korren
2013-04-01 18:39:57 +03:00
parent 32b7a340ad c050148df4
commit 3f44977129
44 changed files with 8257 additions and 3265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions.php
View File

@@ -60,7 +60,7 @@
"nb_NO" => "Norwegian bokmål",
"nl_NL" => "Dutch",
"pl_PL" => "Polski",
// "ru_RU" => "Русский",
"ru_RU" => "Русский",
"pt_BR" => "Portuguese/Brazil",
"zh_CN" => "Simplified Chinese",
"fi_FI" => "Suomi");
@@ -621,6 +621,7 @@
$_SESSION["uid"]);
$_SESSION["ip_address"] = $_SERVER["REMOTE_ADDR"];
$_SESSION["user_agent"] = sha1($_SERVER['HTTP_USER_AGENT']);
$_SESSION["pwd_hash"] = db_fetch_result($result, 0, "pwd_hash");
$_SESSION["last_version_check"] = time();

2
include/localized_schema.php
View File

@@ -1,4 +1,4 @@
<?php # This file has been generated at: Mon Apr 1 16:28:03 MSK 2013
<?php # This file has been generated at: Mon Apr 1 19:15:55 MSK 2013
__("Title");
__("Title or Content");

5
include/sessions.php
View File

@@ -3,6 +3,8 @@
require_once "config.php";
require_once "db.php";
require_once "lib/accept-to-gettext.php";
require_once "lib/gettext/gettext.inc";
$session_expire = max(SESSION_COOKIE_LIFETIME, 86400);
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
@@ -57,6 +59,9 @@
if ($_SESSION["ref_schema_version"] != session_get_schema_version($link, true))
return false;
if (sha1($_SERVER['HTTP_USER_AGENT']) != $_SESSION["user_agent"])
return false;
if ($_SESSION["uid"]) {
$result = db_query($link,
"SELECT pwd_hash FROM ttrss_users WHERE id = '".$_SESSION["uid"]."'");