--- loncom/interface/loncommon.pm	2006/05/01 20:48:55	1.359
+++ loncom/interface/loncommon.pm	2006/05/12 15:53:10	1.371
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.359 2006/05/01 20:48:55 albertel Exp $
+# $Id: loncommon.pm,v 1.371 2006/05/12 15:53:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,6 +64,7 @@ use HTML::Entities;
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
 use Apache::lontexconvert();
+use LONCAPA;
 
 my $readit;
 
@@ -709,7 +710,7 @@ sub help_open_menu {
     my $timestamp = time;
     foreach my $datum (\$color,\$function,\$topic,\$component_help,\$faq,
 		       \$bug,\$origurl) {
-        $$datum = &Apache::lonnet::escape($$datum);
+        $$datum = &escape($$datum);
     }
     if (!$stayOnPage) {
          $link = "javascript:helpMenu('open')";
@@ -775,7 +776,7 @@ ENDTEMPLATE
 				       $width,$height).' '.$template;
 	} else {
 	    my $help_text;
-	    $help_text=&Apache::lonnet::unescape($topic);
+	    $help_text=&unescape($topic);
 	    $template='<table><tr><td>'.
 		&help_open_topic($component_help,$help_text,$stayOnPage,
 				 $width,$height).'</td><td>'.$template.
@@ -803,7 +804,7 @@ sub help_open_bug {
     my $link='';
     my $template='';
     my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.
-	&Apache::lonnet::escape($ENV{'REQUEST_URI'}).'&component='.$topic;
+	&escape($ENV{'REQUEST_URI'}).'&component='.$topic;
     if (!$stayOnPage)
     {
 	$link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
@@ -2024,10 +2025,11 @@ sub screenname {
 # ------------------------------------------------------------- Message Wrapper
 
 sub messagewrapper {
-    my ($link,$username,$domain)=@_;
+    my ($link,$username,$domain,$subject,$text)=@_;
     return 
         '<a href="/adm/email?compose=individual&'.
-        'recname='.$username.'&recdom='.$domain.'" '.
+        'recname='.$username.'&recdom='.$domain.
+	'&subject='.&escape($subject).'&text='.&escape($text).'" '.
         'title="'.&mt('Send message').'">'.$link.'</a>';
 }
 # --------------------------------------------------------------- Notes Wrapper
@@ -2394,7 +2396,7 @@ sub get_previous_attempt {
 	       } else {
 		  $value=$returnhash{$version.':'.$key};
 	       }
-	       $prevattempts.='<td>'.&Apache::lonnet::unescape($value).'&nbsp;</td>';   
+	       $prevattempts.='<td>'.&unescape($value).'&nbsp;</td>';   
 	    }
 	 }
       }
@@ -2406,7 +2408,7 @@ sub get_previous_attempt {
 	} else {
 	  $value=$lasthash{$key};
 	}
-	$value=&Apache::lonnet::unescape($value);
+	$value=&unescape($value);
 	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
 	$prevattempts.='<td>'.$value.'&nbsp;</td>';
       }
@@ -2528,7 +2530,7 @@ sub submlink {
 	if (!$symb) { $symb=$cursymb; }
     }
     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-    $symb=&Apache::lonnet::escape($symb);
+    $symb=&escape($symb);
     if ($target) { $target="target=\"$target\""; }
     return '<a href="/adm/grades?&command=submission&'.
 	'symb='.$symb.'&student='.$uname.
@@ -2574,7 +2576,7 @@ sub pprmlink {
 	if (!$symb) { $symb=$cursymb; }
     }
     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
-    $symb=&Apache::lonnet::escape($symb);
+    $symb=&escape($symb);
     if ($target) { $target="target=\"$target\""; }
     return '<a href="/adm/parmset?&command=set&'.
 	'symb='.$symb.'&uname='.$uname.
@@ -2604,6 +2606,11 @@ sub timehash {
              'dlsav'   => $ltime[8] );
 }
 
+sub utc_string {
+    my ($date)=@_;
+    return strftime("%Y%m%dT%H%M%SZ",gmtime($date));
+}
+
 sub maketime {
     my %th=@_;
     return POSIX::mktime(
@@ -2773,6 +2780,9 @@ Inputs:
 
 =item * $notitle, if true keep the nav controls, but remove the title bar
 
+=item * $no_inline_link, if true and in remote mode, don't show the 
+         'Switch To Inline Menu' link
+
 
 =back
 
@@ -2785,15 +2795,13 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
-	$notopbar,$bgcolor,$notitle)=@_;
+	$notopbar,$bgcolor,$notitle,$no_inline_link)=@_;
 
     $title=&mt($title);
 
     $function = &get_users_function() if (!$function);
     my $img =    &designparm($function.'.img',$domain);
