--- loncom/interface/domainprefs.pm	2010/03/12 15:01:36	1.131
+++ loncom/interface/domainprefs.pm	2010/05/21 15:54:44	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.131 2010/03/12 15:01:36 raeburn Exp $
+# $Id: domainprefs.pm,v 1.135 2010/05/21 15:54:44 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,7 +236,7 @@ sub handler {
                                   col2 => 'Value'}],
                     },
         'quotas' => 
-                    { text => 'User blogs, personal information pages and portfolios',
+                    { text => 'User blogs, personal information pages, portfolios',
                       help => 'Domain_Configuration_Quotas',
                       header => [{col1 => 'User affiliation',
                                   col2 => 'Available tools',
@@ -364,7 +364,7 @@ sub handler {
     my @actions = &Apache::loncommon::get_env_multiple('form.actions');
     &Apache::lonhtmlcommon::add_breadcrumb
     ({href=>"javascript:changePage(document.$phase,'pickactions')",
-      text=>"Pick functionality"});
+      text=>"Settings to display/modify"});
     my $confname = $dom.'-domainconfig';
     if ($phase eq 'process') {
         &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
@@ -756,7 +756,6 @@ sub print_login {
             $checkedon{$item} = ' ';
         }
     }
-    my $loginheader = 'image';
     my @images = ('img','logo','domlogo','login');
     my @logintext = ('textcol','bgcol');
     my @bgs = ('pgbg','mainbg','sidebg');
@@ -805,9 +804,6 @@ sub print_login {
                 $is_custom{$item} = 1;
             }
         }
-        if ($settings->{'loginheader'} ne '') {
-            $loginheader = $settings->{'loginheader'};
-        }
         if ($settings->{'font'} ne '') {
             $designs{'font'} = $settings->{'font'};
             $is_custom{'font'} = 1;
@@ -866,7 +862,7 @@ sub print_login {
             '</tr>';
         $itemcount ++;
     }
-    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext,$loginheader);
+    $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
     $datatable .= '</tr></table></td></tr>';
     return $datatable;
 }
@@ -986,9 +982,9 @@ sub print_rolecolors {
 
 sub display_color_options {
     my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
-        $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
+        $images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-    my $datatable = '<tr>'.
+    my $datatable = '<tr'.$css_class.'>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
         $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
@@ -1028,8 +1024,7 @@ sub display_color_options {
         if ($role eq 'login') {
             if ($img eq 'login') {
                 $login_hdr_pick =
-                    &login_header_options($img,$role,$defaults,$is_custom,$choices,
-                                          $loginheader);
+                    &login_header_options($img,$role,$defaults,$is_custom,$choices);
                 $logincolors =
                     &login_text_colors($img,$role,$logintext,$phase,$choices,
                                             $designs);
@@ -1106,8 +1101,8 @@ sub display_color_options {
                 }
                 $datatable .= '<td>';
                 if ($img eq 'login') {
-                    $datatable .= $login_hdr_pick;    
-                }
+                    $datatable .= $login_hdr_pick;
+                } 
                 $datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
                                              $showfile,$fullsize,$role,$img,$imgfile,$logincolors);
             } else {
@@ -1121,7 +1116,9 @@ sub display_color_options {
         if ($switchserver) {
             $datatable .= &mt('Upload to library server: [_1]',$switchserver);
         } else {
-            $datatable .='&nbsp;<input type="file" name="'.$role.'_'.$img.'" />';
+            if ($img ne 'login') { # suppress file selection for Log-in header
+                $datatable .='&nbsp;<input type="file" name="'.$role.'_'.$img.'" />';
+            }
         }
         $datatable .= '</td></tr>';
     }
@@ -1210,20 +1207,10 @@ sub logo_display_options {
 }
 
 sub login_header_options  {
-    my ($img,$role,$defaults,$is_custom,$choices,$loginheader) = @_;
-    my $image_checked = ' checked="checked" ';
-    my $text_checked = ' ';
-    if ($loginheader eq 'text') {
-        $image_checked = ' ';
-        $text_checked = ' checked="checked" ';
-    }
-    my $output = '<span class="LC_nobreak"><label><input type="radio" name="'.
-              'loginheader" value="image" '.$image_checked.'/>'.
-              &mt('use image').'</label>&nbsp;&nbsp;&nbsp;'.
-              '<label><input type="radio" name="loginheader" value="text"'.
-              $text_checked.'/>'.&mt('use text').'</label><br />'."\n";
+    my ($img,$role,$defaults,$is_custom,$choices) = @_;
+    my $output = '';
     if ((!$is_custom->{'textcol'}) || (!$is_custom->{'bgcol'})) {
-        $output .= &mt('Text default(s)').':<br />';
+        $output .= &mt('Text default(s):').'<br />';
         if (!$is_custom->{'textcol'}) {
             $output .= $choices->{'textcol'}.':&nbsp;'.$defaults->{'logintext'}{'textcol'}.
                        '&nbsp;&nbsp;&nbsp;';
@@ -1259,25 +1246,31 @@ sub login_text_colors {
 sub image_changes {
     my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
     my $output;
-    if (!$is_custom) {
+    if ($img eq 'login') {
+            # suppress image for Log-in header
+    } elsif (!$is_custom) {
         if ($img ne 'domlogo') {
             $output .= &mt('Default image:').'<br />';
         } else {
             $output .= &mt('Default in use:').'<br />';
         }
     }
-    if ($img_import) {
-        $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
-    }
-    $output .= '<a href="'.$fullsize.'" target="_blank"><img src="'.
-               $showfile.'" alt="'.$alt_text.'" border="0" /></a></td>';
-    if ($is_custom) {
-        $output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'.
-                   '<input type="checkbox" name="'.
-                   $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
-                   '</label>&nbsp;'.&mt('Replace:').'</span><br />';
+    if ($img eq 'login') { # suppress image for Log-in header
+        $output .= '<td>'.$logincolors;
     } else {
-        $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
+        if ($img_import) {
+            $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
+        }
+        $output .= '<a href="'.$fullsize.'" target="_blank"><img src="'.
+                   $showfile.'" alt="'.$alt_text.'" border="0" /></a></td>';
+        if ($is_custom) {
+            $output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'.
+                       '<input type="checkbox" name="'.
+                       $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
+                       '</label>&nbsp;'.&mt('Replace:').'</span><br />';
+        } else {
+            $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
+        }
     }
     return $output;
 }
@@ -1825,7 +1818,7 @@ sub print_autoupdate {
         $$rowtotal ++;
     } else {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my @fields = ('lastname','firstname','middlename','gen',
+        my @fields = ('lastname','firstname','middlename','generation',
                       'permanentemail','id');
         my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
         my $numrows = 0;
@@ -2014,12 +2007,13 @@ sub print_contacts {
     my ($dom,$settings,$rowtotal) = @_;
     my $datatable;
     my @contacts = ('adminemail','supportemail');
-    my (%checked,%to,%otheremails);
+    my (%checked,%to,%otheremails,%bccemails);
     my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail',
                     'requestsmail');
     foreach my $type (@mailings) {
         $otheremails{$type} = '';
     }
+    $bccemails{'helpdeskmail'} = '';
     if (ref($settings) eq 'HASH') {
         foreach my $item (@contacts) {
             if (exists($settings->{$item})) {
@@ -2035,6 +2029,9 @@ sub print_contacts {
                         }
                     }
                     $otheremails{$type} = $settings->{$type}{'others'};
+                    if ($type eq 'helpdeskmail') {
+                        $bccemails{$type} = $settings->{$type}{'bcc'};
+                    }
                 }
             } elsif ($type eq 'lonstatusmail') {
                 $checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" ';
@@ -2078,8 +2075,13 @@ sub print_contacts {
         }
         $datatable .= '</span><br />'.&mt('Others').':&nbsp;&nbsp;'.
                       '<input type="text" name="'.$type.'_others" '.
-                      'value="'.$otheremails{$type}.'"  />'.
-                      '</td></tr>'."\n";
+                      'value="'.$otheremails{$type}.'"  />';
+        if ($type eq 'helpdeskmail') {
+            $datatable .= '<br />'.&mt('Bcc').':'.('&nbsp;'x6).
+                          '<input type="text" name="'.$type.'_bcc" '.
+                          'value="'.$bccemails{$type}.'"  />';
+        }
+        $datatable .= '</td></tr>'."\n";
     }
     $$rowtotal += $rownum;
     return $datatable;
@@ -3699,22 +3701,12 @@ sub modify_login {
                     }
                 }
             }
-            if (($domconfig{'login'}{'loginheader'} eq 'text') && 
-                ($env{'form.loginheader'} eq 'image')) {
-                $changes{'loginheader'} = 1;
-            } elsif (($domconfig{'login'}{'loginheader'} eq '' ||
-                      $domconfig{'login'}{'loginheader'} eq 'image') &&
-                     ($env{'form.loginheader'} eq 'text')) {
-                $changes{'loginheader'} = 1;
-            }
         }
         if (keys(%changes) > 0 || $colchgtext) {
             &Apache::loncommon::devalidate_domconfig_cache($dom);
             $resulttext = &mt('Changes made:').'<ul>';
             foreach my $item (sort(keys(%changes))) {
-                if ($item eq 'loginheader') {
-                    $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
-                } elsif ($item eq 'loginvia') {
+                if ($item eq 'loginvia') {
                     if (ref($changes{$item}) eq 'HASH') {
                         $resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>';
                         foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
@@ -4767,7 +4759,7 @@ sub modify_autoupdate {
                         lastname => 'Last Name',
                         firstname => 'First Name',
                         middlename => 'Middle Name',
-                        gen => 'Generation',
+                        generation => 'Generation',
                       );
     my $othertitle = &mt('All users');
     if (keys(%{$usertypes}) >  0) {
@@ -4775,7 +4767,16 @@ sub modify_autoupdate {
     }
     foreach my $key (keys(%env)) {
         if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) {
-            push(@{$fields{$1}},$2);
+            my ($usertype,$item) = ($1,$2);
+            if (grep(/^\Q$item\E$/,keys(%fieldtitles))) {
+                if ($usertype eq 'default') {   
+                    push(@{$fields{$1}},$2);
+                } elsif (ref($types) eq 'ARRAY') {
+                    if (grep(/^\Q$usertype\E$/,@{$types})) {
+                        push(@{$fields{$1}},$2);
+                    }
+                }
+            }
         }
     }
     my @lockablenames = &Apache::loncommon::get_env_multiple('form.lockablenames');
@@ -4812,9 +4813,11 @@ sub modify_autoupdate {
                         foreach my $type (@{$currautoupdate{$key}{$item}}) {
                             if (!exists($fields{$item})) {
                                 $change = 1;
+                                last;
                             } elsif (ref($fields{$item}) eq 'ARRAY') {
                                 if (!grep(/^\Q$type\E$/,@{$fields{$item}})) {
                                     $change = 1;
+                                    last;
                                 }
                             }
                         }
@@ -4845,7 +4848,20 @@ sub modify_autoupdate {
     foreach my $item (@{$types},'default') {
         if (defined($fields{$item})) {
             if (ref($currautoupdate{'fields'}) eq 'HASH') {
-                if (!exists($currautoupdate{'fields'}{$item})) {
+                if (ref($currautoupdate{'fields'}{$item}) eq 'ARRAY') {
+                    my $change = 0;
+                    if (ref($fields{$item}) eq 'ARRAY') {
+                        foreach my $type (@{$fields{$item}}) {
+                            if (!grep(/^\Q$type\E$/,@{$currautoupdate{'fields'}{$item}})) {
+                                $change = 1;
+                                last;
+                            }
+                        }
+                    }
+                    if ($change) {
+                        push(@{$changes{'fields'}},$item);
+                    }
+                } else {
                     push(@{$changes{'fields'}},$item);
                 }
             } else {
@@ -5162,7 +5178,7 @@ sub modify_contacts {
             $currsetting{$key} = $domconfig{'contacts'}{$key};
         }
     }
-    my (%others,%to);
+    my (%others,%to,%bcc);
     my @contacts = ('supportemail','adminemail');
     my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail',
                     'requestsmail');
@@ -5178,6 +5194,10 @@ sub modify_contacts {
         }  
         $others{$type} = $env{'form.'.$type.'_others'};
         $contacts_hash{contacts}{$type}{'others'} = $others{$type};
+        if ($type eq 'helpdeskmail') {
+            $bcc{$type} = $env{'form.'.$type.'_bcc'};
+            $contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type};
+        }
     }
     foreach my $item (@contacts) {
         $to{$item} = $env{'form.'.$item};
@@ -5202,6 +5222,11 @@ sub modify_contacts {
             if ($others{$type} ne $currsetting{$type}{'others'}) {
                 push(@{$changes{$type}},'others');
             }
+            if ($type eq 'helpdeskmail') {   
+                if ($bcc{$type} ne $currsetting{$type}{'bcc'}) {
+                    push(@{$changes{$type}},'bcc'); 
+                }
+            }
         }
     } else {
         my %default;
@@ -5224,7 +5249,12 @@ sub modify_contacts {
             }
             if ($others{$type} ne '') {
                 push(@{$changes{$type}},'others');
-            } 
+            }
+            if ($type eq 'helpdeskmail') {
+                if ($bcc{$type} ne '') {
+                    push(@{$changes{$type}},'bcc');
+                }
+            }
         }
     }
     my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash,
@@ -5252,7 +5282,13 @@ sub modify_contacts {
                         push(@text,$others{$type});
                     }
                     $resulttext .= '<span class="LC_cusr_emph">'.
-                                   join(', ',@text).'</span></li>';
+                                   join(', ',@text).'</span>';
+                    if ($type eq 'helpdeskmail') {
+                        if ($bcc{$type} ne '') {
+                            $resulttext .= '&nbsp;'.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>';
+                        }
+                    }
+                    $resulttext .= '</li>';
                 }
             }
             $resulttext .= '</ul>';