--- loncom/interface/loncommon.pm	2007/11/15 21:24:51	1.615
+++ loncom/interface/loncommon.pm	2007/12/08 00:03:32	1.622
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.615 2007/11/15 21:24:51 raeburn Exp $
+# $Id: loncommon.pm,v 1.622 2007/12/08 00:03:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2073,6 +2073,7 @@ sub authform_internal{
     $result = &mt
         ('[_1] Internally authenticated (with initial password [_2])',
          '<label>'.$authtype,'</label>'.$autharg);
+    $result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
     return $result;
 }
 
@@ -4834,6 +4835,7 @@ table.LC_descriptive_input td.LC_descrip
   font-weight: bold;
 }
 div.LC_feedback_link {
+  clear: both;
   background: white;
   width: 100%;  
 }
@@ -5037,7 +5039,6 @@ div.LC_clear_float_footer {
 
 
 div.LC_grade_select_mode {
-  float: left;
   font-family: $sans;
 }
 div.LC_grade_select_mode div div {
@@ -5860,7 +5861,6 @@ sub get_course_users {
         my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist($cdom,$cnum);
         my $now = time;
         foreach my $student (keys(%{$classlist})) {
-            my $status;
             my $match = 0;
             my $secmatch = 0;
             my $section = $$classlist{$student}[$idx{section}];
@@ -6147,24 +6147,24 @@ sub default_quota {
     my ($udom,$inststatus) = @_;
     my ($defquota,$settingstatus);
     my %quotahash = &Apache::lonnet::get_dom('configuration',
-                                            ['quota'],$udom);
-    if (ref($quotahash{'quota'}) eq 'HASH') {
+                                            ['quotas'],$udom);
+    if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
             my @statuses = split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if ($quotahash{'quota'}{$item} ne '') {
+                if ($quotahash{'quotas'}{$item} ne '') {
                     if ($defquota eq '') {
-                        $defquota = $quotahash{'quota'}{$item};
+                        $defquota = $quotahash{'quotas'}{$item};
                         $settingstatus = $item;
-                    } elsif ($quotahash{'quota'}{$item} > $defquota) {
-                        $defquota = $quotahash{'quota'}{$item};
+                    } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                        $defquota = $quotahash{'quotas'}{$item};
                         $settingstatus = $item;
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            $defquota = $quotahash{'quota'}{'default'};
+            $defquota = $quotahash{'quotas'}{'default'};
             $settingstatus = 'default';
         }
     } else {
@@ -7636,6 +7636,76 @@ sub restore_settings {
     }
 }
 
+#######################################################
+#######################################################
+
+=pod
+
+=head1 Domain E-mail Routines  
+
+=over 4
+
+=item &build_recipient_list
+
+Build recipient lists for three types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
+
+Inputs:
+defmail (scalar - email address of default recipient), 
+mailing type (scalar - errormail, packagesmail, or helpdeskmail), 
+defdom (domain for which to retrieve configuration settings),
+origmail (scalar - email address of recipient from loncapa.conf, 
+i.e., predates configuration by DC via domainprefs.pm 
+
+Returns: comma separated list of addresses to which to send e-mail.   
+
+=cut
+
+############################################################
+############################################################
+sub build_recipient_list {
+    my ($defmail,$mailing,$defdom,$origmail) = @_;
+    my @recipients;
+    my $otheremails;
+    my %domconfig =
+         &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+    if (ref($domconfig{'contacts'}) eq 'HASH') {
+        if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+            my @contacts = ('adminemail','supportemail');
+            foreach my $item (@contacts) {
+                if ($domconfig{'contacts'}{$mailing}{$item}) {
+                    my $addr = $domconfig{'contacts'}{$item}; 
+                    if (!grep(/^\Q$addr\E$/,@recipients)) {
+                        push(@recipients,$addr);
+                    }
+                }
+                $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
+            }
+        }
+    } elsif ($origmail ne '') {
+        push(@recipients,$origmail);
+    }
+    if ($defmail ne '') {
+        push(@recipients,$defmail);
+    }
+    if ($otheremails) {
+        my @others;
+        if ($otheremails =~ /,/) {
+            @others = split(/,/,$otheremails);
+        } else {
+            push(@others,$otheremails);
+        }
+        foreach my $addr (@others) {
+            if (!grep(/^\Q$addr\E$/,@recipients)) {
+                push(@recipients,$addr);
+            }
+        }
+    }
+    my $recipientlist = join(',',@recipients); 
+    return $recipientlist;
+}
+
 ############################################################
 ############################################################