version 1.314, 2017/10/07 00:50:47
|
version 1.319, 2017/11/30 02:17:50
|
Line 1656 sub display_color_options {
|
Line 1656 sub display_color_options {
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $width && $fullheight > $height) { |
if ($fullwidth > $width && $fullheight > $height) { |
my $size = $width.'x'.$height; |
my $size = $width.'x'.$height; |
system("convert -sample $size $input $output"); |
my @args = ('convert','-sample',$size,$input,$output); |
|
system({$args[0]} @args); |
$showfile = "/$imgdir/tn-".$filename; |
$showfile = "/$imgdir/tn-".$filename; |
} |
} |
} |
} |
Line 2585 ENDSCRIPT
|
Line 2586 ENDSCRIPT
|
|
|
sub ltitools_javascript { |
sub ltitools_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
return unless(ref($settings) eq 'HASH'); |
my $togglejs = <itools_toggle_js(); |
|
unless (ref($settings) eq 'HASH') { |
|
return $togglejs; |
|
} |
my (%ordered,$total,%jstext); |
my (%ordered,$total,%jstext); |
$total = 0; |
$total = 0; |
foreach my $item (keys(%{$settings})) { |
foreach my $item (keys(%{$settings})) { |
Line 2603 sub ltitools_javascript {
|
Line 2607 sub ltitools_javascript {
|
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function reorderLTI(form,item) { |
function reorderLTITools(form,item) { |
var changedVal; |
var changedVal; |
$jstext |
$jstext |
var newpos = 'ltitools_add_pos'; |
var newpos = 'ltitools_add_pos'; |
Line 2648 $jstext
|
Line 2652 $jstext
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
|
$togglejs |
|
|
|
ENDSCRIPT |
|
} |
|
|
|
sub ltitools_toggle_js { |
|
return <<"ENDSCRIPT"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
|
|
function toggleLTITools(form,setting,item) { |
|
var radioname = ''; |
|
var divid = ''; |
|
if ((setting == 'passback') || (setting == 'roster')) { |
|
radioname = 'ltitools_'+setting+'_'+item; |
|
divid = 'ltitools_'+setting+'time_'+item; |
|
var num = form.elements[radioname].length; |
|
if (num) { |
|
var setvis = ''; |
|
for (var i=0; i<num; i++) { |
|
if (form.elements[radioname][i].checked) { |
|
if (form.elements[radioname][i].value == '1') { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'inline-block'; |
|
} |
|
setvis = 1; |
|
} |
|
break; |
|
} |
|
} |
|
} |
|
if (!setvis) { |
|
if (document.getElementById(divid)) { |
|
document.getElementById(divid).style.display = 'none'; |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
// ]]> |
|
</script> |
|
|
ENDSCRIPT |
ENDSCRIPT |
} |
} |
|
|
Line 3124 sub print_contacts {
|
Line 3170 sub print_contacts {
|
$to{$item}.'" /></td></tr>'; |
$to{$item}.'" /></td></tr>'; |
$rownum ++; |
$rownum ++; |
} |
} |
} else { |
} elsif ($position eq 'bottom') { |
|
$css_class = $rownum%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
|
&mt('(e-mail, subject, and description always shown)'). |
|
'</td><td class="LC_left_item">'; |
|
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
|
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
|
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
|
foreach my $field (@{$fields}) { |
|
$datatable .= '<tr><td>'.$fieldtitles->{$field}; |
|
if (($field eq 'screenshot') || ($field eq 'cc')) { |
|
$datatable .= ' '.&mt('(logged-in users)'); |
|
} |
|
$datatable .='</td><td>'; |
|
my $clickaction; |
|
if ($field eq 'screenshot') { |
|
$clickaction = ' onclick="screenshotSize(this);"'; |
|
} |
|
if (ref($possoptions->{$field}) eq 'ARRAY') { |
|
foreach my $option (@{$possoptions->{$field}}) { |
|
my $checked; |
|
if ($currfield{$field} eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="helpform_'.$field.'" '. |
|
'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}. |
|
'</label></span>'.(' 'x2); |
|
} |
|
} |
|
if ($field eq 'screenshot') { |
|
my $display; |
|
if ($currfield{$field} eq 'no') { |
|
$display = ' style="display:none"'; |
|
} |
|
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
|
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
|
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
|
} |
|
$datatable .= '</td></tr>'; |
|
} |
|
$datatable .= '</table>'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
|
$rownum ++; |
|
} |
|
unless ($position eq 'top') { |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
$datatable .= '<tr'.$css_class.'>'. |
$datatable .= '<tr'.$css_class.'>'. |
Line 3184 sub print_contacts {
|
Line 3277 sub print_contacts {
|
\%choices,$rownum); |
\%choices,$rownum); |
$datatable .= $reports; |
$datatable .= $reports; |
} elsif ($position eq 'bottom') { |
} elsif ($position eq 'bottom') { |
$css_class = $rownum%2?' class="LC_odd_row"':''; |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
$datatable .= '<tr'.$css_class.'>'. |
my (@posstypes,%usertypeshash); |
'<td>'.&mt('Extra helpdesk form fields:').'<br />'. |
if (ref($types) eq 'ARRAY') { |
&mt('(e-mail, subject, and description always shown)'). |
@posstypes = @{$types}; |
'</td><td class="LC_left_item">'; |
} |
if ((ref($fields) eq 'ARRAY') && (ref($fieldtitles) eq 'HASH') && |
if (@posstypes) { |
(ref($fieldoptions) eq 'HASH') && (ref($possoptions) eq 'HASH')) { |
if (ref($usertypes) eq 'HASH') { |
$datatable .= '<table><tr><th>'.&mt('Field').'</th><th>'.&mt('Status').'</th></tr>'; |
%usertypeshash = %{$usertypes}; |
foreach my $field (@{$fields}) { |
} |
$datatable .= '<tr><td>'.$fieldtitles->{$field}; |
my @overridden; |
if (($field eq 'screenshot') || ($field eq 'cc')) { |
my $numinrow = 4; |
$datatable .= ' '.&mt('(logged-in users)'); |
if (ref($settings) eq 'HASH') { |
} |
if (ref($settings->{'overrides'}) eq 'HASH') { |
$datatable .='</td><td>'; |
foreach my $key (sort(keys(%{$settings->{'overrides'}}))) { |
my $clickaction; |
if (ref($settings->{'overrides'}{$key}) eq 'HASH') { |
if ($field eq 'screenshot') { |
push(@overridden,$key); |
$clickaction = ' onclick="screenshotSize(this);"'; |
foreach my $item (@contacts) { |
} |
if ($settings->{'overrides'}{$key}{$item}) { |
if (ref($possoptions->{$field}) eq 'ARRAY') { |
$checked{'override_'.$key}{$item} = ' checked="checked" '; |
foreach my $option (@{$possoptions->{$field}}) { |
} |
my $checked; |
} |
if ($currfield{$field} eq $option) { |
$otheremails{'override_'.$key} = $settings->{'overrides'}{$key}{'others'}; |
$checked = ' checked="checked"'; |
$bccemails{'override_'.$key} = $settings->{'overrides'}{$key}{'bcc'}; |
|
$includeloc{'override_'.$key} = ''; |
|
$includestr{'override_'.$key} = ''; |
|
if ($settings->{'overrides'}{$key}{'include'} ne '') { |
|
($includeloc{'override_'.$key},$includestr{'override_'.$key}) = |
|
split(/:/,$settings->{'overrides'}{$key}{'include'},2); |
|
$includestr{'override_'.$key} = &unescape($includestr{'override_'.$key}); |
|
} |
} |
} |
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="helpform_'.$field.'" '. |
|
'value="'.$option.'"'.$checked.$clickaction.' />'.$fieldoptions->{$option}. |
|
'</label></span>'.(' 'x2); |
|
} |
} |
} |
} |
if ($field eq 'screenshot') { |
} |
my $display; |
my $customclass = 'LC_helpdesk_override'; |
if ($currfield{$field} eq 'no') { |
my $optionsprefix = 'LC_options_helpdesk_'; |
$display = ' style="display:none"'; |
|
} |
my $onclicktypes = "toggleHelpdeskRow(this.form,'overrides','$customclass','$optionsprefix');"; |
$datatable .= '</td></tr><tr id="help_screenshotsize"'.$display.' />'. |
|
'<td>'.&mt('Maximum size for upload (MB)').'</td><td>'. |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
'<input type="text" size="5" name="helpform_maxsize" value="'.$maxsize.'" />'; |
$numinrow,$othertitle,'overrides', |
|
\$rownum,$onclicktypes,$customclass); |
|
$rownum ++; |
|
$usertypeshash{'default'} = $othertitle; |
|
foreach my $status (@posstypes) { |
|
my $css_class; |
|
if ($rownum%2) { |
|
$css_class = 'LC_odd_row '; |
|
} |
|
$css_class .= $customclass; |
|
my $rowid = $optionsprefix.$status; |
|
my $hidden = 1; |
|
my $currstyle = 'display:none'; |
|
if (grep(/^\Q$status\E$/,@overridden)) { |
|
$currstyle = 'display:table-row'; |
|
$hidden = 0; |
|
} |
|
my $key = 'override_'.$status; |
|
$datatable .= &overridden_helpdesk($checked{$key},$otheremails{$key},$bccemails{$key}, |
|
$includeloc{$key},$includestr{$key},$status,$rowid, |
|
$usertypeshash{$status},$css_class,$currstyle, |
|
\@contacts,$short_titles); |
|
unless ($hidden) { |
|
$rownum ++; |
} |
} |
$datatable .= '</td></tr>'; |
|
} |
} |
$datatable .= '</table>'; |
|
} |
} |
$datatable .= '</td></tr>'."\n"; |
|
$rownum ++; |
|
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub overridden_helpdesk { |
|
my ($checked,$otheremails,$bccemails,$includeloc,$includestr,$type,$rowid, |
|
$typetitle,$css_class,$rowstyle,$contacts,$short_titles) = @_; |
|
my $class = 'LC_left_item'; |
|
if ($css_class) { |
|
$css_class = ' class="'.$css_class.'"'; |
|
} |
|
if ($rowid) { |
|
$rowid = ' id="'.$rowid.'"'; |
|
} |
|
if ($rowstyle) { |
|
$rowstyle = ' style="'.$rowstyle.'"'; |
|
} |
|
my ($output,$description); |
|
$description = &mt('Helpdesk requests from: [_1] in this domain (overrides default)',"<b>$typetitle</b>"); |
|
$output = '<tr'.$css_class.$rowid.$rowstyle.'>'. |
|
"<td>$description</td>\n". |
|
'<td class="'.$class.'" colspan="2">'. |
|
'<fieldset><legend>'.&mt('E-mail recipient(s)').'</legend>'. |
|
'<span class="LC_nobreak">'; |
|
if (ref($contacts) eq 'ARRAY') { |
|
foreach my $item (@{$contacts}) { |
|
my $check; |
|
if (ref($checked) eq 'HASH') { |
|
$check = $checked->{$item}; |
|
} |
|
my $title; |
|
if (ref($short_titles) eq 'HASH') { |
|
$title = $short_titles->{$item}; |
|
} |
|
$output .= '<label>'. |
|
'<input type="checkbox" name="override_'.$type.'"'.$check. |
|
' value="'.$item.'" />'.$title.'</label> '; |
|
} |
|
} |
|
$output .= '</span><br />'.&mt('Others').': '. |
|
'<input type="text" name="override_'.$type.'_others" '. |
|
'value="'.$otheremails.'" />'; |
|
my %locchecked; |
|
foreach my $loc ('s','b') { |
|
if ($includeloc eq $loc) { |
|
$locchecked{$loc} = ' checked="checked"'; |
|
last; |
|
} |
|
} |
|
$output .= '<br />'.&mt('Bcc:').(' 'x6). |
|
'<input type="text" name="override_'.$type.'_bcc" '. |
|
'value="'.$bccemails.'" /></fieldset>'. |
|
'<fieldset><legend>'.&mt('Optional added text').'</legend>'. |
|
&mt('Text automatically added to e-mail:').' '. |
|
'<input type="text" name="override_'.$type.'_includestr" value="'.$includestr.'" /><br >'. |
|
'<span class="LC_nobreak">'.&mt('Location:').' '. |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="s"'.$locchecked{'s'}.' />'.&mt('in subject').'</label>'. |
|
(' 'x2). |
|
'<label><input type="radio" name="override_'.$type.'_includeloc" value="b"'.$locchecked{'b'}.' />'.&mt('in body').'</label>'. |
|
'</span></fieldset>'. |
|
'</td></tr>'."\n"; |
|
return $output; |
|
} |
|
|
sub contacts_javascript { |
sub contacts_javascript { |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
|
|
Line 3251 function screenshotSize(field) {
|
Line 3426 function screenshotSize(field) {
|
return; |
return; |
} |
} |
|
|
|
function toggleHelpdeskRow(form,checkbox,target,prefix,docount) { |
|
if (form.elements[checkbox].length != undefined) { |
|
var count = 0; |
|
if (docount) { |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
if (form.elements[checkbox][i].checked) { |
|
count ++; |
|
} |
|
} |
|
} |
|
for (var i=0; i<form.elements[checkbox].length; i++) { |
|
var type = form.elements[checkbox][i].value; |
|
if (document.getElementById(prefix+type)) { |
|
if (form.elements[checkbox][i].checked) { |
|
document.getElementById(prefix+type).style.display = 'table-row'; |
|
if (count % 2 == 1) { |
|
document.getElementById(prefix+type).className = target+' LC_odd_row'; |
|
} else { |
|
document.getElementById(prefix+type).className = target; |
|
} |
|
count ++; |
|
} else { |
|
document.getElementById(prefix+type).style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
|
|
// ]]> |
// ]]> |
</script> |
</script> |
|
|
Line 3724 sub print_ltitools {
|
Line 3930 sub print_ltitools {
|
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $item = $ordered{$items[$i]}; |
my $item = $ordered{$items[$i]}; |
my ($title,$key,$secret,$url,$imgsrc,$version); |
my ($title,$key,$secret,$url,$imgsrc); |
if (ref($settings->{$item}) eq 'HASH') { |
if (ref($settings->{$item}) eq 'HASH') { |
$title = $settings->{$item}->{'title'}; |
$title = $settings->{$item}->{'title'}; |
$url = $settings->{$item}->{'url'}; |
$url = $settings->{$item}->{'url'}; |
Line 3735 sub print_ltitools {
|
Line 3941 sub print_ltitools {
|
$imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />'; |
$imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />'; |
} |
} |
} |
} |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_".$item."'".');"'; |
my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_".$item."'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="ltitools_'.$item.'"'.$chgstr.'>'; |
.'<select name="ltitools_'.$item.'"'.$chgstr.'>'; |
for (my $k=0; $k<=$maxnum; $k++) { |
for (my $k=0; $k<=$maxnum; $k++) { |
Line 3762 sub print_ltitools {
|
Line 3968 sub print_ltitools {
|
'<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'. |
'<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'. |
' value="'.$url.'" /></span>'. |
' value="'.$url.'" /></span>'. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'key'}. |
'<span class="LC_nobreak">'.$lt{'key'}.':'. |
'<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '. |
'<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.$lt{'secret'}.':'. |
'<span class="LC_nobreak">'.$lt{'secret'}.':'. |
Line 3808 sub print_ltitools {
|
Line 4014 sub print_ltitools {
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
'<textarea name="ltitools_explanation_'.$i.'" rows="5" cols="40">'.$currdisp{'explanation'}. |
'</textarea></div><div style=""></div><br />'; |
'</textarea></div><div style=""></div><br />'; |
$datatable .= '<br />'; |
my %units = ( |
|
'passback' => 'days', |
|
'roster' => 'seconds', |
|
); |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
|
my $validsty = 'none'; |
|
my $currvalid; |
my $checkedon = ''; |
my $checkedon = ''; |
my $checkedoff = ' checked="checked"'; |
my $checkedoff = ' checked="checked"'; |
if ($settings->{$item}->{$extra}) { |
if ($settings->{$item}->{$extra}) { |
$checkedon = $checkedoff; |
$checkedon = $checkedoff; |
$checkedoff = ''; |
$checkedoff = ''; |
} |
$validsty = 'inline-block'; |
$datatable .= $lt{$extra}.' '. |
if ($settings->{$item}->{$extra.'valid'} =~ /^\d+\.?\d*$/) { |
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.' />'. |
$currvalid = $settings->{$item}->{$extra.'valid'}; |
&mt('Yes').'</label>'.(' 'x2). |
} |
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.' />'. |
} |
&mt('No').'</label>'.(' 'x4); |
my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','$i'".');"'; |
|
$datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.' '. |
|
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.$onclick.' />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.$onclick.' />'. |
|
&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:'.$validsty.';" id="ltitools_'.$extra.'time_'.$i.'">'. |
|
'<span class="LC_nobreak">'. |
|
&mt("at least [_1] $units{$extra} after launch", |
|
'<input type="text" name="ltitools_'.$extra.'valid_'.$i.'" value="'.$currvalid.'" />'). |
|
'</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
} |
} |
$datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.': '; |
$datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.': '; |
if ($imgsrc) { |
if ($imgsrc) { |
$datatable .= $imgsrc. |
$datatable .= $imgsrc. |
'<label><input type="checkbox" name="ltitools_image_del"'. |
'<label><input type="checkbox" name="ltitools_image_del"'. |
Line 3889 sub print_ltitools {
|
Line 4110 sub print_ltitools {
|
} |
} |
} |
} |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target','linktext','explanation','append') { |
my $checked; |
my $checked; |
if ($courseconfig{$item}) { |
if ($courseconfig{$item}) { |
$checked = ' checked="checked"'; |
$checked = ' checked="checked"'; |
Line 3922 sub print_ltitools {
|
Line 4143 sub print_ltitools {
|
} |
} |
} |
} |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_add_pos'".');"'; |
my $chgstr = ' onchange="javascript:reorderLTITools(this.form,'."'ltitools_add_pos'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
'<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n". |
'<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n". |
'<select name="ltitools_add_pos"'.$chgstr.'>'; |
'<select name="ltitools_add_pos"'.$chgstr.'>'; |
Line 3973 sub print_ltitools {
|
Line 4194 sub print_ltitools {
|
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<div class="LC_left_float">'.$lt{'explanation'}.'<br />'. |
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
'<textarea name=ltitools_add_explanation" rows="5" cols="40"></textarea>'. |
'</div><div style=""></div><br />'; |
'</div><div style=""></div><br />'; |
|
my %units = ( |
|
'passback' => 'days', |
|
'roster' => 'seconds', |
|
); |
|
my %defaulttimes = ( |
|
'passback' => '7', |
|
'roster' => '300', |
|
); |
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
$datatable .= $lt{$extra}.' '. |
my $onclick = ' onclick="toggleLTITools(this.form,'."'$extra','add'".');"'; |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
$datatable .= '<div class="LC_floatleft"><span class="LC_nobreak">'.$lt{$extra}.' '. |
&mt('Yes').'</label>'.(' 'x2). |
'<label><input type="radio" name="ltitools_'.$extra.'_add" value="0" checked="checked"'.$onclick.' />'. |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="0" checked="checked" />'. |
&mt('No').'</label></span>'.(' 'x2).'<span class="LC_nobreak">'. |
&mt('No').'</label>'.(' 'x4); |
'<label><input type="radio" name="ltitools_'.$extra.'_add" value="1"'.$onclick.' />'. |
|
&mt('Yes').'</label></span></div>'. |
|
'<div class="LC_floatleft" style="display:none;" id="ltitools_'.$extra.'time_add">'. |
|
'<span class="LC_nobreak">'. |
|
&mt("at least [_1] $units{$extra} after launch", |
|
'<input type="text" name="ltitools_'.$extra.'valid_add" value="'.$defaulttimes{$extra}.'" />'). |
|
'</span></div><div style="padding:0;clear:both;margin:0;border:0"></div>'; |
} |
} |
$datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.': '. |
$datatable .= '<span class="LC_nobreak">'.$lt{'icon'}.': '. |
'('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
'('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
if ($switchserver) { |
if ($switchserver) { |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
Line 4010 sub print_ltitools {
|
Line 4245 sub print_ltitools {
|
} |
} |
$datatable .= '</tr></table></fieldset>'. |
$datatable .= '</tr></table></fieldset>'. |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target','linktext','explanation','append') { |
$datatable .= '<label>'. |
$datatable .= '<label>'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
Line 4058 sub ltitools_names {
|
Line 4293 sub ltitools_names {
|
'crstitle' => 'Course title', |
'crstitle' => 'Course title', |
'crslinktext' => 'Link Text', |
'crslinktext' => 'Link Text', |
'crsexplanation' => 'Explanation', |
'crsexplanation' => 'Explanation', |
|
'crsappend' => 'Provider URL', |
); |
); |
return %lt; |
return %lt; |
} |
} |
Line 4169 sub print_coursedefaults {
|
Line 4405 sub print_coursedefaults {
|
if ($checked) { |
if ($checked) { |
$show = 'block'; |
$show = 'block'; |
} |
} |
$additional = '<div id="cloneinstcode" style="display:'.$show.'" />'. |
$additional = '<div id="cloneinstcode" style="display:'.$show.';" />'. |
&mt('Institutional codes for new and cloned course have identical:'). |
&mt('Institutional codes for new and cloned course have identical:'). |
'<br />'; |
'<br />'; |
foreach my $item (@code_order) { |
foreach my $item (@code_order) { |
Line 5484 sub loadbalance_rule_row {
|
Line 5720 sub loadbalance_rule_row {
|
} |
} |
my $space; |
my $space; |
if ($islast && $num == 1) { |
if ($islast && $num == 1) { |
$space = '<div display="inline-block"> </div>'; |
$space = '<div style="display:inline-block;"> </div>'; |
} |
} |
my $output = |
my $output = |
'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td style="vertical-align: top">'.$space. |
'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td style="vertical-align: top">'.$space. |
Line 5570 sub contact_titles {
|
Line 5806 sub contact_titles {
|
'adminemail' => 'Default Server Admin E-mail address', |
'adminemail' => 'Default Server Admin E-mail address', |
'errormail' => 'Error reports to be e-mailed to', |
'errormail' => 'Error reports to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'packagesmail' => 'Package update alerts to be e-mailed to', |
'helpdeskmail' => "Helpdesk requests for this domain's users", |
'helpdeskmail' => "Helpdesk requests from all users in this domain", |
'otherdomsmail' => 'Helpdesk requests for other (unconfigured) domains', |
'otherdomsmail' => 'Helpdesk requests from users in other (unconfigured) domains', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'lonstatusmail' => 'E-mail from nightly status check (warnings/errors)', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'requestsmail' => 'E-mail from course requests requiring approval', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
'updatesmail' => 'E-mail from nightly check of LON-CAPA module integrity/updates', |
Line 7776 sub insttypes_row {
|
Line 8012 sub insttypes_row {
|
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
lockablenames => 'User preference to lock name', |
lockablenames => 'User preference to lock name', |
selfassign => 'Self-reportable affiliations', |
selfassign => 'Self-reportable affiliations', |
|
overrides => "Override domain's helpdesk settings based on requester's affiliation", |
); |
); |
my $showdom; |
my $showdom; |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
Line 7822 sub insttypes_row {
|
Line 8059 sub insttypes_row {
|
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
|
} elsif (ref($settings->{$context}) eq 'HASH') { |
|
if (ref($settings->{$context}->{$types->[$i]}) eq 'HASH') { |
|
$check = ' checked="checked" '; |
|
} |
} elsif ($context eq 'statustocreate') { |
} elsif ($context eq 'statustocreate') { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
Line 7836 sub insttypes_row {
|
Line 8077 sub insttypes_row {
|
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
if (($rem == 0) && (@{$types} > 0)) { |
if ($context eq 'overrides') { |
$output .= '<tr>'; |
if ($colsleft > 1) { |
} |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
if ($colsleft > 1) { |
} else { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
$output .= '<td class="LC_left_item">'; |
|
} |
|
$output .= ' '; |
} else { |
} else { |
$output .= '<td class="LC_left_item">'; |
if (($rem == 0) && (@{$types} > 0)) { |
} |
$output .= '<tr>'; |
my $defcheck = ' '; |
} |
if (ref($settings) eq 'HASH') { |
if ($colsleft > 1) { |
if (ref($settings->{$context}) eq 'ARRAY') { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
if (grep(/^default$/,@{$settings->{$context}})) { |
} else { |
|
$output .= '<td class="LC_left_item">'; |
|
} |
|
my $defcheck = ' '; |
|
if (ref($settings) eq 'HASH') { |
|
if (ref($settings->{$context}) eq 'ARRAY') { |
|
if (grep(/^default$/,@{$settings->{$context}})) { |
|
$defcheck = ' checked="checked" '; |
|
} |
|
} elsif ($context eq 'statustocreate') { |
$defcheck = ' checked="checked" '; |
$defcheck = ' checked="checked" '; |
} |
} |
} elsif ($context eq 'statustocreate') { |
|
$defcheck = ' checked="checked" '; |
|
} |
} |
|
$output .= '<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.$onclick.' />'. |
|
$othertitle.'</label></span>'; |
} |
} |
$output .= '<span class="LC_nobreak"><label>'. |
$output .= '</td></tr></table></td></tr>'; |
'<input type="checkbox" name="'.$context.'" '. |
|
'value="default"'.$defcheck.$onclick.' />'. |
|
$othertitle.'</label></span></td>'. |
|
'</tr></table></td></tr>'; |
|
return $output; |
return $output; |
} |
} |
|
|
Line 8892 sub publishlogo {
|
Line 9142 sub publishlogo {
|
} else { |
} else { |
my $source = $filepath.'/'.$file; |
my $source = $filepath.'/'.$file; |
my $logfile; |
my $logfile; |
if (!open($logfile,">>$source".'.log')) { |
if (!open($logfile,">>",$source.'.log')) { |
return (&mt('No write permission to Authoring Space')); |
return (&mt('No write permission to Authoring Space')); |
} |
} |
print $logfile |
print $logfile |
"\n================= Publish ".localtime()." ================\n". |
"\n================= Publish ".localtime()." ================\n". |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
$env{'user.name'}.':'.$env{'user.domain'}."\n"; |
# Save the file |
# Save the file |
if (!open(FH,'>'.$source)) { |
if (!open(FH,">",$source)) { |
&Apache::lonnet::logthis('Failed to create '.$source); |
&Apache::lonnet::logthis('Failed to create '.$source); |
return (&mt('Failed to create file')); |
return (&mt('Failed to create file')); |
} |
} |
Line 8960 $env{'user.name'}.':'.$env{'user.domain'
|
Line 9210 $env{'user.name'}.':'.$env{'user.domain'
|
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth ne '' && $fullheight ne '') { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) { |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
system("convert -sample $thumbsize $inputfile $outfile"); |
my @args = ('convert','-sample',$thumbsize,$inputfile,$outfile); |
|
system({$args[0]} @args); |
chmod(0660, $filepath.'/tn-'.$file); |
chmod(0660, $filepath.'/tn-'.$file); |
if (-e $outfile) { |
if (-e $outfile) { |
my $copyfile=$targetdir.'/tn-'.$file; |
my $copyfile=$targetdir.'/tn-'.$file; |
Line 9040 sub write_metadata {
|
Line 9291 sub write_metadata {
|
{ |
{ |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
print $logfile "\nWrite metadata file for ".$targetdir.'/'.$file; |
my $mfh; |
my $mfh; |
if (open($mfh,'>'.$targetdir.'/'.$file.'.meta')) { |
if (open($mfh,">",$targetdir.'/'.$file.'.meta')) { |
foreach (sort(keys(%metadatafields))) { |
foreach (sort(keys(%metadatafields))) { |
unless ($_=~/\./) { |
unless ($_=~/\./) { |
my $unikey=$_; |
my $unikey=$_; |
Line 9074 sub notifysubscribed {
|
Line 9325 sub notifysubscribed {
|
next unless (ref($targetsource) eq 'ARRAY'); |
next unless (ref($targetsource) eq 'ARRAY'); |
my ($target,$source)=@{$targetsource}; |
my ($target,$source)=@{$targetsource}; |
if ($source ne '') { |
if ($source ne '') { |
if (open(my $logfh,'>>'.$source.'.log')) { |
if (open(my $logfh,">>",$source.'.log')) { |
print $logfh "\nCleanup phase: Notifications\n"; |
print $logfh "\nCleanup phase: Notifications\n"; |
my @subscribed=&subscribed_hosts($target); |
my @subscribed=&subscribed_hosts($target); |
foreach my $subhost (@subscribed) { |
foreach my $subhost (@subscribed) { |
Line 9100 sub notifysubscribed {
|
Line 9351 sub notifysubscribed {
|
sub subscribed_hosts { |
sub subscribed_hosts { |
my ($target) = @_; |
my ($target) = @_; |
my @subscribed; |
my @subscribed; |
if (open(my $fh,"<$target.subscription")) { |
if (open(my $fh,"<","$target.subscription")) { |
while (my $subline=<$fh>) { |
while (my $subline=<$fh>) { |
if ($subline =~ /^($match_lonid):/) { |
if ($subline =~ /^($match_lonid):/) { |
my $host = $1; |
my $host = $1; |
Line 9927 sub modify_ltitools {
|
Line 10178 sub modify_ltitools {
|
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
} |
} |
foreach my $item ('passback','roster') { |
foreach my $item ('passback','roster') { |
if ($env{'form.ltitools_add_'.$item}) { |
if ($env{'form.ltitools_'.$item.'_add'}) { |
$confhash{$newid}{$item} = 1; |
$confhash{$newid}{$item} = 1; |
|
if ($env{'form.ltitools_'.$item.'valid_add'} ne '') { |
|
my $lifetime = $env{'form.ltitools_'.$item.'valid_add'}; |
|
$lifetime =~ s/^\s+|\s+$//g; |
|
if ($lifetime =~ /^\d+\.?\d*$/) { |
|
$confhash{$newid}{$item.'valid'} = $lifetime; |
|
} |
|
} |
} |
} |
} |
} |
if ($env{'form.ltitools_add_image.filename'} ne '') { |
if ($env{'form.ltitools_add_image.filename'} ne '') { |
Line 10078 sub modify_ltitools {
|
Line 10336 sub modify_ltitools {
|
foreach my $extra ('passback','roster') { |
foreach my $extra ('passback','roster') { |
if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
$confhash{$itemid}{$extra} = 1; |
$confhash{$itemid}{$extra} = 1; |
|
if ($env{'form.ltitools_'.$extra.'valid_'.$i} ne '') { |
|
my $lifetime = $env{'form.ltitools_'.$extra.'valid_add'}; |
|
$lifetime =~ s/^\s+|\s+$//g; |
|
if ($lifetime =~ /^\d+\.?\d*$/) { |
|
$confhash{$itemid}{$extra.'valid'} = $lifetime; |
|
} |
|
} |
} |
} |
if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) { |
if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) { |
$changes{$itemid} = 1; |
$changes{$itemid} = 1; |
} |
} |
|
if ($domconfig{$action}{$itemid}{$extra.'valid'} ne $confhash{$itemid}{$extra.'valid'}) { |
|
$changes{$itemid} = 1; |
|
} |
} |
} |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
foreach my $item ('label','title','target','linktext','explanation') { |
foreach my $item ('label','title','target','linktext','explanation','append') { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
Line 10275 sub modify_ltitools {
|
Line 10543 sub modify_ltitools {
|
$resulttext .= ('*'x$num).'</li>'; |
$resulttext .= ('*'x$num).'</li>'; |
} |
} |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
my @possconfig = ('label','title','target','linktext','explanation'); |
my @possconfig = ('label','title','target','linktext','explanation','append'); |
my $numconfig = 0; |
my $numconfig = 0; |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
foreach my $item (@possconfig) { |
foreach my $item (@possconfig) { |
Line 10293 sub modify_ltitools {
|
Line 10561 sub modify_ltitools {
|
$resulttext .= '<li>'.$lt{$item}.' '; |
$resulttext .= '<li>'.$lt{$item}.' '; |
if ($confhash{$itemid}{$item}) { |
if ($confhash{$itemid}{$item}) { |
$resulttext .= &mt('Yes'); |
$resulttext .= &mt('Yes'); |
|
if ($confhash{$itemid}{$item.'valid'}) { |
|
if ($item eq 'passback') { |
|
$resulttext .= ' '.&mt('valid for at least [quant,_1,day] after launch', |
|
$confhash{$itemid}{$item.'valid'}); |
|
} else { |
|
$resulttext .= ' '.&mt('valid for at least [quant,_1,second] after launch', |
|
$confhash{$itemid}{$item.'valid'}); |
|
} |
|
} |
} else { |
} else { |
$resulttext .= &mt('No'); |
$resulttext .= &mt('No'); |
} |
} |
Line 10353 sub modify_ltitools {
|
Line 10630 sub modify_ltitools {
|
} |
} |
} |
} |
if ($customlist) { |
if ($customlist) { |
$resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>'; |
$resulttext .= '<li>'.&mt('Custom items').': '.$customlist.'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></li>'; |
Line 11074 sub modify_contacts {
|
Line 11351 sub modify_contacts {
|
my $value = $env{'form.helpform_'.$field}; |
my $value = $env{'form.helpform_'.$field}; |
$value =~ s/^\s+|\s+$//g; |
$value =~ s/^\s+|\s+$//g; |
if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) { |
if (grep(/^\Q$value\E$/,@{$possoptions->{$field}})) { |
$contacts_hash{contacts}{'helpform'}{$field} = $value; |
$contacts_hash{'contacts'}{'helpform'}{$field} = $value; |
if ($field eq 'screenshot') { |
if ($field eq 'screenshot') { |
$env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g; |
$env{'form.helpform_maxsize'} =~ s/^\s+|\s+$//g; |
if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) { |
if ($env{'form.helpform_maxsize'} =~ /^\d+\.?\d*$/) { |
$contacts_hash{contacts}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'}; |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'} = $env{'form.helpform_maxsize'}; |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my (@statuses,%usertypeshash,@overrides); |
|
if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { |
|
@statuses = @{$types}; |
|
if (ref($usertypes) eq 'HASH') { |
|
%usertypeshash = %{$usertypes}; |
|
} |
|
} |
|
if (@statuses) { |
|
my @possoverrides = &Apache::loncommon::get_env_multiple('form.overrides'); |
|
foreach my $type (@possoverrides) { |
|
if (($type ne '') && (grep(/^\Q$type\E$/,@statuses))) { |
|
push(@overrides,$type); |
|
} |
|
} |
|
if (@overrides) { |
|
foreach my $type (@overrides) { |
|
my @standard = &Apache::loncommon::get_env_multiple('form.override_'.$type); |
|
foreach my $item (@contacts) { |
|
if (grep(/^\Q$item\E$/,@standard)) { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 1; |
|
$newsetting{'override_'.$type}{$item} = 1; |
|
} else { |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{$item} = 0; |
|
$newsetting{'override_'.$type}{$item} = 0; |
|
} |
|
} |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
$newsetting{'override_'.$type}{'others'} = $env{'form.override_'.$type.'_others'}; |
|
$newsetting{'override_'.$type}{'bcc'} = $env{'form.override_'.$type.'_bcc'}; |
|
if (($env{'form.override_'.$type.'_includestr'} ne '') && ($env{'form.override_'.$type.'_includeloc'} =~ /^s|b$/)) { |
|
$includestr{$type} = $env{'form.override_'.$type.'_includestr'}; |
|
$includeloc{$type} = $env{'form.override_'.$type.'_includeloc'}; |
|
$contacts_hash{'contacts'}{'overrides'}{$type}{'include'} = $includeloc{$type}.':'.&escape($includestr{$type}); |
|
$newsetting{'override_'.$type}{'include'} = $contacts_hash{'contacts'}{'overrides'}{$type}{'include'}; |
|
} |
|
} |
|
} |
|
} |
if (keys(%currsetting) > 0) { |
if (keys(%currsetting) > 0) { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($to{$item} ne $currsetting{$item}) { |
if ($to{$item} ne $currsetting{$item}) { |
Line 11139 sub modify_contacts {
|
Line 11456 sub modify_contacts {
|
} |
} |
} |
} |
} |
} |
|
if (@statuses) { |
|
if (ref($currsetting{'overrides'}) eq 'HASH') { |
|
foreach my $key (keys(%{$currsetting{'overrides'}})) { |
|
if (ref($currsetting{'overrides'}{$key}) eq 'HASH') { |
|
if (ref($newsetting{'override_'.$key}) eq 'HASH') { |
|
foreach my $item (@contacts,'bcc','others','include') { |
|
if ($currsetting{'overrides'}{$key}{$item} ne $newsetting{'override_'.$key}{$item}) { |
|
push(@{$changes{'overrides'}},$key); |
|
last; |
|
} |
|
} |
|
} else { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
|
foreach my $key (@overrides) { |
|
unless (exists($currsetting{'overrides'}{$key})) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} else { |
|
foreach my $key (@overrides) { |
|
push(@{$changes{'overrides'}},$key); |
|
} |
|
} |
|
} |
} else { |
} else { |
my %default; |
my %default; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
$default{'supportemail'} = $Apache::lonnet::perlvar{'lonSupportEMail'}; |
Line 11253 sub modify_contacts {
|
Line 11597 sub modify_contacts {
|
$resulttext .= '</li>'; |
$resulttext .= '</li>'; |
} |
} |
} |
} |
|
if (ref($changes{'overrides'}) eq 'ARRAY') { |
|
my @deletions; |
|
foreach my $type (@{$changes{'overrides'}}) { |
|
if ($usertypeshash{$type}) { |
|
if (grep(/^\Q$type\E/,@overrides)) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation set for [_1]", |
|
$usertypeshash{$type}).'<ul><li>'; |
|
if (ref($newsetting{'override_'.$type}) eq 'HASH') { |
|
my @text; |
|
foreach my $item (@contacts) { |
|
if ($newsetting{'override_'.$type}{$item}) { |
|
push(@text,$short_titles->{$item}); |
|
} |
|
} |
|
if ($newsetting{'override_'.$type}{'others'} ne '') { |
|
push(@text,$newsetting{'override_'.$type}{'others'}); |
|
} |
|
|
|
if (@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to: [_1]', |
|
'<span class="LC_cusr_emph">'.join(', ',@text).'</span>'); |
|
} |
|
if ($newsetting{'override_'.$type}{'bcc'} ne '') { |
|
my $bcctext; |
|
if (@text) { |
|
$bcctext = ' '.&mt('with Bcc to'); |
|
} else { |
|
$bcctext = '(Bcc)'; |
|
} |
|
$resulttext .= $bcctext.': <span class="LC_cusr_emph">'.$newsetting{'override_'.$type}{'bcc'}.'</span>'; |
|
} elsif (!@text) { |
|
$resulttext .= &mt('Helpdesk e-mail sent to no one'); |
|
} |
|
$resulttext .= '</li>'; |
|
if ($newsetting{'override_'.$type}{'include'} ne '') { |
|
my ($loc,$str) = split(/:/,$newsetting{'override_'.$type}{'include'}); |
|
if ($loc eq 'b') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail body:').' '.&unescape($str).'</li>'; |
|
} elsif ($loc eq 's') { |
|
$resulttext .= '<li>'.&mt('Text automatically added to e-mail subject:').' '.&unescape($str).'</li>'; |
|
} |
|
} |
|
} |
|
$resulttext .= '</li></ul></li>'; |
|
} else { |
|
push(@deletions,$usertypeshash{$type}); |
|
} |
|
} |
|
} |
|
if (@deletions) { |
|
$resulttext .= '<li>'.&mt("Overrides based on requester's affiliation discontinued for: [_1]", |
|
join(', ',@deletions)).'</li>'; |
|
} |
|
} |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
if ($changes{'reporterrors'}) { |
if ($changes{'reporterrors'}) { |
$resulttext .= '<li>'. |
$resulttext .= '<li>'. |
Line 11308 sub modify_contacts {
|
Line 11706 sub modify_contacts {
|
&mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.', |
&mt('Max size for file uploaded to help form by logged-in user set to [_1] MB.', |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'}). |
$contacts_hash{'contacts'}{'helpform'}{'maxsize'}). |
'</li>'; |
'</li>'; |
|
|
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |