version 1.15, 2007/05/27 16:31:54
|
version 1.17, 2007/05/29 15:58:41
|
Line 550 sub display_color_options {
|
Line 550 sub display_color_options {
|
$showfile = ''; |
$showfile = ''; |
} |
} |
} elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) { |
} elsif ($imgfile =~ m-^/(adm/[^/]+)/([^/]+)$-) { |
|
$showfile = $imgfile; |
my $imgdir = $1; |
my $imgdir = $1; |
my $filename = $2; |
my $filename = $2; |
if (-e "/home/httpd/html/$imgdir/tn-".$filename) { |
if (-e "/home/httpd/html/$imgdir/tn-".$filename) { |
Line 559 sub display_color_options {
|
Line 560 sub display_color_options {
|
my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename; |
my $output = '/home/httpd/html/'.$imgdir.'/tn-'.$filename; |
if (!-e $output) { |
if (!-e $output) { |
my ($width,$height) = &thumb_dimensions(); |
my ($width,$height) = &thumb_dimensions(); |
my $size = $width.'x'.$height; |
my ($fullwidth,$fullheight) = &check_dimensions($input); |
system("convert -sample $size $input $output"); |
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) { |
if ($showfile) { |
$showfile = &Apache::loncommon::lonhttpdurl($showfile); |
$showfile = &Apache::loncommon::lonhttpdurl($showfile); |
$fullsize = &Apache::loncommon::lonhttpdurl($imgfile); |
$fullsize = &Apache::loncommon::lonhttpdurl($imgfile); |
Line 740 sub print_quotas {
|
Line 746 sub print_quotas {
|
|
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings) = @_; |
my ($dom,$settings) = @_; |
my $defdom = $dom; |
|
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my ($runon,$runoff); |
my ($defdom,$runon,$runoff); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (exists($settings->{'run'})) { |
if (exists($settings->{'run'})) { |
if ($settings->{'run'} eq '0') { |
if ($settings->{'run'} eq '0') { |
Line 1237 sub thumb_dimensions {
|
Line 1242 sub thumb_dimensions {
|
return ('200','50'); |
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 { |
sub check_configuser { |
my ($uhome,$dom,$confname,$servadm) = @_; |
my ($uhome,$dom,$confname,$servadm) = @_; |
my ($configuserok,%currroles); |
my ($configuserok,%currroles); |
Line 1369 $env{'user.name'}.':'.$env{'user.domain'
|
Line 1394 $env{'user.name'}.':'.$env{'user.domain'
|
if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { |
if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { |
my $inputfile = $filepath.'/'.$file; |
my $inputfile = $filepath.'/'.$file; |
my $outfile = $filepath.'/'.'tn-'.$file; |
my $outfile = $filepath.'/'.'tn-'.$file; |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my ($fullwidth,$fullheight) = &check_dimensions($inputfile); |
system("convert -sample $thumbsize $inputfile $outfile"); |
if ($fullwidth ne '' && $fullheight ne '') { |
chmod(0660, $filepath.'/tn-'.$file); |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
if (-e $outfile) { |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my $copyfile=$targetdir.'/tn-'.$file; |
system("convert -sample $thumbsize $inputfile $outfile"); |
if (copy($outfile,$copyfile)) { |
chmod(0660, $filepath.'/tn-'.$file); |
print $logfile "\nCopied source to ".$copyfile."\n"; |
if (-e $outfile) { |
&write_metadata($dom,$confname,$formname,$targetdir, |
my $copyfile=$targetdir.'/tn-'.$file; |
'tn-'.$file,$logfile); |
if (copy($outfile,$copyfile)) { |
} else { |
print $logfile "\nCopied source to ".$copyfile."\n"; |
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n"; |
&write_metadata($dom,$confname,$formname, |
|
$targetdir,'tn-'.$file,$logfile); |
|
} else { |
|
print $logfile "\nUnable to write ".$copyfile. |
|
':'.$!."\n"; |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 1545 sub modify_autoenroll {
|
Line 1576 sub modify_autoenroll {
|
my %title = ( run => 'Auto-enrollment active', |
my %title = ( run => 'Auto-enrollment active', |
sender => 'Sender for notification messages'); |
sender => 'Sender for notification messages'); |
my @offon = ('off','on'); |
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 = ( |
my %autoenrollhash = ( |
autoenroll => { run => $env{'form.autoenroll_run'}, |
autoenroll => { run => $env{'form.autoenroll_run'}, |
sender_uname => $env{'form.sender_uname'}, |
sender_uname => $sender_uname, |
sender_domain => $env{'form.sender_domain'}, |
sender_domain => $sender_domain, |
|
|
} |
} |
); |
); |
Line 1564 sub modify_autoenroll {
|
Line 1602 sub modify_autoenroll {
|
$changes{'run'} = 1; |
$changes{'run'} = 1; |
} |
} |
} |
} |
if (exists($currautoenroll{sender_uname})) { |
if ($currautoenroll{'sender_uname'} ne $sender_uname) { |
if ($currautoenroll{'sender_uname'} ne $env{'form.sender_uname'}) { |
|
$changes{'sender'} = 1; |
|
} |
|
} else { |
|
$changes{'sender'} = 1; |
$changes{'sender'} = 1; |
} |
} |
if (exists($currautoenroll{sender_domain})) { |
if ($currautoenroll{'sender_domain'} ne $sender_domain) { |
if ($currautoenroll{'sender_domain'} ne $env{'form.sender_domain'}) { |
|
$changes{'sender'} = 1; |
|
} |
|
} else { |
|
$changes{'sender'} = 1; |
$changes{'sender'} = 1; |
} |
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
Line 1584 sub modify_autoenroll {
|
Line 1614 sub modify_autoenroll {
|
$resulttext .= '<li>'.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'run'} set to $offon[$env{'form.autoenroll_run'}]").'</li>'; |
} |
} |
if ($changes{'sender'}) { |
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>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |