Diff for /loncom/interface/loncommon.pm between versions 1.370 and 1.374

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

Removed from v.1.370  
changed lines
  Added in v.1.374


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>