[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface lonsyllabus.pm

[raeburn]

raeburn		Wed Dec 24 08:10:09 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	lonsyllabus.pm 
  Log:
  - Backport 1.75
  
  
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.69 loncom/interface/lonsyllabus.pm:1.69.2.1
--- loncom/interface/lonsyllabus.pm:1.69	Fri Nov  7 18:06:19 2008
+++ loncom/interface/lonsyllabus.pm	Wed Dec 24 08:10:09 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.69 2008/11/07 18:06:19 bisitz Exp $
+# $Id: lonsyllabus.pm,v 1.69.2.1 2008/12/24 08:10:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -239,9 +239,11 @@
           if ($forcestudent or $target eq 'tex') { $allowed=0; }
        }
        if ($allowed) {
+          my $protocol = $Apache::lonnet::protocol{$homeserver};
+          $protocol = 'http' if ($protocol ne 'https');
           $r->print('<p>'.
 &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes',&mt('Help with filling in text boxes')).'</p><p>'.&mt('This syllabus can be publicly viewed at')
-		    .' <tt>http://'.
+		    .' <tt>'.$protocol.'://'.
 		    &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
           '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>'.
@@ -271,7 +273,7 @@
 # get rid of leading and trailing spaces
                       $url=~s/^\s+//;
                       $url=~s/\s+$//;
-                      if ($url=~m|^http://([^/]+)/(.+)$|) {
+                      if ($url=~m|^https?\://([^/]+)/(.+)$|) {
 			  my $host = $1;
                           my $remainder=$2;
 # remove the hostname from internal URLs
@@ -284,7 +286,7 @@
 		          }
 		      }
 # norm internal URLs
-                      unless ($url=~/^http\:/) {
+                      unless ($url=~/^https?\:/) {
 		          $url=&Apache::lonnet::clutter($url);
                       }
 # re-assemble field
@@ -361,7 +363,7 @@
 		   } 
 	       } else {
 		   &Apache::lonfeedback::newline_to_br(\$message);
-		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+		   $message =~s|(https?\://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
 		   if ($allowed) {
 		       $message=&Apache::lonspeller::markeduptext($message);
 		   }