--- loncom/interface/lonsyllabus.pm	2013/09/17 15:04:30	1.133
+++ loncom/interface/lonsyllabus.pm	2016/01/26 14:30:25	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.133 2013/09/17 15:04:30 raeburn Exp $
+# $Id: lonsyllabus.pm,v 1.139 2016/01/26 14:30:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,7 @@ sub handler {
     my $minimal=$courseenv{'minimalsyllabus'};
 
     if (($minimal =~/\w/) || ($uploaded =~/\w/)) {
-        my $item;
+        my ($item,$is_pdf);
         if ($minimal =~/\w/) {
             if ($external =~ m{\Q$minimal\E$}) {
                 undef($external);
@@ -110,6 +110,9 @@ sub handler {
                 undef($external);
             }
             $item = $uploaded;
+            if ($item =~ /\.pdf$/i) {
+                $is_pdf = 1;
+            }
         }
         unless ($allowed && $forceedit) {
             my $file=&Apache::lonnet::filelocation("",$item);
@@ -129,6 +132,9 @@ sub handler {
                         if ($env{'form.only_body'}) {
                             $args{'only_body'} = 1;
                         }
+                        if ($env{'request.use_absolute'}) {
+                            $args{'use_absolute'} = $env{'request.use_absolute'};
+                        }
                         $r->print(&Apache::loncommon::start_page("Syllabus",undef,\%args).
                                   $result.
                                   &Apache::loncommon::end_page());
@@ -157,7 +163,8 @@ sub handler {
                               &mt('Print the syllabus directly from your web browser').
                               '\end{document}');
                 } else {
-                    $r->print(&Apache::lonwrapper::wrapper($item));
+                    $r->print(&Apache::lonwrapper::wrapper($item,undef,$env{'request.use_absolute'},
+                                                           undef,$is_pdf,undef,&mt('Syllabus')));
                 }
             }
             return OK;
@@ -170,7 +177,13 @@ sub handler {
                          ' \strut \\\\ '.&mt('Print the syllabus directly from your web browser').
                          '\end{document}');
             } else {
-                $r->print(&Apache::lonwrapper::wrapper($external));
+                my $is_ext = 1;
+                my $is_pdf;
+                if ($external =~ /\.pdf$/i) {
+                    $is_pdf = 1;
+                }
+                $r->print(&Apache::lonwrapper::wrapper($external,undef,$env{'request.use_absolute'},
+                                                       $is_ext,$is_pdf,undef,&mt('Syllabus')));
             }
             return OK;
         }
@@ -410,7 +423,7 @@ sub handler {
                 }
                 $rsslinktext = &mt('Manage Course RSS Feeds/Blogs');
                 if ($crstype eq 'Community') {
-                    $rsslinktext = &mt('Manage Communiity RSS Feeds/Blogs');
+                    $rsslinktext = &mt('Manage Community RSS Feeds/Blogs');
                 }
             }
             my $editurl= &Apache::lonnet::absolute_url().'/adm/'.$cdom.'/'.$cnum.'/_rss.html';
@@ -567,6 +580,7 @@ ENDSCRIPT
         my $checkedstr = "var include = new Array('".join("','",@checked)."');";
         my $uncheckedstr = "var exclude = new Array('".join("','",@unchecked)."');";
         my $invurl = &mt('Invalid URL');
+        &js_escape(\$invurl);
         my $urlregexp = <<'ENDREGEXP';
 /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
 ENDREGEXP
@@ -695,6 +709,10 @@ ENDSCRIPT
                          onload => 'setTemplateBoxes();',
                        );
         $args->{'add_entries'} = \%loaditem;
+    } else {
+        if ($env{'request.use_absolute'}) {
+            $args->{'use_absolute'} = $env{'request.use_absolute'};
+        }
     }
     if ($env{'form.only_body'}) {
         $args->{'only_body'} = 1;
@@ -1271,7 +1289,7 @@ sub save_changes {
                 ($url,$needlink) = &process_upload(\$output,$cnum,$cdom,
                                                    \%allfiles,\%codebase);
             } else {
-                $output = '<div class="LC_info">';
+                $output = '<div class="LC_info">'.
                           &mt('No file uploaded').
                           '</div>';
             }
@@ -1503,7 +1521,7 @@ sub home_http_host {
     if ($home ne 'no_host') {
         my $protocol = $Apache::lonnet::protocol{$home};
         $protocol = 'http' if ($protocol ne 'https');
-        return $protocol.'://'.$home;
+        return $protocol.'://'.&Apache::lonnet::hostname($home);
     }
     return;
 }
@@ -1610,11 +1628,12 @@ sub editfile_button {
 }
 
 sub editbutton_js {
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                min    => 'Are you sure you want to delete the contents of the syllabus template?',
                file   => 'Are you sure you want to delete the uploaded syllabus file?',
                noundo => 'This action cannot be reversed.'
              );
+    &js_escape(\%js_lt);
     return <<ENDJS;
                 <script type="text/javascript">
                 // <![CDATA[
@@ -1625,12 +1644,12 @@ sub editbutton_js {
                       if (document.getElementById('deleteuploaded_'+caller)) {
                           document.getElementById('deleteuploaded_'+caller).value=1;
                           if (caller == 'minimal') {
-                              if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) {
+                              if (confirm("$js_lt{'min'}"+"\\n"+"$js_lt{'noundo'}")) {
                                   document.syllabus.submit();
                               }
                           }
                           if (caller == 'file') {
-                              if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) {
+                              if (confirm("$js_lt{'file'}"+"\\n"+"$js_lt{'noundo'}")) {
                                   document.syllabus.submit();
                               }
                           }