Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r3907 -r4077
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 3907)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 4077)
@@ -666,6 +666,8 @@
     var $QueryDone = false;
     var $LastQuerySQL = '';
     
+    var $Prefix = '';
+    var $Special = '';
     
 	/**
 	 * Application object
@@ -820,7 +822,7 @@
     
     }
     
-    function CopyResource($OldId,$NewId)
+    function CopyResource($OldId,$NewId, $main_prefix)
     {
     	$this->Clear();
     	
@@ -837,6 +839,7 @@
     		}
     	}
     }
+    
     function ItemsOnClipboard()
     {
     	global $objSession;
@@ -1237,11 +1240,8 @@
         $sql = "SELECT * FROM $edit_table";
         $rs = $this->adodbConnection->Execute($sql);
         
-        //echo "In Main <b>CopyFromEditTable</b> in class <b>".get_class($this).'</b><br>';
-        //echo $sql."<BR>";
-    	
-        while($rs && !$rs->EOF)
-        {
+        $item_ids = Array();
+        while ($rs && !$rs->EOF) {
             $data = $rs->fields;            
             $c = new $this->classname;
             $c->SetFromArray($data);
@@ -1269,7 +1269,7 @@
                }               	
                $c->Create();
             }
-            $item_ids[]=$c->UniqueId(); // save item id for future use
+            $item_ids[] = $c->UniqueId(); // save item id for future use
           	if(is_numeric($c->Get("ResourceId")))
 			{							
                 if( isset($c->Related) && is_object($c->Related) )
Index: trunk/admin/category/addcategory_custom.php
===================================================================
diff -u -N -r2853 -r4077
--- trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 2853)
+++ trunk/admin/category/addcategory_custom.php	(.../addcategory_custom.php)	(revision 4077)
@@ -39,6 +39,7 @@
 }
 unset($objEditItems);
 
+$application->SetVar('c_mode', 't');
 $objEditItems = new clsCatList();
 $objEditItems->SourceTable = $objSession->GetEditTable("Category");
 
@@ -121,10 +122,10 @@
       $fieldid = $field->Get("CustomFieldId");
 
 		$CF=$field->GetAdminUI();
-		if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE)))
-			if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"))))
-				$CF->default_value = $cv->Get("Value");
-
+		if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE))) {
+			$CF->default_value = $c->GetCustomFieldValue(substr($CF->name,1), '', 0, true);
+  		}
+  		
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
 
Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -N -r4029 -r4077
--- trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4029)
+++ trunk/core/units/categories/categories_config.php	(.../categories_config.php)	(revision 4077)
@@ -11,6 +11,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4	=>	'mode',
 											),
 					'AggregateTags' => Array(
 															Array(
@@ -40,6 +41,8 @@
 																FROM %1$s
 																LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
 
+					'SubItems'			=>	Array('c-cdata'),
+					
 					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -N -r4029 -r4077
--- trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4029)
+++ trunk/kernel/units/categories/categories_config.php	(.../categories_config.php)	(revision 4077)
@@ -11,6 +11,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4	=>	'mode',
 											),
 					'AggregateTags' => Array(
 															Array(
@@ -40,6 +41,8 @@
 																FROM %1$s
 																LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryCustomData cust ON %1$s.ResourceId = cust.ResourceId'),
 
+					'SubItems'			=>	Array('c-cdata'),
+					
 					'ListSortings'	=> 	Array(
 																'' => Array(
 																	'ForcedSorting' => Array("CurrentSort" => 'asc', 'Priority' => 'desc', 'Name' => 'asc'),
Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r3895 -r4077
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 3895)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 4077)
@@ -29,6 +29,7 @@
 $objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
+$application->SetVar('u_mode', 't');
 $objCustomFields = new clsCustomFieldList(6);
 $objRelList = new clsRelationshipList();
 $objImages = new clsImageList();
@@ -44,7 +45,7 @@
     $action = "m_add_user";
     $objUsers->CreateEmptyEditTable("PortalUserId");
     $objRelList->CreateEmptyEditTable("RelationshipId");
-    $objCustomDataList->CreateEmptyEditTable("CustomDataId");
+    $objCustomDataList->CreateEmptyEditTable('u');
     $objImages->CreateEmptyEditTable("ResourceId");  
     $objUserGroupsList->CreateEmptyEditTable("PortalUserId");
     
@@ -75,7 +76,7 @@
         $user_ids[] = $u->Get("PortalUserId");
         $ids = $objEditItems->GetResourceIDList();
         $objRelList->CopyToEditTable("SourceId",$ids);
-        $objCustomDataList->CopyToEditTable("ResourceId",$ids);
+        $objCustomDataList->CopyToEditTable('u', $ids);
         $objImages->CopyToEditTable("ResourceId",$ids);
         $objUserGroupsList->CopyToEditTable("PortalUserId", $user_ids);
     }
@@ -335,42 +336,31 @@
         {
         	$n = substr($f->name,1); // TabIndex
         	$cfield = $objCustomFields->GetItemByField('FieldName',$n,FALSE);
-        	if(is_object($cfield))
-        	{
-        		$cv = $objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"));
-        		if(is_object($cv))
-        		{
-        	      $f->default_value = $cv->Get("Value");
-        		}
+        	if (is_object($cfield)) {
+				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
             
             print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";       
-            if(is_object($f->NextItem))
-            {
+            if (is_object($f->NextItem)) {
                 $n = $f->NextItem;
                 print "  <td>".$n->ItemFormElement(17)."</TD>";       
             }
-            else
-              print "  <td><span class=\"text\">&nbsp;</span></td>\n";
+            else {
+              	print "  <td><span class=\"text\">&nbsp;</span></td>\n";
+            }
             print "</tr>\n";
         }
     }
   }
   $objCustomDataList->SetTable('live');
 }
 ?>
-  <tr <?php int_table_color(); ?>> 
-    <td colspan="3"> 
-	  <input type="hidden" name="Action" value="<?php echo $action; ?>">
+</table>
+<input type="hidden" name="Action" value="<?php echo $action; ?>">
 	  <input type="hidden" name="user_id" value="<?php echo $c->Get("PortalUserId"); ?>">
       <input type="hidden" name="UserEditStatus" VALUE="0">
-   </td>
-  </tr>
-    </td>
-  </tr>
-</table>
 </form>
 <script src="<?php echo $adminURL; ?>/include/calendar.js"></script>
 <SCRIPT language="JavaScript">
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r3983 -r4077
--- trunk/kernel/action.php	(.../action.php)	(revision 3983)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4077)
@@ -75,6 +75,8 @@
         	break;
 
 		case "m_add_user":
+			$application =& kApplication::Instance();
+        	$application->SetVar('u_mode', 't');
 	  	  	$dupe_user = '';
 			//$user_pending = (int)$_POST["user_pending"];
 			//$user_enabled = (int)$_POST["user_enabled"];
@@ -144,15 +146,18 @@
             			}
             		}
             	}
-            	if($DataChanged)
-            		$objCustomEdit->SaveData();
+            	if ($DataChanged) {
+            		$objCustomEdit->SaveData('u', $u->Get('ResourceId'));
+            	}
 
             	$objCustomEdit->SetTable('live');
 			}
 
 			break;
 
 		case "m_edit_user":
+			$application =& kApplication::Instance();
+        	$application->SetVar('u_mode', 't');
 			//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat(0, true));
          	//$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
             $dob = DateTimestamp($_POST["user_dob"],GetDateFormat(0, true));
@@ -208,8 +213,9 @@
             	}
             }
 
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$objCustomEdit->SaveData('u', $u->Get('ResourceId'));
+            }
             $objCustomEdit->SetTable('live');
 			break;
 
@@ -780,6 +786,9 @@
 
 
      case "m_add_category":
+     	$application =& kApplication::Instance();
+        $application->SetVar('c_mode', 't');
+        
          if (ValidDate($_POST['cat_date'], GetDateFormat(0, true))) {
 			$CreatedOn = DateTimestamp($_POST['cat_date'],GetDateFormat(0, true));
          }
@@ -817,12 +826,16 @@
             		}
             	}
             }
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$objCustomEdit->SaveData('c', $cat->Get('ResourceId'));
+            }
 
      break;
 
-     case "m_edit_category":
+	case "m_edit_category":
+     	$application =& kApplication::Instance();
+        $application->SetVar('c_mode', 't');
+        	
          $CreatedOn = DateTimestamp($_POST["cat_date"],GetDateFormat(0, true));
          $cat_pick = GetVar('cat_pick');
          $Status = (int)$_POST["status"];
@@ -878,8 +891,9 @@
             		}
             	}
          }
-         if($DataChanged)
-         	$objCustomEdit->SaveData();
+         if ($DataChanged) {
+         	$objCustomEdit->SaveData('c', $cat->Get('ResourceId'));
+         }
 
      break;
      case "m_edit_custom_data":
@@ -903,8 +917,15 @@
             		}
             	}
             }
-            if($DataChanged)
-            	$objCustomEdit->SaveData();
+            if ($DataChanged) {
+            	$db =& GetADODBConnection(true);
+            	$sql = 'SELECT Prefix
+            			FROM '.TABLE_PREFIX.'ItemTypes
+            			WHERE ItemType = '.GetVar('CustomType');
+            	$main_prefix = $db->GetOne($sql);
+            	$application->SetVar($main_prefix.'_mode', 't');
+            	$objCustomEdit->SaveData($main_prefix, $id);
+            }
 /*
      	$id = $_POST["ItemId"];
         $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData"));
@@ -2471,12 +2492,8 @@
 	    }
 
 	    $cat_ids = $objCatList->CopyFromEditTable("CategoryId");
-	    if($cat_ids)
-		{
-			$db =& GetADODBConnection();
-			$sql = 'SELECT ResourceId FROM '.$objCatList->SourceTable.' WHERE CategoryId IN ('.implode(',', $cat_ids).')';
-			$rids = $db->GetCol($sql);
-			$objCustomDataList->CopyFromEditTable("CustomDataId", $rids);
+	    if ($cat_ids) {
+			$objCustomDataList->CopyFromEditTable('c');
 		}
 	    $objCatList->Clear();
 
@@ -2490,7 +2507,7 @@
 	if( GetVar('CatEditStatus') == 2 )
 	{
 	    $objCatList->PurgeEditTable("CategoryId");
-	    $objCustomDataList->PurgeEditTable("CustomDataId");
+	    $objCustomDataList->PurgeEditTable('c');
 	  	if($_REQUEST['CategoryId'] > 0) // not root category is updated
 	    {
 	    	$objImages = new clsImageList();
@@ -2508,10 +2525,7 @@
 
 	    $user_ids = $objUsers->CopyFromEditTable("PortalUserId");
 	    if ($user_ids) {
-			$db =& GetADODBConnection();
-			$sql = 'SELECT ResourceId FROM '.$objUsers->SourceTable.' WHERE PortalUserId IN ('.implode(',', $user_ids).')';
-			$rids = $db->GetCol($sql);
-			$objCustomDataList->CopyFromEditTable("CustomDataId", $rids);
+			$objCustomDataList->CopyFromEditTable('u');
 		}
 
 	    $objGroups->Clear();
@@ -2523,7 +2537,7 @@
 		$objUserGroupsList = new clsUserGroupList();
 	    $objGroups->PurgeEditTable("PortalUserId");
 	    $objUserGroupsList->PurgeEditTable("PortalUserId");
-	    $objCustomDataList->PurgeEditTable("CustomDataId");
+	    $objCustomDataList->PurgeEditTable('u');
 	    $objGroups->Clear();
 	}
 
Index: trunk/kernel/include/itemdb.php
===================================================================
diff -u -N -r3907 -r4077
--- trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 3907)
+++ trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 4077)
@@ -14,6 +14,9 @@
 	var $NoResourceId;
 	var $debuglevel;
 	
+	var $Prefix = '';
+	var $Special = '';
+	
 	var $SelectSQL = 'SELECT * FROM %s WHERE %s';
   
 	/**
Index: trunk/admin/head.php
===================================================================
diff -u -N -r3983 -r4077
--- trunk/admin/head.php	(.../head.php)	(revision 3983)
+++ trunk/admin/head.php	(.../head.php)	(revision 4077)
@@ -132,7 +132,7 @@
 			$http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT");
         	$http_request.send(null);
 
-        	setTimeout('checkServer()', 5 * 60000);	// one time in 5 minutes
+        	setTimeout('checkServer()', 20 * 60000);	// one time in 20 minutes
         }
 
         checkServer();
Index: trunk/kernel/include/image.php
===================================================================
diff -u -N -r3476 -r4077
--- trunk/kernel/include/image.php	(.../image.php)	(revision 3476)
+++ trunk/kernel/include/image.php	(.../image.php)	(revision 4077)
@@ -795,7 +795,7 @@
 		$this->Query_Item($sql);
 	}
 
-	function CopyResource($SourceId,$DestId)
+	function CopyResource($SourceId, $DestId, $main_prefix)
 	{
 		global $pathtoroot;
 
@@ -835,7 +835,7 @@
 				}
 			}
 		}
-		parent::CopyResource($SourceId,$DestId);
+		parent::CopyResource($SourceId, $DestId, $main_prefix);
 		$this->Clear();
 		$this->LoadResource($DestId);
 		foreach($this->Items as $img)
Index: trunk/kernel/include/item.php
===================================================================
diff -u -N -r3576 -r4077
--- trunk/kernel/include/item.php	(.../item.php)	(revision 3576)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 4077)
@@ -124,13 +124,12 @@
 
 	/* item custom fields */
 
