Version 3.4.5

upload/admin/sources/classes/session/api.php

@@ -4,11 +4,11 @@
  *~TERABYTE_DOC_READY~
  * $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
  * $License: http://www.invisionpower.com/company/standards.php#license$
- * $Author: bfarber $
+ * $Author: mmecham $
  * @since		Friday 12th November 2010 16:58
- * $LastChangedDate: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
- * @version		v3.3.4
- * $Revision: 10914 $
+ * $LastChangedDate: 2012-08-22 05:05:53 -0400 (Wed, 22 Aug 2012) $
+ * @version		v3.4.5
+ * $Revision: 11245 $
  */
 
 /**
@@ -348,7 +348,7 @@ class session_api
 	}
 	
 	/**
-	 * Log user in remotely.
+	 * Log user in remotely if user is not logged in.
 	 * @param	array	Array of member data (member_id, etc) or Id
 	 */
 	public function logGuestInAsMember( $member )
@@ -359,17 +359,31 @@ class session_api
 		}
 		
 		/* Check for existing session */
-		$ip = ipsRegistry::member()->ip_address;
+		$ip       = ipsRegistry::member()->ip_address;
 		$_session = $this->DB->buildAndFetch( array( 'select'	=> '*',
 										   			 'from'	    => 'sessions',
 													 'where'    => "ip_address='{$ip}'" ) );
 				
-		if ( !$_session['id'] or !$_session['member_id'] )
+		if ( ! $_session['id'] or ! $_session['member_id'] )
 		{
 			$this->_getSessionClass()->convertGuestToMember( $member, $member );
 		}
 	}
 	
+	/**
+	 * Log user in remotely overwriting a different accounts log in if need be.
+	 * @param	array	Array of member data (member_id, etc) or Id
+	 */
+	public function logInAsMember( $member )
+	{
+		if ( is_numeric( $member ) )
+		{
+			$member = IPSMember::load( $member );
+		}
+	
+		$this->_getSessionClass()->convertGuestToMember( $member, $member );
+	}
+	
 	/**
 	 * Load session class if not loaded
 	 */