[LON-CAPA-cvs] cvs: rat / lonpage.pm lonwrapper.pm

[raeburn]

raeburn		Fri Dec 19 14:30:51 2008 EDT

  Modified files:              
    /rat	lonpage.pm lonwrapper.pm 
  Log:
  - Escape : in regexp, and separate ? and :
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.90 rat/lonpage.pm:1.91
--- rat/lonpage.pm:1.90	Fri Dec 19 03:50:48 2008
+++ rat/lonpage.pm	Fri Dec 19 14:30:51 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.90 2008/12/19 03:50:48 raeburn Exp $
+# $Id: lonpage.pm,v 1.91 2008/12/19 14:30:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -342,7 +342,7 @@
                               }
                               $thisdir=~s/\/[^\/]*$//;
 			      foreach (@rlinks) {
-				  unless (($_=~/^https?:\/\//i) ||
+				  unless (($_=~/^https?\:\/\//i) ||
 					  ($_=~/^\//) ||
 					  ($_=~/^javascript:/i) ||
 					  ($_=~/^mailto:/i) ||
Index: rat/lonwrapper.pm
diff -u rat/lonwrapper.pm:1.31 rat/lonwrapper.pm:1.32
--- rat/lonwrapper.pm:1.31	Fri Dec 19 13:47:40 2008
+++ rat/lonwrapper.pm	Fri Dec 19 14:30:51 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.31 2008/12/19 13:47:40 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.32 2008/12/19 14:30:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,7 +89,7 @@
 	&Apache::loncommon::end_page({'frameset' => 1});
     
     foreach my $url ($topurl,$bottomurl) {
-	if ($url !~ /^https?:/) {
+	if ($url !~ /^https?\:/) {
 	    $url = &Apache::lonenc::check_encrypt($url);
 	}
     }