-	function LoadCustomFields($force = null)
+	function LoadCustomFields($force = null, $temp_table = false)
 	{		
-		if((!is_null($force) || !$this->CustomLoaded) && $this->Get("ResourceId")>0)
-		{
+		if ((!is_null($force) || !$this->CustomLoaded) && $this->Get('ResourceId')>0) {
 			$this->FieldClass = new clsCustomFieldList();
 			$this->FieldClass->Type = $this->type;
-			$this->FieldClass->LoadFieldsAndValues($this->Get("ResourceId"));
+			$this->FieldClass->LoadFieldsAndValues($this->Get("ResourceId"), $this->Prefix, $temp_table);
 			foreach($this->FieldClass->Items as $f)
 			{
 				if (strlen($f->Get("ValueList") && (($f->Get("ElementType") == "select") || ($f->Get("ElementType") == "radio"))))
@@ -191,13 +190,12 @@
 		return TRUE;
 
 		$data = new clsCustomDataList();
-		$data->LoadResource($this->Get("ResourceId"));
 		foreach($this->FieldClass->Items as $f)
 		{
 			$value = $this->CustomFields[$f->Get("FieldName")];
 			$data->SetFieldValue($f->Get("CustomFieldId"),$this->Get("ResourceId"),$value);
 		}
-		$data->SaveData();
+		$data->SaveData($this->Prefix, $this->Get('ResourceId'));
 		unset($data);
 	}
 
@@ -226,19 +224,18 @@
 	}
 	*/
 	
-	function GetCustomFieldValue($fieldname, $default="", $ListValue = 0)
+	function GetCustomFieldValue($fieldname, $default = '', $ListValue = 0, $temp_table = false)
 	{
-		if(!$this->CustomLoaded)
-			$this->LoadCustomFields(null);		
-		elseif (is_array($this->CustomFields) && empty($this->CustomFields))
-			$this->LoadCustomFields(1);		
-			
-		$fieldname = strtolower($fieldname);
+		if (!$this->CustomLoaded) {
+			$this->LoadCustomFields(null, $temp_table);		
+		}
+		elseif (is_array($this->CustomFields) && empty($this->CustomFields)) {
+			$this->LoadCustomFields(1, $temp_table);		
+		}
 		
-		foreach($this->CustomFields as $k => $v)
-		{
-			if(strtolower($k) == $fieldname)
-			{					
+		$fieldname = strtolower($fieldname);
+		foreach($this->CustomFields as $k => $v) {
+			if (strtolower($k) == $fieldname) {
 				return $ListValue? $v['lang_value'] : $v['value'];
 			}				
 		}
@@ -249,7 +246,7 @@
 	function DeleteCustomData()
 	{
 		$cdata = new clsCustomDataList();
-		$cdata->DeleteResource($this->Get("ResourceId"));
+		$cdata->DeleteResource($this->Get('ResourceId'), $this->Prefix);
 	}
 
 	function Delete($RecordOnly=FALSE)
@@ -978,26 +975,25 @@
 		if(!is_numeric($this->Get("OrgId")))
 		$this->UnsetField("OrgId");
 		$this->UnsetField("ResourceId");
-		if(is_numeric($TargetCat) && strlen($NameField))
-		{
+		if (is_numeric($TargetCat) && strlen($NameField)) {
 			$OldName = $this->Get($NameField);
-			if(substr($OldName,0,5)=="Copy ")
-			{
+			if (substr($OldName,0,5)=="Copy ") {
 				$parts = explode(" ",$OldName,4);
-				if($parts[2]=="of" && is_numeric($parts[1]))
-				{
+				if ($parts[2]=="of" && is_numeric($parts[1])) {
 					$Name = $parts[3];
 				}
-				else
-				if($parts[1]=="of")
-				{
-					$Name = $parts[2]." ".$parts[3];
+				else {
+					if ($parts[1]=="of") {
+						$Name = $parts[2]." ".$parts[3];
+					}
+					else {
+						$Name = $OldName;
+					}
 				}
-				else
+			}
+			else {
 				$Name = $OldName;
 			}
-			else
-			$Name = $OldName;
 			$Names = CategoryItemNameCount($TargetCat,$this->tablename,$NameField,$Name);
 			if(count($Names)>0)
 			{
@@ -1044,12 +1040,12 @@
 
 		// copy custom fields
 		$cdata = new clsCustomDataList();
-		$cdata->CopyResource($OldId,$NewId);
+		$cdata->CopyResource($OldId,$NewId,$this->Prefix);
 		unset($cdata);
 
 		// copy images
 		if(is_object($this->Images))
-		$this->Images->CopyResource($OldId,$NewId);
+		$this->Images->CopyResource($OldId,$NewId,$this->Prefix);
 
 		$this->AddToCategory($TargetCat, '', 0); // insert (but with duplicate records check)
 		//echo "ok";
Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r4043 -r4077
--- trunk/core/kernel/application.php	(.../application.php)	(revision 4043)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 4077)
@@ -1687,6 +1687,12 @@
 		return getArrayValue($this->ModuleInfo, $module_name, 'Loaded');
 		
 	}*/
+	
+	function reportError($class, $method)
+	{
+		$this->Debugger->appendTrace();
+		trigger_error('depricated method <b>'.$class.'->'.$method.'(...)</b>', E_USER_ERROR);
+	}
 
 }
 
Index: trunk/core/kernel/utility/temp_handler.php
===================================================================
diff -u -N -r3863 -r4077
--- trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 3863)
+++ trunk/core/kernel/utility/temp_handler.php	(.../temp_handler.php)	(revision 4077)
@@ -126,12 +126,20 @@
 	{
 		$this->TableIdCounter = 0;
 		$tables = Array(
-				'TableName' => $this->Application->getUnitOption($prefix,'TableName'),
-				'IdField' => $this->Application->getUnitOption($prefix,'IDField'),
-				'IDs' => $ids,
-				'Prefix' => $prefix,
-				'TableId' => $this->TableIdCounter++,
+				'TableName'	=>	$this->Application->getUnitOption($prefix, 'TableName'),
+				'IdField'	=>	$this->Application->getUnitOption($prefix, 'IDField'),
+				'IDs'		=>	$ids,
+				'Prefix'	=>	$prefix,
+				'TableId'	=>	$this->TableIdCounter++,
 		);
+		
+		$parent_prefix = $this->Application->getUnitOption($prefix, 'ParentPrefix');
+		if ($parent_prefix) {
+			$tables['ForeignKey'] = $this->Application->getUnitOption($prefix, 'ForeignKey');
+			$tables['ParentPrefix'] = $parent_prefix;
+			$tables['ParentTableKey'] = $this->Application->getUnitOption($prefix, 'ParentTableKey');
+		}
+		
 		$this->FinalRefs[ $tables['TableName'] ] = $tables['TableId'];	// don't forget to add main table to FinalRefs too
 		
 		$SubItems = $this->Application->getUnitOption($prefix,'SubItems');
Index: trunk/kernel/include/portaluser.php
===================================================================
diff -u -N -r3983 -r4077
--- trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 3983)
+++ trunk/kernel/include/portaluser.php	(.../portaluser.php)	(revision 4077)
@@ -14,6 +14,7 @@
         $this->clsItem();
         $this->tablename=GetTablePrefix()."PortalUser";
         $this->type=6;
+        $this->Prefix = 'u';
         $this->BasePermission="USER";
         $this->id_field = "PortalUserId";
         $this->TagPrefix="user";
@@ -769,6 +770,7 @@
 	function clsUserManager()
 	{
       $this->clsItemCollection(); // clsItemList() // need to use this, but double limit clause being created (normal+default 0,100)
+      $this->Prefix = 'u';
       $this->classname = "clsPortalUser";
       $this->SetTable('live', GetTablePrefix().'PortalUser');
 	  $this->Page = isset($_GET['lpn']) ? $_GET['lpn'] : 1;
@@ -1104,7 +1106,9 @@
     function CopyFromEditTable($idfield)
     {
         global $objSession;
-		$GLOBALS['_CopyFromEditTable']=1;
+		
+        $this->Application->SetVar('u_mode', '');
+        $GLOBALS['_CopyFromEditTable']=1;
 
         $edit_table = $objSession->GetEditTable($this->SourceTable);        
         $sql = "SELECT * FROM $edit_table";
Index: trunk/core/units/users/users_config.php
===================================================================
diff -u -N -r4029 -r4077
--- trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 4029)
+++ trunk/core/units/users/users_config.php	(.../users_config.php)	(revision 4077)
@@ -40,6 +40,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4	=>	'mode',
 											),
 
 					'RegularEvents'		=>	Array(
@@ -64,7 +65,7 @@
 																)
 															),
 
-					'SubItems'		=> Array('addr'),
+					'SubItems'		=> Array('addr', 'u-cdata'),
 
 					'Fields' => Array
 							    (
Index: trunk/globals.php
===================================================================
diff -u -N -r4002 -r4077
--- trunk/globals.php	(.../globals.php)	(revision 4002)
+++ trunk/globals.php	(.../globals.php)	(revision 4077)
@@ -87,16 +87,23 @@
 $LogFile = NULL;
 
 /**
- * @return object
- * @desc Returns reference to database connection
-*/
-function &GetADODBConnection()
+ * Returns reference to database connection
+ *
+ * @param bool $new_type Return Kernel4 or in-portal connection object
+ * @return kDBConnection
+ */
+function &GetADODBConnection($new_type = false)
 {
 	static $DB = null;
 
 	global $g_DBType, $g_DBHost, $g_DBUser, $g_DBUserPassword, $g_DBName, $g_DebugMode;
 	global $ADODB_FETCH_MODE, $ADODB_COUNTRECS, $ADODB_CACHE_DIR, $pathtoroot;
 
+	if ($new_type) {
+		$application =& kApplication::Instance();
+		return $application->GetADODBConnection();
+	}
+	
 	if( !isset($DB) && strlen($g_DBType) > 0 )
 	{
 		$DB = ADONewConnection($g_DBType);
Index: trunk/kernel/units/users/users_config.php
===================================================================
diff -u -N -r4029 -r4077
--- trunk/kernel/units/users/users_config.php	(.../users_config.php)	(revision 4029)
+++ trunk/kernel/units/users/users_config.php	(.../users_config.php)	(revision 4077)
@@ -40,6 +40,7 @@
 												1	=>	'id',
 												2	=>	'page',
 												3	=>	'event',
+												4	=>	'mode',
 											),
 
 					'RegularEvents'		=>	Array(
@@ -64,7 +65,7 @@
 																)
 															),
 
-					'SubItems'		=> Array('addr'),
+					'SubItems'		=> Array('addr', 'u-cdata'),
 
 					'Fields' => Array
 							    (
Index: trunk/admin/users/adduser_custom.php
===================================================================
diff -u -N -r2853 -r4077
--- trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 2853)
+++ trunk/admin/users/adduser_custom.php	(.../adduser_custom.php)	(revision 4077)
@@ -35,6 +35,8 @@
     }
 }
 unset($objEditItems);
+$application->SetVar('u_mode', 't');
+
 $objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
@@ -112,11 +114,10 @@
       $fieldid = $field->Get("CustomFieldId");
 
 		$CF=$field->GetAdminUI();
-		if(is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE)))
-			if(is_object($cv=$objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"))))
-				$CF->default_value = $cv->Get("Value");
+		if (is_object($cfield = $objCustomFields->GetItemByField("FieldName",substr($CF->name,1),FALSE))) {
+			$CF->default_value = $c->GetCustomFieldValue(substr($CF->name,1), '', 0, true);
+		}
 
-
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
       $field->Set('FieldLabel', admin_language($field->Get('Prompt')) );
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r4052 -r4077
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 4052)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 4077)
@@ -503,12 +503,10 @@
                    $g = $objGroups->GetItem($GroupId);
                    $g->AddUser($u->Get("PortalUserId"),1,false);
                  }
-               
+                 
                  $custom = $_POST["custom"];
-                 if(is_array($custom))
-                 {
-               	   for($x=0;$x<count($custom);$x++)
-               	   {
+                 if (is_array($custom)) {
+               	   for($x = 0; $x < count($custom); $x++) {
                	    	$u->SetCustomField($custom[$x],$_POST[$custom[$x]]);
                	   }
                	   $u->SaveCustomFields();
@@ -656,7 +654,7 @@
 		           elseif(isset($_POST[strtolower($fname)]))
                        $objCustomDataList->SetFieldValue($fieldid,$ResourceId,$_POST[strtolower($fname)]);
                }
-               $objCustomDataList->SaveData(); 
+               $objCustomDataList->SaveData('u', $ResourceId); 
 
          }
          DeleteModuleTagCache('kernel');
@@ -796,7 +794,7 @@
 							$objCustomDataList->SetFieldValue($fieldid,$CatResourceId,$_POST[strtolower($fname)]);
 						}
 					}
-					$objCustomDataList->SaveData();
+					$objCustomDataList->SaveData('c', $CatResourceId);
 
 					$cat->UpdateCachedPath();
 					$cat->Update();
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r3983 -r4077
--- trunk/kernel/include/category.php	(.../category.php)	(revision 3983)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 4077)
@@ -19,7 +19,7 @@
         $this->BasePermission ="CATEGORY";
         $this->id_field = "CategoryId";
         $this->TagPrefix = "cat";
