Index: trunk/kernel/include/config.php
===================================================================
diff -u -r2743 -r2882
--- trunk/kernel/include/config.php	(.../config.php)	(revision 2743)
+++ trunk/kernel/include/config.php	(.../config.php)	(revision 2882)
@@ -1,6 +1,4 @@
 <?php
-require_once($pathtoroot."kernel/include/db.class.php");
-require_once($pathtoroot."kernel/include/adodb/adodb.inc.php");
 
 class clsConfig
 {
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r2849 -r2882
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2849)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2882)
@@ -582,6 +582,13 @@
 		$sql = 'REPLACE INTO '.GetTablePrefix().'SessionData (SessionKey,VariableName,VariableValue) VALUES (%s,%s,%s)';
 		$db->Execute( sprintf($sql, $db->qstr($sessionkey), $db->qstr($variableName), $db->qstr($variableValue) ) );
 		
+		if( class_exists('kApplication') )
+		{
+//			echo 'var stored ['.$variableName.'] = ['.$variableValue.']<br>';
+			$application =& kApplication::Instance();
+			$application->StoreVar($variableName, $variableValue);
+		}
+		
 		//			echo "<BR>UPDATE: $sql<BR>";
 		//}
 	}
Index: trunk/kernel/include/item.php
===================================================================
diff -u -r2734 -r2882
--- trunk/kernel/include/item.php	(.../item.php)	(revision 2734)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 2882)
@@ -1,6 +1,4 @@
 <?php
-require_once($pathtoroot."kernel/include/itemreview.php");
-require_once($pathtoroot."kernel/include/itemrating.php");
 
 class clsItem extends clsParsedItem
 {
Index: trunk/kernel/startup.php
===================================================================
diff -u -r2853 -r2882
--- trunk/kernel/startup.php	(.../startup.php)	(revision 2853)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 2882)
@@ -17,7 +17,6 @@
 		// KENEL4 INIT: BEGIN
 		if($FrontEnd != 1 && !defined('ADMIN') ) define('ADMIN', 1);
 		
-		
 		define('APPLICATION_CLASS', 'MyApplication');
 		include_once(FULL_PATH.'/kernel/kernel4/startup.php');
 		
@@ -63,7 +62,7 @@
     startup.php: this is the primary startup sequence for in-portal services    
 */
 
-if( file_exists($pathtoroot.'debug.php') && !defined('DEBUG_MODE') ) include_once($pathtoroot.'debug.php');
+if( file_exists(FULL_PATH.'/debug.php') && !defined('DEBUG_MODE') ) include_once(FULL_PATH.'/debug.php');
 if( !defined('DEBUG_MODE') ) error_reporting(0);
 
 ini_set('memory_limit', '32M');
@@ -73,10 +72,10 @@
 $FormError = array();
 $FormValues = array();
 /* include PHP version compatibility functions */
-require_once($pathtoroot."compat.php");
+require_once(FULL_PATH.'/compat.php');
 /* set global variables and module lists */
 
-include_once($pathtoroot.'kernel/include/'.( IsDebugMode() ? 'debugger.php' : 'debugger_dummy.php') );
+include_once(FULL_PATH.'/kernel/include/'.( IsDebugMode() ? 'debugger.php' : 'debugger_dummy.php') );
 
 	// put all non-checked checkboxes in $_POST & $_REQUEST with 0 values
 	if( GetVar('form_fields') )
@@ -90,15 +89,19 @@
 
 LogEntry("Initalizing System..\n");
 /* for 64 bit timestamps */
-require_once($pathtoroot."kernel/include/adodb/adodb-time.inc.php");
-require_once($pathtoroot."kernel/include/dates.php");
+require_once(FULL_PATH.'/kernel/include/adodb/adodb-time.inc.php');
+require_once(FULL_PATH.'/kernel/include/dates.php');
 
 /* create the global error object */
-require_once($pathtoroot."kernel/include/error.php");
+require_once(FULL_PATH.'/kernel/include/error.php');
 $Errors = new clsErrorManager();
 
-require_once($pathtoroot."kernel/include/itemdb.php");
-require_once($pathtoroot."kernel/include/config.php");
+require_once(FULL_PATH.'/kernel/include/itemdb.php');
+
+require_once(FULL_PATH.'/kernel/include/db.class.php'); // moved from kernel/include/config.php
+require_once(FULL_PATH.'/kernel/include/adodb/adodb.inc.php'); // moved from kernel/include/config.php
+
+require_once(FULL_PATH.'/kernel/include/config.php');
 /* create the global configuration object */
 LogEntry("Creating Config Object..\n");
 $objConfig = new clsConfig();
