--- loncom/interface/lonnavmaps.pm	2017/06/21 19:54:58	1.509.2.5.4.1
+++ loncom/interface/lonnavmaps.pm	2019/02/03 22:25:47	1.509.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.5.4.1 2017/06/21 19:54:58 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.9 2019/02/03 22:25:47 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -643,6 +643,9 @@ sub getDescription {
             } elsif ($slot_status == $res->RESERVABLE) {
                 $slotmsg = &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
+            } elsif ($slot_status == $res->NEEDS_CHECKIN) {
+                $slotmsg = &mt('Reserved, check-in needed - ends [_1]',
+                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
                 $slotmsg = &mt('Reservable, reservations open [_1]',
                            timeToHumanString($slot_time,'start'));
@@ -938,7 +941,28 @@ sub render_resource {
     # links to open and close the folder
 
     my $whitespace = $location.'/whitespace_21.gif';
-    my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
+    my $linkopen = "<img src='$whitespace' alt='' />";
+    my $nomodal;
+    if (($params->{'modalLink'}) && (!$resource->is_sequence())) {
+        if ($link =~m{^(?:|/adm/wrapper)/ext/([^#]+)}) {
+            my $exturl = $1;
+            if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                $nomodal = 1;
+            }
+        } elsif (($link eq "/public/$LONCAPA::match_domain/$LONCAPA::match_courseid/syllabus") &&
+                 ($env{'request.course.id'}) && ($ENV{'SERVER_PORT'} == 443) &&
+                 ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
+             $nomodal = 1;
+        }
+        my $esclink = &js_escape($link);
+        if ($nomodal) {
+            $linkopen .= "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+        } else {
+            $linkopen .= "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+        }
+    } else {
+        $linkopen .= "<a href=\"$link\">";
+    }
     my $linkclose = "</a>";
 
     # Default icon: unknown page
@@ -1063,10 +1087,19 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
-    } else {
-        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
+        $linkclose = '</a>';
+        if ($params->{'modalLink'}) {
+            my $esclink = &js_escape($link);
+            if ($nomodal) {
+                $linkopen = "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+            } else {
+                $linkopen = "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+            }
+        } else {
+            $linkopen = "<a href=\"$link\">";
+        }
     }
+    $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
 
     return $result;
 }
@@ -1420,10 +1453,13 @@ sub render {
         if ($args->{'iterator_map'}) {
             my $map = $args->{'iterator_map'};
             $map = $navmap->getResourceByUrl($map);
-            my $firstResource = $map->map_start();
-            my $finishResource = $map->map_finish();
-
-            $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
+            if (ref($map)) {
+                my $firstResource = $map->map_start();
+                my $finishResource = $map->map_finish();
+                $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
+            } else {
+                return;
+            }
         } else {
             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'});
         }
@@ -1687,6 +1723,11 @@ END
     }
 
 
+    my $inhibitmenu;
+    if ($args->{'modalLink'}) {
+        $inhibitmenu = '&amp;inhibitmenu=yes';
+    }
+
     while (1) {
 	if ($args->{'sort'}) {
 	    $curRes = shift(@resources);
@@ -1823,7 +1864,7 @@ END
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
 		($srcHasQuestion?'&amp;':'?') .
-		'symb=' . &escape($symb).$anchor;
+		'symb=' . &escape($symb).$inhibitmenu.$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
         # show them.
@@ -2237,7 +2278,7 @@ sub generate_email_discuss_status {
     foreach my $msgid (@keys) {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
-                $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+                $symb,$error) = &Apache::lonmsg::unpackmsgid(&LONCAPA::escape($msgid));
             &Apache::lonenc::check_decrypt(\$symb); 
             if (($fromcid ne '') && ($fromcid ne $cid)) {
                 next;
@@ -4632,12 +4673,11 @@ sub duedate {
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if ($interval[0] =~ /^(\d+)/) {
-        my $timelimit = $1;
-        my $first_access=&Apache::lonnet::get_first_access($interval[1],
+    if ($interval[0] =~ /\d+/) {
+       my $first_access=&Apache::lonnet::get_first_access($interval[1],
                                                           $self->{SYMB});
 	if (defined($first_access)) {
-            my $interval = $first_access+$timelimit;
+           my $interval = $first_access+$interval[0];
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
                                                           : $due_date;
 	} else {
@@ -5543,7 +5583,7 @@ sub check_for_slot {
                                 ($checkedin,$checkedinslot) = $self->checkedin();
                                 unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
                                         ($checkedinslot eq $slot_name)) {
-                                    return (NEEDS_CHECKIN,undef,$slot_name); 
+                                    return (NEEDS_CHECKIN,$end,$slot_name); 
                                 }
                             }
                             return (RESERVED,$end,$slot_name);