-
+		$this->Prefix = 'c';
         $this->debuglevel=0;
         /* keyword highlighting */
         $this->OpenTagVar = "Category_Highlight_OpenTag";
@@ -1528,6 +1528,7 @@
   	{
   	    global $m_var_list;
   	    $this->clsItemCollection();
+  	    $this->Prefix = 'c';
   	    $this->classname="clsCategory";
   	    $this->AdminSearchFields = array("Name","Description");
   	    $this->Page = (int)$m_var_list["p"];
Index: trunk/admin/category/addcategory.php
===================================================================
diff -u -N -r3282 -r4077
--- trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 3282)
+++ trunk/admin/category/addcategory.php	(.../addcategory.php)	(revision 4077)
@@ -24,6 +24,7 @@
 $objEditItems = new clsCatList();
 $objEditItems->SourceTable = $objSession->GetEditTable("Category");
 $objCustomFields = new clsCustomFieldList(1);
+$application->SetVar('c_mode', 't');
 $objCustomDataList = new clsCustomDataList();
 $objRelList = new clsRelationshipList();
 $objImages = new clsImageList();
@@ -42,7 +43,7 @@
     $action = "m_add_category";
     $objCatList->CreateEmptyEditTable("CategoryId");
     $objRelList->CreateEmptyEditTable("RelationshipId");    
