loncom/interface/domainprefs.pm - diff

Return to domainprefs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/domainprefs.pm between versions 1.305 and 1.317

version 1.305, 2017/08/03 16:22:08	version 1.317, 2017/11/30 01:49:19
Line 762 sub print_config_box {	Line 762 sub print_config_box {
$output .=	$output .=
'<table class="LC_nested_outer">	'<table class="LC_nested_outer">
<tr>	<tr>
<th align="left" valign="middle"><span class="LC_nobreak">'.	<th class="LC_left_item LC_middle"><span class="LC_nobreak">'.
&mt($item->{text}).' '.	&mt($item->{text}).' '.
&Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".	&Apache::loncommon::help_open_topic($item->{'help'}).'</span></th>'."\n".
'</tr>';	'</tr>';
Line 978 sub print_config_box {	Line 978 sub print_config_box {
<td>	<td>
<table class="LC_nested">	<table class="LC_nested">
<tr class="LC_info_row">	<tr class="LC_info_row">
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td>	<td class="LC_left_item"'.$colspan.' style="vertical-align: top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td>
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>	<td class="LC_right_item" style="vertical-align: top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td>
</tr>'.	</tr>'.
&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);	&print_validation_rows('requestcourses',$dom,$settings,\$rowtotal);
} elsif ($action eq 'requestauthor') {	} elsif ($action eq 'requestauthor') {
Line 994 sub print_config_box {	Line 994 sub print_config_box {
<td>	<td>
<table class="LC_nested">	<table class="LC_nested">
<tr class="LC_info_row">	<tr class="LC_info_row">
<td class="LC_left_item"'.$colspan.' valign="top">'.	<td class="LC_left_item"'.$colspan.' style="vertical-align: top">'.
&mt($item->{'header'}->[2]->{'col1'}).'</td>	&mt($item->{'header'}->[2]->{'col1'}).'</td>
<td class="LC_right_item" valign="top">'.	<td class="LC_right_item" style="vertical-align: top">'.
&mt($item->{'header'}->[2]->{'col2'}).'</td>	&mt($item->{'header'}->[2]->{'col2'}).'</td>
</tr>'.	</tr>'.
&print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'	&print_rolecolors($phase,'author',$dom,$confname,$settings,\$rowtotal).'
Line 1024 sub print_config_box {	Line 1024 sub print_config_box {
<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';	<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
} elsif ($action eq 'serverstatuses') {	} elsif ($action eq 'serverstatuses') {
$output .= '	$output .= '
<td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).	<td class="LC_left_item" style="vertical-align: top">'.&mt($item->{'header'}->[0]->{'col1'}).
'<br />('.&mt('Automatic access for Dom. Coords.').')</td>';	'<br />('.&mt('Automatic access for Dom. Coords.').')</td>';

} else {	} else {
$output .= '	$output .= '
<td class="LC_left_item" valign="top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';	<td class="LC_left_item" style="vertical-align: top">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>';
}	}
if (defined($item->{'header'}->[0]->{'col3'})) {	if (defined($item->{'header'}->[0]->{'col3'})) {
$output .= '<td class="LC_left_item" valign="top">'.	$output .= '<td class="LC_left_item" style="vertical-align: top">'.
&mt($item->{'header'}->[0]->{'col2'});	&mt($item->{'header'}->[0]->{'col2'});
if ($action eq 'serverstatuses') {	if ($action eq 'serverstatuses') {
$output .= '<br />(<tt>'.&mt('user1:domain1,user2:domain2 etc.').'</tt>)';	$output .= '<br />(<tt>'.&mt('user1:domain1,user2:domain2 etc.').'</tt>)';
}	}
} else {	} else {
$output .= '<td class="LC_right_item" valign="top">'.	$output .= '<td class="LC_right_item" style="vertical-align: top">'.
&mt($item->{'header'}->[0]->{'col2'});	&mt($item->{'header'}->[0]->{'col2'});
}	}
$output .= '</td>';	$output .= '</td>';
if ($item->{'header'}->[0]->{'col3'}) {	if ($item->{'header'}->[0]->{'col3'}) {
if (defined($item->{'header'}->[0]->{'col4'})) {	if (defined($item->{'header'}->[0]->{'col4'})) {
$output .= '<td class="LC_left_item" valign="top">'.	$output .= '<td class="LC_left_item" style="vertical-align: top">'.
&mt($item->{'header'}->[0]->{'col3'});	&mt($item->{'header'}->[0]->{'col3'});
} else {	} else {
$output .= '<td class="LC_right_item" valign="top">'.	$output .= '<td class="LC_right_item" style="vertical-align: top">'.
&mt($item->{'header'}->[0]->{'col3'});	&mt($item->{'header'}->[0]->{'col3'});
}	}
if ($action eq 'serverstatuses') {	if ($action eq 'serverstatuses') {
Line 1056 sub print_config_box {	Line 1056 sub print_config_box {
$output .= '</td>';	$output .= '</td>';
}	}
if ($item->{'header'}->[0]->{'col4'}) {	if ($item->{'header'}->[0]->{'col4'}) {
$output .= '<td class="LC_right_item" valign="top">'.	$output .= '<td class="LC_right_item" style="vertical-align: top">'.
&mt($item->{'header'}->[0]->{'col4'});	&mt($item->{'header'}->[0]->{'col4'});
}	}
$output .= '</tr>';	$output .= '</tr>';
Line 1089 sub print_login {	Line 1089 sub print_login {
my $choice = $choices{'disallowlogin'};	my $choice = $choices{'disallowlogin'};
$css_class = ' class="LC_odd_row"';	$css_class = ' class="LC_odd_row"';
$datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'.	$datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'.
'<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'.	'<td style="text-align: right"><table><tr><th>'.$choices{'hostid'}.'</th>'.
'<th>'.$choices{'server'}.'</th>'.	'<th>'.$choices{'server'}.'</th>'.
'<th>'.$choices{'serverpath'}.'</th>'.	'<th>'.$choices{'serverpath'}.'</th>'.
'<th>'.$choices{'custompath'}.'</th>'.	'<th>'.$choices{'custompath'}.'</th>'.
Line 1370 sub print_login {	Line 1370 sub print_login {
my $choice = $choices{'headtag'};	my $choice = $choices{'headtag'};
$css_class = ' class="LC_odd_row"';	$css_class = ' class="LC_odd_row"';
$datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'.	$datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'.
'<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'.	'<td style="text-align: left"><table><tr><th>'.$choices{'hostid'}.'</th>'.
'<th>'.$choices{'current'}.'</th>'.	'<th>'.$choices{'current'}.'</th>'.
'<th>'.$choices{'action'}.'</th>'.	'<th>'.$choices{'action'}.'</th>'.
'<th>'.$choices{'exempt'}.'</th></tr>'."\n";	'<th>'.$choices{'exempt'}.'</th></tr>'."\n";
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 1726 sub display_color_options {	Line 1727 sub display_color_options {
'<table border="0"><tr>';	'<table border="0"><tr>';

foreach my $item (@{$bgs}) {	foreach my $item (@{$bgs}) {
$datatable .= '<td align="center">'.$choices->{$item};	$datatable .= '<td style="text-align: center">'.$choices->{$item};
my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};	my $color = $designs->{'bgs'}{$item} ? $designs->{'bgs'}{$item} : $defaults->{'bgs'}{$item};
if ($designs->{'bgs'}{$item}) {	if ($designs->{'bgs'}{$item}) {
$datatable .= ' ';	$datatable .= ' ';
Line 1754 sub display_color_options {	Line 1755 sub display_color_options {
'<table border="0"><tr>';	'<table border="0"><tr>';
foreach my $item (@{$links}) {	foreach my $item (@{$links}) {
my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};	my $color = $designs->{'links'}{$item} ? $designs->{'links'}{$item} : $defaults->{'links'}{$item};
$datatable .= '<td align="center">'.$choices->{$item}."\n";	$datatable .= '<td style="text-align: center">'.$choices->{$item}."\n";
if ($designs->{'links'}{$item}) {	if ($designs->{'links'}{$item}) {
$datatable.=' ';	$datatable.=' ';
}	}
Line 1815 sub login_text_colors {	Line 1816 sub login_text_colors {
my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;	my ($img,$role,$logintext,$phase,$choices,$designs,$defaults) = @_;
my $color_menu = '<table border="0"><tr>';	my $color_menu = '<table border="0"><tr>';
foreach my $item (@{$logintext}) {	foreach my $item (@{$logintext}) {
$color_menu .= '<td align="center">'.$choices->{$item};	$color_menu .= '<td style="text-align: center">'.$choices->{$item};
my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};	my $color = $designs->{'logintext'}{$item} ? $designs->{'logintext'}{$item} : $defaults->{'logintext'}{$item};
$color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.	$color_menu .= '<br /><input type="text" class="colorchooser" size="8" name="'.$role.'_'.$item.'" value="'.$color.
'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';	'" onblur = "javascript:colchg_span('."'css_".$role.'_'.$item."'".',this);" /></td>';
Line 1850 sub image_changes {	Line 1851 sub image_changes {
$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').	$role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
'</label> '.&mt('Replace:').'</span><br />';	'</label> '.&mt('Replace:').'</span><br />';
} else {	} else {
$output .= '<td valign="middle">'.$logincolors.&mt('Upload:').'<br />';	$output .= '<td class="LC_middle">'.$logincolors.&mt('Upload:').'<br />';
}	}
}	}
return $output;	return $output;
Line 3124 sub print_contacts {	Line 3125 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 3232 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 3381 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 3356 sub print_helpsettings {	Line 3517 sub print_helpsettings {
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);	my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
$css_class = $itemcount%2?' class="LC_odd_row"':'';	$css_class = $itemcount%2?' class="LC_odd_row"':'';
my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"';	my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$num."_pos'".');"';
$datatable .= '<tr '.$css_class.'><td valign="top"><b>'.$role.'</b><br />'.	$datatable .= '<tr '.$css_class.'><td style="vertical-align: top"><b>'.$role.'</b><br />'.
'<select name="helproles_'.$num.'_pos"'.$chgstr.'>';	'<select name="helproles_'.$num.'_pos"'.$chgstr.'>';
for (my $k=0; $k<=$maxnum; $k++) {	for (my $k=0; $k<=$maxnum; $k++) {
my $vpos = $k+1;	my $vpos = $k+1;
Line 3395 sub print_helpsettings {	Line 3556 sub print_helpsettings {
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);	&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);	my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"';	my $chgstr = ' onchange="javascript:reorderHelpRoles(this.form,'."'helproles_".$count."_pos'".');"';
$datatable .= '<tr '.$css_class.'><td valign="top"><span class="LC_nobreak"><label>'.	$datatable .= '<tr '.$css_class.'><td style="vertical-align: top"><span class="LC_nobreak"><label>'.
'<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n".	'<input type="hidden" name="helproles_maxnum" value="'.$maxnum.'" />'."\n".
'<select name="helproles_'.$count.'_pos"'.$chgstr.'>';	'<select name="helproles_'.$count.'_pos"'.$chgstr.'>';
for (my $k=0; $k<$maxnum+1; $k++) {	for (my $k=0; $k<$maxnum+1; $k++) {
Line 3674 sub radiobutton_prefs {	Line 3835 sub radiobutton_prefs {
foreach my $item (@{$toggles}) {	foreach my $item (@{$toggles}) {
$css_class = $itemcount%2?' class="LC_odd_row"':'';	$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .=	$datatable .=
'<tr'.$css_class.'><td valign="top">'.	'<tr'.$css_class.'><td style="vertical-align: top">'.
'<span class="LC_nobreak">'.$choices->{$item}.	'<span class="LC_nobreak">'.$choices->{$item}.
'</span></td>';	'</span></td>';
if ($align eq 'left') {	if ($align eq 'left') {
Line 3724 sub print_ltitools {	Line 3885 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 3865 sub print_ltitools {	Line 4026 sub print_ltitools {
if (!$rolemaps{$role}) {	if (!$rolemaps{$role}) {
$selectnone = ' selected="selected"';	$selectnone = ' selected="selected"';
}	}
$datatable .= '<td align="center">'.	$datatable .= '<td style="text-align: center">'.
&Apache::lonnet::plaintext($role,'Course').'<br />'.	&Apache::lonnet::plaintext($role,'Course').'<br />'.
'<select name="ltitools_roles_'.$role.'_'.$i.'">'.	'<select name="ltitools_roles_'.$role.'_'.$i.'">'.
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>';	'<option value=""'.$selectnone.'>'.&mt('Select').'</option>';
Line 3999 sub print_ltitools {	Line 4160 sub print_ltitools {
'<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';	'<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>';
foreach my $role (@courseroles) {	foreach my $role (@courseroles) {
my ($checked,$checkednone);	my ($checked,$checkednone);
$datatable .= '<td align="center">'.	$datatable .= '<td style="text-align: center">'.
&Apache::lonnet::plaintext($role,'Course').'<br />'.	&Apache::lonnet::plaintext($role,'Course').'<br />'.
'<select name="ltitools_add_roles_'.$role.'">'.	'<select name="ltitools_add_roles_'.$role.'">'.
'<option value="" selected="selected">'.&mt('Select').'</option>';	'<option value="" selected="selected">'.&mt('Select').'</option>';
Line 4073 sub print_coursedefaults {	Line 4234 sub print_coursedefaults {
coursecredits => 'Credits can be specified for courses',	coursecredits => 'Credits can be specified for courses',
uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',	uselcmath => 'Math preview uses LON-CAPA previewer (javascript) in place of DragMath (Java)',
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',	usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)',
	texengine => 'Default method to display mathematics',
postsubmit => 'Disable submit button/keypress following student submission',	postsubmit => 'Disable submit button/keypress following student submission',
canclone => "People who may clone a course (besides course's owner and coordinators)",	canclone => "People who may clone a course (besides course's owner and coordinators)",
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',	mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver',
);	);
my %staticdefaults = (	my %staticdefaults = (
	texengine => 'MathJax',
anonsurvey_threshold => 10,	anonsurvey_threshold => 10,
uploadquota => 500,	uploadquota => 500,
postsubmit => 60,	postsubmit => 60,
Line 4091 sub print_coursedefaults {	Line 4254 sub print_coursedefaults {
'canclone' => 'none',	'canclone' => 'none',
);	);
@toggles = ('canuse_pdfforms','uselcmath','usejsme');	@toggles = ('canuse_pdfforms','uselcmath','usejsme');
	my $deftex = $staticdefaults{'texengine'};
	if (ref($settings) eq 'HASH') {
	if ($settings->{'texengine'}) {
	if ($settings->{'texengine'} =~ /^(MathJax\|mimetex\|tth)$/) {
	$deftex = $settings->{'texengine'};
	}
	}
	}
	$css_class = $itemcount%2?' class="LC_odd_row"':'';
	my $mathdisp = '<tr'.$css_class.'><td style="vertical-align: top">'.
	'<span class="LC_nobreak">'.$choices{'texengine'}.
	'</span></td><td class="LC_right_item">'.
	'<select name="texengine">'."\n";
	my %texoptions = (
	MathJax => 'MathJax',
	mimetex => &mt('Convert to Images'),
	tth => &mt('TeX to HTML'),
	);
	foreach my $renderer ('MathJax','mimetex','tth') {
	my $selected = '';
	if ($renderer eq $deftex) {
	$selected = ' selected="selected"';
	}
	$mathdisp .= '<option value="'.$renderer.'"'.$selected.'>'.$texoptions{$renderer}.'</option>'."\n";
	}
	$mathdisp .= '</select></td></tr>'."\n";
	$itemcount ++;
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,	($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked,
\%choices,$itemcount);	\%choices,$itemcount);
	$datatable = $mathdisp.$datatable;
$css_class = $itemcount%2?' class="LC_odd_row"':'';	$css_class = $itemcount%2?' class="LC_odd_row"':'';
$datatable .=	$datatable .=
'<tr'.$css_class.'><td valign="top">'.	'<tr'.$css_class.'><td style="vertical-align: top">'.
'<span class="LC_nobreak">'.$choices{'canclone'}.	'<span class="LC_nobreak">'.$choices{'canclone'}.
'</span></td><td class="LC_left_item">';	'</span></td><td class="LC_left_item">';
my $currcanclone = 'none';	my $currcanclone = 'none';
Line 4139 sub print_coursedefaults {	Line 4330 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 4247 sub print_coursedefaults {	Line 4438 sub print_coursedefaults {
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.	$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
$choices{'uploadquota'}.	$choices{'uploadquota'}.
'</span></td>'.	'</span></td>'.
'<td align="right" class="LC_right_item">'.	'<td style="text-align: right" class="LC_right_item">'.
'<table><tr>';	'<table><tr>';
foreach my $type (@types) {	foreach my $type (@types) {
$datatable .= '<td align="center">'.&mt($type).'<br />'.	$datatable .= '<td style="text-align: center">'.&mt($type).'<br />'.
'<input type="text" name="uploadquota_'.$type.'"'.	'<input type="text" name="uploadquota_'.$type.'"'.
' value="'.$curruploadquota{$type}.'" size="5" /></td>';	' value="'.$curruploadquota{$type}.'" size="5" /></td>';
}	}
Line 4265 sub print_coursedefaults {	Line 4456 sub print_coursedefaults {
'<i>'.&mt('Default credits').'</i><br /><table><tr>';	'<i>'.&mt('Default credits').'</i><br /><table><tr>';
foreach my $type (@types) {	foreach my $type (@types) {
next if ($type eq 'community');	next if ($type eq 'community');
$additional .= '<td align="center">'.&mt($type).'<br />'.	$additional .= '<td style="text-align: center">'.&mt($type).'<br />'.
'<input type="text" name="'.$type.'_credits"'.	'<input type="text" name="'.$type.'_credits"'.
' value="'.$defcredits{$type}.'" size="3" /></td>';	' value="'.$defcredits{$type}.'" size="3" /></td>';
}	}
Line 4289 sub print_coursedefaults {	Line 4480 sub print_coursedefaults {
'<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'.	'<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'.
'<table><tr>';	'<table><tr>';
foreach my $type (@types) {	foreach my $type (@types) {
$additional .= '<td align="center">'.&mt($type).'<br />'.	$additional .= '<td style="text-align: center">'.&mt($type).'<br />'.
'<input type="text" name="'.$type.'_timeout" value="'.	'<input type="text" name="'.$type.'_timeout" value="'.
$deftimeout{$type}.'" size="5" /></td>';	$deftimeout{$type}.'" size="5" /></td>';
}	}
Line 4307 sub print_coursedefaults {	Line 4498 sub print_coursedefaults {
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.	$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'.
$choices{'mysqltables'}.	$choices{'mysqltables'}.
'</span></td>'.	'</span></td>'.
'<td align="right" class="LC_right_item">'.	'<td style="text-align: right" class="LC_right_item">'.
'<table><tr>';	'<table><tr>';
foreach my $type (@types) {	foreach my $type (@types) {
$datatable .= '<td align="center">'.&mt($type).'<br />'.	$datatable .= '<td style="text-align: center">'.&mt($type).'<br />'.
'<input type="text" name="mysqltables_'.$type.'"'.	'<input type="text" name="mysqltables_'.$type.'"'.
' value="'.$currmysql{$type}.'" size="8" /></td>';	' value="'.$currmysql{$type}.'" size="8" /></td>';
}	}
Line 5209 sub print_loadbalancing {	Line 5400 sub print_loadbalancing {
my $disabled_div_style = 'display: block';	my $disabled_div_style = 'display: block';
my $homedom_div_style = 'display: none';	my $homedom_div_style = 'display: none';
$datatable .= '<tr class="'.$css_class[$cssidx].'">'.	$datatable .= '<tr class="'.$css_class[$cssidx].'">'.
'<td rowspan="'.$rownum.'" valign="top">'.	'<td rowspan="'.$rownum.'" style="vertical-align: top">'.
'<p>';	'<p>';
if ($lonhost eq '') {	if ($lonhost eq '') {
$datatable .= '<span class="LC_nobreak">';	$datatable .= '<span class="LC_nobreak">';
Line 5242 sub print_loadbalancing {	Line 5433 sub print_loadbalancing {
$homedom_div_style = 'display: block';	$homedom_div_style = 'display: block';
}	}
}	}
$datatable .= '</p></td><td rowspan="'.$rownum.'" valign="top">'.	$datatable .= '</p></td><td rowspan="'.$rownum.'" style="vertical-align: top">'.
'<div id="loadbalancing_disabled_'.$balnum.'" style="'.	'<div id="loadbalancing_disabled_'.$balnum.'" style="'.
$disabled_div_style.'">'.$disabledtext.'</div>'."\n".	$disabled_div_style.'">'.$disabledtext.'</div>'."\n".
'<div id="loadbalancing_targets_'.$balnum.'" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />';	'<div id="loadbalancing_targets_'.$balnum.'" style="'.$targets_div_style.'">'.&mt('Offloads to:').'<br />';
Line 5454 sub loadbalance_rule_row {	Line 5645 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 valign="top">'.$space.	'<tr class="'.$css_class.'" id="balanceruletr_'.$balnum.'_'.$num.'"><td style="vertical-align: top">'.$space.
'<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".	'<div id="balanceruletitle_'.$balnum.'_'.$type.'" style="'.$style.'">'.$title.'</div></td>'."\n".
'<td valaign="top">'.$space.	'<td valaign="top">'.$space.
'<div id="balancerule_'.$balnum.'_'.$type.'" style="'.$style.'">'."\n";	'<div id="balancerule_'.$balnum.'_'.$type.'" style="'.$style.'">'."\n";
Line 5540 sub contact_titles {	Line 5731 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 5694 sub print_usercreation {	Line 5885 sub print_usercreation {
}	}
$datatable .= '<tr'.$css_class.'>'.	$datatable .= '<tr'.$css_class.'>'.
'<td><span class="LC_nobreak">'.$lt{$item}.	'<td><span class="LC_nobreak">'.$lt{$item}.
'</span></td><td align="right">';	'</span></td><td style="text-align: right">';
my @options = ('any');	my @options = ('any');
if (ref($rules) eq 'HASH') {	if (ref($rules) eq 'HASH') {
if (keys(%{$rules}) > 0) {	if (keys(%{$rules}) > 0) {
Line 6137 sub noninst_users {	Line 6328 sub noninst_users {
}	}
$output .= '</tr><tr>';	$output .= '</tr><tr>';
foreach my $item ('approve','email','username') {	foreach my $item ('approve','email','username') {
$output .= '<td valign="top">';	$output .= '<td style="vertical-align: top">';
my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);	my (%choices,@options,$hashref,$defoption,$name,$onclick,$hascustom);
if ($item eq 'approve') {	if ($item eq 'approve') {
%choices = &Apache::lonlocal::texthash (	%choices = &Apache::lonlocal::texthash (
Line 6402 sub user_formats_row {	Line 6593 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 6849 sub print_scantronformat {	Line 7040 sub print_scantronformat {
}	}
$datatable .= '</span></td>';	$datatable .= '</span></td>';
if (keys(%error) == 0) {	if (keys(%error) == 0) {
$datatable .= '<td valign="bottom">';	$datatable .= '<td style="vertical-align: bottom">';
if (!$switchserver) {	if (!$switchserver) {
$datatable .= &mt('Upload:').'<br />';	$datatable .= &mt('Upload:').'<br />';
}	}
Line 7643 sub modifiable_userdata_row {	Line 7834 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 7747 sub insttypes_row {	Line 7937 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 7793 sub insttypes_row {	Line 7984 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 7807 sub insttypes_row {	Line 8002 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 8736 sub display_colorchgs {	Line 8940 sub display_colorchgs {
} else {	} else {
my $newitem = $confhash->{$role}{$item};	my $newitem = $confhash->{$role}{$item};
if ($key eq 'images') {	if ($key eq 'images') {
$newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" valign="bottom" />';	$newitem = '<img src="'.$confhash->{$role}{$item}.'" alt="'.$choices{$item}.'" style="vertical-align: bottom" />';
}	}
$resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>';	$resulttext .= '<li>'.&mt("$choices{$item} set to [_1]",$newitem).'</li>';
}	}
Line 8863 sub publishlogo {	Line 9067 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 8931 $env{'user.name'}.':'.$env{'user.domain'	Line 9135 $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 9011 sub write_metadata {	Line 9216 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 9045 sub notifysubscribed {	Line 9250 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 9071 sub notifysubscribed {	Line 9276 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 9270 sub modify_quotas {	Line 9475 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 9522 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 10026 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 9896 sub modify_ltitools {	Line 10109 sub modify_ltitools {
}	}
if ($env{'form.ltitools_add_image.filename'} ne '') {	if ($env{'form.ltitools_add_image.filename'} ne '') {
my ($imageurl,$error) =	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);	$configuserok,$switchserver,$author_ok);
if ($imageurl) {	if ($imageurl) {
$confhash{$newid}{'image'} = $imageurl;	$confhash{$newid}{'image'} = $imageurl;
Line 9959 sub modify_ltitools {	Line 10172 sub modify_ltitools {
my $maxnum = $env{'form.ltitools_maxnum'};	my $maxnum = $env{'form.ltitools_maxnum'};
for (my $i=0; $i<=$maxnum; $i++) {	for (my $i=0; $i<=$maxnum; $i++) {
my $itemid = $env{'form.ltitools_id_'.$i};	my $itemid = $env{'form.ltitools_id_'.$i};
	$itemid =~ s/\D+//g;
if (ref($domconfig{$action}{$itemid}) eq 'HASH') {	if (ref($domconfig{$action}{$itemid}) eq 'HASH') {
if ($deletions{$itemid}) {	if ($deletions{$itemid}) {
if ($domconfig{$action}{$itemid}{'image'}) {	if ($domconfig{$action}{$itemid}{'image'}) {
Line 10315 sub modify_ltitools {	Line 10529 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 11036 sub modify_contacts {	Line 11250 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 11101 sub modify_contacts {	Line 11355 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 11215 sub modify_contacts {	Line 11496 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 11270 sub modify_contacts {	Line 11605 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>';
Line 12072 sub modify_selfcreation {	Line 12406 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 12273 sub modify_selfcreation {	Line 12607 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 12290 sub modify_selfcreation {	Line 12624 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);
}	}
}	}
}	}
Line 13656 sub modify_coursedefaults {	Line 13989 sub modify_coursedefaults {
postsubmit => 60,	postsubmit => 60,
mysqltables => 172800,	mysqltables => 172800,
);	);
	my %texoptions = (
	MathJax => 'MathJax',
	mimetex => &mt('Convert to Images'),
	tth => &mt('TeX to HTML'),
	);
$defaultshash{'coursedefaults'} = {};	$defaultshash{'coursedefaults'} = {};

if (ref($domconfig{'coursedefaults'}) ne 'HASH') {	if (ref($domconfig{'coursedefaults'}) ne 'HASH') {
Line 13716 sub modify_coursedefaults {	Line 14053 sub modify_coursedefaults {
}	}
}	}
}	}
	my $texengine;
	if ($env{'form.texengine'} =~ /^(MathJax\|mimetex\|tth)$/) {
	$texengine = $env{'form.texengine'};
	if ($defaultshash{'coursedefaults'}{'texengine'} eq '') {
	unless ($texengine eq 'MathJax') {
	$changes{'texengine'} = 1;
	}
	} elsif ($defaultshash{'coursedefaults'}{'texengine'} ne $texengine) {
	$changes{'texengine'} = 1;
	}
	}
	if ($texengine ne '') {
	$defaultshash{'coursedefaults'}{'texengine'} = $texengine;
	}
my $currclone = $domconfig{'coursedefaults'}{'canclone'};	my $currclone = $domconfig{'coursedefaults'}{'canclone'};
my @currclonecode;	my @currclonecode;
if (ref($currclone) eq 'HASH') {	if (ref($currclone) eq 'HASH') {
Line 13836 sub modify_coursedefaults {	Line 14187 sub modify_coursedefaults {
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);	my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1);
if (($changes{'canuse_pdfforms'}) \|\| ($changes{'uploadquota'}) \|\| ($changes{'postsubmit'}) \|\|	if (($changes{'canuse_pdfforms'}) \|\| ($changes{'uploadquota'}) \|\| ($changes{'postsubmit'}) \|\|
($changes{'coursecredits'}) \|\| ($changes{'uselcmath'}) \|\| ($changes{'usejsme'}) \|\|	($changes{'coursecredits'}) \|\| ($changes{'uselcmath'}) \|\| ($changes{'usejsme'}) \|\|
($changes{'canclone'}) \|\| ($changes{'mysqltables'})) {	($changes{'canclone'}) \|\| ($changes{'mysqltables'}) \|\| ($changes{'texengine'})) {
foreach my $item ('canuse_pdfforms','uselcmath','usejsme') {	foreach my $item ('canuse_pdfforms','uselcmath','usejsme','texengine') {
if ($changes{$item}) {	if ($changes{$item}) {
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};	$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item};
}	}
Line 13906 sub modify_coursedefaults {	Line 14257 sub modify_coursedefaults {
} else {	} else {
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';	$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>';
}	}
	} elsif ($item eq 'texengine') {
	if ($defaultshash{'coursedefaults'}{'texengine'} ne '') {
	$resulttext .= '<li>'.&mt('Default method to display mathematics set to: "[_1]"',
	$texoptions{$defaultshash{'coursedefaults'}{'texengine'}}).'</li>';
	}
} elsif ($item eq 'anonsurvey_threshold') {	} elsif ($item eq 'anonsurvey_threshold') {
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';	$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>';
} elsif ($item eq 'uploadquota') {	} elsif ($item eq 'uploadquota') {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.305
changed lines
	Added in v.1.317