From 6316898f8de2c5163fef32105427416cedb13fee Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 23 Apr 2013 20:22:55 +0400 Subject: special version reporting for git --- include/version.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'include/version.php') diff --git a/include/version.php b/include/version.php index 61851dffb..07b6c4a00 100644 --- a/include/version.php +++ b/include/version.php @@ -1,3 +1,18 @@ -- cgit v1.2.3-54-g00ecf From 50d4b30b338bae62fd3eb8692ba6b9b6e8e53f26 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Apr 2013 08:56:37 +0400 Subject: get_version: force UTC --- include/version.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include/version.php') diff --git a/include/version.php b/include/version.php index 07b6c4a00..4d088a2bb 100644 --- a/include/version.php +++ b/include/version.php @@ -2,6 +2,7 @@ define('VERSION_STATIC', '1.7.8'); function get_version() { + date_default_timezone_set('UTC'); $root_dir = dirname(dirname(__FILE__)); if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) { -- cgit v1.2.3-54-g00ecf From 3472c4c5696cfa868b16d81c937605258acd2125 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 24 Apr 2013 16:57:24 +0400 Subject: use static version for session checking, show latest changeset for git version instead of head date --- include/functions.php | 2 +- include/sessions.php | 2 +- include/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include/version.php') diff --git a/include/functions.php b/include/functions.php index a41d3a950..39021e9d0 100644 --- a/include/functions.php +++ b/include/functions.php @@ -659,7 +659,7 @@ @session_start(); $_SESSION["uid"] = $user_id; - $_SESSION["version"] = VERSION; + $_SESSION["version"] = VERSION_STATIC; $result = db_query("SELECT login,access_level,pwd_hash FROM ttrss_users WHERE id = '$user_id'"); diff --git a/include/sessions.php b/include/sessions.php index c4876489f..423ef0eda 100644 --- a/include/sessions.php +++ b/include/sessions.php @@ -39,7 +39,7 @@ function validate_session() { if (SINGLE_USER_MODE) return true; - if (VERSION != $_SESSION["version"]) return false; + if (VERSION_STATIC != $_SESSION["version"]) return false; $check_ip = $_SESSION['ip_address']; diff --git a/include/version.php b/include/version.php index 4d088a2bb..0e583f9ec 100644 --- a/include/version.php +++ b/include/version.php @@ -7,7 +7,7 @@ if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) { - $suffix = date("Ymd", filemtime("$root_dir/.git/ORIG_HEAD")); + $suffix = substr(trim(file_get_contents("$root_dir/.git/ORIG_HEAD")), 0, 7); return VERSION_STATIC . ".$suffix"; } else { -- cgit v1.2.3-54-g00ecf