--- loncom/interface/domainprefs.pm	2007/04/10 20:49:07	1.9
+++ loncom/interface/domainprefs.pm	2007/05/29 15:58:41	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.9 2007/04/10 20:49:07 raeburn Exp $
+# $Id: domainprefs.pm,v 1.17 2007/05/29 15:58:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,7 +145,7 @@ sub handler {
       </td>
     </tr>
    </table>');
-        &print_footer($r,$phase,'process','Store changes');
+        &print_footer($r,$phase,'process','Save changes');
     }
     return OK;
 }
@@ -550,6 +550,7 @@ sub display_color_options {
                     $showfile = '';
                 }
             } elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) {
+                $showfile = $imgfile;
                 my $imgdir = $1;
                 my $filename = $2;
                 if (-e "/home/httpd/html/$imgdir/tn-".$filename) {
@@ -559,12 +560,17 @@ sub display_color_options {
                     my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename;
                     if (!-e $output) {
                         my ($width,$height) = &thumb_dimensions();
-                        my $size = $width.'x'.$height;
-                        system("convert -sample $size $input $output");
+                        my ($fullwidth,$fullheight) = &check_dimensions($input);
+                        if ($fullwidth ne '' && $fullheight ne '') {
+                            if ($fullwidth > $width && $fullheight > $height) { 
+                                my $size = $width.'x'.$height;
+                                system("convert -sample $size $input $output");
+                                $showfile = '/'.$imgdir.'/tn-'.$filename;
+                            }
+                        }
                     }
-                    $showfile = '/'.$imgdir.'/tn-'.$filename;
                 }
-            } 
+            }
             if ($showfile) {
                 $showfile = &Apache::loncommon::lonhttpdurl($showfile);
                 $fullsize =  &Apache::loncommon::lonhttpdurl($imgfile);
@@ -733,16 +739,15 @@ sub print_quotas {
     $datatable .= '<tr'.$css_class.'>'.
                   '<td>'.&mt($othertitle).'</td>'.
                   '<td class="LC_right_item"><span class="LC_nobreak">'.
-                  '<input type="text" name="default" value="'.
+                  '<input type="text" name="defaultquota" value="'.
                   $defaultquota.'" size="5" /> Mb</span></td></tr>';
     return $datatable;
 }
 
 sub print_autoenroll {
     my ($dom,$settings) = @_;
-    my $defdom = $dom;
     my $autorun = &Apache::lonnet::auto_run(undef,$dom),
-    my ($runon,$runoff);
+    my ($defdom,$runon,$runoff);
     if (ref($settings) eq 'HASH') {
         if (exists($settings->{'run'})) {
             if ($settings->{'run'} eq '0') {
@@ -764,6 +769,14 @@ sub print_autoenroll {
         if (exists($settings->{'sender_domain'})) {
             $defdom = $settings->{'sender_domain'};
         }
+    } else {
+        if ($autorun) {
+            $runon = ' checked="checked" ';
+            $runoff = ' ';
+        } else {
+            $runoff = ' checked="checked" ';
+            $runon = ' ';
+        }
     }
     my $domform = &Apache::loncommon::select_dom_form($defdom,'sender_domain',1);
     my $datatable='<tr class="LC_odd_row">'.
@@ -772,7 +785,7 @@ sub print_autoenroll {
                   '<input type="radio" name="autoenroll_run"'.
                   $runon.' value="1" />'.&mt('Yes').'</label>&nbsp;'.
                   '<label><input type="radio" name="autoenroll_run"'.
-                  $runoff.'value="0" />'.&mt('No').'</label></span></td>'.
+                  $runoff.' value="0" />'.&mt('No').'</label></span></td>'.
                   '</tr><tr>'.
                   '<td>'.&mt('Notification messages - sender').
                   '</td><td class="LC_right_item"><span class="LC_nobreak">'.
@@ -951,7 +964,8 @@ sub modify_login {
             $resulttext = &mt('No changes made to log-in page settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
         $resulttext .= '<br />'.&mt('The following errors occurred: ').'<ul>'.
@@ -993,7 +1007,8 @@ sub modify_rolecolors {
             $resulttext = &mt('No changes made to default color schemes');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     if ($errors) {
         $resulttext .= &mt('The following errors occurred: ').'<ul>'.
@@ -1004,7 +1019,7 @@ sub modify_rolecolors {
 
 sub modify_colors {
     my ($r,$dom,$confname,$roles,$domconfig,$confhash) = @_;
-    my %changes;
+    my (%changes,%choices);
     my @bgs = ('pgbg','mainbg','sidebg');
     my @links = ('link','alink','vlink');
     my @images;
@@ -1012,6 +1027,11 @@ sub modify_colors {
     my $errors;
     foreach my $role (@{$roles}) {
         if ($role eq 'login') {
+            %choices = &login_choices();
+        } else {
+            %choices = &color_font_choices();
+        }
+        if ($role eq 'login') {
             @images = ('img','logo','domlogo');
         } else {
             @images = ('img');
@@ -1036,7 +1056,7 @@ sub modify_colors {
                 my $error;
                 if ($configuserok eq 'ok') {
                     if ($switchserver) {
-                        $error = &mt("Upload of image [_1] for $role page(s) is not permitted to this server: [_2]",$img,$switchserver);
+                        $error = &mt("Upload of [_1] image for $role page(s) is not permitted to this server: [_2]",$choices{$img},$switchserver);
                     } else {
                         if ($author_ok eq 'ok') {
                             my ($result,$logourl) = 
@@ -1044,20 +1064,20 @@ sub modify_colors {
                                            $dom,$confname,$img,$width,$height);
                             if ($result eq 'ok') {
                                 $confhash->{$role}{$img} = $logourl;
-                                $changes{$role}{$img} = 1;
+                                $changes{$role}{'images'}{$img} = 1;
                             } else {
-                                $error = &mt("Upload of image [_1] for $role page(s) failed because an error occurred publshing the file in RES space. Error was: [_2].",$img,$result);
+                                $error = &mt("Upload of [_1] image for $role page(s) failed because an error occurred publishing the file in RES space. Error was: [_2].",$choices{img},$result);
                             }
                         } else {
-                            $error = &mt("Upload of image [_1] for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3].  Error was: [_4].",$img,$confname,$dom,$author_ok);
+                            $error = &mt("Upload of [_1] image for $role page(s) failed because an author role could not be assigned to a Domain Configuation user ([_2]) in domain: [_3].  Error was: [_4].",$choices{$img},$confname,$dom,$author_ok);
                         }
                     }
                 } else {
-                    $error = &mt("Upload of image [_1] for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$img,$confname,$dom,$configuserok);
+                    $error = &mt("Upload of [_1] image for $role page(s) failed because a Domain Configuation user ([_2]) could not be created in domain: [_3].  Error was: [_4].",$choices{$img},$confname,$dom,$configuserok);
                 }
                 if ($error) {
                     &Apache::lonnet::logthis($error);
-                    $errors .= '<li>'.$error.'</li>';
+                    $errors .= '<li><span class="LC_error">'.$error.'</span></li>';
                 }
             } elsif ($domconfig->{$role}{$img} ne '') {
                 if ($domconfig->{$role}{$img} !~ m-^(/res/\Q$dom\E/\Q$confname\E/\Q$img\E)/([^/]+)$-) {
@@ -1084,7 +1104,7 @@ sub modify_colors {
                     if ($domconfig->{$role}{$img} ne '') {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } else {
                             if ($confhash->{$role}{$img} eq '') {
                                 $confhash->{$role}{$img} = $domconfig->{$role}{$img};
@@ -1093,7 +1113,7 @@ sub modify_colors {
                     } else {
                         if ($env{'form.'.$role.'_del_'.$img}) {
                             $confhash->{$role}{$img} = '';
-                            $changes{$role}{$img} = 1;
+                            $changes{$role}{'images'}{$img} = 1;
                         } 
                     }
                 }  
@@ -1155,7 +1175,7 @@ sub default_change_checker {
     foreach my $img (@{$images}) {
         if ($env{'form.'.$role.'_del_'.$img}) {
             $confhash->{$role}{$img} = '';
-            $changes->{$role}{$img} = 1;
+            $changes->{$role}{'images'}{$img} = 1;
         }
     }
     if ($confhash->{$role}{'font'}) {
@@ -1192,7 +1212,11 @@ sub display_colorchgs {
                         if ($confhash->{$role}{$item} eq '') {
                             $resulttext .= '<li>'.&mt("$choices{$item} set to default").'</li>';
                         } else {
-                            $resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$confhash->{$role}{$item}).'</li>';
+                            my $newitem = $confhash->{$role}{$item};
+                            if ($key eq 'images') {
+                                $newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" valign="bottom" />';
+                            }
+                            $resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>';
                         }
                     }
                     if ($role ne 'login') {
@@ -1218,6 +1242,26 @@ sub thumb_dimensions {
     return ('200','50');
 }
 
+sub check_dimensions {
+    my ($inputfile) = @_;
+    my ($fullwidth,$fullheight);
+    if ($inputfile =~ m|^[/\w.\-]+$|) {
+        if (open(PIPE,"identify $inputfile 2>&1 |")) {
+            my $imageinfo = <PIPE>;
+            if (!close(PIPE)) {
+                &Apache::lonnet::logthis("Failed to close PIPE opened to retrieve image information for $inputfile");
+            }
+            chomp($imageinfo);
+            my ($fullsize) = 
+                ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)\s+/);
+            if ($fullsize) {
+                ($fullwidth,$fullheight) = split(/x/,$fullsize);
+            }
+        }
+    }
+    return ($fullwidth,$fullheight);
+}
+
 sub check_configuser {
     my ($uhome,$dom,$confname,$servadm) = @_;
     my ($configuserok,%currroles);
@@ -1350,17 +1394,23 @@ $env{'user.name'}.':'.$env{'user.domain'
             if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
                 my $inputfile = $filepath.'/'.$file;
                 my $outfile = $filepath.'/'.'tn-'.$file;
-                my $thumbsize = $thumbwidth.'x'.$thumbheight;
-                system("convert -sample $thumbsize $inputfile $outfile");
-                chmod(0660, $filepath.'/tn-'.$file);
-                if (-e $outfile) {
-                    my $copyfile=$targetdir.'/tn-'.$file;
-                    if (copy($outfile,$copyfile)) {
-                        print $logfile "\nCopied source to ".$copyfile."\n";
-                        &write_metadata($dom,$confname,$formname,$targetdir,
-                                        'tn-'.$file,$logfile);
-                    } else {
-                        print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
+                my ($fullwidth,$fullheight) = &check_dimensions($inputfile);
+                if ($fullwidth ne '' && $fullheight ne '') { 
+                    if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
+                        my $thumbsize = $thumbwidth.'x'.$thumbheight;
+                        system("convert -sample $thumbsize $inputfile $outfile");
+                        chmod(0660, $filepath.'/tn-'.$file);
+                        if (-e $outfile) {
+                            my $copyfile=$targetdir.'/tn-'.$file;
+                            if (copy($outfile,$copyfile)) {
+                                print $logfile "\nCopied source to ".$copyfile."\n";
+                                &write_metadata($dom,$confname,$formname,
+                                                $targetdir,'tn-'.$file,$logfile);
+                            } else {
+                                print $logfile "\nUnable to write ".$copyfile.
+                                               ':'.$!."\n";
+                            }
+                        }
                     }
                 }
             }
@@ -1454,10 +1504,9 @@ sub check_switchserver {
         $home = &Apache::lonnet::domain($dom,'primary');
     }
     my @ids=&Apache::lonnet::current_machine_ids();
-    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; }
-        if (!$allowed) {
-            $switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
-        }
+    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+    if (!$allowed) {
+	$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>';
     }
     return $switchserver;
 }
@@ -1473,6 +1522,7 @@ sub modify_quotas {
             $formhash{$1} = $env{$key};
         }
     }
+    $formhash{'default'} = $env{'form.defaultquota'};
     if (ref($domconfig{'quotas'}) eq 'HASH') {
         foreach my $key (keys(%{$domconfig{'quotas'}})) {
             if (exists($formhash{$key})) {
@@ -1507,7 +1557,8 @@ sub modify_quotas {
             $resulttext = &mt('No changes made to default quotas');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1525,10 +1576,17 @@ sub modify_autoenroll {
     my %title = ( run => 'Auto-enrollment active',
                   sender => 'Sender for notification messages');
     my @offon = ('off','on');
+    my $sender_uname = $env{'form.sender_uname'};
+    my $sender_domain = $env{'form.sender_domain'};
+    if ($sender_domain eq '') {
+        $sender_uname = '';
+    } elsif ($sender_uname eq '') {
+        $sender_domain = '';
+    }
     my %autoenrollhash =  (
                        autoenroll => { run => $env{'form.autoenroll_run'},
-                                       sender_uname => $env{'form.sender_uname'},
-                                       sender_domain => $env{'form.sender_domain'},
+                                       sender_uname => $sender_uname,
+                                       sender_domain => $sender_domain,
 
                                 }
                      );
@@ -1544,18 +1602,10 @@ sub modify_autoenroll {
                 $changes{'run'} = 1;
             }
         }
-        if (exists($currautoenroll{sender_uname})) {
-            if ($currautoenroll{'sender_uname'} ne $env{'form.sender_uname'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_uname'} ne $sender_uname) {
             $changes{'sender'} = 1;
         }
-        if (exists($currautoenroll{sender_domain})) {
-            if ($currautoenroll{'sender_domain'} ne $env{'form.sender_domain'}) {
-                $changes{'sender'} = 1;
-            }
-        } else {
+        if ($currautoenroll{'sender_domain'} ne $sender_domain) {
             $changes{'sender'} = 1;
         }
         if (keys(%changes) > 0) {
@@ -1564,14 +1614,19 @@ sub modify_autoenroll {
                 $resulttext .= '<li>'.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'</li>';
             }
             if ($changes{'sender'}) {
-                $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$env{'form.sender_uname'}.':'.$env{'form.sender_domain'}).'</li>';
+                if ($sender_uname eq '' || $sender_domain eq '') {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to default (course owner).").'</li>';
+                } else {
+                    $resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>';
+                }
             }
             $resulttext .= '</ul>';
         } else {
             $resulttext = &mt('No changes made to auto-enrollment settings');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }
@@ -1690,7 +1745,8 @@ sub modify_autoupdate {
             $resulttext = &mt('No changes made to autoupdates');
         }
     } else {
-        $resulttext = &mt('An error occurred: [_1]',$putresult);
+        $resulttext = '<span class="LC_error">'.
+	    &mt('An error occurred: [_1]',$putresult).'</span>';
     }
     return $resulttext;
 }