summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/errorhandler.php2
-rw-r--r--include/functions.php3
-rw-r--r--include/sessions.php10
3 files changed, 12 insertions, 3 deletions
diff --git a/include/errorhandler.php b/include/errorhandler.php
index 2ad0be062..3211599ba 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -8,7 +8,7 @@ function format_backtrace($trace) {
if (isset($e["file"]) && isset($e["line"])) {
$fmt_args = [];
- if (is_array($e["args"])) {
+ if (is_array($e["args"] ?? false)) {
foreach ($e["args"] as $a) {
if (is_object($a)) {
array_push($fmt_args, "{" . get_class($a) . "}");
diff --git a/include/functions.php b/include/functions.php
index 922d3765c..36519fd44 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -157,8 +157,7 @@
require_once 'controls.php';
require_once 'controls_compat.php';
- define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . Config::get_version() . ' (http://tt-rss.org/)');
- ini_set('user_agent', SELF_USER_AGENT);
+ ini_set('user_agent', Config::get_user_agent());
/* compat shims */
diff --git a/include/sessions.php b/include/sessions.php
index 7f61f6dbe..52ab80b71 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -19,6 +19,16 @@
ini_set("session.gc_maxlifetime", $session_expire);
ini_set("session.cookie_lifetime", "0");
+ // prolong PHP session cookie
+ if (isset($_COOKIE[$session_name]))
+ setcookie($session_name,
+ $_COOKIE[$session_name],
+ time() + $session_expire,
+ ini_get("session.cookie_path"),
+ ini_get("session.cookie_domain"),
+ ini_get("session.cookie_secure"),
+ ini_get("session.cookie_httponly"));
+
function validate_session() {
if (\Config::get(\Config::SINGLE_USER_MODE)) return true;