@@ -107,50 +110,54 @@
 if( defined('ADODB_EXTENSION') && constant('ADODB_EXTENSION') > 0 )
 	LogEntry("ADO Extension: ".ADODB_EXTENSION."\n");	
 
-require_once($pathtoroot."kernel/include/parseditem.php");
-require_once($pathtoroot."kernel/include/item.php");
-require_once($pathtoroot."kernel/include/syscache.php");
-require_once($pathtoroot."kernel/include/modlist.php");
-require_once($pathtoroot."kernel/include/searchconfig.php");
-require_once($pathtoroot."kernel/include/banrules.php");
+require_once(FULL_PATH.'/kernel/include/parseditem.php');
 
+require_once(FULL_PATH.'/kernel/include/itemreview.php'); // moved from kernel/include/item.php
+require_once(FULL_PATH.'/kernel/include/itemrating.php'); // moved from kernel/include/item.php
+
+require_once(FULL_PATH.'/kernel/include/item.php');
+require_once(FULL_PATH.'/kernel/include/syscache.php');
+require_once(FULL_PATH.'/kernel/include/modlist.php');
+require_once(FULL_PATH.'/kernel/include/searchconfig.php');
+require_once(FULL_PATH.'/kernel/include/banrules.php');
+
 $objModules = new clsModList();
 $objSystemCache = new clsSysCacheList();
 $objSystemCache->PurgeExpired();
 $objBanList = new clsBanRuleList();
 
-require_once($pathtoroot."kernel/include/image.php");
+require_once(FULL_PATH.'/kernel/include/image.php');
 
-require_once($pathtoroot."kernel/include/itemtypes.php");
+require_once(FULL_PATH.'/kernel/include/itemtypes.php');
 $objItemTypes = new clsItemTypeList();
 
-require_once($pathtoroot."kernel/include/theme.php");
+require_once(FULL_PATH.'/kernel/include/theme.php');
 $objThemes = new clsThemeList();
 
-require_once($pathtoroot."kernel/include/language.php");
+require_once(FULL_PATH.'/kernel/include/language.php');
 $objLanguages = new clsLanguageList();
 $objImageList = new clsImageList();
 
 /* Load session and user class definitions */
 //require_once("include/customfield.php");
 //require_once("include/custommetadata.php");
-require_once($pathtoroot."kernel/include/usersession.php");
-require_once($pathtoroot."kernel/include/favorites.php");
-require_once($pathtoroot."kernel/include/portaluser.php");
-require_once($pathtoroot."kernel/include/portalgroup.php");
+require_once(FULL_PATH.'/kernel/include/usersession.php');
+require_once(FULL_PATH.'/kernel/include/favorites.php');
+require_once(FULL_PATH.'/kernel/include/portaluser.php');
+require_once(FULL_PATH.'/kernel/include/portalgroup.php');
 
 /* create the user management class */
 $objFavorites = new clsFavoriteList();
 $objUsers = new clsUserManager();
 $objGroups = new clsGroupList();
 
-require_once($pathtoroot."kernel/include/cachecount.php");
-require_once($pathtoroot."kernel/include/customfield.php");
-require_once($pathtoroot."kernel/include/custommetadata.php");
-require_once($pathtoroot."kernel/include/permissions.php");
-require_once($pathtoroot."kernel/include/relationship.php");
-require_once($pathtoroot."kernel/include/category.php");
-require_once($pathtoroot."kernel/include/statitem.php");
+require_once(FULL_PATH.'/kernel/include/cachecount.php');
+require_once(FULL_PATH.'/kernel/include/customfield.php');
+require_once(FULL_PATH.'/kernel/include/custommetadata.php');
+require_once(FULL_PATH.'/kernel/include/permissions.php');
+require_once(FULL_PATH.'/kernel/include/relationship.php');
+require_once(FULL_PATH.'/kernel/include/category.php');
+require_once(FULL_PATH.'/kernel/include/statitem.php');
 /* category base class, used by all the modules at some point */
 $objPermissions = new clsPermList();
 $objPermCache = new clsPermCacheList();
