[Logicampus-cvs] logicampus/src/logicreate/lib LC_user.php, 1.34, 1.35

[Mark K <har...@us...>]

Update of /cvsroot/logicampus/logicampus/src/logicreate/lib
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23680

Modified Files:
	LC_user.php 
Log Message:
Fixing some problems after removing the entire user from the session object.


Index: LC_user.php
===================================================================
RCS file: /cvsroot/logicampus/logicampus/src/logicreate/lib/LC_user.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** LC_user.php	26 Jan 2008 02:09:13 -0000	1.34
--- LC_user.php	26 Jan 2008 02:24:19 -0000	1.35
***************
*** 114,117 ****
--- 114,118 ----
  				$temp = lcUser::getUserByPkey($sessArr["_userId"]);
  				$temp->sessionvars = $sessArr;
+ 				$temp->unwrapSessionVars();
  				$temp->_sessionKey = $sessID;
  				$temp->_origChecksum = $origSession;
***************
*** 122,125 ****
--- 123,127 ----
  				$temp = lcUser::getUserByUsername($sessArr["_username"]);
  				$temp->sessionvars = $sessArr;
+ 				$temp->unwrapSessionVars();
  				$temp->_sessionKey = $sessID;
  				$temp->_origChecksum = $origSession;
***************
*** 130,133 ****
--- 132,136 ----
  				$temp = new lcUser();
  				$temp->sessionvars = $sessArr;
+ 				$temp->unwrapSessionVars();
  				$temp->_sessionKey = $sessID;
  				$temp->_origChecksum = $origSession;
***************
*** 381,387 ****
--- 384,403 ----
  	function commitSessionVars() {
  		$this->sessionvars['_userId'] = $this->userId;
+ 		$this->sessionvars['_activeClassTaught'] = $this->activeClassTaught;
+ 		$this->sessionvars['_activeClassTaken'] = $this->activeClassTaken;
+ 		$this->sessionvars['_classesTaken'] = $this->classesTaken;
+ 		$this->sessionvars['_classesTaught'] = $this->classesTaught;
+ 	}
+ 
+ 	function unwrapSessionVars() {
+ 		$this->userId = $this->sessionvars['_userId'];
+ 		$this->activeClassTaught = $this->sessionvars['_activeClassTaught'];
+ 		$this->activeClassTaken = $this->sessionvars['_activeClassTaken'];
+ 		$this->classesTaken = $this->sessionvars['_classesTaken'];
+ 		$this->classesTaught = $this->sessionvars['_classesTaught'];
  	}
  
  
+ 
  	/**
  	 * Saves current session (user->sessionvars) into lcSession table
***************
*** 412,424 ****
  			$val = serialize($sessBlob);
  		}
- 		/*
- 		 */
- 			$val = serialize($sessBlob);
  
  		if ( crc32($val) == $this->_origChecksum) { return true; }
  		$db = DB::getHandle();
  		$sessid = $this->_sessionKey;
! //		$val=base64_encode($val);
! 		$val = addslashes($val);
  		$s="UPDATE lcSessions SET username =\"".$this->username."\", sessdata = \"".$val."\" WHERE sesskey = '".$sessid."'";
  		if ($this->username == "anonymous" ) { 
--- 428,436 ----
  			$val = serialize($sessBlob);
  		}
  
  		if ( crc32($val) == $this->_origChecksum) { return true; }
  		$db = DB::getHandle();
  		$sessid = $this->_sessionKey;
! 		$val=base64_encode($val);
  		$s="UPDATE lcSessions SET username =\"".$this->username."\", sessdata = \"".$val."\" WHERE sesskey = '".$sessid."'";
  		if ($this->username == "anonymous" ) { 
***************
*** 464,468 ****
  		}
  		 */
! 		$this->sessionvars['_username'] = $this->username;
  		if (function_exists("gzcompress")) { 
  			$val = base64_encode(gzcompress(serialize($this->sessionvars)));
--- 476,480 ----
  		}
  		 */
! 		$this->commitSessionVars();
  		if (function_exists("gzcompress")) { 
  			$val = base64_encode(gzcompress(serialize($this->sessionvars)));