Index: trunk/kernel/include/portalgroup.php
===================================================================
diff -u -r701 -r881
--- trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 701)
+++ trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 881)
@@ -117,9 +117,11 @@
 
 	function AddUser($UserId,$PrimaryGroup=0)
 	{
+		global $objSession;
+		
  	  	// add user to group OR just updates it's status there
  	  	$db =& $this->adodbConnection;
- 	  	$table = GetTablePrefix().'UserGroup';
+ 	  	$table = $objSession->GetEditTable("UserGroup");//GetTablePrefix().'UserGroup';
  	  	$group_id = $this->Get('GroupId');
  	  
  	  	$sql_patterns['check'] = 'SELECT PortalUserId FROM %s WHERE GroupId = %s AND PortalUserId = %s';
@@ -150,7 +152,9 @@
 
     function DeleteUser($UserId)
     {
-        $sql = "DELETE FROM ".GetTablePrefix()."UserGroup WHERE PortalUserId=$UserId AND GroupId=".$this->Get("GroupId");        
+    	global $objSession;
+    	
+        $sql = "DELETE FROM ".$objSession->GetEditTable("UserGroup")." WHERE PortalUserId=$UserId AND GroupId=".$this->Get("GroupId");        
         $this->adodbConnection->Execute($sql);
     }
     
@@ -194,7 +198,9 @@
 
     function GetUserList()
     {
-        $sql = "SELECT * FROM ".GetTablePrefix()."UserGroup WHERE GroupId=".$this->Get("GroupId");
+    	global $objSession;
+    	
+        $sql = "SELECT * FROM ".$objSession->GetEditTable("UserGroup")." WHERE GroupId=".$this->Get("GroupId");
         $rs = $this->adodbConnection->Execute($sql);
         $res = array();
         while($rs && !$rs->EOF) 
@@ -487,7 +493,7 @@
       
     }
 }
-/*
+
 class clsUserGroupList extends clsItemCollection
 {
     function clsUserGroupList()
@@ -497,6 +503,38 @@
         $this->SetTable('live', GetTablePrefix()."UserGroup");
         $this->id_field = "PortalUserId"; // don't try to insert by this ID :)
     }
+    
+    function CopyFromEditTable($idfield)
+    {
+        global $objSession;
+		$GLOBALS['_CopyFromEditTable']=1;
+
+        $edit_table = $objSession->GetEditTable($this->SourceTable);        
+        $sql = "SELECT * FROM $edit_table";
+        $rs = $this->adodbConnection->Execute($sql);
+        
+        //echo $sql."<BR>";
+        
+        $clear_old = true;
+        while($rs && !$rs->EOF)
+        {
+            $data = $rs->fields;            
+			
+            if ($clear_old) {
+           		$sql = "DELETE FROM ".$this->SourceTable." WHERE $idfield = ".$data[$idfield];
+            	@$this->adodbConnection->Execute($sql);
+            	$clear_old = false;
+            }
+            
+            $sql = "INSERT INTO ".$this->SourceTable." (PortalUserId, GroupId, PrimaryGroup) VALUES (".$data['PortalUserId'].", ".$data['GroupId'].", ".$data['PrimaryGroup'].")";
+            @$this->adodbConnection->Execute($sql);
+            
+            $rs->MoveNext();
+        }   
+                     
+        @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table");          
+		unset($GLOBALS['_CopyFromEditTable']);
+    }    
 }
-*/
+
 ?>