@@ -160,19 +167,19 @@
 $objCustomDataList = new clsCustomDataList();
 $objCountCache = new clsCacheCountList();
  
-require_once($pathtoroot."kernel/include/smtp.php");
-require_once($pathtoroot."kernel/include/emailmessage.php");
-require_once($pathtoroot."kernel/include/events.php");
+require_once(FULL_PATH.'/kernel/include/smtp.php');
+require_once(FULL_PATH.'/kernel/include/emailmessage.php');
+require_once(FULL_PATH.'/kernel/include/events.php');
 LogEntry("Creating Mail Queue..\n");
 $objMessageList = new clsEmailMessageList();
 $objEmailQueue = new clsEmailQueue();
 LogEntry("Done creating Mail Queue Objects\n");
 
-require_once($pathtoroot."kernel/include/searchitems.php");
-require_once($pathtoroot."kernel/include/advsearch.php");
+require_once(FULL_PATH.'/kernel/include/searchitems.php');
+require_once(FULL_PATH.'/kernel/include/advsearch.php');
 
-require_once($pathtoroot."kernel/include/parse.php");
-require_once($pathtoroot."kernel/include/socket.php");
+require_once(FULL_PATH.'/kernel/include/parse.php');
+require_once(FULL_PATH.'/kernel/include/socket.php');
   
 /* responsible for including module code as required 
    This script also creates an instance of the user session onject and
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -r2853 -r2882
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 2853)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 2882)
@@ -47,6 +47,8 @@
     $objCustomDataList->CreateEmptyEditTable("CustomDataId");
     $objImages->CreateEmptyEditTable("ResourceId");  
     $objUserGroupsList->CreateEmptyEditTable("PortalUserId");
+    
+    $objItemTypes->BuildUserItemTable(-1, 1); // 0 - user_id, 1 - clear table
 }
 else
 {   
Index: trunk/admin/include/elements.php
===================================================================
diff -u -r2853 -r2882
--- trunk/admin/include/elements.php	(.../elements.php)	(revision 2853)
+++ trunk/admin/include/elements.php	(.../elements.php)	(revision 2882)
@@ -454,6 +454,12 @@
  </body>
 </html>
 END;
+
+	if( class_exists('kApplication') )
+	{
+		$application =& kApplication::Instance();
+		$application->Done();	
+	}
 }//Page Footer
 
 
Index: trunk/kernel/include/systemconfiguration.php
===================================================================
diff -u -r534 -r2882
--- trunk/kernel/include/systemconfiguration.php	(.../systemconfiguration.php)	(revision 534)
+++ trunk/kernel/include/systemconfiguration.php	(.../systemconfiguration.php)	(revision 2882)
@@ -1,6 +1,7 @@
 <?php
+// file pending deletion, not in use
 
-$pathtoroot="";
+/*$pathtoroot="";
 for ($i=0;$i+1<(count(explode("/",$GLOBALS["SCRIPT_NAME"]))-2);$i++)
     $pathtoroot.="../";
 
@@ -206,5 +207,5 @@
     var $m_DBSchemaVersion;
     var $m_SystemSecurityContextId;
 	var $m_ModuleList;
-}
+}*/
 ?>
Index: trunk/kernel/include/init.php
===================================================================
diff -u -r13 -r2882
--- trunk/kernel/include/init.php	(.../init.php)	(revision 13)
+++ trunk/kernel/include/init.php	(.../init.php)	(revision 2882)
@@ -1 +1,4 @@
-$lid=0;
+<?php
+// file not in use, pending for deletion
+//	$lid = 0;
+?>
\ No newline at end of file
Index: trunk/kernel/include/error.php
===================================================================
diff -u -r13 -r2882
--- trunk/kernel/include/error.php	(.../error.php)	(revision 13)
+++ trunk/kernel/include/error.php	(.../error.php)	(revision 2882)
@@ -1,7 +1,5 @@
 <?php
 
-//require_once("languagecache.php");
-
 class clsError
 {
     var $m_Message;
Index: trunk/kernel/include/itemdb.php
===================================================================
diff -u -r2082 -r2882
--- trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 2082)
+++ trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 2882)
@@ -391,6 +391,7 @@
   function DetectChanges($name, $value)
   {  	
   	global $objSession;
+  	if( !is_object($objSession) ) return false;
   	
   	//echo "<b>class: ".get_class($this)."</b><br>";
 	if ($this->Data[$name] != $value && $value != '') {