-    my $tabbg =  &designparm($function.'.tabbg',$domain);
     my $font =   &designparm($function.'.font',$domain);
-    my $sidebg = &designparm($function.'.sidebg',$domain);
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
     my %design = ( 'style'   => 'margin-top: 0px',
@@ -2847,12 +2855,13 @@ sub bodytag {
     $env{'environment.middlename'}
     $env{'environment.lastname'}
     $env{'environment.generation'}
+    &nbsp;
 </div>
 <div class="LC_title_bar_role">
-$role
+$role&nbsp;
 </div>
 <div class="LC_title_bar_realm">
-$realm
+$realm&nbsp;
 </div>
 </td>
 ENDROLE
@@ -2934,7 +2943,8 @@ ENDROLE
         $lonhttpdPort.$img.'" alt="'.$function.'" />';
 
     # Explicit link to get inline menu
-    my $menu='<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>';
+    my $menu= ($no_inline_link?''
+	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
     #
     if ($notitle) {
 	return $bodytag;
@@ -2942,11 +2952,12 @@ ENDROLE
     return(<<ENDBODY);
 $bodytag
 <table id="LC_title_bar" class="LC_with_remote">
-<tr><td>$upperleft</td>
+<tr><td class="LC_title_bar_role_logo">$upperleft</td>
     <td class="LC_title_bar_domain_logo">$messages&nbsp;</td>
 </tr>
 <tr><td>$titleinfo $dc_info $menu</td>
 $roleinfo
+</tr>
 </table>
 ENDBODY
 }
@@ -3086,7 +3097,6 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
 
     return <<END;
-<style type="text/css">
 h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow } 
 table.thinborder { border-collapse: collapse; }
@@ -3106,7 +3116,7 @@ table#LC_top_nav, table#LC_menubuttons,
   width: 100%;
   background: $pgbg;
   border: 0px;
-  border-spacing: 1px;
+  border-spacing: 2px 1px;
   padding: 0px;
   margin: 0px;
   border-collapse: separate;
@@ -3114,9 +3124,11 @@ table#LC_top_nav, table#LC_menubuttons,
 table#LC_title_bar {
   width: 100%;
   border: 0;
-  border-spacing: 3px;
+  border-spacing: 0px 1px;
+  padding: 0px 2px 0px 2px;
   background: $pgbg;
   font-family: $sans;
+  border-collapse: collapse;
 }
 table#LC_title_bar.LC_with_remote {
   width: 100%;
@@ -3142,6 +3154,11 @@ span.LC_title_bar_title {
 table#LC_title_bar td.LC_title_bar_domain_logo {
   background: $sidebg;
   text-align: right;
+  padding: 0px;
+}
+table#LC_title_bar td.LC_title_bar_role_logo {
+  background: $sidebg;
+  padding: 0px;
 }
 
 table#LC_menubuttons_mainmenu {
@@ -3162,6 +3179,10 @@ table#LC_top_nav td a, div#LC_top_nav a
   color: $font;
   font-family: $sans;
 }
+table#LC_top_nav td.LC_top_nav_logo {
+  background: $tabbg;
+  text-align: right;
+}
 table#LC_breadcrumbs td {
   background: $tabbg;
   color: $font;
@@ -3257,7 +3278,6 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
-</style>
 END
 }
 
@@ -3291,10 +3311,18 @@ Inputs: $title - optional title for the
 sub headtag {
     my ($title,$head_extra,$args) = @_;
     
+    my $function = $args->{'function'} || &get_users_function();
+    my $domain   = $args->{'domain'}   || &determinedomain();
+    my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
+    my $url = join(':',$env{'user.name'},$env{'user.domain'},
+		   $env{'environment.color.timestamp'},
+		   $function,$domain,$bgcolor);
+
+    $url = '/adm/css/'.&escape($url).'.css';
+
     my $result =
 	'<head>'.
-	&standard_css($args->{'function'},$args->{'domain'},
-		      $args->{'bgcolor'}).
+	'<link rel="stylesheet" type="text/css" href="'.$url.'" />'.
 	&font_settings().
 	&Apache::lonhtmlcommon::htmlareaheaders();
 
@@ -3453,6 +3481,9 @@ Inputs: $title - optional title for the
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
 
+                  no_inline_link -> if true and in remote mode, don't show the 
+                                    'Switch To Inline Menu' link
+
 =back
 
 =cut
@@ -3488,7 +3519,7 @@ sub start_page {
 			 $args->{'only_body'},      $args->{'domain'},
 			 $args->{'force_register'}, $args->{'body_title'},
 			 $args->{'no_nav_bar'},     $args->{'bgcolor'},
-			 $args->{'no_title'});
+			 $args->{'no_title'},       $args->{'no_inline_link'});
 	}
     }
 
