--- loncom/lonnet/perl/lonnet.pm 2006/09/29 18:23:25 1.787 +++ loncom/lonnet/perl/lonnet.pm 2006/10/04 21:02:41 1.789 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.787 2006/09/29 18:23:25 albertel Exp $ +# $Id: lonnet.pm,v 1.789 2006/10/04 21:02:41 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -323,9 +323,9 @@ sub convert_and_load_session_env { # ------------------------------------------- Transfer profile into environment my $env_loaded; sub transfer_profile_to_env { - if ($env_loaded) { return; } + my ($lonidsdir,$handle,$force_transfer) = @_; + if (!$force_transfer && $env_loaded) { return; } - my ($lonidsdir,$handle)=@_; if (!defined($lonidsdir)) { $lonidsdir = $perlvar{'lonIDsDir'}; } @@ -1177,15 +1177,6 @@ sub ssi_body { sub absolute_url { my ($host_name) = @_; - my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://'); - if ($host_name eq '') { - $host_name = $ENV{'SERVER_NAME'}; - } - return $protocol.$host_name; -} - -sub absolute_url { - my ($host_name) = @_; my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://'); if ($host_name eq '') { $host_name = $ENV{'SERVER_NAME'};