--- rat/lonwrapper.pm	2006/04/11 19:42:32	1.23
+++ rat/lonwrapper.pm	2006/11/30 23:35:38	1.25
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.23 2006/04/11 19:42:32 albertel Exp $
+# $Id: lonwrapper.pm,v 1.25 2006/11/30 23:35:38 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,7 +32,8 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::lonnet;
 use Apache::lonxml();
-use Apache::lonmenu;
+use Apache::lonenc();
+use Apache::lonmenu();
 
 # ================================================================ Main Handler
 
@@ -81,8 +82,12 @@ sub wrapper {
 
     my $end_page = 
 	&Apache::loncommon::end_page({'frameset' => 1});
-
-  
+    
+    foreach my $url ($topurl,$bottomurl) {
+	if ($url !~ /^http:/) {
+	    $url = &Apache::lonenc::check_encrypt($url);
+	}
+    }
 #
 # frame-based rendering for graphical interface
 #
@@ -118,6 +123,7 @@ sub handler {
     $url=~s/^\/adm\/wrapper//;
     my $is_ext = $url =~ m|^/ext/|;
     $url=~s/^\/ext\//http\:\/\//;
+    $url=~s|http://https://|https://|;
     $url=~s|:|:|g;
 #
 # Actual URL