-    $objCustomDataList->CreateEmptyEditTable("CustomDataId");
+    $objCustomDataList->CreateEmptyEditTable('c');
     $objImages->CreateEmptyEditTable("ResourceId");
     
     $TitleVerb = prompt_language("la_Text_Adding");
@@ -57,7 +58,7 @@
         /* make a copy of the relationship records */
         $ids = $objEditItems->GetResourceIDList();
         $objRelList->CopyToEditTable("SourceId", $ids);
-        $objCustomDataList->CopyToEditTable("ResourceId",$ids);
+        $objCustomDataList->CopyToEditTable('c', $ids);
         $objImages->CopyToEditTable("ResourceId", $ids);
         $c = $objEditItems->GetItemByIndex(0);
         $itemcount=$objEditItems->NumItems();
@@ -157,7 +158,16 @@
   <tr <?php int_table_color(); ?>>
     <td valign="top"><span class="text"><?php echo prompt_language("la_prompt_CategoryId"); ?></span></td>
     <td valign="top"><span class="text"><?php echo $c->Get("CategoryId"); ?></span></td>
-    <td><span class="text">&nbsp;</span></td>
+    <td class="text">
+    	<?php
+    		if (IsDebugMode()) {
+    			echo '<b>DBG:</b> ResourceId = '.$c->Get('ResourceId');
+    		}
+    		else {
+    			echo '&nbsp;';
+    		}
+    	?>
+    </td>
   </tr>
   <?php } ?>
   <tr <?php int_table_color(); ?>>
