fixed now playing for the API and lack of session extend when using the API

3 files changed, 27 insertions, 3 deletions

diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index 06b5fd2e..8e15c136 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -86,6 +86,10 @@ class Api {
 				$data['type']		= 'api'; 
 				$data['value']		= $timestamp; 
 				$token = vauth::session_create($data); 
+				// Insert the token into the streamer
+				$stream = new Stream(); 
+				$stream->user_id = $client->id; 
+				$stream->insert_session($token); 
 				debug_event('API','Login Success, passphrase matched','1'); 
 
 				return array('auth'=>$token,'api'=>self::$version); 
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index 7a925daa..179e9eed 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -114,12 +114,14 @@ class Stream {
 	 * insert_session
 	 * This inserts a row into the session_stream table
 	 */
-	private function insert_session() { 
+	public function insert_session($sid='') { 
+
+		$sid = $sid ? Dba::escape($sid) : Dba::escape(self::$session); 
 
 		$expire = time() + Config::get('stream_length'); 
 
 		$sql = "INSERT INTO `session_stream` (`id`,`expire`,`user`) " . 
-			"VALUES('" . self::$session . "','$expire','$this->user_id')"; 
+			"VALUES('$sid','$expire','$this->user_id')"; 
 		$db_results = Dba::query($sql); 
 
 		if (!$db_results) { return false; } 
diff --git a/lib/class/vauth.class.php b/lib/class/vauth.class.php
index 8fa547d9..94210381 100644
--- a/lib/class/vauth.class.php
+++ b/lib/class/vauth.class.php
@@ -354,7 +354,6 @@ class vauth {
 				$key = Dba::escape($key); 
 				$time = time(); 
 				$sql = "SELECT * FROM `session` WHERE `id`='$key' AND `expire` > '$time' AND `type`!='api' AND `type`!='xml-rpc'"; 
-debug_event('testo',$sql,'1');
 				$db_results = Dba::query($sql); 
 
 				if (Dba::num_rows($db_results)) { 
@@ -384,6 +383,25 @@ debug_event('testo',$sql,'1');
 	} // session_exists
 
 	/**
+	 * session_extend
+	 * This should really be extend_session but hey you gotta go with the flow
+	 * this takes a SID and extends it's expire
+	 */
+	public static function session_extend($sid) { 
+
+		$sid = Dba::escape($sid); 
+                $expire = isset($_COOKIE[Config::get('session_name') . '_remember']) ? time() + Config::get('remember_length') : time() + Config::get('session_length');
+
+		$sql = "UPDATE `session` SET `expire`='$expire' WHERE `id`='$sid'"; 
+		$db_results = Dba::query($sql); 
+
+		debug_event('SESSION','Session:' . $sid . ' Has been Extended to ' . $expire,'5'); 
+
+		return $db_results; 
+
+	} // session_extend
+
+	/**
 	 * _auto_init
 	 * This function is called when the object is included, this sets up the session_save_handler
 	 */