From abfbe9c9375c7505e0422b8adc1d9d5426d7df1a Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 10 Apr 2016 16:56:08 -0700
Subject: a few issues: block public not blocking mod_cal, typo in sql for one
 clone file sync operation, fix_system_urls not catching cached contact
 photos, extend sessionhandler expiration when remember_me is enabled as the
 stored session is expiring long before the browser session.

---
 Zotlabs/Web/Session.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'Zotlabs/Web/Session.php')

diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php
index 494c02b1d..d25ce5f6a 100644
--- a/Zotlabs/Web/Session.php
+++ b/Zotlabs/Web/Session.php
@@ -13,6 +13,8 @@ namespace Zotlabs\Web;
 
 class Session {
 
+	private static $handler = null;
+
 	function init() {
 
 		$gc_probability = 50;
@@ -26,6 +28,7 @@ class Session {
 		 */
 
 		$handler = new \Zotlabs\Web\SessionHandler();
+		self::$handler = $handler;
 
 		$x = session_set_save_handler($handler,true);
 		if(! $x)
@@ -67,26 +70,28 @@ class Session {
 
 
 
-	function new_cookie($time) {
+	function new_cookie($xtime) {
+
+		$newxtime = (($xtime> 0) ? (time() + $xtime) : 0);
 
 		$old_sid = session_id();
 
 		session_regenerate_id(false);
 
-		q("UPDATE session SET sid = '%s' WHERE sid = '%s'",
-			dbesc(session_id()),
-			dbesc($old_sid)
-		);
+		if(self::$handler) {
+			$v = q("UPDATE session SET sid = '%s' WHERE sid = '%s'",
+				dbesc(session_id()),
+				dbesc($old_sid)
+			);
+		}
+		else 
+			logger('no session handler');
 
 		if (x($_COOKIE, 'jsAvailable')) {
-			if ($time) {
-				$expires = time() + $time;
-			} else {
-				$expires = 0;
-			}
-			setcookie('jsAvailable', $_COOKIE['jsAvailable'], $expires);
+			setcookie('jsAvailable', $_COOKIE['jsAvailable'], $newxtime);
 		}
-		setcookie(session_name(),session_id(),$expires);
+		setcookie(session_name(),session_id(),$newxtime);
+
 	}
 
 
-- 
cgit v1.2.3