--- loncom/interface/domainprefs.pm 2017/08/03 16:51:53 1.306
+++ loncom/interface/domainprefs.pm 2017/08/25 00:07:45 1.312
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.306 2017/08/03 16:51:53 raeburn Exp $
+# $Id: domainprefs.pm,v 1.312 2017/08/25 00:07:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -6402,7 +6402,7 @@ sub user_formats_row {
}
$output .= '
'.
''.$rolename.' | '.
'';
@@ -9813,7 +9812,7 @@ sub process_textbook_image {
} elsif ($author_ok eq 'ok') {
my ($result,$imageurl) =
&publishlogo($r,'upload',$caller,$dom,$confname,
- "$type/$dom/$cnum/cover",$width,$height);
+ "$type/$cdom/$cnum/cover",$width,$height);
if ($result eq 'ok') {
$url = $imageurl;
} else {
@@ -9896,7 +9895,7 @@ sub modify_ltitools {
}
if ($env{'form.ltitools_add_image.filename'} ne '') {
my ($imageurl,$error) =
- &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$dom,
+ &process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$newid,
$configuserok,$switchserver,$author_ok);
if ($imageurl) {
$confhash{$newid}{'image'} = $imageurl;
@@ -9959,6 +9958,7 @@ sub modify_ltitools {
my $maxnum = $env{'form.ltitools_maxnum'};
for (my $i=0; $i<=$maxnum; $i++) {
my $itemid = $env{'form.ltitools_id_'.$i};
+ $itemid =~ s/\D+//g;
if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
if ($deletions{$itemid}) {
if ($domconfig{$action}{$itemid}{'image'}) {
@@ -12072,7 +12072,7 @@ sub modify_selfcreation {
if (@types) {
if (@statuses) {
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:').
- '';
+ '';
foreach my $status (@statuses) {
if ($status eq 'default') {
$chgtext .= '- '.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'
';
@@ -12273,8 +12273,8 @@ sub modify_selfcreation {
}
}
$chgtext .= ' ';
+ my $typename;
if (@types) {
- my $typename;
if ($type eq 'default') {
$typename = $othertitle;
} else {
@@ -12290,10 +12290,9 @@ sub modify_selfcreation {
'';
} else {
$resulttext .= '- '.
- &mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.',
- $usertypes{$type}).
+ &mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.').
'
'.
- &mt('(Affiliation: [_1])',$type);
+ &mt('(Affiliation: [_1])',$typename);
}
}
}
|