--- loncom/interface/lonparmset.pm	2007/02/27 20:35:22	1.360
+++ loncom/interface/lonparmset.pm	2007/03/20 00:08:09	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.360 2007/02/27 20:35:22 www Exp $
+# $Id: lonparmset.pm,v 1.364 2007/03/20 00:08:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -554,7 +554,8 @@ sub valout {
             }
             $result=~s/\s+$//;
         } elsif (&isdateparm($type)) {
-            $result = localtime($value).&date_sanity_info($value);
+            $result = &Apache::lonlocal::locallocaltime($value).
+		&date_sanity_info($value);
         } else {
             $result = $value;
         }
@@ -934,57 +935,66 @@ sub extractResourceInformation {
 	$$typep{$id}=$1;
 	$$keyp{$id}='';
         $$uris{$id}=$srcf;
-	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
-	    if ($_=~/^parameter\_(.*)/) {
-		my $key=$_;
+	foreach my $key (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+	    next if ($key!~/^parameter_/);
+
 # Hidden parameters
-		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
-		    next;
-		}
-		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
-		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
-		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+	    next if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm');
 #
 # allparms is a hash of parameter names
 #
+	    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+	    if (!exists($$allparms{$name})) {
+		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
 		my $parmdis = $display;
 		$parmdis =~ s/\[Part.*$//g;
-                $$allparms{$name}=$parmdis;
-		$$defkeytype{$name}=&Apache::lonnet::metadata($srcf,$key.'.type');
+		$$allparms{$name}=$parmdis;
+		if (ref($defkeytype)) {
+		    $$defkeytype{$name}=
+			&Apache::lonnet::metadata($srcf,$key.'.type');
+		}
+	    }
+
 #
 # allparts is a hash of all parts
 #
-		$$allparts{$part} = "Part: $part";
+	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+	    $$allparts{$part} = "Part: $part";
 #
 # Remember all keys going with this resource
 #
-		if ($$keyp{$id}) {
-		    $$keyp{$id}.=','.$key;
-		} else {
-		    $$keyp{$id}=$key;
-		}
+	    if ($$keyp{$id}) {
+		$$keyp{$id}.=','.$key;
+	    } else {
+		$$keyp{$id}=$key;
+	    }
 #
 # Put in order
 # 
-                unless ($$keyorder{$key}) {
-                    $$keyorder{$key}=$keyordercnt;
-                    $keyordercnt++;
-		}
-
+	    unless ($$keyorder{$key}) {
+		$$keyorder{$key}=$keyordercnt;
+		$keyordercnt++;
 	    }
 	}
-	$$mapp{$id}=
-	    &Apache::lonnet::declutter($resource->enclosing_map_src());
-	$$mapp{$mapid}=$$mapp{$id};
-	$$allmaps{$mapid}=$$mapp{$id};
-	if ($mapid eq '1') {
-	    $$maptitles{$mapid}='Main Course Documents';
+
+	
+	if (!exists($$mapp{$mapid})) {
+	    $$mapp{$id}=
+		&Apache::lonnet::declutter($resource->enclosing_map_src());
+	    $$mapp{$mapid}=$$mapp{$id};
+	    $$allmaps{$mapid}=$$mapp{$id};
+	    if ($mapid eq '1') {
+		$$maptitles{$mapid}='Main Course Documents';
+	    } else {
+		$$maptitles{$mapid}=
+		    &Apache::lonnet::gettitle($$mapp{$id});    
+	    }
+	    $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+	    $$symbp{$mapid}=$$mapp{$id}.'___(all)';
 	} else {
-	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+	    $$mapp{$id} = $$mapp{$mapid};
 	}
-	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
 	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
-	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
     }
 }
 
@@ -2034,6 +2044,22 @@ sub crsenv {
         if ($name =~ /^default_enrollment_(start|end)_date$/) {
             $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
         }
+	#
+        # Deal with the emails
+        if ($name =~ /\.email$/) {
+	    my ($user,$domain) = split(/:/,$value);
+	    if (!defined($user) || !defined($domain)) {
+		$setoutput.= '<br /> <span class="LC_error">'.
+		    &mt("Invalid email address specified, address must be of the form username:domain").
+		    '</span>';
+		undef($value);
+	    } elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
+		$setoutput.= '<br /> <span class="LC_error">'.
+		    &mt("Invalid email address specified, user [_1] is unknown.",$value).
+		    '</span>';
+		undef($value);
+	    }
+        }
         # Get existing cloners
         my @oldcloner = ();
         if ($name eq 'cloners') {
@@ -2881,6 +2907,11 @@ ENDOVER
 		      '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'		      );
 	    
 	    $r->print('<td>');
+	    my $display_value = $resourcedata->{$thiskey};
+	    if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
+		$display_value = 
+		    &Apache::lonlocal::locallocaltime($display_value);
+	    }
 	    $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
 			  &standard_parameter_names($data{'parameter_name'}),
 			  $resourcedata->{$thiskey}));
@@ -2905,7 +2936,7 @@ ENDOVER
 		$r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
 			      $url,$resid,$map));
 	    }
-	    $r->print(&mt('Part: [_1]',$data{'parameter_part'}));
+	    $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
 	    $r->print('</td></tr>');
 	
 	}
@@ -3379,8 +3410,8 @@ sub addmetafield {
         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');
-        $r->print('</form>');
     }
+    $r->print('</form>');
 }
 sub setrestrictmeta {
     my ($r)=@_;