refs #1681 : modified - sessionvisit table handler when using memcache.

-
Needlworks · Jul 21, 2014 · b6cf6d8 · b6cf6d8
1 parent 960f504
commit b6cf6d8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 25 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -5,23 +5,13 @@
 
 // Define basic signatures.
 define('TEXTCUBE_NAME', 'Textcube');
-<<<<<<< HEAD
 define('TEXTCUBE_VERSION_ID', '2.0 : Alpha 1');
 define('TEXTCUBE_REVISION', 'root-main-trunk');
 define('TEXTCUBE_CODENAME', 'BASELINE');
 define('TEXTCUBE_VERSION', TEXTCUBE_VERSION_ID.' : '.TEXTCUBE_CODENAME);
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2014. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');
 define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/trunk');
-=======
-define('TEXTCUBE_VERSION_ID', '1.10');
-define('TEXTCUBE_REVISION', 'root-main-branch1.10-r33');
-define('TEXTCUBE_CODENAME', 'beta 1');
-define('TEXTCUBE_VERSION', TEXTCUBE_VERSION_ID.' : '.TEXTCUBE_CODENAME);
-define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2014. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
-define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');
-define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.10.0');
->>>>>>> 9e07b3f...  refs #1681 : modified - sessionvisit table handler when using memcache.
 define('TEXTCUBE_NOTICE_URL','http://feeds.feedburner.com/textcube/');
 // Define basic definitions.
 define('CRLF', "\r\n");

diff --git a/framework/legacy/Textcube.Control.Session.Memcached.php b/framework/legacy/Textcube.Control.Session.Memcached.php
@@ -44,12 +44,7 @@ public static function read($id) {
 	}
 
 	public static function write($id, $data) {
-<<<<<<< HEAD
-		return true;  // Bypass.
-		if(is_null(self::$mc)) self::initialize();		
-=======
 		if(is_null(self::$mc)) self::initialize();
->>>>>>> 9e07b3f...  refs #1681 : modified - sessionvisit table handler when using memcache.
 		//return self::$mc->set(self::$context->getProperty('service.domain')."/sessions/{$id}/{$_SERVER['REMOTE_ADDR']}",$data,0,self::$context->getProperty('service.timeout'));
 		//return self::$mc->set(self::$context->getProperty('service.domain')."/sessions/{$id}",$data,0,self::$context->getProperty('service.timeout'));
 	}
@@ -131,13 +126,8 @@ public static function set() {
 			self::setSessionAnonymous($id);
 		}
 	}
-<<<<<<< HEAD
-
-	public static function authorize($blogid, $userid, $expires = null) {
-=======
 
 	public static function authorize($blogid, $userid) {
->>>>>>> 9e07b3f...  refs #1681 : modified - sessionvisit table handler when using memcache.
 		if(is_null(self::$mc)) self::initialize();
 		$session_cookie_path = "/";
 		if( !is_null(self::$context->getProperty('service.session_cookie_path') )) {
@@ -163,13 +153,8 @@ public static function authorize($blogid, $userid) {
 		for ($i = 0; $i < 3; $i++) {
 			$id = dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF)) . dechex(rand(0x10000000, 0x7FFFFFFF));
 			//$result = self::$mc->set(self::$context->getProperty('service.domain')."/authorizedSession/{$id}/{$_SERVER['REMOTE_ADDR']}",$userid,0,self::$context->getProperty('service.timeout'));
-<<<<<<< HEAD
-			$result = self::$mc->set(self::$context->getProperty('service.domain')."/authorizedSession/{$id}",$userid,0,$expires);
-
-=======
 			$result = self::$mc->set(self::$context->getProperty('service.domain')."/authorizedSession/{$id}",$userid,0,self::$context->getProperty('service.timeout'));
 
->>>>>>> 9e07b3f...  refs #1681 : modified - sessionvisit table handler when using memcache.
 			if ($result) {
 				@session_id($id);
 				setcookie( self::getName(), $id, 0, $session_cookie_path, self::$context->getProperty('service.session_cookie_domain'));