--- loncom/interface/lonparmset.pm	2006/12/14 20:08:15	1.350.2.1
+++ loncom/interface/lonparmset.pm	2007/01/18 21:02:20	1.350.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.350.2.1 2006/12/14 20:08:15 albertel Exp $
+# $Id: lonparmset.pm,v 1.350.2.5 2007/01/18 21:02:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,7 +272,7 @@ sub resetrulescache {
 
 sub rulescache {
     my $id=shift;
-    if ($rulesid ne $env{'request.course.id'}) {
+    if ($rulesid ne $env{'request.course.id'}
 	&& !defined($rules{$id})) {
 	my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
 	my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
@@ -3310,7 +3310,7 @@ sub addmetafield {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {
-        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');
+        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
             $options =~ s/deleted//;
@@ -3339,7 +3339,7 @@ sub addmetafield {
             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
-                $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');
+                $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
             }
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
@@ -3728,7 +3728,15 @@ sub parm_change_log {
 	}
 	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }
-    foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
+    foreach my $id (sort 
+		    {
+			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+			}
+			my $aid = (split('00000',$a))[-1];
+			my $bid = (split('00000',$b))[-1];
+			return $bid<=>$aid;
+		    } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
 	my $count = 0;
 	my $time =
@@ -3836,6 +3844,12 @@ sub parm_change_log {
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub check_for_course_info {
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    return 1 if ($navmap);
+    return 0;
+}
+
 ##################################################
 ##################################################
 
@@ -3879,7 +3893,9 @@ sub handler {
 	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
 	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
 				  $env{'request.course.sec'}));
-    if ($env{'request.course.id'} &&  $parm_permission) {
+    my $exists = &check_for_course_info();
+
+    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
 
         # Start Page
         &Apache::loncommon::content_type($r,'text/html');
@@ -3949,8 +3965,13 @@ sub handler {
 	}       
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
-	$env{'user.error.msg'}=
-	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+	if ($exists) {
+	    $env{'user.error.msg'}=
+		"/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+	} else {
+	    $env{'user.error.msg'}=
+		"/adm/parmset::0:1:Course environment gone, reinitialize the course";
+	}
 	return HTTP_NOT_ACCEPTABLE;
     }
     return OK;