version 1.308, 2017/08/15 21:02:40
|
version 1.313, 2017/08/25 00:33:14
|
Line 6402 sub user_formats_row {
|
Line 6402 sub user_formats_row {
|
} |
} |
$output .= '<td class="LC_left_item">'. |
$output .= '<td class="LC_left_item">'. |
'<span class="LC_nobreak"><label>'. |
'<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="'.$name.'"'. |
'<input type="checkbox" name="'.$name.'" '. |
'value="'.$ruleorder->[$i].'"'.$check.'/>'. |
'value="'.$ruleorder->[$i].'"'.$check.'/>'. |
$rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>'; |
$rules->{$ruleorder->[$i]}{'name'}.'</label></span></td>'; |
} |
} |
Line 7643 sub modifiable_userdata_row {
|
Line 7643 sub modifiable_userdata_row {
|
if ($rowid) { |
if ($rowid) { |
$rowid = ' id="'.$rowid.'"'; |
$rowid = ' id="'.$rowid.'"'; |
} |
} |
|
|
$output = '<tr '.$css_class.$rowid.'>'. |
$output = '<tr '.$css_class.$rowid.'>'. |
'<td><span class="LC_nobreak">'.$rolename.'</span></td>'. |
'<td><span class="LC_nobreak">'.$rolename.'</span></td>'. |
'<td class="LC_left_item" colspan="2"><table>'; |
'<td class="LC_left_item" colspan="2"><table>'; |
Line 9270 sub modify_quotas {
|
Line 9269 sub modify_quotas {
|
#FIXME need to obsolete item in RES space |
#FIXME need to obsolete item in RES space |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
my ($cdom,$cnum) = split(/_/,$key); |
my ($cdom,$cnum) = split(/_/,$key); |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
$cdom,$cnum,$type,$configuserok, |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$switchserver,$author_ok); |
} else { |
if ($imgurl) { |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
$confhash{$type}{$key}{'image'} = $imgurl; |
$cdom,$cnum,$type,$configuserok, |
$changes{$type}{$key} = 1; |
$switchserver,$author_ok); |
|
if ($imgurl) { |
|
$confhash{$type}{$key}{'image'} = $imgurl; |
|
$changes{$type}{$key} = 1; |
|
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
} |
} |
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
$confhash{$type}{$key}{'image'} = |
$confhash{$type}{$key}{'image'} = |
$domconfig{$action}{$type}{$key}{'image'}; |
$domconfig{$action}{$type}{$key}{'image'}; |
Line 9313 sub modify_quotas {
|
Line 9316 sub modify_quotas {
|
if ($type eq 'textbooks') { |
if ($type eq 'textbooks') { |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
my ($imageurl,$error) = |
if (&Apache::lonnet::homeserver($cnum,$cdom) eq 'no_host') { |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
$errors .= '<li><span class="LC_error">'.&mt('Image not saved: could not find textbook course').'</li>'; |
$configuserok,$switchserver,$author_ok); |
} else { |
if ($imageurl) { |
my ($imageurl,$error) = |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
} |
$configuserok,$switchserver,$author_ok); |
if ($error) { |
if ($imageurl) { |
&Apache::lonnet::logthis($error); |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 9813 sub process_textbook_image {
|
Line 9820 sub process_textbook_image {
|
} elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
my ($result,$imageurl) = |
my ($result,$imageurl) = |
&publishlogo($r,'upload',$caller,$dom,$confname, |
&publishlogo($r,'upload',$caller,$dom,$confname, |
"$type/$dom/$cnum/cover",$width,$height); |
"$type/$cdom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 12073 sub modify_selfcreation {
|
Line 12080 sub modify_selfcreation {
|
if (@types) { |
if (@types) { |
if (@statuses) { |
if (@statuses) { |
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). |
$chgtext .= &mt('Processing of requests to create account with e-mail verification set as follows:'). |
'<ul>'; |
'<ul>'; |
foreach my $status (@statuses) { |
foreach my $status (@statuses) { |
if ($status eq 'default') { |
if ($status eq 'default') { |
$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>'; |
$chgtext .= '<li>'.$othertitle.' -- '.$choices{$cancreate{'selfcreateprocessing'}{$status}}.'</li>'; |
Line 12274 sub modify_selfcreation {
|
Line 12281 sub modify_selfcreation {
|
} |
} |
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
|
my $typename; |
if (@types) { |
if (@types) { |
my $typename; |
|
if ($type eq 'default') { |
if ($type eq 'default') { |
$typename = $othertitle; |
$typename = $othertitle; |
} else { |
} else { |
Line 12291 sub modify_selfcreation {
|
Line 12298 sub modify_selfcreation {
|
'</li>'; |
'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
&mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.', |
&mt('There are now no restrictions on e-mail addresses which may be used for verification when a user requests an account.'). |
$usertypes{$type}). |
|
'</li>'. |
'</li>'. |
&mt('(Affiliation: [_1])',$type); |
&mt('(Affiliation: [_1])',$typename); |
} |
} |
} |
} |
} |
} |