--- loncom/interface/loncommon.pm	2006/12/11 21:56:52	1.492
+++ loncom/interface/loncommon.pm	2007/03/03 01:33:20	1.512
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.492 2006/12/11 21:56:52 albertel Exp $
+# $Id: loncommon.pm,v 1.512 2007/03/03 01:33:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,6 +59,7 @@ use Apache::lonnet;
 use GDBM_File;
 use POSIX qw(strftime mktime);
 use Apache::lonmenu();
+use Apache::lonenc();
 use Apache::lonlocal;
 use HTML::Entities;
 use Apache::lonhtmlcommon();
@@ -1264,37 +1265,13 @@ sub create_text_file {
 ##        Home server <option> list generating code          ##
 ###############################################################
 
-=pod
-
-=head1 Home Server option list generating code
-
-=over 4
-
-=item * get_domains()
-
-Returns an array containing each of the domains listed in the hosts.tab
-file.
-
-=cut
-
-#-------------------------------------------
-sub get_domains {
-    # The code below was stolen from "The Perl Cookbook", p 102, 1st ed.
-    my @domains;
-    my %seen;
-    foreach my $dom (sort(values(%Apache::lonnet::hostdom))) {
-	push(@domains,$dom) unless $seen{$dom}++;
-    }
-    return @domains;
-}
-
 # ------------------------------------------
 
 sub domain_select {
     my ($name,$value,$multiple)=@_;
     my %domains=map { 
 	$_ => $_.' '.$Apache::lonnet::domaindescription{$_} 
-    } &get_domains;
+    } &Apache::lonnet::all_domains();
     if ($multiple) {
 	$domains{''}=&mt('Any domain');
 	return &multiple_select_form($name,$value,4,\%domains);
@@ -1314,11 +1291,11 @@ Returns a string containing a <select> e
 
 Args:
   $name - name of the <select> element
-  $value - sclara or array ref of values that should already be selected
+  $value - scalar or array ref of values that should already be selected
   $size - number of rows long the select element is
   $hash - the elements should be 'option' => 'shown text'
           (shown text should already have been &mt())
-  $order - (optional) array ref of the order to show the elments in
+  $order - (optional) array ref of the order to show the elements in
 
 =cut
 
@@ -1334,8 +1311,16 @@ sub multiple_select_form {
         }
     }
     $output.="\n<select name='$name' size='$size' multiple='1'>";
-    my @order = ref($order) ? @$order
-                            : sort(keys(%$hash));
+    my @order;
+    if (ref($order) eq 'ARRAY')  {
+        @order = @{$order};
+    } else {
+        @order = sort(keys(%$hash));
+    }
+    if (exists($$hash{'select_form_order'})) {
+        @order = @{$$hash{'select_form_order'}};
+    }
+        
     foreach my $key (@order) {
         $output.='<option value="'.&HTML::Entities::encode($key,'"<>&').'" ';
         $output.='selected="selected" ' if ($selected{$key});
@@ -1450,7 +1435,7 @@ selected");
 #-------------------------------------------
 sub select_dom_form {
     my ($defdom,$name,$includeempty) = @_;
-    my @domains = get_domains();
+    my @domains = &Apache::lonnet::all_domains();
     if ($includeempty) { @domains=('',@domains); }
     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
@@ -1476,14 +1461,7 @@ given $domain.
 
 #-------------------------------------------
 sub get_library_servers {
-    my $domain = shift;
-    my %library_servers;
-    foreach my $hostid (keys(%Apache::lonnet::libserv)) {
-        if ($Apache::lonnet::hostdom{$hostid} eq $domain) {
-            $library_servers{$hostid} = $Apache::lonnet::hostname{$hostid};
-        }
-    }
-    return %library_servers;
+    return &Apache::lonnet::get_servers($_[0],'library');
 }
 
 #-------------------------------------------
@@ -2258,6 +2236,19 @@ sub track_student_link {
 	&help_open_topic('View_recent_activity');
 }
 
+# ===================================================== Display a student photo
+
+
+sub student_image_tag {
+    my ($domain,$user)=@_;
+    my $imgsrc=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+    if (($imgsrc) && ($imgsrc ne '/adm/lonKaputt/lonlogo_broken.gif')) {
+	return '<img src="'.$imgsrc.'" align="right" />';
+    } else {
+	return '';
+    }
+}
+
 =pod
 
 =back
@@ -2690,7 +2681,9 @@ sub get_student_answers {
   }
   $moreenv{'grade_target'}='answer';
   %moreenv=(%form,%moreenv);
-  my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv);
+  $feedurl = &Apache::lonnet::clutter($feedurl);
+  &Apache::lonenc::check_encrypt(\$feedurl);
+  my $userview=&Apache::lonnet::ssi($feedurl,%moreenv);
   return $userview;
 }
 
@@ -2893,16 +2886,16 @@ sub blockcheck {
         $uname = $env{'user.name'};
     }
 
-    my ($startblock,$endblock);
-
     # If uname and udom are for a course, check for blocks in the course.
 
     if (&Apache::lonnet::is_course($udom,$uname)) {
         my %records = &Apache::lonnet::dump('comm_block',$udom,$uname);
-        ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
+        my ($startblock,$endblock)=&get_blocks($setters,$activity,$udom,$uname);
         return ($startblock,$endblock);
     }
 
+    my $startblock = 0;
+    my $endblock = 0;
     my %live_courses = &findallcourses(undef,$uname,$udom);
 
     # If uname is for a user, and activity is course-specific, i.e.,
@@ -2963,8 +2956,6 @@ sub blockcheck {
             if ($sec ne 'none') {
                 $checkrole .= '/'.$sec;
             }
-            # Resource belongs to user other than current user.
-            # Assemble privs for that user, and check for 'evb' priv.  
             if ($otheruser) {
                 # Resource belongs to user other than current user.
                 # Assemble privs for that user, and check for 'evb' priv.
@@ -3014,8 +3005,16 @@ sub blockcheck {
 
         # Retrieve blocking times and identity of blocker for course
         # of specified user, unless user has 'evb' privilege.
-
-        ($startblock,$endblock)=&get_blocks($setters,$activity,$cdom,$cnum);
+        
+        my ($start,$end)=&get_blocks($setters,$activity,$cdom,$cnum);
+        if (($start != 0) && 
+            (($startblock == 0) || ($startblock > $start))) {
+            $startblock = $start;
+        }
+        if (($end != 0)  &&
+            (($endblock == 0) || ($endblock < $end))) {
+            $endblock = $end;
+        }
     }
     return ($startblock,$endblock);
 }
@@ -3341,7 +3340,7 @@ sub bodytag {
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
     if ($role  eq 'ca') {
         my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$});
-        $realm = &plainname($rname,$rdom).':'.$rdom;
+        $realm = &plainname($rname,$rdom);
     } 
 # realm
     if ($env{'request.course.id'}) {
@@ -3645,9 +3644,20 @@ sub standard_css {
     return <<END;
 h1, h2, h3, th { font-family: $sans }
 a:focus { color: red; background: yellow } 
-table.thinborder { border-collapse: collapse; }
-table.thinborder tr th {  border-style: solid; border-width: 1px; background: $tabbg;}
-table.thinborder tr td { border-style: solid; border-width: 1px}
+table.thinborder,
+table.LC_optres_prior {
+  border-collapse: collapse;
+}
+table.thinborder tr th {
+  border-style: solid;
+  border-width: 1px;
+  background: $tabbg;
+}
+table.thinborder tr td, 
+table.LC_optres_prior tr td {
+  border-style: solid;
+  border-width: 1px
+}
 
 form, .inline { display: inline; }
 .center { text-align: center; }
@@ -3819,6 +3829,18 @@ table.LC_data_table, table.LC_mail_list
 .LC_data_table_dense {
   font-size: small;
 }
+table.LC_nested_outer {
+  border: 1px solid #000000;
+  border-collapse: separate;
+  border-spacing: 0px;
+  width: 100%;
+}
+table.LC_nested {
+  border: 0px;
+  border-collapse: separate;
+  border-spacing: 0px;
+  width: 100%;
+}
 table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th {
   font-weight: bold;
   background-color: $data_table_head;
@@ -3837,36 +3859,50 @@ table.LC_data_table tr.LC_data_table_hig
   background-color: $data_table_darker;
 }
 table.LC_data_table tr.LC_empty_row td,
-table.LC_whatsnew tr.LC_empty_row td {
+table.LC_nested tr.LC_empty_row td {
   background-color: #FFFFFF;
   font-weight: bold;
   font-style: italic;
   text-align: center;
   padding: 8px;
 }
-table.LC_whatsnew tr.LC_empty_row td {
+table.LC_nested tr.LC_empty_row td {
   padding: 4ex
 }
-table.LC_whatsnew {
+table.LC_nested_outer tr th {
+  font-weight: bold;
+  background-color: $data_table_head;
+  font-size: smaller;
+  border-bottom: 1px solid #000000;
 }
-
-table.LC_whatsnew tr th,
-table.LC_whatsnew tr.LC_info_row td {
-  background-color: #CCC;
+table.LC_nested_outer tr td.LC_subheader {
+  background-color: $data_table_head;
   font-weight: bold;
   font-size: small;
+  border-bottom: 1px solid #000000;
   text-align: right;
 }
-table.LC_whatsnew tr td {
-  background-color: #FFF;
+table.LC_nested tr.LC_info_row td {
+  background-color: #CCC;
+  font-weight: bold;
   font-size: small;
-  text-align: right;
+  text-align: center;
 }
-table.LC_whatsnew tr td.LC_first_item {
+table.LC_nested tr.LC_info_row td.LC_left_item {
   text-align: left;
 }
+table.LC_nested td {
+  background-color: #FFF;
+  font-size: small;
+}
+table.LC_nested_outer tr th.LC_right_item,
+table.LC_nested tr.LC_info_row td.LC_right_item,
+table.LC_nested tr.LC_odd_row td.LC_right_item,
+table.LC_nested tr td.LC_right_item {
+  text-align: right;
+}
 
-table.LC_whatsnew tr.LC_odd_row td {
+table.LC_nested tr.LC_odd_row td {
   background-color: #EEE;
 }
 
@@ -3925,6 +3961,11 @@ table.LC_mail_list tr.LC_mail_other {
 table.LC_mail_list tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
+table.LC_mail_list tr.LC_mail_even {
+}
+table.LC_mail_list tr.LC_mail_odd {
+}
+
 
 table#LC_portfolio_actions {
   width: auto;
@@ -4468,6 +4509,11 @@ Inputs:         $args - additional optio
                                  a html attribute
                  frameset     -> if true will start with a <frameset>
                                  rather than <body>
+                 dicsussion   -> if true will get discussion from
+                                  lonxml::xmlend
+                                 (you can pass the target and parser arguments
+                                  through optional 'target' and 'parser' args
+                                  to this routine)
 
 =cut
 
@@ -4926,7 +4972,7 @@ sub get_course_users {
                     $usec = 'none';
                 }
                 if ($uname ne '' && $udom ne '') {
-                    if ($end < $now) {
+                    if ($end > 0 && $end < $now) {
                         $status = 'previous';
                     } elsif ($start > $now) {
                         $status = 'future';
@@ -5368,9 +5414,9 @@ sub record_sep {
     } else {
         my @allfields;
         if ($env{'form.upfiletype'} eq 'semisv') {
-            @allfields=split(/;/,$record);
+            @allfields=split(/;/,$record,-1);
         } else {
-            @allfields=split(/\,/,$record);
+            @allfields=split(/\,/,$record,-1);
         }
         my $i=0;
         my $j;
@@ -6064,16 +6110,19 @@ Returns: both routines return nothing
 #######################################################
 #######################################################
 sub store_course_settings {
+    return &store_settings($env{'request.course.id'},@_);
+}
+
+sub store_settings {
     # save to the environment
     # appenv the same items, just to be safe
-    my $courseid = $env{'request.course.id'};
     my $udom  = $env{'user.domain'};
     my $uname = $env{'user.name'};
-    my ($prefix,$Settings) = @_;
+    my ($context,$prefix,$Settings) = @_;
     my %SaveHash;
     my %AppHash;
     while (my ($setting,$type) = each(%$Settings)) {
-        my $basename = join('.','internal',$courseid,$prefix,$setting);
+        my $basename = join('.','internal',$context,$prefix,$setting);
         my $envname = 'environment.'.$basename;
         if (exists($env{'form.'.$setting})) {
             # Save this value away
@@ -6113,11 +6162,14 @@ sub store_course_settings {
 }
 
 sub restore_course_settings {
-    my $courseid = $env{'request.course.id'};
-    my ($prefix,$Settings) = @_;
+    return &restore_settings($env{'request.course.id'},@_);
+}
+
+sub restore_settings {
+    my ($context,$prefix,$Settings) = @_;
     while (my ($setting,$type) = each(%$Settings)) {
         next if (exists($env{'form.'.$setting}));
-        my $envname = 'environment.internal.'.$courseid.'.'.$prefix.
+        my $envname = 'environment.internal.'.$context.'.'.$prefix.
             '.'.$setting;
         if (exists($env{$envname})) {
             if ($type eq 'scalar') {
@@ -6532,7 +6584,7 @@ sub group_term {
 
 sub icon {
     my ($file)=@_;
-    my $curfext = (split(/\./,$file))[-1];
+    my $curfext = lc((split(/\./,$file))[-1]);
     my $iconname=$Apache::lonnet::perlvar{'lonIconsURL'}.'/unknown.gif';
     my $embstyle = &Apache::loncommon::fileembstyle($curfext);
     if (!(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn')) {