--- loncom/lonnet/perl/lonnet.pm	2006/09/05 20:42:15	1.778
+++ loncom/lonnet/perl/lonnet.pm	2006/09/15 20:49:29	1.781
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.778 2006/09/05 20:42:15 albertel Exp $
+# $Id: lonnet.pm,v 1.781 2006/09/15 20:49:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -293,8 +293,10 @@ sub error {
 }
 
 # ------------------------------------------- Transfer profile into environment
-
+my $env_loaded;
 sub transfer_profile_to_env {
+    if ($env_loaded) { return; } 
+
     my ($lonidsdir,$handle)=@_;
     if (!defined($lonidsdir)) {
 	$lonidsdir = $perlvar{'lonIDsDir'};
@@ -325,6 +327,7 @@ sub transfer_profile_to_env {
         }
     }
     $env{'user.environment'} = "$lonidsdir/$handle.id";
+    $env_loaded=1;
     foreach my $expired_key (keys(%Remove)) {
         &delenv($expired_key);
     }
@@ -344,6 +347,11 @@ sub appenv {
             $env{$key}=$newenv{$key};
         }
     }
+    foreach my $key (keys(%newenv)) {
+	my $value = &escape($newenv{$key});
+	delete($newenv{$key});
+	$newenv{&escape($key)}=$value;
+    }
 
     my $lockfh;
     unless (open($lockfh,"$env{'user.environment'}")) {
@@ -369,8 +377,6 @@ sub appenv {
         chomp($oldenv[$i]);
         if ($oldenv[$i] ne '') {
 	    my ($name,$value)=split(/=/,$oldenv[$i],2);
-	    $name=&unescape($name);
-	    $value=&unescape($value);
 	    unless (defined($newenv{$name})) {
 		$newenv{$name}=$value;
 	    }
@@ -383,7 +389,7 @@ sub appenv {
 	}
 	my $newname;
 	foreach $newname (keys %newenv) {
-	    print $fh &escape($newname).'='.&escape($newenv{$newname})."\n";
+	    print $fh $newname.'='.$newenv{$newname}."\n";
 	}
 	close($fh);
     }
@@ -891,6 +897,7 @@ sub save_cache {
     &purge_remembered();
     #&Apache::loncommon::validate_page();
     undef(%env);
+    undef($env_loaded);
 }
 
 my $to_remember=-1;
@@ -7110,29 +7117,8 @@ BEGIN {
 # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
     unless ($readit) {
 {
-    # FIXME: Use LONCAPA::Configuration::read_conf here and omit next block
-    open(my $config,"</etc/httpd/conf/loncapa.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           chomp($varvalue);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-    close($config);
-}
-{
-    open(my $config,"</etc/httpd/conf/loncapa_apache.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline =~ /^[^\#]*PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           chomp($varvalue);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-    close($config);
+    my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf');
+    %perlvar = (%perlvar,%{$configvars});
 }
 
 # ------------------------------------------------------------ Read domain file