Index: trunk/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r1795 -r2261
--- trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 1795)
+++ trunk/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 2261)
@@ -5,7 +5,7 @@
 	/**
 	* Description
 	*
-	* @var DBConnection
+	* @var kDBConnection
 	* @access public
 	*/
 	var $Conn;
Index: trunk/core/kernel/utility/iterator.php
===================================================================
diff -u -N
--- trunk/core/kernel/utility/iterator.php	(revision 1560)
+++ trunk/core/kernel/utility/iterator.php	(revision 0)
@@ -1,51 +0,0 @@
-<?php
-
-	// OLD STUFF
-
-class MyIterator {
-	
-	var $Items;
-	var $Index;
-	var $Count;
-	var $CurrentIndex;
-	
-	function MyIterator(&$items)
-	{
-		$this->Items =& $items;
-		$this->IndexItems();
-		$this->CurrentIndex = 0;
-	}
-	
-	function IndexItems()
-	{
-		$i = 0;
-		foreach ($this->Items as $key => $item) {
-			$this->Index[$i] = $key; // ?????? $i++
-			$i++;
-		}
-		$this->Count = $i;
-	}
-	
-	function HasMore()
-	{
-		return $this->CurrentIndex < $this->Count;
-	}
-	
-	function GoNext()
-	{
-		$this->CurrentIndex++;
-	}
-	
-	function &GetItem()
-	{
-		return $this->Items[$this->Index[$this->CurrentIndex]];
-	}
-
-	function GetKey()
-	{
-		return $this->Index[$this->CurrentIndex];
-	}
-
-}
-
-?>
\ No newline at end of file
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql
===================================================================
diff -u -N -r2234 -r2261
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql	(.../inportal_upgrade_v1.1.1.sql)	(revision 2234)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.1.sql	(.../inportal_upgrade_v1.1.1.sql)	(revision 2261)
@@ -32,5 +32,6 @@
 INSERT INTO Events VALUES ('', 'USER.MEMBERSHIP_EXPIRATION_NOTICE', '1', '0', 'In-Portal:Users', 'la_event_user.membership_expiration_notice', '1');
 
 ALTER TABLE UserGroup ADD MembershipExpires INT UNSIGNED DEFAULT NULL AFTER GroupId;
+ALTER TABLE PersistantSessionData ADD PRIMARY KEY (PortalUserId, VariableName);
 
 UPDATE Modules SET Version = '1.1.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r1560 -r2261
--- trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 1560)
+++ trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 2261)
@@ -24,7 +24,7 @@
 	/**
 	* Description
 	*
-	* @var DBConnection
+	* @var kDBConnection
 	* @access public
 	*/
 	var $Conn;
Index: trunk/core/kernel/utility/configuration.php
===================================================================
diff -u -N
--- trunk/core/kernel/utility/configuration.php	(revision 1560)
+++ trunk/core/kernel/utility/configuration.php	(revision 0)
@@ -1,87 +0,0 @@
-<?php
-
-
-// need to be rewrited
-
-class ConfigItem extends kDBItem
-{
-	var $Application;
-	
-	function ConfigItem($Id)
-	{
-		$this->Application =& KernelApplication::Instance(); 
-		$this->id_field = 'name';
-		$this->table_name = 'config';
-		$this->CreateField('name','',1,1);
-		$this->CreateField('value','',1,1);
-		$this->CreateField('config_description','', 0, 0);
-		$this->DisplayErrors = 0;
-		$this->DisplayQueries = 0;
-		parent::DBItem($Id);
-	}
-	
-	function Update()
-	{
-		$ret = parent::Update();
-		// echo " update ".$this->GetDBField('name')."<br>";
-		if ( $ret AND ereg("(per_page)",$this->GetDBField('name'))) {
-			$this->Application->StoreVar(
-				$this->GetDBField('name'),
-				$this->GetDBField('value')
-			);
-		}
-		return $ret;
-	}
-}
-
-class ConfigList extends kDBList
-{
-	function ConfigList($sql, $query_now=0, $owner=null)
-	{
-		parent::kDBList($sql, $query_now, $owner);
-		$this->Special = $owner->Params['special'];
-		switch ($this->Special) 
-		{
-			default:  
-				$this->sql = " SELECT * FROM config ";
-		};
-		$this->DisplayQueries = 0;
-	} 
-	
-	function &NewItem ()
-	{
-		$new_item = new ConfigItem(NULL);
-		return $new_item;
-	}
-	
-	function GetOption($name)
-	{
-		if ($this->Find('name', $name))
-			return $this->GetCurrentFieldValue('value');
-		else
-			return false;
-	}
-	
-	function SetOption($name, $value)
-	{
-		if ($this->Find('name', $name)) {;
-			$this->SetCurrentFieldValue('value', $value);
-			$tmp =& $this->GetCurrentRec();
-			$tmp->Update();
-		}
-		else {
-			$push_hash =  Array('name'=>$name, 'value'=>$value);
-			$id = array_push($this->Records, $push_hash);
-			if (count($this->IndexFields) > 0) {
-	    	foreach ($this->IndexFields as $key) {
-	    		if (is_string($push_hash[$key])) $store_key = strtolower($push_hash[$key]);
-	    		else $store_key = $push_hash[$key];
-					$this->Indexes[$key][$store_key] = $id-1;
-				}	
-	    }
-	    $this->last_rec++;
-		}
-	}
-}
-
-?>
\ No newline at end of file
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r2184 -r2261
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 2184)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 2261)
@@ -331,10 +331,10 @@
   PortalUserId int(11) NOT NULL default '0',
   VariableName varchar(255) NOT NULL default '',
   VariableValue text NOT NULL,
