[LON-CAPA-cvs] cvs: loncom /interface lonbulletin.pm lonsimplepage.pm lonsyllabus.pm

[www]

www		Fri Jun 20 09:31:46 2003 EDT

  Modified files:              
    /loncom/interface	lonbulletin.pm lonsimplepage.pm lonsyllabus.pm 
  Log:
  Bug #1640: Recognizes "https:" as a web link.
  
  
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.9 loncom/interface/lonbulletin.pm:1.10
--- loncom/interface/lonbulletin.pm:1.9	Mon Mar 10 09:20:07 2003
+++ loncom/interface/lonbulletin.pm	Fri Jun 20 09:31:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.9 2003/03/10 14:20:07 www Exp $
+# $Id: lonbulletin.pm,v 1.10 2003/06/20 13:31:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,7 +143,7 @@
               my $message=$syllabus{$_};
               $message=~s/\n/\<br \/\>/g;
               $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+        =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
             unless ($_ eq 'aaa_title') {
 		if (($_ ne 'bbb_content') || ($allowed)) {
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.9 loncom/interface/lonsimplepage.pm:1.10
--- loncom/interface/lonsimplepage.pm:1.9	Mon Mar 10 09:20:07 2003
+++ loncom/interface/lonsimplepage.pm	Fri Jun 20 09:31:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.9 2003/03/10 14:20:07 www Exp $
+# $Id: lonsimplepage.pm,v 1.10 2003/06/20 13:31:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -142,7 +142,7 @@
               my $message=$syllabus{$_};
               $message=~s/\n/\<br \/\>/g;
               $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+        =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
             unless ($_ eq 'aaa_title') {
 		if (($_ ne 'bbb_content') || ($allowed)) {
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.19 loncom/interface/lonsyllabus.pm:1.20
--- loncom/interface/lonsyllabus.pm:1.19	Wed May 21 16:10:53 2003
+++ loncom/interface/lonsyllabus.pm	Fri Jun 20 09:31:46 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.19 2003/05/21 20:10:53 www Exp $
+# $Id: lonsyllabus.pm,v 1.20 2003/06/20 13:31:46 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -218,7 +218,7 @@
               } else {
                  $message=~s/\n/\<br \/\>/g;
                  $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+           =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	         $message=&Apache::lontexconvert::msgtexconverted($message);
                  $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
                         $message.'</blockquote>');