--- loncom/interface/loncommon.pm	2006/05/12 02:17:50	1.370
+++ loncom/interface/loncommon.pm	2006/05/17 23:25:56	1.374
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.370 2006/05/12 02:17:50 www Exp $
+# $Id: loncommon.pm,v 1.374 2006/05/17 23:25:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2608,10 +2608,7 @@ sub timehash {
 
 sub utc_string {
     my ($date)=@_;
-    my @utctime=gmtime($date);
-    my $year=$utctime[5]+1900;
-    my $month=$utctime[4]+1;
-    return "$year$month$utctime[3]T$utctime[2]$utctime[1]$utctime[0]Z";
+    return strftime("%Y%m%dT%H%M%SZ",gmtime($date));
 }
 
 sub maketime {
@@ -3131,7 +3128,7 @@ table#LC_title_bar {
   padding: 0px 2px 0px 2px;
   background: $pgbg;
   font-family: $sans;
-  border-collapse: collapse;
+  border-collapse: separate;
 }
 table#LC_title_bar.LC_with_remote {
   width: 100%;
@@ -3168,7 +3165,7 @@ table#LC_menubuttons_mainmenu {
   background: $pgbg;
   border: 0px;
   border-spacing: 1px;
-  padding: 0px;
+  padding: 0px 1px;
   margin: 0px;
   border-collapse: separate;
 }
@@ -3557,7 +3554,6 @@ Inputs:         $args - additional optio
 
 sub end_page {
     my ($args) = @_;
-    #&Apache::lonnet::logthis("end_page ".join(':',caller(0)));
     $env{'internal.end_page'}++;
     my $result;
     if ($args->{'discussion'}) {
@@ -3600,7 +3596,7 @@ sub js_ready {
     $result =~ s/[\n\r]/ /xmsg;
     $result =~ s/\\/\\\\/xmsg;
     $result =~ s/'/\\'/xmsg;
-    $result =~ s{</script>}{</scrip'+'t>}xmsg;
+    $result =~ s{</}{<\\/}xmsg;
     
     return $result;
 }
@@ -3764,13 +3760,14 @@ sub check_user_status {
 
 Determines all the sections for a course including
 sections with students and sections containing other roles.
-Incoming parameters: domain, course number, reference to 
-section hash (keys to be section/group IDs), reference to 
-array containing roles for which sections should be gathered
-(optional). If the fourth argument is undefined, sections
-are gathered for any role.
+Incoming parameters: domain, course number, 
+reference to array containing roles for which sections should 
+be gathered (optional). If the third argument is undefined,
+sections are gathered for any role.
  
-Returns number of sections.
+Returns section hash (keys are section IDs, values are
+number of users in each section), subject to the
+optional roles filter.
 
 =cut
 
@@ -3826,10 +3823,9 @@ sub get_sections {
 Retrieve information about groups in a course,
 
 Input:
-1. Reference to hash to populate with group information. 
-2. Optional course domain
-3. Optional course number
-4. Optional group name
+1. Optional course domain
+2. Optional course number
+3. Optional group name
 
 Course domain and number will be taken from user's
 environment if not supplied. Optional group name will'
@@ -3837,15 +3833,14 @@ be passed to lonnet::get_coursegroups()
 use in the call to the dump function.
 
 Output
-Returns number of groups in the course (subject to the
-optional group name filter).
-
-Side effects:
-Populates the referenced curr_groups hash, with key,
-value pairs. Keys are group names, corresponding values
+Returns hash of groups in the course (subject to the
+optional group name filter). In the hash, the keys are
+group names, and their corresponding values
 are scalars containing group information in XML. This
-can be sent to &get_group_settings() to be parsed.     
+can be sent to &get_group_settings() to be parsed.
 
+Side effects:
+None.
 =cut 
 
 ###############################################
@@ -3920,6 +3915,7 @@ sub get_group_settings {
             } elsif ($entry eq 'role') {
                 if ($tool eq 'autosec') {
                     $role = $token->[2]{id};
+                    @{$content{$tool}{$role}} = ();
                 }
             } else {
                 my $value=$parser->get_text('/'.$entry);
@@ -5028,6 +5024,7 @@ a hash ref describing the data to be sto
     'chartoutputmode' => 'scalar',
     'chartoutputdata' => 'scalar',
     'Section' => 'array',
+    'Group' => 'array',
     'StudentData' => 'array',
     'Maps' => 'array');