+  PRIMARY KEY  (PortalUserId,VariableName),
   KEY UserId (PortalUserId),
   KEY VariableName (VariableName)
 )
-
 # --------------------------------------------------------
 
 CREATE TABLE Phrase (
Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r2117 -r2261
--- trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 2117)
+++ trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 2261)
@@ -33,7 +33,7 @@
 		/**
 		* Description
 		*
-		* @var DBConnection
+		* @var kDBConnection
 		* @access public
 		*/
 		var $Conn;
Index: trunk/core/kernel/utility/utilities.php
===================================================================
diff -u -N
--- trunk/core/kernel/utility/utilities.php	(revision 1560)
+++ trunk/core/kernel/utility/utilities.php	(revision 0)
@@ -1,41 +0,0 @@
-<?php
-
-	// OLD STUFF
-
-class Utilites extends kBase {
-	
-	function ExtractByMask($array, $mask, $key_id=1, $ret_mode=1)
-	{
-//		 echo "extracting from <br>";
-//		 print_pre($array);
-		$rets = Array();
-		foreach ($array as $name => $val)
-		{
-			$regs = Array();
-//			 echo "checking $name<br>";
-			if (eregi($mask, $name, $regs)) {
-//				 echo "matched<br>";
-//				 print_pre($regs);
-				if ($ret_mode == 1) {
-					$rets[$regs[$key_id]] = $val;
-				}
-				else {
-					array_push($regs, $val);
-					$a_key = $regs[$key_id];
-					$i = 0;
-					while (array_key_exists($a_key, $rets)) {
-						$a_key.=$i;
-						$i++;
-					}
-					$rets[$a_key] = $regs;
-				}
-			}
-		}
-//		echo "returning ";
-//		print_pre($rets);
-		return $rets;
-	}
-		
-}
-
-?>
\ No newline at end of file
Index: trunk/core/kernel/languages/phrases_cache.php
===================================================================
diff -u -N -r2232 -r2261
--- trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 2232)
+++ trunk/core/kernel/languages/phrases_cache.php	(.../phrases_cache.php)	(revision 2261)
@@ -5,7 +5,7 @@
 	/**
 	* Connection to database
 	*
-	* @var DBConnection
+	* @var kDBConnection
 	* @access public
 	*/
 	var $Conn;
Index: trunk/core/kernel/kbase.php
===================================================================
diff -u -N -r2232 -r2261
--- trunk/core/kernel/kbase.php	(.../kbase.php)	(revision 2232)
+++ trunk/core/kernel/kbase.php	(.../kbase.php)	(revision 2261)
@@ -96,7 +96,7 @@
 	/**
 	* Connection to database
 	*
-	* @var DBConnection
+	* @var kDBConnection
 	* @access public
 	*/
 	var $Conn;