--- loncom/interface/loncreateuser.pm	2006/05/09 17:21:13	1.116
+++ loncom/interface/loncreateuser.pm	2006/05/30 12:46:09	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.116 2006/05/09 17:21:13 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.118 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,6 +64,9 @@ use Apache::Constants qw(:common :http);
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my $loginscript; # piece of javascript used in two separate instances
 my $generalrule;
@@ -305,7 +308,7 @@ sub print_user_modification_page {
     my %loaditem;
 
     my $groupslist;
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     if (%curr_groups) {
         $groupslist = join('","',sort(keys(%curr_groups)));
         $groupslist = '"'.$groupslist.'"';   
@@ -1225,9 +1228,9 @@ END
 			 &Apache::lonnet::critical('put:'.
                              $env{'course.'.$cid.'.domain'}.':'.
 	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                         &escape($env{'form.ccuname'}.':'.
                              $env{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
+                         &escape($now.':'),
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
@@ -1252,9 +1255,9 @@ END
 			 &Apache::lonnet::critical('put:'.
                              $env{'course.'.$cid.'.domain'}.':'.
 	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                         &escape($env{'form.ccuname'}.':'.
                              $env{'form.ccdomain'}).'='.
-                         &Apache::lonnet::escape($now.':'),
+                         &escape($now.':'),
 	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
             }
@@ -1328,7 +1331,7 @@ END
                     $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
                 } else {
 		    my %curr_groups =
-			&Apache::loncommon::coursegroups($one,$two);
+			&Apache::longroup::coursegroups($one,$two);
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         if (($sec eq 'none') || ($sec eq 'all') || 
                             exists($curr_groups{$sec})) {
@@ -1358,7 +1361,7 @@ END
                     $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                 } else {
                     my %curr_groups = 
-			&Apache::loncommon::coursegroups($one,$two);
+			&Apache::longroup::coursegroups($one,$two);
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         $sec =~ s/\W//g;