@@ -3629,6 +3660,14 @@ sub simple_error_page {
     sub end_data_table_row {
 	return '</tr>';
     }
+
+    sub start_data_table_header_row {
+	return  '<tr class="LC_header_row">';
+    }
+
+    sub end_data_table_header_row {
+	return '</tr>';
+    }
 }
 
 ###############################################
@@ -3734,20 +3773,27 @@ Returns number of sections.
 
 ###############################################
 sub get_sections {
-    my ($cdom,$cnum,$sectioncount,$possible_roles) = @_;
-    if (!($cdom && $cnum)) { return 0; }
-    my $numsections = 0;
+    my ($cdom,$cnum,$possible_roles) = @_;
+    if (!defined($cdom) || !defined($cnum)) {
+        my $cid =  $env{'request.course.id'};
 
-    if (!defined($possible_roles) || (grep/^st$/,@$possible_roles)) {
+	return if (!defined($cid));
+
+        $cdom = $env{'course.'.$cid.'.domain'};
+        $cnum = $env{'course.'.$cid.'.num'};
+    }
+
+    my %sectioncount;
+
+    if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) {
 	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
 	my $sec_index = &Apache::loncoursedata::CL_SECTION();
 	my $status_index = &Apache::loncoursedata::CL_STATUS();
-	while (my ($student,$data) = each %$classlist) {
+	while (my ($student,$data) = each(%$classlist)) {
 	    my ($section,$status) = ($data->[$sec_index],
 				     $data->[$status_index]);
 	    unless ($section eq '-1' || $section =~ /^\s*$/) {
-		if (!defined($$sectioncount{$section})) { $numsections++; }
-		$$sectioncount{$section}++;
+		$sectioncount{$section}++;
 	    }
 	}
     }
@@ -3763,10 +3809,9 @@ sub get_sections {
 	}
 	if ($user =~ /^$role:[^:]*:[^:]*:(\w+)/) { $section=$1; }
 	if (!defined($section) || $section eq '-1') { next; }
-	if (!defined($$sectioncount{$section})) { $numsections++; } 
-	$$sectioncount{$section}++;
+	$sectioncount{$section}++;
     }
-    return $numsections;
+    return %sectioncount;
 }
 
 ###############################################
@@ -3803,25 +3848,24 @@ can be sent to &get_group_settings() to
 ###############################################
 
 sub coursegroups {
-    my ($curr_groups,$cdom,$cnum,$group) = @_;
-    my $numgroups;
+    my ($cdom,$cnum,$group) = @_;
     if (!defined($cdom) || !defined($cnum)) {
         my $cid =  $env{'request.course.id'};
+
+	return if (!defined($cid));
+
         $cdom = $env{'course.'.$cid.'.domain'};
         $cnum = $env{'course.'.$cid.'.num'};
     }
-    %{$curr_groups} = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
-    my ($tmp) = keys(%{$curr_groups});
-    if ($tmp=~/^error:/) {
-        unless ($tmp eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-            &logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.
-                                                                   $cdom);
-        }
-        $numgroups = 0;
-    } else {
-        $numgroups = keys(%{$curr_groups});
+    my %curr_groups = &Apache::lonnet::get_coursegroups($cdom,$cnum,$group);
+    my ($tmp) = keys(%curr_groups);
+    if ($tmp=~/^(con_lost|no_such_host|error: [^2] )/) {
+	undef(%curr_groups);
+	&logthis('Error retrieving groups: '.$tmp.' in '.$cnum.':'.$cdom);
+    } elsif ($tmp=~/^error: 2 /) {
+	undef(%curr_groups);
     }
-    return $numgroups;
+    return %curr_groups;
 }
 
 ###############################################