@@ -276,13 +286,8 @@
         	$n = substr($f->name,1);
 
         	$cfield = $objCustomFields->GetItemByField("FieldName",$n,FALSE);
-        	if(is_object($cfield))
-        	{
-        		$cv = $objCustomDataList->GetDataItem($cfield->Get("CustomFieldId"));
-        		if(is_object($cv))
-        		{
-        	      $f->default_value = $cv->Get("Value");
-        		}
+        	if (is_object($cfield)) {
+				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\" class=\"text\">".$f->GetPrompt()."</td>\n";
Index: trunk/kernel/include/custommetadata.php
===================================================================
diff -u -N -r3872 -r4077
--- trunk/kernel/include/custommetadata.php	(.../custommetadata.php)	(revision 3872)
+++ trunk/kernel/include/custommetadata.php	(.../custommetadata.php)	(revision 4077)
@@ -12,100 +12,48 @@
 
     function clsCustomMetaData($CustomDataId=-1,$table="CustomMetaData")
     {
-        $this->clsItem();
+        parent::clsItem();
         $this->tablename=GetTablePrefix()."CustomMetaData";
         $this->type=12;
         $this->BasePermission="";
         $this->id_field = "CustomDataId";
         $this->NoResourceId=1; //set this to avoid using a resource ID
-
-        if(isset($CustomDataId))
-            $this->LoadFromDatabase($CustomDataId);
     }
+}
 
-    function Validate()
-    {
- 	global $Errors;
-
-        $dataValid = true;
-        if(!strlen($this->Get("ResourceId")))
-        {
-            $Errors->AddError("error.fieldIsRequired",'ResourceId',"","",get_class($this),"Validate");
-            $dataValid = false;
-        }
-        return $dataValid;
-    }
-
-    function SetFieldName($name)
-    {
-      $this->FieldName = $name;
-    }
-    
-    function GetFieldName()
-    {
-      return $this->FieldName;
-    }
-
-    function Save()
-    {
-        if(is_numeric($this->Get("CustomDataId")))
-        {
-            $this->Update();
-        }
-        else
-            $this->Create();
-    }
-
-    /*
-    function LoadFromDatabase($Id)
-    {
-        global $objSession, $Errors;
-
-        if(!isset($Id))
-        {
-            $Errors->AddError("error.AppError",NULL,'Internal error: LoadFromDatabase id',"",get_class($this),"LoadFromDatabase");
-            return false;
-        }
-        $sql = sprintf("SELECT * FROM ".$this->SourceTable." WHERE CustomDataId = '%s'",$Id);
-        $result = $this->adodbConnection->Execute($sql);
-        if ($result === false)
-        {
-            $Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"LoadFromDatabase");
-            return false;
-        }
-        $data = $result->fields;
-        $this->SetFromArray($data);
-        $this->Clean();
-        return true;
-    }
-    */
-} /*clsCustomMetaData*/
-
 class clsCustomDataList extends clsItemCollection
 {
-
-  function clsCustomDataList($table="")
-  {
-    $this->clsItemCollection();
-    $this->classname = "clsCustomMetaData";
-    if(!strlen($table))
-        $table = GetTablePrefix()."CustomMetaData";
-    $this->SetTable('live', $table);
-  }
-
-  function LoadResource($ResourceId)
-  {
-      $sql = "SELECT * FROM ".$this->SourceTable." WHERE ResourceId=".$ResourceId;
-      $this->Query_Item($sql);
-      return $this->Items;
-  }
+	function clsCustomDataList()
+	{
+		parent::clsItemCollection();
+		$this->classname = 'clsCustomMetaData';
+	}
+	
+	function LoadResource($ResourceId)
+	{
+	  // TO REMOVE
+	}
   
-  function DeleteResource($ResourceId)
-  {
-		if(!is_numeric($ResourceId))return;
-      $sql = "DELETE FROM ".$this->SourceTable." WHERE ResourceID=".$ResourceId;
-      $this->adodbConnection->Execute($sql);
-  }
+	function DeleteResource($ResourceId, $main_prefix)
+	{
+	  	if (!$ResourceId) return false;
+	
+	  	$custom_table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName');
+	  	$sql = 'DELETE FROM '.$custom_table.'
+	    		WHERE ResourceId = '.$ResourceId;
+	  	$this->adodbConnection->Execute($sql);
+	}
+	
+	function CopyResource($OldId,$NewId, $main_prefix)
+	{
+		$custom_data =& $this->Application->recallObject($main_prefix.'-cdata.-item', null, Array('skip_autoload' => true));
+		$custom_data->Load($OldId, 'ResourceId');
+		
+		if ($custom_data->isLoaded()) {
+			$custom_data->SetDBField('ResourceId', $NewId);
+			$custom_data->Create();
+		}
+	}
   
   function &SetFieldValue($FieldId,$ResourceId,$Value)
   {
@@ -171,108 +119,57 @@
     return $found ? ($return_index ? $i : $d) : false;
   }
 
-	function SaveData()
+	function SaveData($main_prefix, $resource_id)
 	{
-	  	foreach($this->Items as $f) {
-	  		$FieldId = $f->Get('CustomFieldId');
-	  		$value = $f->Get('Value');
-	  		$ResId = $f->Get('ResourceId');
-	  		$DataId = $f->Get('CustomDataId');
-	
-	  		if ($FieldId > 0) {
-	  			$db_value = $this->adodbConnection->qstr( isset($GLOBALS['_CopyFromEditTable']) ? $value : stripslashes($value) );	
-	  			
-	  			if (is_numeric($DataId)) {
-	  				$sql = 'UPDATE '.$this->SourceTable.' SET Value = '.$db_value.' WHERE CustomFieldId = '.$FieldId.' AND ResourceId = '.$ResId;
-	  				$this->adodbConnection->Execute($sql);
-	  			}
-	  			else {
-	  				$sql = 'INSERT INTO '.$this->SourceTable.' (ResourceId,CustomFieldId,Value) VALUES ('.$ResId.','.$FieldId.','.$db_value.')';
-	  				$this->adodbConnection->Execute($sql);
-	  			}
-	  		}
-	  		else
-	  		{
-	  			$sql = 'DELETE FROM '.$this->SourceTable.' WHERE CustomDataId = '.$DataId;
-	  			$this->adodbConnection->Execute($sql);
-	  		}
+	  	$ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+	  	$custom_data =& $this->Application->recallObject($main_prefix.'-cdata', null, Array('skip_autoload' => true));
+	  	$custom_data->Load($resource_id, 'ResourceId');
+	  	
+		foreach($this->Items as $f) {
+	  		$custom_id = $f->Get('CustomFieldId');
+	  		$value = isset($GLOBALS['_CopyFromEditTable']) ? $f->Get('Value') : stripslashes($f->Get('Value'));
+	  		
+	  		$custom_name = $ml_formatter->LangFieldName('cust_'.$custom_id);
+			$custom_data->SetDBField($custom_name, $value);
 	  	}
-	
-	  	$rs = $this->adodbConnection->Execute("SELECT * FROM ".$this->SourceTable." WHERE CustomDataId=0 ");
-	  	while($rs && !$rs->EOF)
-	  	{
-	  		$m = $this->adodbConnection->Execute("SELECT MIN(CustomDataId) as MinValue FROM ".$this->SourceTable);
-	  		$NewId = $m->fields["MinValue"]-1;
-	
-	  		$sql = "UPDATE ".$this->SourceTable." SET CustomDataId=$NewId WHERE ResourceId=".$rs->fields["ResourceId"]." AND ";
-	  		$sql .= "CustomFieldId=".$rs->fields["CustomFieldId"];
-	  		$this->adodbConnection->Execute($sql);
-	  		$rs->MoveNext();
-	  	}
+		
+	  	$custom_data->SetDBField('ResourceId', $resource_id);
+		return $custom_data->isLoaded() ? $custom_data->Update() : $custom_data->Create();	  
 	}
 
-  function CopyToEditTable($idfield, $idlist)
-  {
-      global $objSession;
-
-      $edit_table = $objSession->GetEditTable($this->SourceTable);
-      @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
-      if(is_array($idlist))
-      {
-        $list = implode(",",$idlist);
-      }
-      else
-           $list  = $idlist;
-      $query = "SELECT * FROM ".$this->SourceTable." WHERE $idfield IN ($list)";
-      $insert = "CREATE TABLE ".$edit_table." ".$query;
-      if((int)$GLOBALS["debuglevel"])
-          echo $insert;
-      $this->adodbConnection->Execute($insert);      
-      $this->SourceTable = $edit_table;
-      $this->SaveData();
-
-  }
-
-  function CopyFromEditTable($idfield, $ResourceIds)
-  {
-      global $objSession;
-		$GLOBALS['_CopyFromEditTable']=1;
-
-      $edit_table = $objSession->GetEditTable($this->SourceTable);
-      $idlist = array();
-      
-      //$this->adodbConnection->Execute($sql);
-      
-      $sql = "SELECT * FROM $edit_table";
-      $this->Clear();
-      $rs = $this->adodbConnection->Execute($sql);
-      while($rs && !$rs->EOF)
-      {
-          $data = $rs->fields;
-          $c = $this->AddItemFromArray($data);
-
-            $c->Dirty();         
-			if($data[$idfield]>0)
-            {
-              
-              $c->Update();
-            }
-            else
-            {
-              $c->UnsetIdField();
-              $c->Create();
-            }
-			$idlist[] = $c->Get($idfield);
-
-         $rs->MoveNext();
-      }     
-
-		$sql = "DELETE FROM ".$this->SourceTable." WHERE ResourceId IN (".implode(',', $ResourceIds).') '.(count($idlist) > 0 ? "AND $idfield NOT IN (".implode(",",$idlist).")" : "");
-		$this->adodbConnection->Execute($sql);
+	function &getTempHandler($prefix)
+	{
+		if (strlen($prefix) > 2 || strlen($prefix) == 0) {
+			// not e.g. bb, c, u, but CustomFieldId :) or empty at all
+			$this->Application->reportError(get_class($this), 'CopyToEditTable');
+		}
 		
-      @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");
-		unset($GLOBALS['_CopyFromEditTable']);
-  }  
+		$temp_handler =& $this->Application->recallObject($prefix.'-cdata_TempHandler', 'kTempTablesHandler');
+		return $temp_handler;
+	}
+	
+	function CopyToEditTable($main_prefix, $idlist)
+	{
+		$temp_handler =& $this->getTempHandler($main_prefix);
+		$temp_handler->DoCopyLiveToTemp($temp_handler->Tables, $idlist);
+	}
 
-} /* clsCustomDataList */
+	function CopyFromEditTable($main_prefix)
+	{
+		$temp_handler =& $this->getTempHandler($main_prefix);
+		$temp_handler->DoCopyTempToOriginal($temp_handler->Tables);
+	}
+
+	function PurgeEditTable($main_prefix)
+	{
+		$temp_handler =& $this->getTempHandler($main_prefix);
+	    $temp_handler->CancelEdit();
+	}
+	
+	function CreateEmptyEditTable($main_prefix)
+    { 
+       	$temp_handler =& $this->getTempHandler($main_prefix);
+		$temp_handler->DoCopyLiveToTemp($temp_handler->Tables, Array(0));
+    }
+}
 ?>
