--- loncom/lonnet/perl/lonnet.pm	2014/12/07 19:45:30	1.1273
+++ loncom/lonnet/perl/lonnet.pm	2015/03/30 21:13:24	1.1278
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1273 2014/12/07 19:45:30 raeburn Exp $
+# $Id: lonnet.pm,v 1.1278 2015/03/30 21:13:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1179,15 +1179,16 @@ sub spare_can_host {
     my ($udom,$uint_dom,$remotesessions,$try_server)=@_;
     my $canhost=1;
     my @intdoms;
-    my $internet_names = &Apache::lonnet::get_internet_names($try_server);
+    my $internet_names = &get_internet_names($try_server);
     if (ref($internet_names) eq 'ARRAY') {
         @intdoms = @{$internet_names};
     }
     unless (grep(/^\Q$uint_dom\E$/,@intdoms)) {
-        my $serverhomeID = &Apache::lonnet::get_server_homeID($try_server);
-        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
-        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
-        my $remoterev = &Apache::lonnet::get_server_loncaparev(undef,$try_server);
+        my $try_server_hostname = &hostname($try_server);
+        my $serverhomeID = &get_server_homeID($try_server_hostname);
+        my $serverhomedom = &host_domain($serverhomeID);
+        my %defdomdefaults = &get_domain_defaults($serverhomedom);
+        my $remoterev = &get_server_loncaparev(undef,$try_server);
         $canhost = &can_host_session($udom,$try_server,$remoterev,
                                      $remotesessions,
                                      $defdomdefaults{'hostedsessions'});
@@ -2076,6 +2077,11 @@ sub get_domain_defaults {
     }
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
         $domdefaults{'canuse_pdfforms'} = $domconfig{'coursedefaults'}{'canuse_pdfforms'};
+        $domdefaults{'usejsme'} = $domconfig{'coursedefaults'}{'usejsme'};
+        $domdefaults{'uselcmath'} = $domconfig{'coursedefaults'}{'uselcmath'};
+        if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
+            $domdefaults{'postsubmit'} = $domconfig{'coursedefaults'}{'postsubmit'}{'client'};
+        }
         foreach my $type (@coursetypes) {
             if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
                 unless ($type eq 'community') {
@@ -2085,6 +2091,12 @@ sub get_domain_defaults {
             if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
                 $domdefaults{$type.'quota'} = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
             }
+            if ($domdefaults{'postsubmit'} eq 'on') {
+                if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
+                    $domdefaults{$type.'postsubtimeout'} = 
+                        $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; 
+                }
+            }
         }
     }
     if (ref($domconfig{'usersessions'}) eq 'HASH') {
@@ -5105,7 +5117,7 @@ sub privileged {
         my %rolesdump = &dump("roles", $domain, $username) or return 0;
         my $now = time;
 
-        for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys %rolesdump}) {
+        for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys(%rolesdump)}) {
             my ($trole, $tend, $tstart) = split(/_/, $role);
             if (grep(/^\Q$trole\E$/,@{$roles})) {
                 return 1 unless ($tend && $tend < $now) 
@@ -5194,7 +5206,7 @@ sub rolesinit {
     my %allroles=();
     my %allgroups=();
 
-    for my $area (grep { ! /^rolesdef_/ } keys %rolesdump) {
+    for my $area (grep { ! /^rolesdef_/ } keys(%rolesdump)) {
         my $role = $rolesdump{$area};
         $area =~ s/\_\w\w$//;
 
@@ -6040,6 +6052,9 @@ sub get_timebased_id {
     } else {
         $error = "error: could not obtain lockfile\n";
         $dellock = 'ok';
+        if (($prefix eq 'paste') && ($namespace eq 'courseeditor') && ($keyid eq 'num')) {
+            $dellock = 'nolock';
+        }
     }
     return ($newid,$dellock,$error);
 }
@@ -10697,7 +10712,7 @@ sub metadata {
 
 	$metaentry{':keys'} = join(',',keys(%metathesekeys));
 	&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
-	$metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
+	$metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));
 	&do_cache_new('meta',$uri,\%metaentry,$cachetime);
 # this is the end of "was not already recently cached
     }