@@ -3882,7 +3926,7 @@ sub get_group_settings {
                         $content{$tool}{$function} = $value;
                     }
                 } elsif ($entry eq 'groupname') {
-                    $content{$entry}=&Apache::lonnet::unescape($value);
+                    $content{$entry}=&unescape($value);
                 } elsif (($entry eq 'roles') || ($entry eq 'types') ||
                          ($entry eq 'sectionpick') || ($entry eq 'defpriv')) {
                     push(@{$content{$entry}},$value);
@@ -4069,7 +4113,7 @@ sub get_unprocessed_cgi {
   # $Apache::lonxml::debug=1;
   foreach my $pair (split(/&/,$query)) {
     my ($name, $value) = split(/=/,$pair);
-    $name = &Apache::lonnet::unescape($name);
+    $name = &unescape($name);
     if (!defined($possible_names) || (grep {$_ eq $name} @$possible_names)) {
       $value =~ tr/+/ /;
       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
@@ -4698,9 +4742,9 @@ sub DrawBarGraph {
     $Title  = '' if (! defined($Title));
     $xlabel = '' if (! defined($xlabel));
     $ylabel = '' if (! defined($ylabel));
-    $ValuesHash{$id.'.title'}    = &Apache::lonnet::escape($Title);
-    $ValuesHash{$id.'.xlabel'}   = &Apache::lonnet::escape($xlabel);
-    $ValuesHash{$id.'.ylabel'}   = &Apache::lonnet::escape($ylabel);
+    $ValuesHash{$id.'.title'}    = &escape($Title);
+    $ValuesHash{$id.'.xlabel'}   = &escape($xlabel);
+    $ValuesHash{$id.'.ylabel'}   = &escape($ylabel);
     $ValuesHash{$id.'.y_max_value'} = $Max;
     $ValuesHash{$id.'.NumBars'}  = $NumBars;
     $ValuesHash{$id.'.NumSets'}  = $NumSets;
@@ -4780,9 +4824,9 @@ sub DrawXYGraph {
     $ylabel = '' if (! defined($ylabel));
     my %ValuesHash = 
         (
-         $id.'.title'  => &Apache::lonnet::escape($Title),
-         $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
-         $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+         $id.'.title'  => &escape($Title),
+         $id.'.xlabel' => &escape($xlabel),
+         $id.'.ylabel' => &escape($ylabel),
          $id.'.y_max_value'=> $Max,
          $id.'.labels'     => join(',',@$Xlabels),
          $id.'.PlotType'   => 'XY',
@@ -4877,9 +4921,9 @@ sub DrawXYYGraph {
     $ylabel = '' if (! defined($ylabel));
     my %ValuesHash = 
         (
-         $id.'.title'  => &Apache::lonnet::escape($Title),
-         $id.'.xlabel' => &Apache::lonnet::escape($xlabel),
-         $id.'.ylabel' => &Apache::lonnet::escape($ylabel),
+         $id.'.title'  => &escape($Title),
+         $id.'.xlabel' => &escape($xlabel),
+         $id.'.ylabel' => &escape($ylabel),
          $id.'.labels' => join(',',@$Xlabels),
          $id.'.PlotType' => 'XY',
          $id.'.NumSets' => 2,
@@ -4951,7 +4995,7 @@ Inputs:
 sub chartlink {
     my ($linktext, $sname, $sdomain) = @_;
     my $link = '<a href="/adm/statistics?reportSelected=student_assessment'.
-        '&amp;SelectedStudent='.&Apache::lonnet::escape($sname.':'.$sdomain).
+        '&amp;SelectedStudent='.&escape($sname.':'.$sdomain).
         '&amp;chartoutputmode='.HTML::Entities::encode('html, with all links').
        '">'.$linktext.'</a>';
 }
@@ -5014,11 +5058,11 @@ sub store_course_settings {
                 if (ref($env{'form.'.$setting})) {
                     $stored_form = join(',',
                                         map {
-                                            &Apache::lonnet::escape($_);
+                                            &escape($_);
                                         } sort(@{$env{'form.'.$setting}}));
                 } else {
                     $stored_form = 
-                        &Apache::lonnet::escape($env{'form.'.$setting});
+                        &escape($env{'form.'.$setting});
                 }
                 # Determine if the array contents are the same.
                 if ($stored_form ne $env{$envname}) {
@@ -5052,7 +5096,7 @@ sub restore_course_settings {
             } elsif ($type eq 'array') {
                 $env{'form.'.$setting} = [ 
                                            map { 
-                                               &Apache::lonnet::unescape($_); 
+                                               &unescape($_); 
                                            } split(',',$env{$envname})
                                            ];
             }
@@ -5125,7 +5169,7 @@ sub escape_double {
 sub escape_url {
     my ($url)   = @_;
     my @urlslices = split(/\//, $url,-1);
-    my $lastitem = &Apache::lonnet::escape(pop(@urlslices));
+    my $lastitem = &escape(pop(@urlslices));
     return join('/',@urlslices).'/'.$lastitem;
 }
 =pod