X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fsession.php;h=055bfcb4ef3cf3ff48e3a6da7b330ed02d35ccf1;hb=ec9dddb4458c8b98796d3884de33002b879ff7a7;hp=23066be42470e1183d4577a88015f14c89ba8285;hpb=bc407080d2832b2096b0f46e715d4f0fe2b97670;p=friendica.git

diff --git a/include/session.php b/include/session.php
index 23066be424..055bfcb4ef 100644
--- a/include/session.php
+++ b/include/session.php
@@ -1,30 +1,44 @@
 <?php
-
 // Session management functions. These provide database storage of PHP
 // session info.
 
+require_once('include/cache.php');
+
 $session_exists = 0;
 $session_expire = 180000;
 
-if(! function_exists('ref_session_open')) {
-function ref_session_open ($s,$n) {
+function ref_session_open($s, $n) {
 	return true;
-}}
+}
 
-if(! function_exists('ref_session_read')) {
-function ref_session_read ($id) {
+function ref_session_read($id) {
 	global $session_exists;
-	if(x($id))
-		$r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
 
-	if(count($r)) {
+	if (!x($id)) {
+		return '';
+	}
+
+	$memcache = cache::memcache();
+	if (is_object($memcache)) {
+		$data = $memcache->get(get_app()->get_hostname().":session:".$id);
+		if (!is_bool($data)) {
+			return $data;
+		}
+		logger("no data for session $id", LOGGER_TRACE);
+		return '';
+	}
+
+	$r = q("SELECT `data` FROM `session` WHERE `sid`= '%s'", dbesc($id));
+
+	if (dbm::is_result($r)) {
 		$session_exists = true;
 		return $r[0]['data'];
 	} else {
 		logger("no data for session $id", LOGGER_TRACE);
 	}
+
 	return '';
-}}
+}
 
 /**
  * @brief Standard PHP session write callback
@@ -49,16 +63,19 @@ function ref_session_write($id, $data) {
 	$expire = time() + $session_expire;
 	$default_expire = time() + 300;
 
-	if ($session_exists) {
-		$r = q("UPDATE `session`
-				SET `data` = '%s'
-				WHERE `sid` = '%s' AND `data` != '%s'",
-				dbesc($data), dbesc($data), dbesc($id));
+	$memcache = cache::memcache();
+	$a = get_app();
+	if (is_object($memcache) AND is_object($a)) {
+		$memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire);
+		return true;
+	}
 
+	if ($session_exists) {
 		$r = q("UPDATE `session`
-				SET `expire` = '%s'
-				WHERE `sid` = '%s' AND `expire` != '%s'",
-				dbesc($expire), dbesc($expire), dbesc($id));
+				SET `data` = '%s', `expire` = '%s'
+				WHERE `sid` = '%s'
+				AND (`data` != '%s' OR `expire` != '%s')",
+				dbesc($data), dbesc($expire), dbesc($id), dbesc($data), dbesc($expire));
 	} else {
 		$r = q("INSERT INTO `session`
 				SET `sid` = '%s', `expire` = '%s', `data` = '%s'",
@@ -68,22 +85,28 @@ function ref_session_write($id, $data) {
 	return true;
 }
 
-if(! function_exists('ref_session_close')) {
 function ref_session_close() {
 	return true;
-}}
+}
+
+function ref_session_destroy($id) {
+	$memcache = cache::memcache();
+
+	if (is_object($memcache)) {
+		$memcache->delete(get_app()->get_hostname().":session:".$id);
+		return true;
+	}
 
-if(! function_exists('ref_session_destroy')) {
-function ref_session_destroy ($id) {
 	q("DELETE FROM `session` WHERE `sid` = '%s'", dbesc($id));
+
 	return true;
-}}
+}
 
-if(! function_exists('ref_session_gc')) {
 function ref_session_gc($expire) {
 	q("DELETE FROM `session` WHERE `expire` < %d", dbesc(time()));
+
 	return true;
-}}
+}
 
 $gc_probability = 50;
 
@@ -91,7 +114,8 @@ ini_set('session.gc_probability', $gc_probability);
 ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_httponly', 1);
 
-if (!get_config('system', 'disable_database_session'))
+if (!get_config('system', 'disable_database_session')) {
 	session_set_save_handler('ref_session_open', 'ref_session_close',
 				'ref_session_read', 'ref_session_write',
 				'ref_session_destroy', 'ref_session_gc');
+}