--- rat/lonambiguous.pm	2006/03/19 23:06:00	1.18
+++ rat/lonambiguous.pm	2014/12/11 01:13:24	1.26
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to resolve ambiguous file locations
 #
-# $Id: lonambiguous.pm,v 1.18 2006/03/19 23:06:00 albertel Exp $
+# $Id: lonambiguous.pm,v 1.26 2014/12/11 01:13:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::lonambiguous;
 
 use strict;
@@ -55,8 +57,8 @@ sub getlost {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     $r->print(&Apache::loncommon::start_page('Could not handle ambiguous resource reference').
-	      $errmsg.
-	      (&Apache::loncommon::end_page());
+	      '<div class="LC_warning">'.$errmsg.'</div>'.
+	      &Apache::loncommon::end_page());
 }
 
 # ================================================================ Main Handler
@@ -85,7 +87,7 @@ sub handler {
        my $envkey;
        if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
                     &GDBM_READER(),0640)) {
-          foreach $envkey (keys %env) {
+          foreach $envkey (keys(%env)) {
              if ($envkey=~/^form\.(\d+)\.(\d+)$/) {
 # ---------------------------------------------------- Update symb and redirect
 	         my $mapid=$1;
@@ -95,7 +97,7 @@ sub handler {
 				           $resurl => [$resurl,$resid]);
                  untie(%bighash);
                  $r->header_out(Location => 
-                                'http://'.$ENV{'HTTP_HOST'}.$resurl);
+				&Apache::lonnet::absolute_url().$resurl);
                  return REDIRECT;
              }
 	  }
@@ -134,7 +136,7 @@ sub handler {
 # ----------------------------------- Okay, this should have appeared on a page
 	   &Apache::loncommon::content_type($r,'text/html');
            $r->header_out(Location => 
-			  'http://'.$ENV{'HTTP_HOST'}.
+			  &Apache::lonnet::absolute_url().
 			  &Apache::lonnet::clutter($page));
            return REDIRECT;
        } else {
@@ -146,7 +148,8 @@ sub handler {
 # ------------------------------------Encrypted requests go straight to navmaps
    if ($env{'request.enc'}) {
        &Apache::loncommon::content_type($r,'text/html');
-       $r->header_out(Location => 'http://'.$ENV{'HTTP_HOST'}.'/adm/navmaps');
+       $r->header_out(Location => 
+		      &Apache::lonnet::absolute_url().'/adm/navmaps');
        return REDIRECT;
    }
 # ------------------------------------------------ Would be standalone resource
@@ -178,9 +181,9 @@ sub handler {
 		my $mapurl=$bighash{'map_id_'.(split(/\./,$id))[0]};
 		my $symb=&make_symb($id);
 		&Apache::loncommon::content_type($r,'text/html');
-		&Apache::lonnet::logthis('http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
 		$r->header_out(Location => 
-			   'http://'.$ENV{'HTTP_HOST'}.$resurl.'?symb='.$symb);
+			       &Apache::lonnet::absolute_url().
+			       $resurl.'?symb='.$symb);
 		return REDIRECT;
 	    }
             if ($#possibilities>0) {
@@ -189,29 +192,45 @@ sub handler {
                $r->send_http_header;
                my $start_page=
 		   &Apache::loncommon::start_page('Pick Instance of Resource');
-               $r->print(<<ENDSTART);
-$start_page
-The resource you had been accessing appears more than once in this course,
-and LON-CAPA has insufficient session information to determine which instance
-of the resource you meant.
-<p>
-Please click on the instance of the resource you intended to access:
-</p>
-<table border="2">
-<tr><th>Title</th><th>Part of ...</th></tr>
-ENDSTART
+               $r->print(
+                   $start_page
+                  .'<p class="LC_warning">'
+                  .&mt('The resource you had been accessing appears more than'
+                      .' once in this course, and LON-CAPA has insufficient'
+                      .' session information to determine which instance'
+                      .' of the resource you meant.')
+                  .'</p>'
+                  .'<p>'
+                  .&mt('Please click on the instance of the resource you'
+                      .' intended to access:')
+                  .'</p>'
+               );
+               $r->print(
+                   &Apache::loncommon::start_data_table()
+                  .&Apache::loncommon::start_data_table_header_row()
+                  .'<th>'.&mt('Title').'</th>'
+                  .'<th>'.&mt('Part of ...').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row()
+                  .&Apache::loncommon::start_data_table_row()
+               );
                map {
-		   my $resurl=$bighash{'src_'.$_};
+                   my $resurl=$bighash{'src_'.$_};
                    my $mapurl=$bighash{'map_id_'.(split(/\./,$_))[0]};
-		   my $symb=&make_symb($_);
-		   $r->print('<tr><td><a href="'.$resurl.'?symb='.$symb.'">'.
-			     &Apache::lonnet::gettitle($symb).
-			     '</a></td><td>'.
-			     &Apache::lonnet::gettitle($mapurl).'&nbsp;'.
-			     '</td></tr>');
+                   my $symb=&make_symb($_);
+                   $r->print(
+                       &Apache::loncommon::start_data_table_row()
+                      .'<td><a href="'.$resurl.'?symb='.$symb.'">'
+                      .&Apache::lonnet::gettitle($symb)
+                      .'</a></td>'
+                      .'<td>'.&Apache::lonnet::gettitle($mapurl).'&nbsp;</td>'
+                      .&Apache::loncommon::end_data_table_row()
+                   );
                } @possibilities;
-               $r->print('</table>'.&Apache::loncommon::end_page());
-	       untie(%bighash);
+               $r->print(
+                   &Apache::loncommon::end_data_table()
+                  .&Apache::loncommon::end_page()
+               );
+               untie(%bighash);
                return OK;
             }
          }
@@ -229,6 +248,40 @@ __END__
 
 
 
+=head1 NAME
+
+Apache::lonambiguous
+
+=head1 SYNOPSIS
+
+Handler to resolve ambiguous file locations.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+make_symb()
+
+and
+
+handler()
+
+=head1 OTHER SUBROUTINES
+
+=over
+
+=item *
+
+cleanup()
+
+=item *
+
+getlost()
+
+=back
+
+=cut