merged nick's user import changes and added user defined fields to the sorting options for CS

lib/WebGUI/Asset/Wobject/Collaboration.pm

@@ -438,6 +438,11 @@ sub getEditForm {
 			lineage=>"Sequence",
 			dateUpdated=>"Date Updated",
 			dateSubmitted=>"Date Submitted",
+			userDefined1=>"User Defined 1",
+			userDefined2=>"User Defined 2",
+			userDefined3=>"User Defined 3",
+			userDefined4=>"User Defined 4",
+			userDefined5=>"User Defined 5",
 			title=>"Title"
 			},
 		-label=>"Sort By"

lib/WebGUI/Grouping.pm

@@ -115,8 +115,12 @@ sub addUsersToGroups {
 			unless ($isIn) {
                 		WebGUI::SQL->write("insert into groupings (groupId,userId,expireDate) 
 					values (".quote($gid).", ".quote($uid).", ".(WebGUI::DateTime::time()+$expireOffset).")");
+			} else {
+                        	if ($_[2]) {
+                                	userGroupExpireDate($uid,$gid,(WebGUI::DateTime::time()+$expireOffset));
+                        	}
 			}
-		}
+                }
         }
 }