Index: trunk/kernel/include/customfield.php
===================================================================
diff -u -N -r3534 -r4077
--- trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 3534)
+++ trunk/kernel/include/customfield.php	(.../customfield.php)	(revision 4077)
@@ -95,21 +95,32 @@
         }     
     }
 
-    function LoadFieldsAndValues($ResourceId)
+    function LoadFieldsAndValues($ResourceId, $main_prefix, $temp_table = false)
     {
         $this->Clear();
-        $table = $this->SourceTable;
-        $DataTable = GetTablePrefix()."CustomMetaData";
-        $sql = "SELECT $table.*,$DataTable.Value as Value, $DataTable.CustomDataId as CustomDataId FROM ".$table." LEFT JOIN $DataTable ON ";
-        $sql .= "(".$table.".CustomFieldId=$DataTable.CustomFieldId AND $DataTable.ResourceId=$ResourceId) WHERE Type=".$this->Type;
-        if( isset($GLOBALS["debuglevel"]) && $GLOBALS["debuglevel"]) echo $sql."<br>\n";
-        $rs = $this->adodbConnection->Execute($sql);        
-        while($rs && !$rs->EOF)
-        {
-            $data = $rs->fields;
-            $this->AddItemFromArray($data);
-            $rs->MoveNext();
-        } 
+        
+        $table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName');
+        if ($temp_table) {
+        	$table = kTempTablesHandler::GetTempName($table);
+        }
+        
+        $sql = 'SELECT *
+        		FROM '.$table.'
+        		WHERE ResourceId = '.$ResourceId;
+        $custom_data = $this->adodbConnection->GetRow($sql);
+        
+        $sql = 'SELECT *
+        		FROM '.TABLE_PREFIX.'CustomField
+        		WHERE Type = '.$this->Application->getUnitOption($main_prefix, 'ItemType');
+        $custom_fields = $this->Conn->Query($sql, 'CustomFieldId');
+        
+        $ml_formatter =& $this->Application->recallObject('kMultiLanguage');
+        foreach ($custom_fields as $custom_id => $custom_info) {
+        	$custom_name = $ml_formatter->LangFieldName('cust_'.$custom_id);
+        	$custom_info['Value'] = getArrayValue($custom_data, $custom_name) ? $custom_data[$custom_name] : '';
+        	$custom_info['CustomDataId'] = 0;
+        	$this->AddItemFromArray($custom_info);
+        }
     }
     
     function GetFieldUIList($GeneralTab=FALSE)