|
version 1.241, 2014/05/05 23:28:53
|
version 1.262, 2015/05/04 15:43:47
|
|
Line 250 sub handler {
|
Line 250 sub handler {
|
| header => [{col1 => 'Log-in Page Items', |
header => [{col1 => 'Log-in Page Items', |
| col2 => '',}, |
col2 => '',}, |
| {col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
| |
col2 => 'Value'}, |
| |
{col1 => 'Custom HTML in document head', |
| col2 => 'Value'}], |
col2 => 'Value'}], |
| print => \&print_login, |
print => \&print_login, |
| modify => \&modify_login, |
modify => \&modify_login, |
|
Line 369 sub handler {
|
Line 371 sub handler {
|
| col2 => 'Value'}, |
col2 => 'Value'}, |
| {col1 => 'Available textbooks', |
{col1 => 'Available textbooks', |
| col2 => ''}, |
col2 => ''}, |
| |
{col1 => 'Available templates', |
| |
col2 => ''}, |
| {col1 => 'Validation (not official courses)', |
{col1 => 'Validation (not official courses)', |
| col2 => 'Value'},], |
col2 => 'Value'},], |
| print => \&print_quotas, |
print => \&print_quotas, |
|
Line 477 sub handler {
|
Line 481 sub handler {
|
| {col1 => 'Log-in Page Items', |
{col1 => 'Log-in Page Items', |
| col2 => ''}, |
col2 => ''}, |
| {col1 => 'Log-in Help', |
{col1 => 'Log-in Help', |
| |
col2 => 'Value'}, |
| |
{col1 => 'Custom HTML in document head', |
| col2 => 'Value'}], |
col2 => 'Value'}], |
| print => \&print_login, |
print => \&print_login, |
| modify => \&modify_login, |
modify => \&modify_login, |
|
Line 668 sub print_config_box {
|
Line 674 sub print_config_box {
|
| my $colspan = ''; |
my $colspan = ''; |
| my $rightcolspan = ''; |
my $rightcolspan = ''; |
| if (($action eq 'rolecolors') || ($action eq 'defaults') || |
if (($action eq 'rolecolors') || ($action eq 'defaults') || |
| (($action eq 'login') && ($numheaders < 3))) { |
(($action eq 'login') && ($numheaders < 4))) { |
| $colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
| } |
} |
| if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
|
Line 690 sub print_config_box {
|
Line 696 sub print_config_box {
|
| } elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
| $output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
| } elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
| if ($numheaders == 3) { |
if ($numheaders == 4) { |
| $colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
| $output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('service',$dom,$confname,$phase,$settings,\$rowtotal); |
| } else { |
} else { |
|
Line 743 sub print_config_box {
|
Line 749 sub print_config_box {
|
| ($action eq 'defaults')) { |
($action eq 'defaults')) { |
| $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal); |
| } elsif ($action eq 'login') { |
} elsif ($action eq 'login') { |
| if ($numheaders == 3) { |
if ($numheaders == 4) { |
| $output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
| </table> |
</table> |
| </td> |
</td> |
|
Line 759 sub print_config_box {
|
Line 765 sub print_config_box {
|
| } else { |
} else { |
| $output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
$output .= &print_login('help',$dom,$confname,$phase,$settings,\$rowtotal); |
| } |
} |
| |
$output .= ' |
| |
</table> |
| |
</td> |
| |
</tr> |
| |
<tr> |
| |
<td> |
| |
<table class="LC_nested"> |
| |
<tr class="LC_info_row">'; |
| |
if ($numheaders == 4) { |
| |
$output .= ' |
| |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
| |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
| |
</tr>'; |
| |
} else { |
| |
$output .= ' |
| |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
| |
<td class="LC_right_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col2'}).'</td> |
| |
</tr>'; |
| |
} |
| |
$rowtotal ++; |
| |
$output .= &print_login('headtag',$dom,$confname,$phase,$settings,\$rowtotal); |
| } elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
| $output .= &print_requestmail($dom,$action,$settings,\$rowtotal). |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
| &print_studentcode($settings,\$rowtotal).' |
$rowtotal ++; |
| |
$output .= &print_studentcode($settings,\$rowtotal).' |
| </table> |
</table> |
| </td> |
</td> |
| </tr> |
</tr> |
|
Line 771 sub print_config_box {
|
Line 799 sub print_config_box {
|
| <tr class="LC_info_row"> |
<tr class="LC_info_row"> |
| <td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
| <td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
| &print_textbookcourses($dom,$settings,\$rowtotal).' |
&textbookcourses_javascript($settings). |
| |
&print_textbookcourses($dom,'textbooks',$settings,\$rowtotal).' |
| |
</table> |
| |
</td> |
| |
</tr> |
| |
<tr> |
| |
<td> |
| |
<table class="LC_nested"> |
| |
<tr class="LC_info_row"> |
| |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
| |
<td class="LC_right_item">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> </tr>'. |
| |
&print_textbookcourses($dom,'templates',$settings,\$rowtotal).' |
| </table> |
</table> |
| </td> |
</td> |
| </tr> |
</tr> |
|
Line 779 sub print_config_box {
|
Line 818 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'}->[3]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
| <td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'col2'}).'</td> |
<td class="LC_right_item" valign="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') { |
| $output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
$output .= &print_requestmail($dom,$action,$settings,\$rowtotal); |
| |
$rowtotal ++; |
| } elsif ($action eq 'rolecolors') { |
} elsif ($action eq 'rolecolors') { |
| $output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
$output .= &print_rolecolors($phase,'coordinator',$dom,$confname,$settings,\$rowtotal).' |
| </table> |
</table> |
|
Line 1166 sub print_login {
|
Line 1206 sub print_login {
|
| $itemcount ++; |
$itemcount ++; |
| } |
} |
| $datatable .= &captcha_choice('login',$settings,$itemcount); |
$datatable .= &captcha_choice('login',$settings,$itemcount); |
| |
} elsif ($caller eq 'headtag') { |
| |
my %domservers = &Apache::lonnet::get_servers($dom); |
| |
my $choice = $choices{'headtag'}; |
| |
$css_class = ' class="LC_odd_row"'; |
| |
$datatable .= '<tr'.$css_class.'><td colspan="2">'.$choice.'</td>'. |
| |
'<td align="left"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
| |
'<th>'.$choices{'current'}.'</th>'. |
| |
'<th>'.$choices{'action'}.'</th>'. |
| |
'<th>'.$choices{'exempt'}.'</th></tr>'."\n"; |
| |
my (%currurls,%currexempt); |
| |
if (ref($settings) eq 'HASH') { |
| |
if (ref($settings->{'headtag'}) eq 'HASH') { |
| |
foreach my $lonhost (keys(%{$settings->{'headtag'}})) { |
| |
if (ref($settings->{'headtag'}{$lonhost}) eq 'HASH') { |
| |
$currurls{$lonhost} = $settings->{'headtag'}{$lonhost}{'url'}; |
| |
$currexempt{$lonhost} = $settings->{'headtag'}{$lonhost}{'exempt'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my %lt = &Apache::lonlocal::texthash( |
| |
del => 'Delete?', |
| |
rep => 'Replace:', |
| |
upl => 'Upload:', |
| |
curr => 'View contents', |
| |
none => 'None', |
| |
); |
| |
my $switchserver = &check_switchserver($dom,$confname); |
| |
foreach my $lonhost (sort(keys(%domservers))) { |
| |
my $exempt = &check_exempt_addresses($currexempt{$lonhost}); |
| |
$datatable .= '<tr><td>'.$domservers{$lonhost}.'</td>'; |
| |
if ($currurls{$lonhost}) { |
| |
$datatable .= '<td class="LC_right_item"><a href="'. |
| |
"javascript:void(open('$currurls{$lonhost}?inhibitmenu=yes','Custom_HeadTag', |
| |
'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))". |
| |
'">'.$lt{'curr'}.'</a></td>'. |
| |
'<td><span class="LC_nobreak"><label>'. |
| |
'<input type="checkbox" name="loginheadtag_del" value="'.$lonhost.'" />'. |
| |
$lt{'del'}.'</label> '.$lt{'rep'}.'</span>'; |
| |
} else { |
| |
$datatable .= '<td class="LC_right_item">'.$lt{'none'}.'</td><td>'.$lt{'upl'}; |
| |
} |
| |
$datatable .='<br />'; |
| |
if ($switchserver) { |
| |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
| |
} else { |
| |
$datatable .= '<input type="file" name="loginheadtag_'.$lonhost.'" />'; |
| |
} |
| |
$datatable .= '</td><td><input type="textbox" name="loginheadtagexempt_'.$lonhost.'" value="'.$exempt.'" /></td></tr>'; |
| |
} |
| |
$datatable .= '</table></td></tr>'; |
| } |
} |
| return $datatable; |
return $datatable; |
| } |
} |
|
Line 1199 sub login_choices {
|
Line 1290 sub login_choices {
|
| link => "Link", |
link => "Link", |
| alink => "Active link", |
alink => "Active link", |
| vlink => "Visited link", |
vlink => "Visited link", |
| |
headtag => "Custom markup", |
| |
action => "Action", |
| |
current => "Current", |
| ); |
); |
| return %choices; |
return %choices; |
| } |
} |
|
Line 2061 sub print_requestmail {
|
Line 2155 sub print_requestmail {
|
| $datatable .= &mt('There are no active Domain Coordinators'); |
$datatable .= &mt('There are no active Domain Coordinators'); |
| } |
} |
| $datatable .='</td></tr>'; |
$datatable .='</td></tr>'; |
| $$rowtotal += $rows; |
|
| return $datatable; |
return $datatable; |
| } |
} |
| |
|
|
Line 2070 sub print_studentcode {
|
Line 2163 sub print_studentcode {
|
| my $rownum = 0; |
my $rownum = 0; |
| my ($output,%current); |
my ($output,%current); |
| my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook'); |
| if (ref($settings->{'uniquecode'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| foreach my $type (@crstypes) { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
| $current{$type} = $settings->{'uniquecode'}{$type}; |
foreach my $type (@crstypes) { |
| |
$current{$type} = $settings->{'uniquecode'}{$type}; |
| |
} |
| } |
} |
| } |
} |
| $output .= '<tr>'. |
$output .= '<tr>'. |
|
Line 2093 sub print_studentcode {
|
Line 2188 sub print_studentcode {
|
| } |
} |
| |
|
| sub print_textbookcourses { |
sub print_textbookcourses { |
| my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$type,$settings,$rowtotal) = @_; |
| my $rownum = 0; |
my $rownum = 0; |
| my $css_class; |
my $css_class; |
| my $itemcount = 1; |
my $itemcount = 1; |
| my $maxnum = 0; |
my $maxnum = 0; |
| my $bookshash; |
my $bookshash; |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| $bookshash = $settings->{'textbooks'}; |
$bookshash = $settings->{$type}; |
| } |
} |
| my %ordered; |
my %ordered; |
| if (ref($bookshash) eq 'HASH') { |
if (ref($bookshash) eq 'HASH') { |
|
Line 2113 sub print_textbookcourses {
|
Line 2208 sub print_textbookcourses {
|
| } |
} |
| my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
| my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
| $maxnum = scalar(keys(%ordered)); |
my $maxnum = scalar(keys(%ordered)); |
| my $datatable = &textbookcourses_javascript(\%ordered); |
my $datatable; |
| if (keys(%ordered)) { |
if (keys(%ordered)) { |
| my @items = sort { $a <=> $b } keys(%ordered); |
my @items = sort { $a <=> $b } keys(%ordered); |
| for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
|
Line 2122 sub print_textbookcourses {
|
Line 2217 sub print_textbookcourses {
|
| my $key = $ordered{$items[$i]}; |
my $key = $ordered{$items[$i]}; |
| my %coursehash=&Apache::lonnet::coursedescription($key); |
my %coursehash=&Apache::lonnet::coursedescription($key); |
| my $coursetitle = $coursehash{'description'}; |
my $coursetitle = $coursehash{'description'}; |
| my ($subject,$title,$author,$image,$imgsrc,$cdom,$cnum); |
my ($subject,$title,$author,$publisher,$image,$imgsrc,$cdom,$cnum); |
| if (ref($bookshash->{$key}) eq 'HASH') { |
if (ref($bookshash->{$key}) eq 'HASH') { |
| $subject = $bookshash->{$key}->{'subject'}; |
$subject = $bookshash->{$key}->{'subject'}; |
| $title = $bookshash->{$key}->{'title'}; |
$title = $bookshash->{$key}->{'title'}; |
| $author = $bookshash->{$key}->{'author'}; |
if ($type eq 'textbooks') { |
| $image = $bookshash->{$key}->{'image'}; |
$publisher = $bookshash->{$key}->{'publisher'}; |
| if ($image ne '') { |
$author = $bookshash->{$key}->{'author'}; |
| my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
$image = $bookshash->{$key}->{'image'}; |
| my $imagethumb = "$path/tn-".$imagefile; |
if ($image ne '') { |
| $imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
| |
my $imagethumb = "$path/tn-".$imagefile; |
| |
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
| |
} |
| } |
} |
| } |
} |
| my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"'; |
| $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
| .'<select name="'.$key.'"'.$chgstr.'>'; |
.'<select name="'.$type.'_'.$key.'"'.$chgstr.'>'; |
| for (my $k=0; $k<=$maxnum; $k++) { |
for (my $k=0; $k<=$maxnum; $k++) { |
| my $vpos = $k+1; |
my $vpos = $k+1; |
| my $selstr; |
my $selstr; |
|
Line 2146 sub print_textbookcourses {
|
Line 2244 sub print_textbookcourses {
|
| $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
| } |
} |
| $datatable .= '</select>'.(' 'x2). |
$datatable .= '</select>'.(' 'x2). |
| '<label><input type="checkbox" name="book_del" value="'.$key.'" />'. |
'<label><input type="checkbox" name="'.$type.'_del" value="'.$key.'" />'. |
| &mt('Delete?').'</label></span></td>'. |
&mt('Delete?').'</label></span></td>'. |
| '<td colspan="2">'. |
'<td colspan="2">'. |
| '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></span> '. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '. |
| (' 'x2). |
|
| '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></span> '. |
|
| (' 'x2). |
|
| '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="book_author_'.$i.'" value="'.$author.'" /></span> '. |
|
| (' 'x2). |
(' 'x2). |
| '<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> '; |
| if ($image) { |
if ($type eq 'textbooks') { |
| $datatable .= '<span class="LC_nobreak">'. |
$datatable .= (' 'x2). |
| $imgsrc. |
'<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '. |
| '<label><input type="checkbox" name="book_image_del"'. |
(' 'x2). |
| ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '. |
| '<span class="LC_nobreak"> '.&mt('Replace:').' '; |
(' 'x2). |
| } |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
| if ($switchserver) { |
if ($image) { |
| $datatable .= &mt('Upload to library server: [_1]',$switchserver); |
$datatable .= '<span class="LC_nobreak">'. |
| } else { |
$imgsrc. |
| $datatable .= '<input type="file" name="book_image_'.$i.'" value="" />'; |
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
| |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
| |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
| |
} |
| |
if ($switchserver) { |
| |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
| |
} else { |
| |
$datatable .= '<input type="file" name="'.$type.'_image_'.$i.'" value="" />'; |
| |
} |
| } |
} |
| $datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$key.'" /></span> '. |
$datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '. |
| '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
| $coursetitle.'</span></td></tr>'."\n"; |
$coursetitle.'</span></td></tr>'."\n"; |
| $itemcount ++; |
$itemcount ++; |
| } |
} |
| } |
} |
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type"."_addbook_pos','$type'".');"'; |
| $datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
| '<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n". |
'<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n". |
| '<select name="addbook_pos"'.$chgstr.'>'; |
'<select name="'.$type.'_addbook_pos"'.$chgstr.'>'; |
| for (my $k=0; $k<$maxnum+1; $k++) { |
for (my $k=0; $k<$maxnum+1; $k++) { |
| my $vpos = $k+1; |
my $vpos = $k+1; |
| my $selstr; |
my $selstr; |
|
Line 2188 sub print_textbookcourses {
|
Line 2290 sub print_textbookcourses {
|
| $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
| } |
} |
| $datatable .= '</select> '."\n". |
$datatable .= '</select> '."\n". |
| '<input type="checkbox" name="addbook" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n". |
| '<td colspan="2">'. |
'<td colspan="2">'. |
| '<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="addbook_subject" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="'.$type.'_addbook_subject" value="" /></span> '."\n". |
| (' 'x2). |
|
| '<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="addbook_title" value="" /></span> '."\n". |
|
| (' 'x2). |
(' 'x2). |
| '<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n". |
| (' 'x2). |
(' 'x2); |
| '<span class="LC_nobreak">'.&mt('Image:').' '; |
if ($type eq 'textbooks') { |
| if ($switchserver) { |
$datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n". |
| $datatable .= &mt('Upload to library server: [_1]',$switchserver); |
(' 'x2). |
| } else { |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n". |
| $datatable .= '<input type="file" name="addbook_image" value="" />'; |
(' 'x2). |
| |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
| |
if ($switchserver) { |
| |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
| |
} else { |
| |
$datatable .= '<input type="file" name="'.$type.'_addbook_image" value="" />'; |
| |
} |
| } |
} |
| $datatable .= '</span>'."\n". |
$datatable .= '</span>'."\n". |
| '<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
'<span class="LC_nobreak">'.&mt('LON-CAPA course:').' '. |
| &Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom'). |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},$type.'_addbook_cdom'). |
| '<input type="text" size="25" name="addbook_cnum" value="" />'. |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
| &Apache::loncommon::selectcourse_link |
&Apache::loncommon::selectcourse_link |
| ('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course'); |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'); |
| '</span></td>'."\n". |
'</span></td>'."\n". |
| '</tr>'."\n"; |
'</tr>'."\n"; |
| $itemcount ++; |
$itemcount ++; |
|
Line 2215 sub print_textbookcourses {
|
Line 2321 sub print_textbookcourses {
|
| } |
} |
| |
|
| sub textbookcourses_javascript { |
sub textbookcourses_javascript { |
| my ($textbooks) = @_; |
my ($settings) = @_; |
| return unless(ref($textbooks) eq 'HASH'); |
return unless(ref($settings) eq 'HASH'); |
| my $num = scalar(keys(%{$textbooks})); |
my (%ordered,%total,%jstext); |
| my @jsarray; |
foreach my $type ('textbooks','templates') { |
| foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) { |
$total{$type} = 0; |
| push(@jsarray,$textbooks->{$item}); |
if (ref($settings->{$type}) eq 'HASH') { |
| |
foreach my $item (keys(%{$settings->{$type}})) { |
| |
if (ref($settings->{$type}->{$item}) eq 'HASH') { |
| |
my $num = $settings->{$type}->{$item}{'order'}; |
| |
$ordered{$type}{$num} = $item; |
| |
} |
| |
} |
| |
$total{$type} = scalar(keys(%{$settings->{$type}})); |
| |
} |
| |
my @jsarray = (); |
| |
foreach my $item (sort {$a <=> $b } (keys(%{$ordered{$type}}))) { |
| |
push(@jsarray,$ordered{$type}{$item}); |
| |
} |
| |
$jstext{$type} = ' var '.$type.' = Array('."'".join("','",@jsarray)."'".');'."\n"; |
| } |
} |
| my $jstext = ' var textbooks = Array('."'".join("','",@jsarray)."'".');'."\n"; |
|
| return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
| <script type="text/javascript"> |
<script type="text/javascript"> |
| // <![CDATA[ |
// <![CDATA[ |
| function reorderBooks(form,item) { |
function reorderBooks(form,item,caller) { |
| var changedVal; |
var changedVal; |
| $jstext |
$jstext{'textbooks'}; |
| var newpos = 'addbook_pos'; |
$jstext{'templates'}; |
| |
var newpos; |
| |
var maxh; |
| |
if (caller == 'textbooks') { |
| |
newpos = 'textbooks_addbook_pos'; |
| |
maxh = 1 + $total{'textbooks'}; |
| |
} else { |
| |
newpos = 'templates_addbook_pos'; |
| |
maxh = 1 + $total{'templates'}; |
| |
} |
| var current = new Array; |
var current = new Array; |
| var maxh = 1 + $num; |
|
| var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
| if (item == newpos) { |
if (item == newpos) { |
| changedVal = newitemVal; |
changedVal = newitemVal; |
|
Line 2239 $jstext
|
Line 2365 $jstext
|
| changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
| current[newitemVal] = newpos; |
current[newitemVal] = newpos; |
| } |
} |
| for (var i=0; i<textbooks.length; i++) { |
if (caller == 'textbooks') { |
| var elementName = textbooks[i]; |
for (var i=0; i<textbooks.length; i++) { |
| if (elementName != item) { |
var elementName = 'textbooks_'+textbooks[i]; |
| if (form.elements[elementName]) { |
if (elementName != item) { |
| var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
if (form.elements[elementName]) { |
| current[currVal] = elementName; |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
| |
current[currVal] = elementName; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (caller == 'templates') { |
| |
for (var i=0; i<templates.length; i++) { |
| |
var elementName = 'templates_'+templates[i]; |
| |
if (elementName != item) { |
| |
if (form.elements[elementName]) { |
| |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
| |
current[currVal] = elementName; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 2462 sub print_autocreate {
|
Line 2601 sub print_autocreate {
|
| $createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span>'; |
| my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
| 'autocreate_xmldc',%currhash); |
'autocreate_xmldc',%currhash); |
| |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'; |
| if ($numdc > 1) { |
if ($numdc > 1) { |
| $datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'). |
| &mt('Course creation processed as: (choose Dom. Coord.)'). |
'</td><td class="LC_left_item">'; |
| '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
| } else { |
} else { |
| $datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as:'). |
| |
'</td><td class="LC_right_item">'; |
| } |
} |
| |
$datatable .= $dctable.'</td></tr>'; |
| $$rowtotal += $rows; |
$$rowtotal += $rows; |
| return $datatable; |
return $datatable; |
| } |
} |
|
Line 2703 sub print_helpsettings {
|
Line 2844 sub print_helpsettings {
|
| |
|
| sub radiobutton_prefs { |
sub radiobutton_prefs { |
| my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
| $additional) = @_; |
$additional,$align) = @_; |
| return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && |
| (ref($choices) eq 'HASH')); |
(ref($choices) eq 'HASH')); |
| |
|
|
Line 2737 sub radiobutton_prefs {
|
Line 2878 sub radiobutton_prefs {
|
| $datatable .= |
$datatable .= |
| '<tr'.$css_class.'><td valign="top">'. |
'<tr'.$css_class.'><td valign="top">'. |
| '<span class="LC_nobreak">'.$choices->{$item}. |
'<span class="LC_nobreak">'.$choices->{$item}. |
| '</span></td>'. |
'</span></td>'; |
| '<td class="LC_right_item"><span class="LC_nobreak">'. |
if ($align eq 'left') { |
| |
$datatable .= '<td class="LC_left_item">'; |
| |
} else { |
| |
$datatable .= '<td class="LC_right_item">'; |
| |
} |
| |
$datatable .= |
| |
'<span class="LC_nobreak">'. |
| '<label><input type="radio" name="'. |
'<label><input type="radio" name="'. |
| $item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
$item.'" '.$checkedon{$item}.' value="1"'.$onclick.' />'.&mt('Yes'). |
| '</label> <label><input type="radio" name="'.$item.'" '. |
'</label> <label><input type="radio" name="'.$item.'" '. |
|
Line 2760 sub print_coursedefaults {
|
Line 2907 sub print_coursedefaults {
|
| uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
uploadquota => 'Default quota for files uploaded directly to course/community using Course Editor (MB)', |
| anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
| 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)', |
| |
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
| |
postsubmit => 'Disable submit button/keypress following student submission', |
| ); |
); |
| my %staticdefaults = ( |
my %staticdefaults = ( |
| anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
| uploadquota => 500, |
uploadquota => 500, |
| |
postsubmit => 60, |
| ); |
); |
| if ($position eq 'top') { |
if ($position eq 'top') { |
| %defaultchecked = ('canuse_pdfforms' => 'off'); |
%defaultchecked = ( |
| @toggles = ('canuse_pdfforms'); |
'canuse_pdfforms' => 'off', |
| |
'uselcmath' => 'on', |
| |
'usejsme' => 'on', |
| |
); |
| |
@toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
| ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
| \%choices,$itemcount); |
\%choices,$itemcount); |
| } else { |
} else { |
| $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits, |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout); |
| %curruploadquota); |
|
| my $currusecredits = 0; |
my $currusecredits = 0; |
| |
my $postsubmitclient = 1; |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook'); |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| $currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
|
Line 2784 sub print_coursedefaults {
|
Line 2939 sub print_coursedefaults {
|
| } |
} |
| } |
} |
| if (ref($settings->{'coursecredits'}) eq 'HASH') { |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
| $def_official_credits = $settings->{'coursecredits'}->{'official'}; |
foreach my $type (@types) { |
| $def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'}; |
next if ($type eq 'community'); |
| $def_textbook_credits = $settings->{'coursecredits'}->{'textbook'}; |
$defcredits{$type} = $settings->{'coursecredits'}->{$type}; |
| if (($def_official_credits ne '') || ($def_unofficial_credits ne '') || |
if ($defcredits{$type} ne '') { |
| ($def_textbook_credits ne '')) { |
$currusecredits = 1; |
| $currusecredits = 1; |
} |
| } |
} |
| } |
} |
| |
if (ref($settings->{'postsubmit'}) eq 'HASH') { |
| |
if ($settings->{'postsubmit'}->{'client'} eq 'off') { |
| |
$postsubmitclient = 0; |
| |
foreach my $type (@types) { |
| |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
| |
} |
| |
} else { |
| |
foreach my $type (@types) { |
| |
if (ref($settings->{'postsubmit'}->{'timeout'}) eq 'HASH') { |
| |
if ($settings->{'postsubmit'}->{'timeout'}->{$type} =~ /^\d+$/) { |
| |
$deftimeout{$type} = $settings->{'postsubmit'}->{'timeout'}->{$type}; |
| |
} else { |
| |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
| |
} |
| |
} else { |
| |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
foreach my $type (@types) { |
| |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
| |
} |
| |
} |
| |
} else { |
| |
foreach my $type (@types) { |
| |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
| |
} |
| } |
} |
| if (!$currdefresponder) { |
if (!$currdefresponder) { |
| $currdefresponder = $staticdefaults{'anonsurvey_threshold'}; |
$currdefresponder = $staticdefaults{'anonsurvey_threshold'}; |
|
Line 2831 sub print_coursedefaults {
|
Line 3014 sub print_coursedefaults {
|
| $display = 'block'; |
$display = 'block'; |
| } |
} |
| my $additional = '<div id="credits" style="display: '.$display.'">'. |
my $additional = '<div id="credits" style="display: '.$display.'">'. |
| '<span class="LC_nobreak">'. |
'<i>'.&mt('Default credits').'</i><br /><table><tr>'; |
| &mt('Default credits for official courses [_1]', |
foreach my $type (@types) { |
| '<input type="text" name="official_credits" value="'. |
next if ($type eq 'community'); |
| $def_official_credits.'" size="3" />'). |
$additional .= '<td align="center">'.&mt($type).'<br />'. |
| '</span><br />'. |
'<input type="text" name="'.$type.'_credits"'. |
| '<span class="LC_nobreak">'. |
' value="'.$defcredits{$type}.'" size="3" /></td>'; |
| &mt('Default credits for unofficial courses [_1]', |
} |
| '<input type="text" name="unofficial_credits" value="'. |
$additional .= '</tr></table></div>'."\n"; |
| $def_unofficial_credits.'" size="3" />'). |
|
| '</span><br />'. |
|
| '<span class="LC_nobreak">'. |
|
| &mt('Default credits for textbook courses [_1]', |
|
| '<input type="text" name="textbook_credits" value="'. |
|
| $def_textbook_credits.'" size="3" />'). |
|
| '</span></div>'."\n"; |
|
| %defaultchecked = ('coursecredits' => 'off'); |
%defaultchecked = ('coursecredits' => 'off'); |
| @toggles = ('coursecredits'); |
@toggles = ('coursecredits'); |
| my $current = { |
my $current = { |
|
Line 2853 sub print_coursedefaults {
|
Line 3029 sub print_coursedefaults {
|
| }; |
}; |
| (my $table,$itemcount) = |
(my $table,$itemcount) = |
| &radiobutton_prefs($current,\@toggles,\%defaultchecked, |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
| \%choices,$itemcount,$onclick,$additional); |
\%choices,$itemcount,$onclick,$additional,'left'); |
| |
$datatable .= $table; |
| |
$onclick = "toggleDisplay(this.form,'studentsubmission');"; |
| |
my $display = 'none'; |
| |
if ($postsubmitclient) { |
| |
$display = 'block'; |
| |
} |
| |
$additional = '<div id="studentsubmission" style="display: '.$display.'">'. |
| |
&mt('Number of seconds submit is disabled').'<br />'. |
| |
'<i>'.&mt('Enter 0 to remain disabled until page reload.').'</i><br />'. |
| |
'<table><tr>'; |
| |
foreach my $type (@types) { |
| |
$additional .= '<td align="center">'.&mt($type).'<br />'. |
| |
'<input type="text" name="'.$type.'_timeout" value="'. |
| |
$deftimeout{$type}.'" size="5" /></td>'; |
| |
} |
| |
$additional .= '</tr></table></div>'."\n"; |
| |
%defaultchecked = ('postsubmit' => 'on'); |
| |
@toggles = ('postsubmit'); |
| |
my $current = { |
| |
'postsubmit' => $postsubmitclient, |
| |
}; |
| |
($table,$itemcount) = |
| |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
| |
\%choices,$itemcount,$onclick,$additional,'left'); |
| $datatable .= $table; |
$datatable .= $table; |
| $itemcount ++; |
|
| } |
} |
| $$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
| return $datatable; |
return $datatable; |
|
Line 3060 sub print_validation_rows {
|
Line 3259 sub print_validation_rows {
|
| } |
} |
| if ($caller eq 'requestcourses') { |
if ($caller eq 'requestcourses') { |
| my %currhash; |
my %currhash; |
| if (ref($settings->{'validation'}) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| if ($settings->{'validation'}{'dc'} ne '') { |
if (ref($settings->{'validation'}) eq 'HASH') { |
| $currhash{$settings->{'validation'}{'dc'}} = 1; |
if ($settings->{'validation'}{'dc'} ne '') { |
| |
$currhash{$settings->{'validation'}{'dc'}} = 1; |
| |
} |
| } |
} |
| } |
} |
| my $numinrow = 2; |
my $numinrow = 2; |
| my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
my ($numdc,$dctable,$rows) = &active_dc_picker($dom,$numinrow,'radio', |
| 'validationdc',%currhash); |
'validationdc',%currhash); |
| |
my $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| |
$datatable .= '</td></tr><tr'.$css_class.'><td>'; |
| if ($numdc > 1) { |
if ($numdc > 1) { |
| $datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
$datatable .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
| &mt('Course creation processed as: (choose Dom. Coord.)'). |
|
| '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
| } else { |
} else { |
| $datatable .= $dctable.'</td></tr>'; |
$datatable .= &mt('Course creation processed as: '); |
| } |
} |
| |
$datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
| $itemcount ++; |
$itemcount ++; |
| } |
} |
| if (ref($rowtotal)) { |
if (ref($rowtotal)) { |
|
Line 3097 sub print_usersessions {
|
Line 3299 sub print_usersessions {
|
| if ($position eq 'top') { |
if ($position eq 'top') { |
| if (keys(%serverhomes) > 1) { |
if (keys(%serverhomes) > 1) { |
| my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
my %spareid = ¤t_offloads_to($dom,$settings,\%servers); |
| $datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal); |
my $curroffloadnow; |
| |
if (ref($settings) eq 'HASH') { |
| |
if (ref($settings->{'offloadnow'}) eq 'HASH') { |
| |
$curroffloadnow = $settings->{'offloadnow'}; |
| |
} |
| |
} |
| |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$curroffloadnow,$rowtotal); |
| } else { |
} else { |
| $datatable .= '<tr'.$css_class.'><td colspan="2">'. |
$datatable .= '<tr'.$css_class.'><td colspan="2">'. |
| &mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
&mt('Nothing to set here, as the cluster to which this domain belongs only contains one server.'); |
|
Line 3347 sub current_offloads_to {
|
Line 3555 sub current_offloads_to {
|
| } |
} |
| |
|
| sub spares_row { |
sub spares_row { |
| my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_; |
my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_; |
| my $css_class; |
my $css_class; |
| my $numinrow = 4; |
my $numinrow = 4; |
| my $itemcount = 1; |
my $itemcount = 1; |
|
Line 3367 sub spares_row {
|
Line 3575 sub spares_row {
|
| } |
} |
| } |
} |
| next unless (ref($spareid->{$server}) eq 'HASH'); |
next unless (ref($spareid->{$server}) eq 'HASH'); |
| |
my $checkednow; |
| |
if (ref($curroffloadnow) eq 'HASH') { |
| |
if ($curroffloadnow->{$server}) { |
| |
$checkednow = ' checked="checked"'; |
| |
} |
| |
} |
| $css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
| $datatable .= '<tr'.$css_class.'> |
$datatable .= '<tr'.$css_class.'> |
| <td rowspan="2"> |
<td rowspan="2"> |
| <span class="LC_nobreak">'. |
<span class="LC_nobreak">'. |
| &mt('[_1] when busy, offloads to:' |
&mt('[_1] when busy, offloads to:' |
| ,'<b>'.$server.'</b>'). |
,'<b>'.$server.'</b>').'</span><br />'. |
| |
'<span class="LC_nobreak">'."\n". |
| |
'<label><input type="checkbox" name="offloadnow" value="'.$server.'"'.$checkednow.' />'. |
| |
' '.&mt('Switch active users on next access').'</label></span>'. |
| "\n"; |
"\n"; |
| my (%current,%canselect); |
my (%current,%canselect); |
| my @choices = |
my @choices = |
|
Line 3596 sub print_loadbalancing {
|
Line 3813 sub print_loadbalancing {
|
| $disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
| } |
} |
| $targettable .= |
$targettable .= |
| '<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
'<td><span class="LC_nobreak"><label>'. |
| |
'<input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
| $checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
$checked.$disabled.' value="'.$chkboxval.'" id="loadbalancing_target_'.$balnum.'_'.$sparetype.'_'.$i.'" onclick="checkOffloads('."this,'$balnum','$sparetype'".');" /><span id="loadbalancing_targettxt_'.$balnum.'_'.$sparetype.'_'.$i.'"> '.$chkboxval. |
| '</span></label></td>'; |
'</span></label></span></td>'; |
| my $rem = $i%($numinrow); |
my $rem = $i%($numinrow); |
| if ($rem == 0) { |
if ($rem == 0) { |
| if (($i > 0) && ($i < $numspares-1)) { |
if (($i > 0) && ($i < $numspares-1)) { |
|
Line 3688 sub loadbalancing_rules {
|
Line 3906 sub loadbalancing_rules {
|
| if (ref($currrules) eq 'HASH') { |
if (ref($currrules) eq 'HASH') { |
| $current = $currrules->{$type}; |
$current = $currrules->{$type}; |
| } |
} |
| if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
| if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
| $current = ''; |
$current = ''; |
| } |
} |
|
Line 3740 sub loadbalance_rule_row {
|
Line 3958 sub loadbalance_rule_row {
|
| my @rulenames; |
my @rulenames; |
| my %ruletitles = &offloadtype_text(); |
my %ruletitles = &offloadtype_text(); |
| if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_ipchangesso') || ($type eq '_LC_ipchange')) { |
| @rulenames = ('balancer','offloadedto'); |
@rulenames = ('balancer','offloadedto','specific'); |
| } else { |
} else { |
| @rulenames = ('default','homeserver'); |
@rulenames = ('default','homeserver'); |
| if ($type eq '_LC_external') { |
if ($type eq '_LC_external') { |
|
Line 3751 sub loadbalance_rule_row {
|
Line 3969 sub loadbalance_rule_row {
|
| push(@rulenames,'none'); |
push(@rulenames,'none'); |
| } |
} |
| my $style = $targets_div_style; |
my $style = $targets_div_style; |
| if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom')) { |
| $style = $homedom_div_style; |
$style = $homedom_div_style; |
| } |
} |
| my $space; |
my $space; |
|
Line 3802 sub loadbalance_rule_row {
|
Line 4020 sub loadbalance_rule_row {
|
| '<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
'<input type="radio" name="loadbalancing_rules_'.$balnum.'_'.$type. |
| '" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
'" id="loadbalancing_rules_'.$balnum.'_'.$type.'_'.$i.'" value="'. |
| $rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
$rule.'" onclick="balanceruleChange('."this.form,'$balnum','$type'". |
| ')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
')"'.$checked.' /> '; |
| '</label>'.$extra.'</span><br />'."\n"; |
if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) { |
| |
$output .= $ruletitles{'particular'}; |
| |
} else { |
| |
$output .= $ruletitles{$rulenames[$i]}; |
| |
} |
| |
$output .= '</label>'.$extra.'</span><br />'."\n"; |
| } |
} |
| $output .= '</div></td></tr>'."\n"; |
$output .= '</div></td></tr>'."\n"; |
| return $output; |
return $output; |
|
Line 3818 sub offloadtype_text {
|
Line 4041 sub offloadtype_text {
|
| 'none' => 'No offload', |
'none' => 'No offload', |
| 'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
'balancer' => 'Session hosted on Load Balancer, after re-authentication', |
| 'offloadedto' => 'Session hosted on offload server, after re-authentication', |
'offloadedto' => 'Session hosted on offload server, after re-authentication', |
| |
'particular' => 'Session hosted (after re-auth) on server:', |
| ); |
); |
| return %ruletitles; |
return %ruletitles; |
| } |
} |
|
Line 4100 sub print_selfcreation {
|
Line 4324 sub print_selfcreation {
|
| $datatable .= '<tr>'; |
$datatable .= '<tr>'; |
| } |
} |
| my $currval; |
my $currval; |
| if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
if (ref($createsettings) eq 'HASH') { |
| $currval = $createsettings->{'shibenv'}{$fields[$i]}; |
if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
| |
$currval = $createsettings->{'shibenv'}{$fields[$i]}; |
| |
} |
| } |
} |
| $datatable .= '<td class="LC_left_item">'. |
$datatable .= '<td class="LC_left_item">'. |
| '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'. |
|
Line 5100 sub serverstatus_pages {
|
Line 5326 sub serverstatus_pages {
|
| return ('userstatus','lonstatus','loncron','server-status','codeversions', |
return ('userstatus','lonstatus','loncron','server-status','codeversions', |
| 'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
'checksums','clusterstatus','metadata_keywords','metadata_harvest', |
| 'takeoffline','takeonline','showenv','toggledebug','ping','domconf', |
'takeoffline','takeonline','showenv','toggledebug','ping','domconf', |
| 'uniquecodes','diskusage'); |
'uniquecodes','diskusage','coursecatalog'); |
| } |
} |
| |
|
| sub defaults_javascript { |
sub defaults_javascript { |
| my ($settings) = @_; |
my ($settings) = @_; |
| my ($output,$jstext); |
return unless (ref($settings) eq 'HASH'); |
| if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
if ((ref($settings->{'inststatusorder'}) eq 'ARRAY') && (ref($settings->{'inststatustypes'}) eq 'HASH')) { |
| my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
my $maxnum = scalar(@{$settings->{'inststatusorder'}}); |
| if ($maxnum eq '') { |
if ($maxnum eq '') { |
| $maxnum = 0; |
$maxnum = 0; |
| } |
} |
| $maxnum ++; |
$maxnum ++; |
| $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
my $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
| return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
| <script type="text/javascript"> |
<script type="text/javascript"> |
| // <![CDATA[ |
// <![CDATA[ |
|
Line 5705 sub modify_login {
|
Line 5931 sub modify_login {
|
| } |
} |
| |
|
| my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| |
my %domservers = &Apache::lonnet::get_servers($dom); |
| my @loginvia_attribs = ('serverpath','custompath','exempt'); |
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
| if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
| foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
|
Line 5747 sub modify_login {
|
Line 5974 sub modify_login {
|
| $changes{'loginvia'}{$lonhost} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
| } |
} |
| if ($item eq 'exempt') { |
if ($item eq 'exempt') { |
| $new =~ s/^\s+//; |
$new = &check_exempt_addresses($new); |
| $new =~ s/\s+$//; |
|
| my @poss_ips = split(/\s*[,:]\s*/,$new); |
|
| my @okips; |
|
| foreach my $ip (@poss_ips) { |
|
| if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
|
| if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
|
| push(@okips,$ip); |
|
| } |
|
| } |
|
| } |
|
| if (@okips > 0) { |
|
| $new = join(',',@okips); |
|
| } else { |
|
| $new = ''; |
|
| } |
|
| } |
} |
| $loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
| } |
} |
|
Line 5858 sub modify_login {
|
Line 6070 sub modify_login {
|
| $errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
| if ((grep(/^\Q$lang\E$/,@currlangs)) && |
if ((grep(/^\Q$lang\E$/,@currlangs)) && |
| (!grep(/^\Q$lang\E$/,@delurls))) { |
(!grep(/^\Q$lang\E$/,@delurls))) { |
| |
|
| $loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
$loginhash{'login'}{'helpurl'}{$lang} = $domconfig{'login'}{'helpurl'}{$lang}; |
| } |
} |
| } |
} |
|
Line 5874 sub modify_login {
|
Line 6085 sub modify_login {
|
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| } |
} |
| } |
} |
| |
|
| |
my (%currheadtagurls,%currexempt,@newhosts,%newheadtagurls,%possexempt); |
| |
if (ref($domconfig{'login'}) eq 'HASH') { |
| |
if (ref($domconfig{'login'}{'headtag'}) eq 'HASH') { |
| |
foreach my $lonhost (keys(%{$domconfig{'login'}{'headtag'}})) { |
| |
if ($domservers{$lonhost}) { |
| |
if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
| |
$currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'}; |
| |
$currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my @delheadtagurls = &Apache::loncommon::get_env_multiple('form.loginheadtag_del'); |
| |
foreach my $lonhost (sort(keys(%domservers))) { |
| |
if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) { |
| |
$changes{'headtag'}{$lonhost} = 1; |
| |
} else { |
| |
if ($env{'form.loginheadtagexempt_'.$lonhost}) { |
| |
$possexempt{$lonhost} = &check_exempt_addresses($env{'form.loginheadtagexempt_'.$lonhost}); |
| |
} |
| |
if ($env{'form.loginheadtag_'.$lonhost.'.filename'}) { |
| |
push(@newhosts,$lonhost); |
| |
} elsif ($currheadtagurls{$lonhost}) { |
| |
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $currheadtagurls{$lonhost}; |
| |
if ($currexempt{$lonhost}) { |
| |
if ((!exists($possexempt{$lonhost})) || ($possexempt{$lonhost} ne $currexempt{$lonhost})) { |
| |
$changes{'headtag'}{$lonhost} = 1; |
| |
} |
| |
} elsif ($possexempt{$lonhost}) { |
| |
$changes{'headtag'}{$lonhost} = 1; |
| |
} |
| |
if ($possexempt{$lonhost}) { |
| |
$loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (@newhosts) { |
| |
my $error; |
| |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
| |
if ($configuserok eq 'ok') { |
| |
if ($switchserver) { |
| |
$error = &mt("Upload of custom markup is not permitted to this server: [_1]",$switchserver); |
| |
} elsif ($author_ok eq 'ok') { |
| |
foreach my $lonhost (@newhosts) { |
| |
my $formelem = 'loginheadtag_'.$lonhost; |
| |
(my $result,$newheadtagurls{$lonhost}) = &publishlogo($r,'upload',$formelem,$dom,$confname, |
| |
"login/headtag/$lonhost",'','', |
| |
$env{'form.loginheadtag_'.$lonhost.'.filename'}); |
| |
if ($result eq 'ok') { |
| |
$loginhash{'login'}{'headtag'}{$lonhost}{'url'} = $newheadtagurls{$lonhost}; |
| |
$changes{'headtag'}{$lonhost} = 1; |
| |
if ($possexempt{$lonhost}) { |
| |
$loginhash{'login'}{'headtag'}{$lonhost}{'exempt'} = $possexempt{$lonhost}; |
| |
} |
| |
} else { |
| |
my $puberror = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].", |
| |
$newheadtagurls{$lonhost},$result); |
| |
$errors .= '<li><span class="LC_error">'.$puberror.'</span></li>'; |
| |
if ((grep(/^\Q$lonhost\E$/,keys(%currheadtagurls))) && |
| |
(!grep(/^\Q$lonhost\E$/,@delheadtagurls))) { |
| |
$loginhash{'login'}{'headtag'}{$lonhost} = $currheadtagurls{$lonhost}; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$error = &mt("Upload of custom markup file(s) failed because an author role could not be assigned to a Domain Configuration user ([_1]) in domain: [_2]. Error was: [_3].",$confname,$dom,$author_ok); |
| |
} |
| |
} else { |
| |
$error = &mt("Upload of custom markup file(s) failed because a Domain Configuration user ([_1]) could not be created in domain: [_2]. Error was: [_3].",$confname,$dom,$configuserok); |
| |
} |
| |
if ($error) { |
| |
&Apache::lonnet::logthis($error); |
| |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| |
} |
| |
} |
| &process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
&process_captcha('login',\%changes,$loginhash{'login'},$domconfig{'login'}); |
| |
|
| my $defaulthelpfile = '/adm/loginproblems.html'; |
my $defaulthelpfile = '/adm/loginproblems.html'; |
|
Line 5974 sub modify_login {
|
Line 6263 sub modify_login {
|
| } |
} |
| } |
} |
| } |
} |
| |
} elsif ($item eq 'headtag') { |
| |
if (ref($changes{$item}) eq 'HASH') { |
| |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
| |
if (grep(/^\Q$lonhost\E$/,@delheadtagurls)) { |
| |
$resulttext .= '<li>'.&mt('custom markup file removed for [_1]',$domservers{$lonhost}).'</li>'; |
| |
} elsif (ref($loginhash{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
| |
$resulttext .= '<li><a href="'. |
| |
"javascript:void(open('$loginhash{'login'}{'headtag'}{$lonhost}{'url'}?inhibitmenu=yes','Custom_HeadTag', |
| |
'menubar=0,toolbar=1,scrollbars=1,width=600,height=500,resizable=yes'))". |
| |
'">'.&mt('custom markup').'</a> '.&mt('(for [_1])',$servers{$lonhost}).' '; |
| |
if ($possexempt{$lonhost}) { |
| |
$resulttext .= &mt('not included for client IP(s): [_1]',$possexempt{$lonhost}); |
| |
} else { |
| |
$resulttext .= &mt('included for any client IP'); |
| |
} |
| |
$resulttext .= '</li>'; |
| |
} |
| |
} |
| |
} |
| } elsif ($item eq 'captcha') { |
} elsif ($item eq 'captcha') { |
| if (ref($loginhash{'login'}) eq 'HASH') { |
if (ref($loginhash{'login'}) eq 'HASH') { |
| my $chgtxt; |
my $chgtxt; |
|
Line 6005 sub modify_login {
|
Line 6313 sub modify_login {
|
| if (!$privkey) { |
if (!$privkey) { |
| $chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
$chgtxt .= '<li>'.&mt('Private key deleted').'</li>'; |
| } else { |
} else { |
| $chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$privkey).'</li>'; |
| } |
} |
| $chgtxt .= '</ul>'; |
$chgtxt .= '</ul>'; |
| $resulttext .= '<li>'.$chgtxt.'</li>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
|
Line 6029 sub modify_login {
|
Line 6337 sub modify_login {
|
| return $resulttext; |
return $resulttext; |
| } |
} |
| |
|
| |
|
| |
sub check_exempt_addresses { |
| |
my ($iplist) = @_; |
| |
$iplist =~ s/^\s+//; |
| |
$iplist =~ s/\s+$//; |
| |
my @poss_ips = split(/\s*[,:]\s*/,$iplist); |
| |
my (@okips,$new); |
| |
foreach my $ip (@poss_ips) { |
| |
if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
| |
if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
| |
push(@okips,$ip); |
| |
} |
| |
} |
| |
} |
| |
if (@okips > 0) { |
| |
$new = join(',',@okips); |
| |
} else { |
| |
$new = ''; |
| |
} |
| |
return $new; |
| |
} |
| |
|
| sub color_font_choices { |
sub color_font_choices { |
| my %choices = |
my %choices = |
| &Apache::lonlocal::texthash ( |
&Apache::lonlocal::texthash ( |
|
Line 6830 sub modify_quotas {
|
Line 7160 sub modify_quotas {
|
| $confhash{'uniquecode'}{$type} = 1; |
$confhash{'uniquecode'}{$type} = 1; |
| } |
} |
| } |
} |
| my ($newbook,@allpos); |
my (%newbook,%allpos); |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| if ($env{'form.addbook'}) { |
foreach my $type ('textbooks','templates') { |
| if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) && |
@{$allpos{$type}} = (); |
| ($env{'form.addbook_cdom'} =~ /^$match_domain$/)) { |
my $invalid; |
| if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'}, |
if ($type eq 'textbooks') { |
| $env{'form.addbook_cdom'}) eq 'no_host') { |
$invalid = &mt('Invalid LON-CAPA course for textbook'); |
| $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
} else { |
| '</span></li>'; |
$invalid = &mt('Invalid LON-CAPA course for template'); |
| } else { |
} |
| $newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'}; |
if ($env{'form.'.$type.'_addbook'}) { |
| my $position = $env{'form.addbook_pos'}; |
if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) && |
| $position =~ s/\D+//g; |
($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) { |
| if ($position ne '') { |
if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'}, |
| $allpos[$position] = $newbook; |
$env{'form.'.$type.'_addbook_cdom'}) eq 'no_host') { |
| |
$errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; |
| |
} else { |
| |
$newbook{$type} = $env{'form.'.$type.'_addbook_cdom'}.'_'.$env{'form.'.$type.'_addbook_cnum'}; |
| |
my $position = $env{'form.'.$type.'_addbook_pos'}; |
| |
$position =~ s/\D+//g; |
| |
if ($position ne '') { |
| |
$allpos{$type}[$position] = $newbook{$type}; |
| |
} |
| } |
} |
| |
} else { |
| |
$errors .= '<li><span class="LC_error">'.$invalid.'</span></li>'; |
| } |
} |
| } else { |
|
| $errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
|
| '</span></li>'; |
|
| } |
} |
| } |
} |
| |
|
| } |
} |
| if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
| if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
if (ref($domconfig{$action}{'notify'}) eq 'HASH') { |
|
Line 6885 sub modify_quotas {
|
Line 7221 sub modify_quotas {
|
| $changes{'uniquecode'} = 1; |
$changes{'uniquecode'} = 1; |
| } |
} |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
| my %deletions; |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
| my @todelete = &Apache::loncommon::get_env_multiple('form.book_del'); |
my %deletions; |
| if (@todelete) { |
my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del'); |
| map { $deletions{$_} = 1; } @todelete; |
if (@todelete) { |
| } |
map { $deletions{$_} = 1; } @todelete; |
| my %imgdeletions; |
} |
| my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del'); |
my %imgdeletions; |
| if (@todeleteimages) { |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del'); |
| map { $imgdeletions{$_} = 1; } @todeleteimages; |
if (@todeleteimages) { |
| } |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
| my $maxnum = $env{'form.book_maxnum'}; |
} |
| for (my $i=0; $i<=$maxnum; $i++) { |
my $maxnum = $env{'form.'.$type.'_maxnum'}; |
| my $key = $env{'form.book_id_'.$i}; |
for (my $i=0; $i<=$maxnum; $i++) { |
| if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') { |
my $itemid = $env{'form.'.$type.'_id_'.$i}; |
| if ($deletions{$key}) { |
my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); |
| if ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') { |
| #FIXME need to obsolete item in RES space |
if ($deletions{$key}) { |
| |
if ($domconfig{$action}{$type}{$key}{'image'}) { |
| |
#FIXME need to obsolete item in RES space |
| |
} |
| |
next; |
| |
} else { |
| |
my $newpos = $env{'form.'.$itemid}; |
| |
$newpos =~ s/\D+//g; |
| |
foreach my $item ('subject','title','publisher','author') { |
| |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
| |
($type eq 'templates')); |
| |
$confhash{$type}{$key}{$item} = $env{'form.'.$type.'_'.$item.'_'.$i}; |
| |
if ($domconfig{$action}{$type}{$key}{$item} ne $confhash{$type}{$key}{$item}) { |
| |
$changes{$type}{$key} = 1; |
| |
} |
| |
} |
| |
$allpos{$type}[$newpos] = $key; |
| } |
} |
| next; |
if ($imgdeletions{$key}) { |
| } else { |
$changes{$type}{$key} = 1; |
| my $newpos = $env{'form.'.$key}; |
#FIXME need to obsolete item in RES space |
| $newpos =~ s/\D+//g; |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
| foreach my $item ('subject','title','author') { |
my ($cdom,$cnum) = split(/_/,$key); |
| $confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i}; |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
| if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) { |
$cdom,$cnum,$type,$configuserok, |
| $changes{'textbooks'}{$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>'; |
| |
} |
| |
} elsif ($domconfig{$action}{$type}{$key}{'image'}) { |
| |
$confhash{$type}{$key}{'image'} = |
| |
$domconfig{$action}{$type}{$key}{'image'}; |
| } |
} |
| $allpos[$newpos] = $key; |
|
| } |
|
| if ($imgdeletions{$key}) { |
|
| $changes{'textbooks'}{$key} = 1; |
|
| #FIXME need to obsolete item in RES space |
|
| } elsif ($env{'form.book_image_'.$i.'.filename'}) { |
|
| my ($cdom,$cnum) = split(/_/,$key); |
|
| my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,'book_image_'.$i, |
|
| $cdom,$cnum,$configuserok, |
|
| $switchserver,$author_ok); |
|
| if ($imgurl) { |
|
| $confhash{'textbooks'}{$key}{'image'} = $imgurl; |
|
| $changes{'textbooks'}{$key} = 1; |
|
| } |
|
| if ($error) { |
|
| &Apache::lonnet::logthis($error); |
|
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
| } |
|
| } elsif ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
|
| $confhash{'textbooks'}{$key}{'image'} = |
|
| $domconfig{$action}{'textbooks'}{$key}{'image'}; |
|
| } |
} |
| } |
} |
| } |
} |
|
Line 6949 sub modify_quotas {
|
Line 7290 sub modify_quotas {
|
| } |
} |
| } |
} |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| if ($newbook) { |
foreach my $type ('textbooks','templates') { |
| $changes{'textbooks'}{$newbook} = 1; |
if ($newbook{$type}) { |
| foreach my $item ('subject','title','author') { |
$changes{$type}{$newbook{$type}} = 1; |
| $env{'form.addbook_'.$item} =~ s/(`)/'/g; |
foreach my $item ('subject','title','publisher','author') { |
| if ($env{'form.addbook_'.$item}) { |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
| $confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item}; |
($type eq 'template')); |
| } |
$env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g; |
| } |
if ($env{'form.'.$type.'_addbook_'.$item}) { |
| if ($env{'form.addbook_image.filename'} ne '') { |
$confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item}; |
| my ($cdom,$cnum) = split(/_/,$newbook); |
} |
| my ($imageurl,$error) = |
} |
| &process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok, |
if ($type eq 'textbooks') { |
| $switchserver,$author_ok); |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
| if ($imageurl) { |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
| $confhash{'textbooks'}{$newbook}{'image'} = $imageurl; |
my ($imageurl,$error) = |
| } |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
| if ($error) { |
$configuserok,$switchserver,$author_ok); |
| &Apache::lonnet::logthis($error); |
if ($imageurl) { |
| $errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
| |
} |
| |
if ($error) { |
| |
&Apache::lonnet::logthis($error); |
| |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
if (@{$allpos{$type}} > 0) { |
| if (@allpos > 0) { |
my $idx = 0; |
| my $idx = 0; |
foreach my $item (@{$allpos{$type}}) { |
| foreach my $item (@allpos) { |
if ($item ne '') { |
| if ($item ne '') { |
$confhash{$type}{$item}{'order'} = $idx; |
| $confhash{'textbooks'}{$item}{'order'} = $idx; |
if (ref($domconfig{$action}) eq 'HASH') { |
| if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
| if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') { |
| if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') { |
if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) { |
| if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) { |
$changes{$type}{$item} = 1; |
| $changes{'textbooks'}{$item} = 1; |
} |
| } |
} |
| } |
} |
| } |
} |
| |
$idx ++; |
| } |
} |
| $idx ++; |
|
| } |
} |
| } |
} |
| } |
} |
|
Line 7202 sub modify_quotas {
|
Line 7549 sub modify_quotas {
|
| $domdefaults{'requestauthor'} = \%confhash; |
$domdefaults{'requestauthor'} = \%confhash; |
| } else { |
} else { |
| foreach my $key (keys(%confhash)) { |
foreach my $key (keys(%confhash)) { |
| unless (($context eq 'requestcourses') && ($key eq 'textbooks')) { |
unless (($context eq 'requestcourses') && (($key eq 'textbooks') || ($key eq 'templates'))) { |
| $domdefaults{$key} = $confhash{$key}; |
$domdefaults{$key} = $confhash{$key}; |
| } |
} |
| } |
} |
|
Line 7354 sub modify_quotas {
|
Line 7701 sub modify_quotas {
|
| '</li>'; |
'</li>'; |
| } |
} |
| } |
} |
| if (ref($changes{'textbooks'}) eq 'HASH') { |
foreach my $type ('textbooks','templates') { |
| $resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>'; |
if (ref($changes{$type}) eq 'HASH') { |
| foreach my $key (sort(keys(%{$changes{'textbooks'}}))) { |
$resulttext .= '<li>'.&mt("Available $type updated").'<ul>'; |
| my %coursehash = &Apache::lonnet::coursedescription($key); |
foreach my $key (sort(keys(%{$changes{$type}}))) { |
| my $coursetitle = $coursehash{'description'}; |
my %coursehash = &Apache::lonnet::coursedescription($key); |
| my $position = $confhash{'textbooks'}{$key}{'order'} + 1; |
my $coursetitle = $coursehash{'description'}; |
| $resulttext .= '<li>'; |
my $position = $confhash{$type}{$key}{'order'} + 1; |
| foreach my $item ('subject','title','author') { |
$resulttext .= '<li>'; |
| my $name = $item.':'; |
foreach my $item ('subject','title','publisher','author') { |
| $name =~ s/^(\w)/\U$1/; |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
| $resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />'; |
($type eq 'templates')); |
| } |
my $name = $item.':'; |
| $resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
$name =~ s/^(\w)/\U$1/; |
| if ($confhash{'textbooks'}{$key}{'image'}) { |
$resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />'; |
| $resulttext .= ' '.&mt('Image: [_1]', |
} |
| '<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'. |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
| ' alt="Textbook cover" />').'<br />'; |
if ($type eq 'textbooks') { |
| |
if ($confhash{$type}{$key}{'image'}) { |
| |
$resulttext .= ' '.&mt('Image: [_1]', |
| |
'<img src="'.$confhash{$type}{$key}{'image'}.'"'. |
| |
' alt="Textbook cover" />').'<br />'; |
| |
} |
| |
} |
| |
$resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; |
| } |
} |
| $resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</li>'; |
$resulttext .= '</ul></li>'; |
| } |
} |
| $resulttext .= '</ul></li>'; |
|
| } |
} |
| if (ref($changes{'validation'}) eq 'HASH') { |
if (ref($changes{'validation'}) eq 'HASH') { |
| if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
if ((ref($validationitemsref) eq 'ARRAY') && (ref($validationnamesref) eq 'HASH')) { |
|
Line 7422 sub modify_quotas {
|
Line 7775 sub modify_quotas {
|
| } |
} |
| |
|
| sub process_textbook_image { |
sub process_textbook_image { |
| my ($r,$dom,$confname,$caller,$cdom,$cnum,$configuserok,$switchserver,$author_ok) = @_; |
my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_; |
| my $filename = $env{'form.'.$caller.'.filename'}; |
my $filename = $env{'form.'.$caller.'.filename'}; |
| my ($error,$url); |
my ($error,$url); |
| my ($width,$height) = (50,50); |
my ($width,$height) = (50,50); |
|
Line 7433 sub process_textbook_image {
|
Line 7786 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, |
| "textbooks/$dom/$cnum/cover",$width,$height); |
"$type/$dom/$cnum/cover",$width,$height); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $url = $imageurl; |
$url = $imageurl; |
| } else { |
} else { |
|
Line 8450 sub modify_selfcreation {
|
Line 8803 sub modify_selfcreation {
|
| # value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. |
# value set to one), if self-creation with e-mail address permitted, where $type is user type: faculty, staff, student etc. |
| # |
# |
| |
|
| if ($env{'form.cancreate_email'} eq 'email') { |
if ($env{'form.cancreate_email'}) { |
| push(@contexts,'emailusername'); |
push(@contexts,'emailusername'); |
| if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
| foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
|
Line 8868 sub modify_selfcreation {
|
Line 9221 sub modify_selfcreation {
|
| foreach my $type (@{$types}) { |
foreach my $type (@{$types}) { |
| if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
if (ref($cancreate{'emailusername'}{$type}) eq 'HASH') { |
| if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { |
if (keys(%{$cancreate{'emailusername'}{$type}}) > 0) { |
| $chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',$usertypes->{$type}). |
$chgtext .= &mt('When self-creating account with e-mail as username, the following information will be provided by [_1]:',"'$usertypes->{$type}'"). |
| '<ul>'; |
'<ul>'; |
| foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
| if ($cancreate{'emailusername'}{$type}{$field}) { |
if ($cancreate{'emailusername'}{$type}{$field}) { |
| $chgtext .= '<li>'.$infotitles->{$field}.'</li>'; |
$chgtext .= '<li>'.$infotitles->{$field}.'</li>'; |
| } |
} |
| } |
} |
| |
$chgtext .= '</ul>'; |
| |
} else { |
| |
$chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; |
| } |
} |
| $chgtext .= '</ul>'; |
|
| } else { |
} else { |
| $chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',$usertypes->{$type}).'<br />'; |
$chgtext .= &mt('When self creating account with e-mail as username, no information besides e-mail address will be provided by [_1].',"'$usertypes->{$type}'").'<br />'; |
| } |
} |
| } |
} |
| } |
} |
|
Line 8984 sub process_captcha {
|
Line 9339 sub process_captcha {
|
| if ($newsettings->{'captcha'} eq 'recaptcha') { |
if ($newsettings->{'captcha'} eq 'recaptcha') { |
| $newpub = $env{'form.'.$container.'_recaptchapub'}; |
$newpub = $env{'form.'.$container.'_recaptchapub'}; |
| $newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
$newpriv = $env{'form.'.$container.'_recaptchapriv'}; |
| $newpub =~ s/\W//g; |
$newpub =~ s/[^\w\-]//g; |
| $newpriv =~ s/\W//g; |
$newpriv =~ s/[^\w\-]//g; |
| $newsettings->{'recaptchakeys'} = { |
$newsettings->{'recaptchakeys'} = { |
| public => $newpub, |
public => $newpub, |
| private => $newpriv, |
private => $newpriv, |
|
Line 9685 sub modify_coursecategories {
|
Line 10040 sub modify_coursecategories {
|
| } |
} |
| $resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
| if ($changes{'unauth'} || $changes{'auth'}) { |
if ($changes{'unauth'} || $changes{'auth'}) { |
| &Apache::loncommon::devalidate_domconfig_cache($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
| |
if ($changes{'auth'}) { |
| |
$domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'}; |
| |
} |
| |
if ($changes{'unauth'}) { |
| |
$domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'}; |
| |
} |
| |
my $cachetime = 24*60*60; |
| |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
| if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
| $lastactref->{'domainconfig'} = 1; |
$lastactref->{'domdefaults'} = 1; |
| } |
} |
| } |
} |
| } else { |
} else { |
|
Line 9884 sub modify_helpsettings {
|
Line 10247 sub modify_helpsettings {
|
| sub modify_coursedefaults { |
sub modify_coursedefaults { |
| my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
| my ($resulttext,$errors,%changes,%defaultshash); |
my ($resulttext,$errors,%changes,%defaultshash); |
| my %defaultchecked = ('canuse_pdfforms' => 'off'); |
my %defaultchecked = ( |
| my @toggles = ('canuse_pdfforms'); |
'canuse_pdfforms' => 'off', |
| |
'uselcmath' => 'on', |
| |
'usejsme' => 'on' |
| |
); |
| |
my @toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
| my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
| 'uploadquota_community','uploadquota_textbook'); |
'uploadquota_community','uploadquota_textbook'); |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook'); |
| my %staticdefaults = ( |
my %staticdefaults = ( |
| anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
| uploadquota => 500, |
uploadquota => 500, |
| |
postsubmit => 60, |
| ); |
); |
| |
|
| $defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
|
Line 9953 sub modify_coursedefaults {
|
Line 10321 sub modify_coursedefaults {
|
| } |
} |
| } |
} |
| |
|
| my $officialcreds = $env{'form.official_credits'}; |
my %credits; |
| $officialcreds =~ s/[^\d.]+//g; |
foreach my $type (@types) { |
| my $unofficialcreds = $env{'form.unofficial_credits'}; |
unless ($type eq 'community') { |
| $unofficialcreds =~ s/[^\d.]+//g; |
$credits{$type} = $env{'form.'.$type.'_credits'}; |
| my $textbookcreds = $env{'form.textbook_credits'}; |
$credits{$type} =~ s/[^\d.]+//g; |
| $textbookcreds =~ s/[^\d.]+//g; |
} |
| if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') && |
} |
| ($env{'form.coursecredits'} eq '1')) { |
if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') && |
| $changes{'coursecredits'} = 1; |
($env{'form.coursecredits'} eq '1')) { |
| } else { |
$changes{'coursecredits'} = 1; |
| if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds) || |
foreach my $type (keys(%credits)) { |
| ($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds) || |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
| ($domconfig{'coursedefaults'}{'coursecredits'}{'textbook'} ne $textbookcreds)) { |
} |
| $changes{'coursecredits'} = 1; |
} else { |
| } |
if ($env{'form.coursecredits'} eq '1') { |
| } |
foreach my $type (@types) { |
| $defaultshash{'coursedefaults'}{'coursecredits'} = { |
unless ($type eq 'community') { |
| official => $officialcreds, |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) { |
| unofficial => $unofficialcreds, |
$changes{'coursecredits'} = 1; |
| textbook => $textbookcreds, |
} |
| |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
| |
} |
| |
} |
| |
} elsif (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
| |
foreach my $type (@types) { |
| |
unless ($type eq 'community') { |
| |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type}) { |
| |
$changes{'coursecredits'} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($env{'form.postsubmit'} eq '1') { |
| |
$defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on'; |
| |
my %currtimeout; |
| |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
| |
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'off') { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
| |
%currtimeout = %{$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}}; |
| |
} |
| |
} else { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| |
foreach my $type (@types) { |
| |
my $timeout = $env{'form.'.$type.'_timeout'}; |
| |
$timeout =~ s/\D//g; |
| |
if ($timeout == $staticdefaults{'postsubmit'}) { |
| |
$timeout = ''; |
| |
} elsif (($timeout eq '') || ($timeout =~ /^0+$/)) { |
| |
$timeout = '0'; |
| |
} |
| |
unless ($timeout eq '') { |
| |
$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type} = $timeout; |
| |
} |
| |
if (exists($currtimeout{$type})) { |
| |
if ($timeout ne $currtimeout{$type}) { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| |
} elsif ($timeout ne '') { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| |
} |
| |
} else { |
| |
$defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'off'; |
| |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
| |
if ($domconfig{'coursedefaults'}{'postsubmit'}{'client'} eq 'on') { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| |
} else { |
| |
$changes{'postsubmit'} = 1; |
| |
} |
| } |
} |
| } |
} |
| my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
Line 9980 sub modify_coursedefaults {
|
Line 10403 sub modify_coursedefaults {
|
| if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
| if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
| my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
| if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || |
if (($changes{'canuse_pdfforms'}) || ($changes{'uploadquota'}) || ($changes{'postsubmit'}) || |
| ($changes{'uploadquota'})) { |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'})) { |
| if ($changes{'canuse_pdfforms'}) { |
foreach my $item ('canuse_pdfforms','uselcmath','usejsme') { |
| $domdefaults{'canuse_pdfforms'}=$defaultshash{'coursedefaults'}{'canuse_pdfforms'}; |
if ($changes{$item}) { |
| } |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
| |
} |
| |
} |
| if ($changes{'coursecredits'}) { |
if ($changes{'coursecredits'}) { |
| if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
| $domdefaults{'officialcredits'} = |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) { |
| $defaultshash{'coursedefaults'}{'coursecredits'}{'official'}; |
$domdefaults{$type.'credits'} = |
| $domdefaults{'unofficialcredits'} = |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type}; |
| $defaultshash{'coursedefaults'}{'coursecredits'}{'unofficial'}; |
} |
| $domdefaults{'textbookcredits'} = |
} |
| $domdefaults{'coursedefaults'}{'coursecredits'}{'textbook'}; |
} |
| |
if ($changes{'postsubmit'}) { |
| |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
| |
$domdefaults{'postsubmit'} = $defaultshash{'coursedefaults'}{'postsubmit'}{'client'}; |
| |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
| |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}})) { |
| |
$domdefaults{$type.'postsubtimeout'} = |
| |
$defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| if ($changes{'uploadquota'}) { |
if ($changes{'uploadquota'}) { |
|
Line 10016 sub modify_coursedefaults {
|
Line 10450 sub modify_coursedefaults {
|
| } else { |
} else { |
| $resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
| } |
} |
| |
} elsif ($item eq 'uselcmath') { |
| |
if ($env{'form.'.$item} eq '1') { |
| |
$resulttext .= '<li>'.&mt('Math preview uses LON-CAPA previewer (javascript), if supported by browser.').'</li>'; |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('Math preview uses DragMath (Java), if supported by client OS.').'</li>'; |
| |
} |
| |
} elsif ($item eq 'usejsme') { |
| |
if ($env{'form.'.$item} eq '1') { |
| |
$resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>'; |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</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') { |
|
Line 10031 sub modify_coursedefaults {
|
Line 10477 sub modify_coursedefaults {
|
| } else { |
} else { |
| $resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
$resulttext .= '<li>'.&mt('Default quota for content uploaded via Course Editor remains default: [_1] MB',$staticdefaults{'uploadquota'}).'</li>'; |
| } |
} |
| |
} elsif ($item eq 'postsubmit') { |
| |
if ($domdefaults{'postsubmit'} eq 'off') { |
| |
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('Submit button(s) disabled on page after student makes submission').'; '; |
| |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
| |
$resulttext .= &mt('durations:').'<ul>'; |
| |
foreach my $type (@types) { |
| |
$resulttext .= '<li>'; |
| |
my $timeout; |
| |
if (ref($defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
| |
$timeout = $defaultshash{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; |
| |
} |
| |
my $display; |
| |
if ($timeout eq '0') { |
| |
$display = &mt('unlimited'); |
| |
} elsif ($timeout eq '') { |
| |
$display = &mt('[quant,_1,second] (default)',$staticdefaults{'postsubmit'}); |
| |
} else { |
| |
$display = &mt('[quant,_1,second]',$timeout); |
| |
} |
| |
if ($type eq 'community') { |
| |
$resulttext .= &mt('Communities'); |
| |
} elsif ($type eq 'official') { |
| |
$resulttext .= &mt('Official courses'); |
| |
} elsif ($type eq 'unofficial') { |
| |
$resulttext .= &mt('Unofficial courses'); |
| |
} elsif ($type eq 'textbook') { |
| |
$resulttext .= &mt('Textbook courses'); |
| |
} |
| |
$resulttext .= ' -- '.$display.'</li>'; |
| |
} |
| |
$resulttext .= '</ul>'; |
| |
} |
| |
$resulttext .= '</li>'; |
| |
} |
| } elsif ($item eq 'coursecredits') { |
} elsif ($item eq 'coursecredits') { |
| if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
if (ref($defaultshash{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
| if (($domdefaults{'officialcredits'} eq '') && |
if (($domdefaults{'officialcredits'} eq '') && |
|
Line 10466 sub modify_usersessions {
|
Line 10948 sub modify_usersessions {
|
| $changes{'spares'}{$lonhost} = \%spareschg; |
$changes{'spares'}{$lonhost} = \%spareschg; |
| } |
} |
| } |
} |
| |
$defaultshash{'usersessions'}{'offloadnow'} = {}; |
| |
my @offloadnow = &Apache::loncommon::get_env_multiple('form.offloadnow'); |
| |
my @okoffload; |
| |
if (@offloadnow) { |
| |
foreach my $server (@offloadnow) { |
| |
if (&Apache::lonnet::hostname($server) ne '') { |
| |
unless (grep(/^\Q$server\E$/,@okoffload)) { |
| |
push(@okoffload,$server); |
| |
} |
| |
} |
| |
} |
| |
if (@okoffload) { |
| |
foreach my $lonhost (@okoffload) { |
| |
$defaultshash{'usersessions'}{'offloadnow'}{$lonhost} = 1; |
| |
} |
| |
} |
| |
} |
| if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
| if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
| if (ref($changes{'spares'}) eq 'HASH') { |
if (ref($changes{'spares'}) eq 'HASH') { |
|
Line 10477 sub modify_usersessions {
|
Line 10975 sub modify_usersessions {
|
| } else { |
} else { |
| $savespares = 1; |
$savespares = 1; |
| } |
} |
| |
if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') { |
| |
foreach my $lonhost (keys(%{$domconfig{'usersessions'}{'offloadnow'}})) { |
| |
unless ($defaultshash{'usersessions'}{'offloadnow'}{$lonhost}) { |
| |
$changes{'offloadnow'} = 1; |
| |
last; |
| |
} |
| |
} |
| |
unless ($changes{'offloadnow'}) { |
| |
foreach my $lonhost (keys(%{$defaultshash{'usersessions'}{'offloadnow'}})) { |
| |
unless ($domconfig{'usersessions'}{'offloadnow'}{$lonhost}) { |
| |
$changes{'offloadnow'} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} elsif (@okoffload) { |
| |
$changes{'offloadnow'} = 1; |
| |
} |
| |
} elsif (@okoffload) { |
| |
$changes{'offloadnow'} = 1; |
| } |
} |
| |
|
| my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
my $nochgmsg = &mt('No changes made to settings for user session hosting/offloading.'); |
| if ((keys(%changes) > 0) || ($savespares)) { |
if ((keys(%changes) > 0) || ($savespares)) { |
| my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
|
Line 10491 sub modify_usersessions {
|
Line 11008 sub modify_usersessions {
|
| if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') { |
if (ref($defaultshash{'usersessions'}{'hosted'}) eq 'HASH') { |
| $domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'}; |
$domdefaults{'hostedsessions'} = $defaultshash{'usersessions'}{'hosted'}; |
| } |
} |
| |
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
| |
$domdefaults{'offloadnow'} = $defaultshash{'usersessions'}{'offloadnow'}; |
| |
} |
| } |
} |
| my $cachetime = 24*60*60; |
my $cachetime = 24*60*60; |
| &Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
&Apache::lonnet::do_cache_new('domdefaults',$dom,\%domdefaults,$cachetime); |
|
Line 10559 sub modify_usersessions {
|
Line 11079 sub modify_usersessions {
|
| $resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
| } |
} |
| } |
} |
| |
if ($changes{'offloadnow'}) { |
| |
if (ref($defaultshash{'usersessions'}{'offloadnow'}) eq 'HASH') { |
| |
if (keys(%{$defaultshash{'usersessions'}{'offloadnow'}}) > 0) { |
| |
$resulttext .= '<li>'.&mt('Switch active users on next access, for server(s):').'<ul>'; |
| |
foreach my $lonhost (sort(keys(%{$defaultshash{'usersessions'}{'offloadnow'}}))) { |
| |
$resulttext .= '<li>'.$lonhost.'</li>'; |
| |
} |
| |
$resulttext .= '</ul>'; |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.'); |
| |
} |
| |
} else { |
| |
$resulttext .= '<li>'.&mt('No servers now set to switch active users on next access.').'</li>'; |
| |
} |
| |
} |
| $resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
| } else { |
} else { |
| $resulttext = $nochgmsg; |
$resulttext = $nochgmsg; |
|
Line 10580 sub modify_loadbalancing {
|
Line 11115 sub modify_loadbalancing {
|
| my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
| &Apache::loncommon::sorted_inst_types($dom); |
&Apache::loncommon::sorted_inst_types($dom); |
| my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| |
my %libraryservers = &Apache::lonnet::get_servers($dom,'library'); |
| my @sparestypes = ('primary','default'); |
my @sparestypes = ('primary','default'); |
| my %typetitles = &sparestype_titles(); |
my %typetitles = &sparestype_titles(); |
| my $resulttext; |
my $resulttext; |
|
Line 10671 sub modify_loadbalancing {
|
Line 11207 sub modify_loadbalancing {
|
| $rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
$rule = $env{'form.loadbalancing_rules_'.$i.'_'.$type}; |
| } |
} |
| if ($rule eq 'specific') { |
if ($rule eq 'specific') { |
| $rule = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
| |
if (exists($servers{$specifiedhost})) { |
| |
$rule = $specifiedhost; |
| |
} |
| } |
} |
| $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type} = $rule; |
| if (ref($currrules{$balancer}) eq 'HASH') { |
if (ref($currrules{$balancer}) eq 'HASH') { |
|
Line 10693 sub modify_loadbalancing {
|
Line 11232 sub modify_loadbalancing {
|
| \%defaultshash,$dom); |
\%defaultshash,$dom); |
| if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
| if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
| |
my %toupdate; |
| if (ref($changes{'delete'}) eq 'ARRAY') { |
if (ref($changes{'delete'}) eq 'ARRAY') { |
| foreach my $balancer (sort(@{$changes{'delete'}})) { |
foreach my $balancer (sort(@{$changes{'delete'}})) { |
| $resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
$resulttext .= '<li>'.&mt('Load Balancing discontinued for: [_1]',$balancer).'</li>'; |
| my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
$toupdate{$balancer} = 1; |
| &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
|
| } |
} |
| } |
} |
| if (ref($changes{'add'}) eq 'ARRAY') { |
if (ref($changes{'add'}) eq 'ARRAY') { |
| foreach my $balancer (sort(@{$changes{'add'}})) { |
foreach my $balancer (sort(@{$changes{'add'}})) { |
| $resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
$resulttext .= '<li>'.&mt('Load Balancing enabled for: [_1]',$balancer); |
| |
$toupdate{$balancer} = 1; |
| } |
} |
| } |
} |
| if (ref($changes{'curr'}) eq 'HASH') { |
if (ref($changes{'curr'}) eq 'HASH') { |
| foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
foreach my $balancer (sort(keys(%{$changes{'curr'}}))) { |
| |
$toupdate{$balancer} = 1; |
| if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
if (ref($changes{'curr'}{$balancer}) eq 'HASH') { |
| if ($changes{'curr'}{$balancer}{'targets'}) { |
if ($changes{'curr'}{$balancer}{'targets'}) { |
| my %offloadstr; |
my %offloadstr; |
|
Line 10743 sub modify_loadbalancing {
|
Line 11284 sub modify_loadbalancing {
|
| if ($rule eq '') { |
if ($rule eq '') { |
| $balancetext = $ruletitles{'default'}; |
$balancetext = $ruletitles{'default'}; |
| } elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
} elsif (($rule eq 'homeserver') || ($rule eq 'externalbalancer') || |
| ($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
| $balancetext = $ruletitles{$rule}; |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
| |
foreach my $sparetype (@sparestypes) { |
| |
if (ref($defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}) eq 'ARRAY') { |
| |
map { $toupdate{$_} = 1; } (@{$defaultshash{'loadbalancing'}{$balancer}{'targets'}{$sparetype}}); |
| |
} |
| |
} |
| |
foreach my $item (@{$alltypes}) { |
| |
next if ($item =~ /^_LC_ipchange/); |
| |
my $hasrule = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$item}; |
| |
if ($hasrule eq 'homeserver') { |
| |
map { $toupdate{$_} = 1; } (keys(%libraryservers)); |
| |
} else { |
| |
unless (($hasrule eq 'default') || ($hasrule eq 'none') || ($hasrule eq 'externalbalancer')) { |
| |
if ($servers{$hasrule}) { |
| |
$toupdate{$hasrule} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
| |
$balancetext = $ruletitles{$rule}; |
| |
} else { |
| |
my $receiver = $defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}; |
| |
$balancetext = $ruletitles{'particular'}.' '.$receiver; |
| |
if ($receiver) { |
| |
$toupdate{$receiver}; |
| |
} |
| |
} |
| |
} else { |
| |
$balancetext = $ruletitles{$rule}; |
| |
} |
| } else { |
} else { |
| $balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
$balancetext = &mt('offload to [_1]',$defaultshash{'loadbalancing'}{$balancer}{'rules'}{$type}); |
| } |
} |
|
Line 10753 sub modify_loadbalancing {
|
Line 11324 sub modify_loadbalancing {
|
| } |
} |
| } |
} |
| } |
} |
| my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
if (keys(%toupdate)) { |
| &Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
my %thismachine; |
| |
my $updatedhere; |
| |
my $cachetime = 60*60*24; |
| |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
| |
foreach my $lonhost (keys(%toupdate)) { |
| |
if ($thismachine{$lonhost}) { |
| |
unless ($updatedhere) { |
| |
&Apache::lonnet::do_cache_new('loadbalancing',$dom, |
| |
$defaultshash{'loadbalancing'}, |
| |
$cachetime); |
| |
$updatedhere = 1; |
| |
} |
| |
} else { |
| |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
| |
&Apache::lonnet::remote_devalidate_cache($lonhost,[$cachekey]); |
| |
} |
| |
} |
| |
} |
| } |
} |
| } |
} |
| if ($resulttext ne '') { |
if ($resulttext ne '') { |
|
Line 10895 sub active_dc_picker {
|
Line 11483 sub active_dc_picker {
|
| my ($dcname,$dcdom) = split(':',$domcoord[0]); |
my ($dcname,$dcdom) = split(':',$domcoord[0]); |
| my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
my $user = &Apache::loncommon::plainname($dcname,$dcdom); |
| if ($inputtype eq 'radio') { |
if ($inputtype eq 'radio') { |
| $table .= '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
$table = '<input type="hidden" name="'.$name.'" value="'.$domcoord[0].'" />'.$user; |
| if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
| $table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
| } |
} |
|
Line 10904 sub active_dc_picker {
|
Line 11492 sub active_dc_picker {
|
| if (exists($currhash{$domcoord[0]})) { |
if (exists($currhash{$domcoord[0]})) { |
| $check = ' checked="checked"'; |
$check = ' checked="checked"'; |
| } |
} |
| $table .= '<span class="LC_nobreak"><label>'. |
$table = '<span class="LC_nobreak"><label>'. |
| '<input type="checkbox" name="'.$name.'" '. |
'<input type="checkbox" name="'.$name.'" '. |
| 'value="'.$domcoord[0].'"'.$check.' />'.$user; |
'value="'.$domcoord[0].'"'.$check.' />'.$user; |
| if ($user ne $dcname.':'.$dcdom) { |
if ($user ne $dcname.':'.$dcdom) { |
| $table .= ' ('.$dcname.':'.$dcdom.')'; |
$table .= ' ('.$dcname.':'.$dcdom.')'; |
| } |
} |
|
Line 11454 function toggleDisplay(domForm,caller) {
|
Line 12042 function toggleDisplay(domForm,caller) {
|
| if (caller == 'emailoptions') { |
if (caller == 'emailoptions') { |
| optionsElement = domForm.cancreate_email; |
optionsElement = domForm.cancreate_email; |
| } |
} |
| |
if (caller == 'studentsubmission') { |
| |
optionsElement = domForm.postsubmit; |
| |
} |
| if (optionsElement.length) { |
if (optionsElement.length) { |
| var currval; |
var currval; |
| for (var i=0; i<optionsElement.length; i++) { |
for (var i=0; i<optionsElement.length; i++) { |
|
Line 11495 sub devalidate_remote_domconfs {
|
Line 12086 sub devalidate_remote_domconfs {
|
| my %thismachine; |
my %thismachine; |
| map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids(); |
| my @posscached = ('domainconfig','domdefaults'); |
my @posscached = ('domainconfig','domdefaults'); |
| if (keys(%servers) > 1) { |
if (keys(%servers)) { |
| foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
| next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
| my @cached; |
my @cached; |
![[BACK]](/icons/back.gif){kind=icon}
Return to domainprefs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface