version 1.160.6.71, 2016/09/18 19:22:48
|
version 1.238, 2014/04/28 01:48:04
|
Line 213 sub handler {
|
Line 213 sub handler {
|
'quotas','autoenroll','autoupdate','autocreate', |
'quotas','autoenroll','autoupdate','autocreate', |
'directorysrch','usercreation','usermodification', |
'directorysrch','usercreation','usermodification', |
'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
'serverstatuses','requestcourses','coursedefaults', |
'serverstatuses','requestcourses','helpsettings', |
'usersessions','loadbalancing','requestauthor', |
'coursedefaults','usersessions','loadbalancing', |
'selfenrollment','inststatus'],$dom); |
'requestauthor','selfenrollment','inststatus'],$dom); |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','autocreate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','selfcreation','usermodification','scantron', |
'usercreation','selfcreation','usermodification','scantron', |
'requestcourses','requestauthor','coursecategories', |
'requestcourses','requestauthor','coursecategories', |
'serverstatuses','coursedefaults','selfenrollment', |
'serverstatuses','helpsettings', |
'usersessions'); |
'coursedefaults','selfenrollment','usersessions'); |
my %existing; |
my %existing; |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
%existing = %{$domconfig{'loadbalancing'}}; |
%existing = %{$domconfig{'loadbalancing'}}; |
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 371 sub handler {
|
Line 369 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 411 sub handler {
|
Line 407 sub handler {
|
print => \&print_serverstatuses, |
print => \&print_serverstatuses, |
modify => \&modify_serverstatuses, |
modify => \&modify_serverstatuses, |
}, |
}, |
|
'helpsettings' => |
|
{text => 'Help page settings', |
|
help => 'Domain_Configuration_Help_Settings', |
|
header => [{col1 => 'Help Settings (logged-in users)', |
|
col2 => 'Value'}], |
|
print => \&print_helpsettings, |
|
modify => \&modify_helpsettings, |
|
}, |
'coursedefaults' => |
'coursedefaults' => |
{text => 'Course/Community defaults', |
{text => 'Course/Community defaults', |
help => 'Domain_Configuration_Course_Defaults', |
help => 'Domain_Configuration_Course_Defaults', |
Line 433 sub handler {
|
Line 437 sub handler {
|
print => \&print_selfenrollment, |
print => \&print_selfenrollment, |
modify => \&modify_selfenrollment, |
modify => \&modify_selfenrollment, |
}, |
}, |
|
'privacy' => |
|
{text => 'User Privacy', |
|
help => 'Domain_Configuration_User_Privacy', |
|
header => [{col1 => 'Setting', |
|
col2 => 'Value',}], |
|
print => \&print_privacy, |
|
modify => \&modify_privacy, |
|
}, |
'usersessions' => |
'usersessions' => |
{text => 'User session hosting/offloading', |
{text => 'User session hosting/offloading', |
help => 'Domain_Configuration_User_Sessions', |
help => 'Domain_Configuration_User_Sessions', |
Line 465 sub handler {
|
Line 477 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 612 sub process_changes {
|
Line 622 sub process_changes {
|
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig); |
$output = &modify_scantron($r,$dom,$confname,$lastactref,%domconfig); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output = &modify_coursecategories($dom,$lastactref,%domconfig); |
$output = &modify_coursecategories($dom,%domconfig); |
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
$output = &modify_serverstatuses($dom,%domconfig); |
$output = &modify_serverstatuses($dom,%domconfig); |
} elsif ($action eq 'requestcourses') { |
} elsif ($action eq 'requestcourses') { |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
} elsif ($action eq 'requestauthor') { |
} elsif ($action eq 'requestauthor') { |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
$output = &modify_quotas($r,$dom,$action,$lastactref,%domconfig); |
|
} elsif ($action eq 'helpsettings') { |
|
$output = &modify_helpsettings($r,$dom,$confname,%domconfig); |
} elsif ($action eq 'coursedefaults') { |
} elsif ($action eq 'coursedefaults') { |
$output = &modify_coursedefaults($dom,$lastactref,%domconfig); |
$output = &modify_coursedefaults($dom,$lastactref,%domconfig); |
} elsif ($action eq 'selfenrollment') { |
} elsif ($action eq 'selfenrollment') { |
Line 656 sub print_config_box {
|
Line 668 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 < 4))) { |
(($action eq 'login') && ($numheaders < 3))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
if ($action eq 'usersessions') { |
if ($action eq 'usersessions') { |
Line 678 sub print_config_box {
|
Line 690 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 == 4) { |
if ($numheaders == 3) { |
$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 731 sub print_config_box {
|
Line 743 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 == 4) { |
if ($numheaders == 3) { |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
$output .= &print_login('page',$dom,$confname,$phase,$settings,\$rowtotal).' |
</table> |
</table> |
</td> |
</td> |
Line 747 sub print_config_box {
|
Line 759 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). |
$rowtotal ++; |
&print_studentcode($settings,\$rowtotal).' |
$output .= &print_studentcode($settings,\$rowtotal).' |
|
</table> |
</table> |
</td> |
</td> |
</tr> |
</tr> |
Line 781 sub print_config_box {
|
Line 771 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>'. |
&textbookcourses_javascript($settings). |
&print_textbookcourses($dom,$settings,\$rowtotal).' |
&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 800 sub print_config_box {
|
Line 779 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[4]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.' valign="top">'.&mt($item->{'header'}->[3]->{'col1'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[4]->{'col2'}).'</td> |
<td class="LC_right_item" valign="top">'.&mt($item->{'header'}->[3]->{'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 1188 sub print_login {
|
Line 1166 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 1272 sub login_choices {
|
Line 1199 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 2137 sub print_requestmail {
|
Line 2061 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 2145 sub print_studentcode {
|
Line 2070 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) eq 'HASH') { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
if (ref($settings->{'uniquecode'}) eq 'HASH') { |
foreach my $type (@crstypes) { |
foreach my $type (@crstypes) { |
$current{$type} = $settings->{'uniquecode'}{$type}; |
$current{$type} = $settings->{'uniquecode'}{$type}; |
|
} |
|
} |
} |
} |
} |
$output .= '<tr>'. |
$output .= '<tr>'. |
Line 2170 sub print_studentcode {
|
Line 2093 sub print_studentcode {
|
} |
} |
|
|
sub print_textbookcourses { |
sub print_textbookcourses { |
my ($dom,$type,$settings,$rowtotal) = @_; |
my ($dom,$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->{$type}; |
$bookshash = $settings->{'textbooks'}; |
} |
} |
my %ordered; |
my %ordered; |
if (ref($bookshash) eq 'HASH') { |
if (ref($bookshash) eq 'HASH') { |
Line 2190 sub print_textbookcourses {
|
Line 2113 sub print_textbookcourses {
|
} |
} |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
my $switchserver = &check_switchserver($dom,$confname); |
my $switchserver = &check_switchserver($dom,$confname); |
my $maxnum = scalar(keys(%ordered)); |
$maxnum = scalar(keys(%ordered)); |
my $datatable; |
my $datatable = &textbookcourses_javascript(\%ordered); |
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 2199 sub print_textbookcourses {
|
Line 2122 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,$publisher,$image,$imgsrc,$cdom,$cnum); |
my ($subject,$title,$author,$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'}; |
if ($type eq 'textbooks') { |
$author = $bookshash->{$key}->{'author'}; |
$publisher = $bookshash->{$key}->{'publisher'}; |
$image = $bookshash->{$key}->{'image'}; |
$author = $bookshash->{$key}->{'author'}; |
if ($image ne '') { |
$image = $bookshash->{$key}->{'image'}; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
if ($image ne '') { |
my $imagethumb = "$path/tn-".$imagefile; |
my ($path,$imagefile) = ($image =~ m{^(.+)/([^/]+)$}); |
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
my $imagethumb = "$path/tn-".$imagefile; |
|
$imgsrc = '<img src="'.$imagethumb.'" alt="'.&mt('Textbook image').'" />'; |
|
} |
|
} |
} |
} |
} |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$type".'_'."$key','$type'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'$key'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
.'<select name="'.$type.'_'.$key.'"'.$chgstr.'>'; |
.'<select name="'.$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 2226 sub print_textbookcourses {
|
Line 2146 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="'.$type.'_del" value="'.$key.'" />'. |
'<label><input type="checkbox" name="book_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="'.$type.'_subject_'.$i.'" value="'.$subject.'" /></span> '. |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="book_subject_'.$i.'" value="'.$subject.'" /></span> '. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_title_'.$i.'" value="'.$title.'" /></span> '; |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="book_title_'.$i.'" value="'.$title.'" /></span> '. |
if ($type eq 'textbooks') { |
(' 'x2). |
$datatable .= (' 'x2). |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="book_author_'.$i.'" value="'.$author.'" /></span> '. |
'<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_publisher_'.$i.'" value="'.$publisher.'" /></span> '. |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_author_'.$i.'" value="'.$author.'" /></span> '. |
if ($image) { |
(' 'x2). |
$datatable .= '<span class="LC_nobreak">'. |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
$imgsrc. |
if ($image) { |
'<label><input type="checkbox" name="book_image_del"'. |
$datatable .= '<span class="LC_nobreak">'. |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
$imgsrc. |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
} |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
if ($switchserver) { |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
} |
} else { |
if ($switchserver) { |
$datatable .= '<input type="file" name="book_image_'.$i.'" value="" />'; |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
|
} else { |
|
$datatable .= '<input type="file" name="'.$type.'_image_'.$i.'" value="" />'; |
|
} |
|
} |
} |
$datatable .= '<input type="hidden" name="'.$type.'_id_'.$i.'" value="'.$type.'_'.$key.'" /></span> '. |
$datatable .= '<input type="hidden" name="book_id_'.$i.'" value="'.$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,'."'$type"."_addbook_pos','$type'".');"'; |
my $chgstr = ' onchange="javascript:reorderBooks(this.form,'."'addbook_pos'".');"'; |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
'<input type="hidden" name="'.$type.'_maxnum" value="'.$maxnum.'" />'."\n". |
'<input type="hidden" name="book_maxnum" value="'.$maxnum.'" />'."\n". |
'<select name="'.$type.'_addbook_pos"'.$chgstr.'>'; |
'<select name="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 2272 sub print_textbookcourses {
|
Line 2188 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="'.$type.'_addbook" value="1" />'.&mt('Add').'</td>'."\n". |
'<input type="checkbox" name="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="'.$type.'_addbook_subject" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Subject:').'<input type="text" size="15" name="addbook_subject" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="'.$type.'_addbook_title" value="" /></span> '."\n". |
'<span class="LC_nobreak">'.&mt('Title:').'<input type="text" size="30" name="addbook_title" value="" /></span> '."\n". |
(' 'x2); |
(' 'x2). |
if ($type eq 'textbooks') { |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="addbook_author" value="" /></span> '."\n". |
$datatable .= '<span class="LC_nobreak">'.&mt('Publisher:').'<input type="text" size="10" name="'.$type.'_addbook_publisher" value="" /></span> '."\n". |
(' 'x2). |
(' 'x2). |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
'<span class="LC_nobreak">'.&mt('Author(s):').'<input type="text" size="25" name="'.$type.'_addbook_author" value="" /></span> '."\n". |
if ($switchserver) { |
(' 'x2). |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
'<span class="LC_nobreak">'.&mt('Image:').' '; |
} else { |
if ($switchserver) { |
$datatable .= '<input type="file" name="addbook_image" value="" />'; |
$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'},$type.'_addbook_cdom'). |
&Apache::loncommon::select_dom_form($env{'request.role.domain'},'addbook_cdom'). |
'<input type="text" size="25" name="'.$type.'_addbook_cnum" value="" />'. |
'<input type="text" size="25" name="addbook_cnum" value="" />'. |
&Apache::loncommon::selectcourse_link |
&Apache::loncommon::selectcourse_link |
('display',$type.'_addbook_cnum',$type.'_addbook_cdom',undef,undef,undef,'Course'); |
('display','addbook_cnum','addbook_cdom',undef,undef,undef,'Course'); |
'</span></td>'."\n". |
'</span></td>'."\n". |
'</tr>'."\n"; |
'</tr>'."\n"; |
$itemcount ++; |
$itemcount ++; |
Line 2303 sub print_textbookcourses {
|
Line 2215 sub print_textbookcourses {
|
} |
} |
|
|
sub textbookcourses_javascript { |
sub textbookcourses_javascript { |
my ($settings) = @_; |
my ($textbooks) = @_; |
return unless(ref($settings) eq 'HASH'); |
return unless(ref($textbooks) eq 'HASH'); |
my (%ordered,%total,%jstext); |
my $num = scalar(keys(%{$textbooks})); |
foreach my $type ('textbooks','templates') { |
my @jsarray; |
$total{$type} = 0; |
foreach my $item (sort {$a <=> $b } (keys(%{$textbooks}))) { |
if (ref($settings->{$type}) eq 'HASH') { |
push(@jsarray,$textbooks->{$item}); |
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,caller) { |
function reorderBooks(form,item) { |
var changedVal; |
var changedVal; |
$jstext{'textbooks'}; |
$jstext |
$jstext{'templates'}; |
var newpos = 'addbook_pos'; |
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 2347 $jstext{'templates'};
|
Line 2239 $jstext{'templates'};
|
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; |
} |
} |
if (caller == 'textbooks') { |
for (var i=0; i<textbooks.length; i++) { |
for (var i=0; i<textbooks.length; i++) { |
var elementName = textbooks[i]; |
var elementName = 'textbooks_'+textbooks[i]; |
if (elementName != item) { |
if (elementName != item) { |
if (form.elements[elementName]) { |
if (form.elements[elementName]) { |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
current[currVal] = elementName; |
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 2398 ENDSCRIPT
|
Line 2277 ENDSCRIPT
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe); |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (exists($settings->{'run'})) { |
if (exists($settings->{'run'})) { |
if ($settings->{'run'} eq '0') { |
if ($settings->{'run'} eq '0') { |
Line 2432 sub print_autoenroll {
|
Line 2311 sub print_autoenroll {
|
if (exists($settings->{'sender_domain'})) { |
if (exists($settings->{'sender_domain'})) { |
$defdom = $settings->{'sender_domain'}; |
$defdom = $settings->{'sender_domain'}; |
} |
} |
if (exists($settings->{'autofailsafe'})) { |
|
$failsafe = $settings->{'autofailsafe'}; |
|
} |
|
} else { |
} else { |
if ($autorun) { |
if ($autorun) { |
$runon = ' checked="checked" '; |
$runon = ' checked="checked" '; |
Line 2470 sub print_autoenroll {
|
Line 2346 sub print_autoenroll {
|
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="autoassign_coowners"'. |
'<label><input type="radio" name="autoassign_coowners"'. |
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
'</tr><tr>'. |
'</tr>'; |
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
$$rowtotal += 3; |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="autoenroll_failsafe"'. |
|
' value="'.$failsafe.'" size="4" /></td></tr>'; |
|
$$rowtotal += 4; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2590 sub print_autocreate {
|
Line 2462 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 .= &mt('Course creation processed as: (choose Dom. Coord.)'). |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
'</td><td class="LC_left_item">'; |
&mt('Course creation processed as: (choose Dom. Coord.)'). |
|
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
} else { |
} else { |
$datatable .= &mt('Course creation processed as:'). |
$datatable .= $dctable.'</td></tr>'; |
'</td><td class="LC_right_item">'; |
|
} |
} |
$datatable .= $dctable.'</td></tr>'; |
|
$$rowtotal += $rows; |
$$rowtotal += $rows; |
return $datatable; |
return $datatable; |
} |
} |
Line 2833 sub print_helpsettings {
|
Line 2703 sub print_helpsettings {
|
|
|
sub radiobutton_prefs { |
sub radiobutton_prefs { |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
my ($settings,$toggles,$defaultchecked,$choices,$itemcount,$onclick, |
$additional,$align) = @_; |
$additional) = @_; |
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 2867 sub radiobutton_prefs {
|
Line 2737 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>'. |
if ($align eq 'left') { |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
$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 2892 sub print_coursedefaults {
|
Line 2756 sub print_coursedefaults {
|
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my $itemcount = 1; |
my $itemcount = 1; |
my %choices = &Apache::lonlocal::texthash ( |
my %choices = &Apache::lonlocal::texthash ( |
|
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
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', |
|
canclone => "People who may clone a course (besides course's owner and coordinators)", |
|
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
|
); |
); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
postsubmit => 60, |
|
mysqltables => 172800, |
|
); |
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
%defaultchecked = ( |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
'uselcmath' => 'on', |
@toggles = ('canuse_pdfforms'); |
'usejsme' => 'on', |
|
'canclone' => 'none', |
|
); |
|
@toggles = ('uselcmath','usejsme'); |
|
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
\%choices,$itemcount); |
\%choices,$itemcount); |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
|
$datatable .= |
|
'<tr'.$css_class.'><td valign="top">'. |
|
'<span class="LC_nobreak">'.$choices{'canclone'}. |
|
'</span></td><td class="LC_left_item">'; |
|
my $currcanclone = 'none'; |
|
my $onclick; |
|
my @cloneoptions = ('none','domain'); |
|
my %clonetitles = ( |
|
none => 'No additional course requesters', |
|
domain => "Any course requester in course's domain", |
|
instcode => 'Course requests for official courses ...', |
|
); |
|
my (%codedefaults,@code_order,@posscodes); |
|
if (&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults, |
|
\@code_order) eq 'ok') { |
|
if (@code_order > 0) { |
|
push(@cloneoptions,'instcode'); |
|
$onclick = ' onclick="toggleDisplay(this.form,'."'cloneinstcode'".');"'; |
|
} |
|
} |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'canclone'}) { |
|
if (ref($settings->{'canclone'}) eq 'HASH') { |
|
if (ref($settings->{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
if (@code_order > 0) { |
|
$currcanclone = 'instcode'; |
|
@posscodes = @{$settings->{'canclone'}{'instcode'}}; |
|
} |
|
} |
|
} elsif ($settings->{'canclone'} eq 'domain') { |
|
$currcanclone = $settings->{'canclone'}; |
|
} |
|
} |
|
} |
|
foreach my $option (@cloneoptions) { |
|
my ($checked,$additional); |
|
if ($currcanclone eq $option) { |
|
$checked = ' checked="checked"'; |
|
} |
|
if ($option eq 'instcode') { |
|
if (@code_order) { |
|
my $show = 'none'; |
|
if ($checked) { |
|
$show = 'block'; |
|
} |
|
$additional = '<div id="cloneinstcode" style="display:'.$show.'" />'. |
|
&mt('Institutional codes for new and cloned course have identical:'). |
|
'<br />'; |
|
foreach my $item (@code_order) { |
|
my $codechk; |
|
if ($checked) { |
|
if (grep(/^\Q$item\E$/,@posscodes)) { |
|
$codechk = ' checked="checked"'; |
|
} |
|
} |
|
$additional .= '<label>'. |
|
'<input type="checkbox" name="clonecode" value="'.$item.'"'.$codechk.' />'. |
|
$item.'</label>'; |
|
} |
|
$additional .= (' 'x2).'('.&mt('check as many as needed').')</div>'; |
|
} |
|
} |
|
$datatable .= |
|
'<span class="LC_nobreak"><label><input type="radio" name="canclone"'.$checked. |
|
' value="'.$option.'"'.$onclick.' />'.$clonetitles{$option}. |
|
'</label> '.$additional.'</span><br />'; |
|
} |
|
$datatable .= '</td>'. |
|
'</tr>'; |
|
$itemcount ++; |
|
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
my ($currdefresponder,$def_official_credits,$def_unofficial_credits,$def_textbook_credits, |
|
%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 3001 sub print_coursedefaults {
|
Line 2784 sub print_coursedefaults {
|
} |
} |
} |
} |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
if (ref($settings->{'coursecredits'}) eq 'HASH') { |
foreach my $type (@types) { |
$def_official_credits = $settings->{'coursecredits'}->{'official'}; |
next if ($type eq 'community'); |
$def_unofficial_credits = $settings->{'coursecredits'}->{'unofficial'}; |
$defcredits{$type} = $settings->{'coursecredits'}->{$type}; |
$def_textbook_credits = $settings->{'coursecredits'}->{'textbook'}; |
if ($defcredits{$type} ne '') { |
if (($def_official_credits ne '') || ($def_unofficial_credits ne '') || |
$currusecredits = 1; |
($def_textbook_credits ne '')) { |
} |
$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'}; |
|
} |
|
} |
|
if (ref($settings->{'mysqltables'}) eq 'HASH') { |
|
foreach my $type (keys(%{$settings->{'mysqltables'}})) { |
|
$currmysql{$type} = $settings->{'mysqltables'}{$type}; |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
$currmysql{$type} = $staticdefaults{'mysqltables'}; |
|
} |
|
} |
|
} else { |
|
foreach my $type (@types) { |
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
|
} |
} |
} |
} |
if (!$currdefresponder) { |
if (!$currdefresponder) { |
Line 3085 sub print_coursedefaults {
|
Line 2831 sub print_coursedefaults {
|
$display = 'block'; |
$display = 'block'; |
} |
} |
my $additional = '<div id="credits" style="display: '.$display.'">'. |
my $additional = '<div id="credits" style="display: '.$display.'">'. |
'<i>'.&mt('Default credits').'</i><br /><table><tr>'; |
'<span class="LC_nobreak">'. |
foreach my $type (@types) { |
&mt('Default credits for official courses [_1]', |
next if ($type eq 'community'); |
'<input type="text" name="official_credits" value="'. |
$additional .= '<td align="center">'.&mt($type).'<br />'. |
$def_official_credits.'" size="3" />'). |
'<input type="text" name="'.$type.'_credits"'. |
'</span><br />'. |
' value="'.$defcredits{$type}.'" size="3" /></td>'; |
'<span class="LC_nobreak">'. |
} |
&mt('Default credits for unofficial courses [_1]', |
$additional .= '</tr></table></div>'."\n"; |
'<input type="text" name="unofficial_credits" value="'. |
|
$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 3100 sub print_coursedefaults {
|
Line 2853 sub print_coursedefaults {
|
}; |
}; |
(my $table,$itemcount) = |
(my $table,$itemcount) = |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick,$additional,'left'); |
\%choices,$itemcount,$onclick,$additional); |
$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'); |
|
$current = { |
|
'postsubmit' => $postsubmitclient, |
|
}; |
|
($table,$itemcount) = |
|
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
|
\%choices,$itemcount,$onclick,$additional,'left'); |
|
$datatable .= $table; |
$datatable .= $table; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
|
$datatable .= '<tr'.$css_class.'><td><span class="LC_nobreak">'. |
|
$choices{'mysqltables'}. |
|
'</span></td>'. |
|
'<td align="right" class="LC_right_item">'. |
|
'<table><tr>'; |
|
foreach my $type (@types) { |
|
$datatable .= '<td align="center">'.&mt($type).'<br />'. |
|
'<input type="text" name="mysqltables_'.$type.'"'. |
|
' value="'.$currmysql{$type}.'" size="5" /></td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'."\n"; |
|
$itemcount ++; |
$itemcount ++; |
|
|
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
Line 3344 sub print_validation_rows {
|
Line 3060 sub print_validation_rows {
|
} |
} |
if ($caller eq 'requestcourses') { |
if ($caller eq 'requestcourses') { |
my %currhash; |
my %currhash; |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'validation'}) eq 'HASH') { |
if (ref($settings->{'validation'}) eq 'HASH') { |
if ($settings->{'validation'}{'dc'} ne '') { |
if ($settings->{'validation'}{'dc'} ne '') { |
$currhash{$settings->{'validation'}{'dc'}} = 1; |
$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 .= &mt('Course creation processed as: (choose Dom. Coord.)'); |
$datatable .= '</td></tr><tr class="LC_odd_row"><td>'. |
|
&mt('Course creation processed as: (choose Dom. Coord.)'). |
|
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
} else { |
} else { |
$datatable .= &mt('Course creation processed as: '); |
$datatable .= $dctable.'</td></tr>'; |
} |
} |
$datatable .= '</td><td class="LC_left_item">'.$dctable.'</td></tr>'; |
|
$itemcount ++; |
$itemcount ++; |
} |
} |
if (ref($rowtotal)) { |
if (ref($rowtotal)) { |
Line 3384 sub print_usersessions {
|
Line 3097 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); |
my $curroffloadnow; |
$datatable .= &spares_row($dom,\%servers,\%spareid,\%serverhomes,\%altids,$rowtotal); |
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 3640 sub current_offloads_to {
|
Line 3347 sub current_offloads_to {
|
} |
} |
|
|
sub spares_row { |
sub spares_row { |
my ($dom,$servers,$spareid,$serverhomes,$altids,$curroffloadnow,$rowtotal) = @_; |
my ($dom,$servers,$spareid,$serverhomes,$altids,$rowtotal) = @_; |
my $css_class; |
my $css_class; |
my $numinrow = 4; |
my $numinrow = 4; |
my $itemcount = 1; |
my $itemcount = 1; |
Line 3660 sub spares_row {
|
Line 3367 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>').'</span><br />'. |
,'<b>'.$server.'</b>'). |
'<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 3898 sub print_loadbalancing {
|
Line 3596 sub print_loadbalancing {
|
$disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
} |
} |
$targettable .= |
$targettable .= |
'<td><span class="LC_nobreak"><label>'. |
'<td><label><input type="checkbox" name="loadbalancing_target_'.$balnum.'_'.$sparetype.'"'. |
'<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></span></td>'; |
'</span></label></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 3991 sub loadbalancing_rules {
|
Line 3688 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')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
if ($dom ne &Apache::lonnet::host_domain($lonhost)) { |
$current = ''; |
$current = ''; |
} |
} |
Line 4043 sub loadbalance_rule_row {
|
Line 3740 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','specific'); |
@rulenames = ('balancer','offloadedto'); |
} else { |
} else { |
@rulenames = ('default','homeserver'); |
@rulenames = ('default','homeserver'); |
if ($type eq '_LC_external') { |
if ($type eq '_LC_external') { |
Line 4054 sub loadbalance_rule_row {
|
Line 3751 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')) { |
if (($type eq '_LC_external') || ($type eq '_LC_internetdom') || ($type eq '_LC_ipchange')) { |
$style = $homedom_div_style; |
$style = $homedom_div_style; |
} |
} |
my $space; |
my $space; |
Line 4105 sub loadbalance_rule_row {
|
Line 3802 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.' /> '; |
')"'.$checked.' /> '.$ruletitles{$rulenames[$i]}. |
if (($rulenames[$i] eq 'specific') && ($type =~ /^_LC_ipchange/)) { |
'</label>'.$extra.'</span><br />'."\n"; |
$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 4126 sub offloadtype_text {
|
Line 3818 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 4390 sub print_selfcreation {
|
Line 4081 sub print_selfcreation {
|
$$rowtotal ++; |
$$rowtotal ++; |
} |
} |
} |
} |
my @fields = ('lastname','firstname','middlename','permanentemail','id','inststatus'); |
|
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
|
$fieldtitles{'inststatus'} = &mt('Institutional status'); |
|
my $rem; |
|
my $numperrow = 2; |
|
my $css_class = $$rowtotal%2?' class="LC_odd_row"':''; |
|
$datatable .= '<tr'.$css_class.'>'. |
|
'<td class="LC_left_item">'.&mt('Mapping of Shibboleth environment variable names to user data fields (SSO auth)').'</td>'. |
|
'<td class="LC_left_item">'."\n". |
|
'<table><tr><td>'."\n"; |
|
for (my $i=0; $i<@fields; $i++) { |
|
$rem = $i%($numperrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $currval; |
|
if (ref($createsettings) eq 'HASH') { |
|
if (ref($createsettings->{'shibenv'}) eq 'HASH') { |
|
$currval = $createsettings->{'shibenv'}{$fields[$i]}; |
|
} |
|
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak">'. |
|
'<input type="text" name="shibenv_'.$fields[$i].'" '. |
|
'value="'.$currval.'" size="10" /> '. |
|
$fieldtitles{$fields[$i]}.'</span></td>'; |
|
} |
|
my $colsleft = $numperrow - $rem; |
|
if ($colsleft > 1 ) { |
|
$datatable .= '<td colspan="'.$colsleft.'" class="LC_left_item">'. |
|
' </td>'; |
|
} elsif ($colsleft == 1) { |
|
$datatable .= '<td class="LC_left_item"> </td>'; |
|
} |
|
$datatable .= '</tr></table></td></tr>'; |
|
$$rowtotal ++; |
|
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usermodification'],$dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
Line 4439 sub print_selfcreation {
|
Line 4091 sub print_selfcreation {
|
foreach my $status (@{$types}) { |
foreach my $status (@{$types}) { |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
$datatable .= &modifiable_userdata_row('selfcreate',$status,$domconf{'usermodification'}, |
$numinrow,$$rowtotal,$usertypes); |
$numinrow,$$rowtotal,$usertypes); |
$$rowtotal ++; |
$$rowtotal ++; |
} |
} |
} |
} |
} else { |
} else { |
Line 4485 sub print_selfcreation {
|
Line 4137 sub print_selfcreation {
|
$additional .= '</div>'."\n"; |
$additional .= '</div>'."\n"; |
|
|
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
($datatable,$itemcount) = &radiobutton_prefs(\%radiohash,\@toggles,\%defaultchecked, |
\%choices,$$rowtotal,$onclick,$additional); |
\%choices,$itemcount,$onclick,$additional); |
$$rowtotal ++; |
$$rowtotal += $itemcount; |
$datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); |
$datatable .= &print_requestmail($dom,'selfcreation',$createsettings,$rowtotal); |
$$rowtotal ++; |
$$rowtotal ++; |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
Line 4567 sub email_as_username {
|
Line 4219 sub email_as_username {
|
|
|
sub captcha_choice { |
sub captcha_choice { |
my ($context,$settings,$itemcount) = @_; |
my ($context,$settings,$itemcount) = @_; |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext, |
my ($keyentry,$currpub,$currpriv,%checked,$rowname,$pubtext,$privtext); |
$vertext,$currver); |
|
my %lt = &captcha_phrases(); |
my %lt = &captcha_phrases(); |
$keyentry = 'hidden'; |
$keyentry = 'hidden'; |
if ($context eq 'cancreate') { |
if ($context eq 'cancreate') { |
Line 4586 sub captcha_choice {
|
Line 4237 sub captcha_choice {
|
$pubtext = $lt{'pub'}; |
$pubtext = $lt{'pub'}; |
$privtext = $lt{'priv'}; |
$privtext = $lt{'priv'}; |
$keyentry = 'text'; |
$keyentry = 'text'; |
$vertext = $lt{'ver'}; |
|
$currver = $settings->{'recaptchaversion'}; |
|
if ($currver ne '2') { |
|
$currver = 1; |
|
} |
|
} |
} |
if (ref($settings->{'recaptchakeys'}) eq 'HASH') { |
if (ref($settings->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $settings->{'recaptchakeys'}{'public'}; |
$currpub = $settings->{'recaptchakeys'}{'public'}; |
Line 4624 sub captcha_choice {
|
Line 4270 sub captcha_choice {
|
$currpub.'" size="40" /></span><br />'."\n". |
$currpub.'" size="40" /></span><br />'."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchaprivtxt">'.$privtext.'</span> '."\n". |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'. |
'<input type="'.$keyentry.'" id="'.$context.'_recaptchapriv" name="'.$context.'_recaptchapriv" value="'. |
$currpriv.'" size="40" /></span><br />'. |
$currpriv.'" size="40" /></span></td></tr></table>'."\n". |
'<span class="LC_nobreak"><span id="'.$context.'_recaptchavertxt">'.$vertext.'</span> '."\n". |
|
'<input type="'.$keyentry.'" id="'.$context.'_recaptchaversion" name="'.$context.'_recaptchaversion" value="'. |
|
$currver.'" size="3" /></span><br />'. |
|
'</td></tr></table>'."\n". |
|
'</td></tr>'; |
'</td></tr>'; |
return $output; |
return $output; |
} |
} |
Line 4811 sub print_defaults {
|
Line 4453 sub print_defaults {
|
my $includeempty = 1; |
my $includeempty = 1; |
$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); |
$datatable .= &Apache::loncommon::select_datelocale($item,$defaults{$item},undef,$includeempty); |
} elsif ($item eq 'lang_def') { |
} elsif ($item eq 'lang_def') { |
my $includeempty = 1; |
my %langchoices = &get_languages_hash(); |
$datatable .= &Apache::loncommon::select_language($item,$defaults{$item},$includeempty); |
$langchoices{''} = 'No language preference'; |
|
%langchoices = &Apache::lonlocal::texthash(%langchoices); |
|
$datatable .= &Apache::loncommon::select_form($defaults{$item},$item, |
|
\%langchoices); |
} else { |
} else { |
my $size; |
my $size; |
if ($item eq 'portal_def') { |
if ($item eq 'portal_def') { |
Line 4881 sub print_defaults {
|
Line 4526 sub print_defaults {
|
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
} |
} |
$datatable .= '</select> '.&mt('Internal ID:'). |
$datatable .= '</select> '.&mt('Internal ID:'). |
'<input type="text" size="10" name="addinststatus" value="" />'. |
'<input type="text" size="10" name="addinststatus" value="" /></span>'. |
' '.&mt('(new)'). |
' '.&mt('(new)'). |
'</span></td><td class="LC_left_item"><span class="LC_nobreak">'. |
'</span></td><td class="LC_left_item"><span class="LC_nobreak">'. |
&mt('Name displayed:'). |
&mt('Name displayed:'). |
Line 5418 sub serverstatus_pages {
|
Line 5063 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','coursecatalog'); |
'uniquecodes','diskusage'); |
} |
} |
|
|
sub defaults_javascript { |
sub defaults_javascript { |
my ($settings) = @_; |
my ($settings) = @_; |
return unless (ref($settings) eq 'HASH'); |
my ($output,$jstext); |
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 ++; |
my $jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
$jstext = ' var inststatuses = Array('."'".join("','",@{$settings->{'inststatusorder'}})."'".');'; |
return <<"ENDSCRIPT"; |
return <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 5508 sub coursecategories_javascript {
|
Line 5153 sub coursecategories_javascript {
|
} |
} |
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); |
my $instcode_reserved = &mt('The name: [_1] is a reserved category.','"instcode"'); |
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"'); |
my $communities_reserved = &mt('The name: [_1] is a reserved category.','"communities"'); |
my $choose_again = "\n".&mt('Please use a different name for the new top level category.'); |
my $choose_again = '\\n'.&mt('Please use a different name for the new top level category.'); |
&js_escape(\$instcode_reserved); |
|
&js_escape(\$communities_reserved); |
|
&js_escape(\$choose_again); |
|
$output = <<"ENDSCRIPT"; |
$output = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
Line 6026 sub modify_login {
|
Line 5668 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 6069 sub modify_login {
|
Line 5710 sub modify_login {
|
$changes{'loginvia'}{$lonhost} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
} |
} |
if ($item eq 'exempt') { |
if ($item eq 'exempt') { |
$new = &check_exempt_addresses($new); |
$new =~ s/^\s+//; |
|
$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 6181 sub modify_login {
|
Line 5837 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'}{'headtag'}{$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 6360 sub modify_login {
|
Line 5937 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 6410 sub modify_login {
|
Line 5968 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]',$privkey).'</li>'; |
$chgtxt .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
} |
} |
$chgtxt .= '</ul>'; |
$chgtxt .= '</ul>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
$resulttext .= '<li>'.$chgtxt.'</li>'; |
} |
} |
} elsif ($item eq 'recaptchaversion') { |
|
if (ref($loginhash{'login'}) eq 'HASH') { |
|
if ($loginhash{'login'}{'captcha'} eq 'recaptcha') { |
|
$resulttext .= '<li>'.&mt('ReCAPTCHA for helpdesk form set to version [_1]',$loginhash{'login'}{'recaptchaversion'}). |
|
'</li>'; |
|
} |
|
} |
|
} else { |
} else { |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{$item} set to $offon[$env{'form.'.$item}]").'</li>'; |
} |
} |
Line 6441 sub modify_login {
|
Line 5992 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 7263 sub modify_quotas {
|
Line 6793 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') { |
foreach my $type ('textbooks','templates') { |
if ($env{'form.addbook'}) { |
@{$allpos{$type}} = (); |
if (($env{'form.addbook_cnum'} =~ /^$match_courseid$/) && |
my $invalid; |
($env{'form.addbook_cdom'} =~ /^$match_domain$/)) { |
if ($type eq 'textbooks') { |
if (&Apache::lonnet::homeserver($env{'form.addbook_cnum'}, |
$invalid = &mt('Invalid LON-CAPA course for textbook'); |
$env{'form.addbook_cdom'}) eq 'no_host') { |
} else { |
$errors .= '<li><span class="LC_error">'.&mt('Invalid LON-CAPA course for textbook'). |
$invalid = &mt('Invalid LON-CAPA course for template'); |
'</span></li>'; |
} |
} else { |
if ($env{'form.'.$type.'_addbook'}) { |
$newbook = $env{'form.addbook_cdom'}.'_'.$env{'form.addbook_cnum'}; |
if (($env{'form.'.$type.'_addbook_cnum'} =~ /^$match_courseid$/) && |
my $position = $env{'form.addbook_pos'}; |
($env{'form.'.$type.'_addbook_cdom'} =~ /^$match_domain$/)) { |
$position =~ s/\D+//g; |
if (&Apache::lonnet::homeserver($env{'form.'.$type.'_addbook_cnum'}, |
if ($position ne '') { |
$env{'form.'.$type.'_addbook_cdom'}) eq 'no_host') { |
$allpos[$position] = $newbook; |
$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 7324 sub modify_quotas {
|
Line 6848 sub modify_quotas {
|
$changes{'uniquecode'} = 1; |
$changes{'uniquecode'} = 1; |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
foreach my $type ('textbooks','templates') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
my %deletions; |
my %deletions; |
my @todelete = &Apache::loncommon::get_env_multiple('form.book_del'); |
my @todelete = &Apache::loncommon::get_env_multiple('form.'.$type.'_del'); |
if (@todelete) { |
if (@todelete) { |
map { $deletions{$_} = 1; } @todelete; |
map { $deletions{$_} = 1; } @todelete; |
} |
} |
my %imgdeletions; |
my %imgdeletions; |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.book_image_del'); |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.'.$type.'_image_del'); |
if (@todeleteimages) { |
if (@todeleteimages) { |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
} |
} |
my $maxnum = $env{'form.book_maxnum'}; |
my $maxnum = $env{'form.'.$type.'_maxnum'}; |
for (my $i=0; $i<=$maxnum; $i++) { |
for (my $i=0; $i<=$maxnum; $i++) { |
my $key = $env{'form.book_id_'.$i}; |
my $itemid = $env{'form.'.$type.'_id_'.$i}; |
if (ref($domconfig{$action}{'textbooks'}{$key}) eq 'HASH') { |
my ($key) = ($itemid =~ /^\Q$type\E_(\w+)$/); |
if ($deletions{$key}) { |
if (ref($domconfig{$action}{$type}{$key}) eq 'HASH') { |
if ($domconfig{$action}{'textbooks'}{$key}{'image'}) { |
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; |
|
} |
|
if ($imgdeletions{$key}) { |
|
$changes{$type}{$key} = 1; |
|
#FIXME need to obsolete item in RES space |
#FIXME need to obsolete item in RES space |
} elsif ($env{'form.'.$type.'_image_'.$i.'.filename'}) { |
} |
my ($cdom,$cnum) = split(/_/,$key); |
next; |
my ($imgurl,$error) = &process_textbook_image($r,$dom,$confname,$type.'_image_'.$i, |
} else { |
$cdom,$cnum,$type,$configuserok, |
my $newpos = $env{'form.'.$key}; |
$switchserver,$author_ok); |
$newpos =~ s/\D+//g; |
if ($imgurl) { |
foreach my $item ('subject','title','author') { |
$confhash{$type}{$key}{'image'} = $imgurl; |
$confhash{'textbooks'}{$key}{$item} = $env{'form.book_'.$item.'_'.$i}; |
$changes{$type}{$key} = 1; |
if ($domconfig{$action}{'textbooks'}{$key}{$item} ne $confhash{'textbooks'}{$key}{$item}) { |
|
$changes{'textbooks'}{$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 7393 sub modify_quotas {
|
Line 6912 sub modify_quotas {
|
} |
} |
} |
} |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
foreach my $type ('textbooks','templates') { |
if ($newbook) { |
if ($newbook{$type}) { |
$changes{'textbooks'}{$newbook} = 1; |
$changes{$type}{$newbook{$type}} = 1; |
foreach my $item ('subject','title','author') { |
foreach my $item ('subject','title','publisher','author') { |
$env{'form.addbook_'.$item} =~ s/(`)/'/g; |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
if ($env{'form.addbook_'.$item}) { |
($type eq 'template')); |
$confhash{'textbooks'}{$newbook}{$item} = $env{'form.addbook_'.$item}; |
$env{'form.'.$type.'_addbook_'.$item} =~ s/(`)/'/g; |
} |
if ($env{'form.'.$type.'_addbook_'.$item}) { |
} |
$confhash{$type}{$newbook{$type}}{$item} = $env{'form.'.$type.'_addbook_'.$item}; |
if ($env{'form.addbook_image.filename'} ne '') { |
} |
my ($cdom,$cnum) = split(/_/,$newbook); |
} |
my ($imageurl,$error) = |
if ($type eq 'textbooks') { |
&process_textbook_image($r,$dom,$confname,'addbook_image',$cdom,$cnum,$configuserok, |
if ($env{'form.'.$type.'_addbook_image.filename'} ne '') { |
$switchserver,$author_ok); |
my ($cdom,$cnum) = split(/_/,$newbook{$type}); |
if ($imageurl) { |
my ($imageurl,$error) = |
$confhash{'textbooks'}{$newbook}{'image'} = $imageurl; |
&process_textbook_image($r,$dom,$confname,$type.'_addbook_image',$cdom,$cnum,$type, |
} |
$configuserok,$switchserver,$author_ok); |
if ($error) { |
if ($imageurl) { |
&Apache::lonnet::logthis($error); |
$confhash{$type}{$newbook{$type}}{'image'} = $imageurl; |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
} |
|
if ($error) { |
|
&Apache::lonnet::logthis($error); |
|
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
|
} |
|
} |
|
} |
} |
} |
} |
if (@{$allpos{$type}} > 0) { |
} |
my $idx = 0; |
if (@allpos > 0) { |
foreach my $item (@{$allpos{$type}}) { |
my $idx = 0; |
if ($item ne '') { |
foreach my $item (@allpos) { |
$confhash{$type}{$item}{'order'} = $idx; |
if ($item ne '') { |
if (ref($domconfig{$action}) eq 'HASH') { |
$confhash{'textbooks'}{$item}{'order'} = $idx; |
if (ref($domconfig{$action}{$type}) eq 'HASH') { |
if (ref($domconfig{$action}) eq 'HASH') { |
if (ref($domconfig{$action}{$type}{$item}) eq 'HASH') { |
if (ref($domconfig{$action}{'textbooks'}) eq 'HASH') { |
if ($domconfig{$action}{$type}{$item}{'order'} ne $idx) { |
if (ref($domconfig{$action}{'textbooks'}{$item}) eq 'HASH') { |
$changes{$type}{$item} = 1; |
if ($domconfig{$action}{'textbooks'}{$item}{'order'} ne $idx) { |
} |
$changes{'textbooks'}{$item} = 1; |
} |
} |
} |
} |
} |
} |
$idx ++; |
|
} |
} |
|
$idx ++; |
} |
} |
} |
} |
} |
} |
Line 7447 sub modify_quotas {
|
Line 6960 sub modify_quotas {
|
if (@{$confhash{'validation'}{$item}} > 0) { |
if (@{$confhash{'validation'}{$item}} > 0) { |
@{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}}); |
@{$confhash{'validation'}{$item}} = sort(@{$confhash{'validation'}{$item}}); |
} |
} |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
@changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
@changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
$domconfig{'requestcourses'}{'validation'}{$item}); |
$domconfig{'requestcourses'}{'validation'}{$item}); |
|
} else { |
|
@changed = @{$confhash{'validation'}{$item}}; |
|
} |
|
} else { |
} else { |
@changed = @{$confhash{'validation'}{$item}}; |
@changed = @{$confhash{'validation'}{$item}}; |
} |
} |
Line 7475 sub modify_quotas {
|
Line 6984 sub modify_quotas {
|
$env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs; |
$env{'form.requestcourses_validation_'.$item} =~ s/[\n\r\f]+/\s/gs; |
} |
} |
} |
} |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { |
if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { |
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
|
} |
|
} else { |
|
if ($confhash{'validation'}{$item} ne '') { |
|
$changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
|
} |
|
} |
} |
} else { |
} else { |
if ($confhash{'validation'}{$item} ne '') { |
if ($confhash{'validation'}{$item} ne '') { |
Line 7501 sub modify_quotas {
|
Line 7004 sub modify_quotas {
|
} |
} |
} |
} |
if (ref($confhash{'validation'}) eq 'HASH') { |
if (ref($confhash{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if ($confhash{'validation'}{'dc'} eq '') { |
if ($confhash{'validation'}{'dc'} eq '') { |
$changes{'validation'}{'dc'} = &mt('None'); |
$changes{'validation'}{'dc'} = &mt('None'); |
} else { |
} else { |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
|
} |
|
} |
} |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
|
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
|
} |
} |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
Line 7520 sub modify_quotas {
|
Line 7019 sub modify_quotas {
|
} elsif ($confhash{'validation'}{'dc'} ne '') { |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
} |
} |
} else { |
} elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
$changes{'validation'}{'dc'} = &mt('None'); |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
|
$changes{'validation'}{'dc'} = &mt('None'); |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 7670 sub modify_quotas {
|
Line 7165 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') || ($key eq 'templates'))) { |
unless (($context eq 'requestcourses') && ($key eq 'textbooks')) { |
$domdefaults{$key} = $confhash{$key}; |
$domdefaults{$key} = $confhash{$key}; |
} |
} |
} |
} |
Line 7822 sub modify_quotas {
|
Line 7317 sub modify_quotas {
|
'</li>'; |
'</li>'; |
} |
} |
} |
} |
foreach my $type ('textbooks','templates') { |
if (ref($changes{'textbooks'}) eq 'HASH') { |
if (ref($changes{$type}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Available textbooks updated').'<ul>'; |
$resulttext .= '<li>'.&mt("Available $type updated").'<ul>'; |
foreach my $key (sort(keys(%{$changes{'textbooks'}}))) { |
foreach my $key (sort(keys(%{$changes{$type}}))) { |
my %coursehash = &Apache::lonnet::coursedescription($key); |
my %coursehash = &Apache::lonnet::coursedescription($key); |
my $coursetitle = $coursehash{'description'}; |
my $coursetitle = $coursehash{'description'}; |
my $position = $confhash{'textbooks'}{$key}{'order'} + 1; |
my $position = $confhash{$type}{$key}{'order'} + 1; |
$resulttext .= '<li>'; |
$resulttext .= '<li>'; |
foreach my $item ('subject','title','author') { |
foreach my $item ('subject','title','publisher','author') { |
my $name = $item.':'; |
next if ((($item eq 'author') || ($item eq 'publisher')) && |
$name =~ s/^(\w)/\U$1/; |
($type eq 'templates')); |
$resulttext .= &mt($name).' '.$confhash{'textbooks'}{$key}{$item}.'<br />'; |
my $name = $item.':'; |
} |
$name =~ s/^(\w)/\U$1/; |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
$resulttext .= &mt($name).' '.$confhash{$type}{$key}{$item}.'<br />'; |
if ($confhash{'textbooks'}{$key}{'image'}) { |
} |
$resulttext .= ' '.&mt('Image: [_1]', |
$resulttext .= ' '.&mt('Order: [_1]',$position).'<br />'; |
'<img src="'.$confhash{'textbooks'}{$key}{'image'}.'"'. |
if ($type eq 'textbooks') { |
' alt="Textbook cover" />').'<br />'; |
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 .= '</ul></li>'; |
$resulttext .= ' '.&mt('LON-CAPA Course: [_1]',$coursetitle).'</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 7896 sub modify_quotas {
|
Line 7385 sub modify_quotas {
|
} |
} |
|
|
sub process_textbook_image { |
sub process_textbook_image { |
my ($r,$dom,$confname,$caller,$cdom,$cnum,$type,$configuserok,$switchserver,$author_ok) = @_; |
my ($r,$dom,$confname,$caller,$cdom,$cnum,$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 7907 sub process_textbook_image {
|
Line 7396 sub process_textbook_image {
|
} elsif ($author_ok eq 'ok') { |
} elsif ($author_ok eq 'ok') { |
my ($result,$imageurl) = |
my ($result,$imageurl) = |
&publishlogo($r,'upload',$caller,$dom,$confname, |
&publishlogo($r,'upload',$caller,$dom,$confname, |
"$type/$dom/$cnum/cover",$width,$height); |
"textbooks/$dom/$cnum/cover",$width,$height); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $imageurl; |
$url = $imageurl; |
} else { |
} else { |
Line 7934 sub modify_autoenroll {
|
Line 7423 sub modify_autoenroll {
|
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my %title = ( run => 'Auto-enrollment active', |
my %title = ( run => 'Auto-enrollment active', |
sender => 'Sender for notification messages', |
sender => 'Sender for notification messages', |
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)', |
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)'); |
failsafe => 'Failsafe for no drops if institutional data missing for a section'); |
|
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_domain = $env{'form.sender_domain'}; |
my $sender_domain = $env{'form.sender_domain'}; |
Line 7945 sub modify_autoenroll {
|
Line 7433 sub modify_autoenroll {
|
$sender_domain = ''; |
$sender_domain = ''; |
} |
} |
my $coowners = $env{'form.autoassign_coowners'}; |
my $coowners = $env{'form.autoassign_coowners'}; |
my $failsafe = $env{'form.autoenroll_failsafe'}; |
|
$failsafe =~ s{^\s+|\s+$}{}g; |
|
if ($failsafe =~ /\D/) { |
|
undef($failsafe); |
|
} |
|
my %autoenrollhash = ( |
my %autoenrollhash = ( |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
'sender_uname' => $sender_uname, |
'sender_uname' => $sender_uname, |
'sender_domain' => $sender_domain, |
'sender_domain' => $sender_domain, |
'co-owners' => $coowners, |
'co-owners' => $coowners, |
'autofailsafe' => $failsafe, |
|
} |
} |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
Line 7982 sub modify_autoenroll {
|
Line 7464 sub modify_autoenroll {
|
} |
} |
} elsif ($coowners) { |
} elsif ($coowners) { |
$changes{'coowners'} = 1; |
$changes{'coowners'} = 1; |
} |
} |
if ($currautoenroll{'autofailsafe'} ne $failsafe) { |
|
$changes{'autofailsafe'} = 1; |
|
} |
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'run'}) { |
if ($changes{'run'}) { |
Line 8005 sub modify_autoenroll {
|
Line 7484 sub modify_autoenroll {
|
$lastactref->{'domainconfig'} = 1; |
$lastactref->{'domainconfig'} = 1; |
} |
} |
} |
} |
if ($changes{'autofailsafe'}) { |
|
if ($failsafe ne '') { |
|
$resulttext .= '<li>'.&mt("$title{'failsafe'} set to [_1]",$failsafe).'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt("$title{'failsafe'} deleted"); |
|
} |
|
&Apache::lonnet::get_domain_defaults($dom,1); |
|
if (ref($lastactref) eq 'HASH') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
Line 8643 sub modify_usercreation {
|
Line 8111 sub modify_usercreation {
|
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
if (ref($domconfig{'usercreation'}{$key}) eq 'HASH') { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
($item eq 'captcha') || ($item eq 'recaptchakeys')) { |
($item eq 'recaptchaversion')) { |
|
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
} else { |
} else { |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
Line 8868 sub modify_selfcreation {
|
Line 8335 sub modify_selfcreation {
|
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
foreach my $item (keys(%{$domconfig{'usercreation'}{$key}})) { |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
if (($item eq 'selfcreate') || ($item eq 'statustocreate') || |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
($item eq 'captcha') || ($item eq 'recaptchakeys') || |
($item eq 'recaptchaversion') || |
|
($item eq 'emailusername') || ($item eq 'notify') || |
($item eq 'emailusername') || ($item eq 'notify') || |
($item eq 'selfcreateprocessing') || ($item eq 'shibenv')) { |
($item eq 'selfcreateprocessing')) { |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
} else { |
} else { |
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$save_usercreate{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
Line 8902 sub modify_selfcreation {
|
Line 8368 sub modify_selfcreation {
|
%{$cancreate{'emailusername'}} = (); |
%{$cancreate{'emailusername'}} = (); |
@{$cancreate{'statustocreate'}} = (); |
@{$cancreate{'statustocreate'}} = (); |
%{$cancreate{'selfcreateprocessing'}} = (); |
%{$cancreate{'selfcreateprocessing'}} = (); |
%{$cancreate{'shibenv'}} = (); |
|
my %selfcreatetypes = ( |
my %selfcreatetypes = ( |
sso => 'users authenticated by institutional single sign on', |
sso => 'users authenticated by institutional single sign on', |
login => 'users authenticated by institutional log-in', |
login => 'users authenticated by institutional log-in', |
Line 8947 sub modify_selfcreation {
|
Line 8412 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'}) { |
if ($env{'form.cancreate_email'} eq '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 9020 sub modify_selfcreation {
|
Line 8485 sub modify_selfcreation {
|
} |
} |
my @fields = ('lastname','firstname','middlename','generation', |
my @fields = ('lastname','firstname','middlename','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
my @shibfields = (@fields,'inststatus'); |
|
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
# |
# |
# Where usernames may created for institutional log-in and/or institutional single sign on: |
# Where usernames may created for institutional log-in and/or institutional single sign on: |
Line 9065 sub modify_selfcreation {
|
Line 8529 sub modify_selfcreation {
|
} |
} |
} |
} |
} |
} |
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field} ne '') { |
|
$cancreate{'shibenv'}{$field} = $env{'form.shibenv_'.$field}; |
|
} |
|
} |
|
if (ref($curr_usercreation{'cancreate'}) eq 'HASH') { |
|
if (ref($curr_usercreation{'cancreate'}{'shibenv'}) eq 'HASH') { |
|
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field} ne $curr_usercreation{'cancreate'}{'shibenv'}{$field}) { |
|
push(@{$changes{'cancreate'}},'shibenv'); |
|
} |
|
} |
|
} else { |
|
foreach my $field (@shibfields) { |
|
if ($env{'form.shibenv_'.$field}) { |
|
push(@{$changes{'cancreate'}},'shibenv'); |
|
last; |
|
} |
|
} |
|
} |
|
} |
|
} |
} |
foreach my $item (@contexts) { |
foreach my $item (@contexts) { |
if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { |
if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { |
Line 9198 sub modify_selfcreation {
|
Line 8641 sub modify_selfcreation {
|
# |
# |
$save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'}; |
$save_usercreate{'cancreate'}{'captcha'} = $savecaptcha{'captcha'}; |
$save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'}; |
$save_usercreate{'cancreate'}{'recaptchakeys'} = $savecaptcha{'recaptchakeys'}; |
$save_usercreate{'cancreate'}{'recaptchaversion'} = $savecaptcha{'recaptchaversion'}; |
|
$save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'}; |
$save_usercreate{'cancreate'}{'selfcreate'} = $cancreate{'selfcreate'}; |
if (ref($cancreate{'notify'}) eq 'HASH') { |
if (ref($cancreate{'notify'}) eq 'HASH') { |
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'}; |
$save_usercreate{'cancreate'}{'notify'} = $cancreate{'notify'}; |
Line 9209 sub modify_selfcreation {
|
Line 8651 sub modify_selfcreation {
|
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
if (ref($cancreate{'statustocreate'}) eq 'ARRAY') { |
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'}; |
$save_usercreate{'cancreate'}{'statustocreate'} = $cancreate{'statustocreate'}; |
} |
} |
if (ref($cancreate{'shibenv'}) eq 'HASH') { |
|
$save_usercreate{'cancreate'}{'shibenv'} = $cancreate{'shibenv'}; |
|
} |
|
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'cancreate'}{'emailusername'} = $cancreate{'emailusername'}; |
$save_usercreate{'emailrule'} = \@email_rule; |
$save_usercreate{'emailrule'} = \@email_rule; |
|
|
Line 9254 sub modify_selfcreation {
|
Line 8693 sub modify_selfcreation {
|
} |
} |
} |
} |
} |
} |
} elsif ($type eq 'shibenv') { |
|
if (keys(%{$cancreate{$type}}) == 0) { |
|
$chgtext .= &mt('Shibboleth-autheticated user does not use environment variables to set user information'); |
|
} else { |
|
$chgtext .= &mt('Shibboleth-autheticated user information set from environment variables, as follows:'). |
|
'<ul>'; |
|
foreach my $field (@shibfields) { |
|
next if ($cancreate{$type}{$field} eq ''); |
|
if ($field eq 'inststatus') { |
|
$chgtext .= '<li>'.&mt('Institutional status').' -- '.$cancreate{$type}{$field}.'</li>'; |
|
} else { |
|
$chgtext .= '<li>'.$fieldtitles{$field}.' -- '.$cancreate{$type}{$field}.'</li>'; |
|
} |
|
} |
|
$chgtext .= '</ul>'; |
|
} |
|
} elsif ($type eq 'statustocreate') { |
} elsif ($type eq 'statustocreate') { |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') && |
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) { |
(ref($cancreate{'statustocreate'}) eq 'ARRAY')) { |
Line 9360 sub modify_selfcreation {
|
Line 8783 sub modify_selfcreation {
|
$chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
$chgtext .= '<li>'.&mt('Private key set to [_1]',$pubkey).'</li>'; |
} |
} |
$chgtext .= '</ul>'; |
$chgtext .= '</ul>'; |
} elsif ($type eq 'recaptchaversion') { |
|
if ($savecaptcha{'captcha'} eq 'recaptcha') { |
|
$chgtext .= &mt('ReCAPTCHA set to version [_1]',$savecaptcha{$type}); |
|
} |
|
} elsif ($type eq 'emailusername') { |
} elsif ($type eq 'emailusername') { |
if (ref($cancreate{'emailusername'}) eq 'HASH') { |
if (ref($cancreate{'emailusername'}) eq 'HASH') { |
if (ref($types) eq 'ARRAY') { |
if (ref($types) eq 'ARRAY') { |
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 9484 sub process_captcha {
|
Line 8901 sub process_captcha {
|
$changes->{'captcha'} = 1; |
$changes->{'captcha'} = 1; |
} |
} |
} |
} |
my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion); |
my ($newpub,$newpriv,$currpub,$currpriv); |
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, |
}; |
}; |
$newversion = $env{'form.'.$container.'_recaptchaversion'}; |
|
$newversion =~ s/\D//g; |
|
if ($newversion ne '2') { |
|
$newversion = 1; |
|
} |
|
$newsettings->{'recaptchaversion'} = $newversion; |
|
} |
} |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
Line 9511 sub process_captcha {
|
Line 8922 sub process_captcha {
|
} |
} |
} |
} |
} |
} |
if ($current->{'captcha'} eq 'recaptcha') { |
|
$currversion = $current->{'recaptchaversion'}; |
|
if ($currversion ne '2') { |
|
$currversion = 1; |
|
} |
|
} |
|
if ($currversion ne $newversion) { |
|
if ($container eq 'cancreate') { |
|
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
|
push(@{$changes->{'cancreate'}},'recaptchaversion'); |
|
} elsif (!defined($changes->{'cancreate'})) { |
|
$changes->{'cancreate'} = ['recaptchaversion']; |
|
} |
|
} else { |
|
$changes->{'recaptchaversion'} = 1; |
|
} |
|
} |
|
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
if (ref($changes->{'cancreate'}) eq 'ARRAY') { |
Line 9970 sub modify_scantron {
|
Line 9364 sub modify_scantron {
|
} |
} |
|
|
sub modify_coursecategories { |
sub modify_coursecategories { |
my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors, |
my ($resulttext,%deletions,%reorderings,%needreordering,%adds,%changes,$errors, |
$cathash); |
$cathash); |
my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory'); |
my @deletecategory = &Apache::loncommon::get_env_multiple('form.deletecategory'); |
Line 10211 sub modify_coursecategories {
|
Line 9605 sub modify_coursecategories {
|
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
if ($changes{'unauth'} || $changes{'auth'}) { |
|
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') { |
|
$lastactref->{'domdefaults'} = 1; |
|
} |
|
} |
|
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
Line 10419 sub modify_helpsettings {
|
Line 9799 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 = ( |
my %defaultchecked = ('canuse_pdfforms' => 'off'); |
'uselcmath' => 'on', |
my @toggles = ('canuse_pdfforms'); |
'usejsme' => 'on' |
|
); |
|
my @toggles = ('uselcmath','usejsme'); |
|
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
'uploadquota_community','uploadquota_textbook','mysqltables_official', |
'uploadquota_community','uploadquota_textbook'); |
'mysqltables_unofficial','mysqltables_community','mysqltables_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, |
|
mysqltables => 172800, |
|
); |
); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
Line 10473 sub modify_coursedefaults {
|
Line 9847 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
} else { |
} else { |
my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/); |
my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/); |
if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
$currdef = $domconfig{'coursedefaults'}{$setting}{$type}; |
$currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type}; |
} |
} |
$newdef =~ s/[^\w.\-]//g; |
$newdef =~ s/[^\w.\-]//g; |
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
$defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef; |
} |
} |
if ($currdef ne $newdef) { |
if ($currdef ne $newdef) { |
my $staticdef; |
my $staticdef; |
Line 10486 sub modify_coursedefaults {
|
Line 9860 sub modify_coursedefaults {
|
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
} else { |
my $setting = $1; |
unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
$changes{'uploadquota'} = 1; |
$changes{$setting} = 1; |
|
} |
} |
} |
} |
} |
} |
} |
} |
my $currclone = $domconfig{'coursedefaults'}{'canclone'}; |
|
my @currclonecode; |
my $officialcreds = $env{'form.official_credits'}; |
if (ref($currclone) eq 'HASH') { |
$officialcreds =~ s/[^\d.]+//g; |
if (ref($currclone->{'instcode'}) eq 'ARRAY') { |
my $unofficialcreds = $env{'form.unofficial_credits'}; |
@currclonecode = @{$currclone->{'instcode'}}; |
$unofficialcreds =~ s/[^\d.]+//g; |
} |
my $textbookcreds = $env{'form.textbook_credits'}; |
} |
$textbookcreds =~ s/[^\d.]+//g; |
my $newclone; |
if (ref($domconfig{'coursedefaults'}{'coursecredits'} ne 'HASH') && |
if ($env{'form.canclone'} =~ /^(none|domain|instcode)$/) { |
($env{'form.coursecredits'} eq '1')) { |
$newclone = $env{'form.canclone'}; |
$changes{'coursecredits'} = 1; |
} |
|
if ($newclone eq 'instcode') { |
|
my @newcodes = &Apache::loncommon::get_env_multiple('form.clonecode'); |
|
my (%codedefaults,@code_order,@clonecode); |
|
&Apache::lonnet::auto_instcode_defaults($dom,\%codedefaults, |
|
\@code_order); |
|
foreach my $item (@code_order) { |
|
if (grep(/^\Q$item\E$/,@newcodes)) { |
|
push(@clonecode,$item); |
|
} |
|
} |
|
if (@clonecode) { |
|
$defaultshash{'coursedefaults'}{'canclone'} = { $newclone => \@clonecode }; |
|
my @diffs = &Apache::loncommon::compare_arrays(\@currclonecode,\@clonecode); |
|
if (@diffs) { |
|
$changes{'canclone'} = 1; |
|
} |
|
} else { |
|
$newclone eq ''; |
|
} |
|
} elsif ($newclone ne '') { |
|
$defaultshash{'coursedefaults'}{'canclone'} = $newclone; |
|
} |
|
if ($newclone ne $currclone) { |
|
$changes{'canclone'} = 1; |
|
} |
|
my %credits; |
|
foreach my $type (@types) { |
|
unless ($type eq 'community') { |
|
$credits{$type} = $env{'form.'.$type.'_credits'}; |
|
$credits{$type} =~ s/[^\d.]+//g; |
|
} |
|
} |
|
if ((ref($domconfig{'coursedefaults'}{'coursecredits'}) ne 'HASH') && |
|
($env{'form.coursecredits'} eq '1')) { |
|
$changes{'coursecredits'} = 1; |
|
foreach my $type (keys(%credits)) { |
|
$defaultshash{'coursedefaults'}{'coursecredits'}{$type} = $credits{$type}; |
|
} |
|
} else { |
} else { |
if ($env{'form.coursecredits'} eq '1') { |
if (($domconfig{'coursedefaults'}{'coursecredits'}{'official'} ne $officialcreds) || |
foreach my $type (@types) { |
($domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'} ne $unofficialcreds) || |
unless ($type eq 'community') { |
($domconfig{'coursedefaults'}{'coursecredits'}{'textbook'} ne $textbookcreds)) { |
if ($domconfig{'coursedefaults'}{'coursecredits'}{$type} ne $credits{$type}) { |
$changes{'coursecredits'} = 1; |
$changes{'coursecredits'} = 1; |
|
} |
|
$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'}{'coursecredits'} = { |
$defaultshash{'coursedefaults'}{'postsubmit'}{'client'} = 'on'; |
official => $officialcreds, |
my %currtimeout; |
unofficial => $unofficialcreds, |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
textbook => $textbookcreds, |
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 10612 sub modify_coursedefaults {
|
Line 9895 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{'uploadquota'}) || ($changes{'postsubmit'}) || |
if (($changes{'canuse_pdfforms'}) || ($changes{'coursecredits'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'uploadquota'})) { |
($changes{'canclone'}) || ($changes{'mysqltables'})) { |
if ($changes{'canuse_pdfforms'}) { |
foreach my $item ('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') { |
foreach my $type (keys(%{$defaultshash{'coursedefaults'}{'coursecredits'}})) { |
$domdefaults{'officialcredits'} = |
$domdefaults{$type.'credits'} = |
$defaultshash{'coursedefaults'}{'coursecredits'}{'official'}; |
$defaultshash{'coursedefaults'}{'coursecredits'}{$type}; |
$domdefaults{'unofficialcredits'} = |
} |
$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 10646 sub modify_coursedefaults {
|
Line 9917 sub modify_coursedefaults {
|
} |
} |
} |
} |
} |
} |
if ($changes{'canclone'}) { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
my @clonecodes = @{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}}; |
|
if (@clonecodes) { |
|
$domdefaults{'canclone'} = join('+',@clonecodes); |
|
} |
|
} |
|
} else { |
|
$domdefaults{'canclone'}=$defaultshash{'coursedefaults'}{'canclone'}; |
|
} |
|
} |
|
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); |
if (ref($lastactref) eq 'HASH') { |
if (ref($lastactref) eq 'HASH') { |
Line 10666 sub modify_coursedefaults {
|
Line 9925 sub modify_coursedefaults {
|
} |
} |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $item (sort(keys(%changes))) { |
foreach my $item (sort(keys(%changes))) { |
if ($item eq 'uselcmath') { |
if ($item eq 'canuse_pdfforms') { |
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') { |
if ($env{'form.'.$item} eq '1') { |
$resulttext .= '<li>'.&mt('Molecule editor uses JSME (HTML5), if supported by browser.').'</li>'; |
$resulttext .= '<li>'.&mt("Course/Community users can create/upload PDF forms set to 'on'").'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Molecule editor uses JME (Java), if supported by client OS.').'</li>'; |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</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>'; |
Line 10693 sub modify_coursedefaults {
|
Line 9946 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 'mysqltables') { |
|
if (ref($defaultshash{'coursedefaults'}{'mysqltables'}) eq 'HASH') { |
|
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver').'<ul>'. |
|
'<li>'.&mt('Official courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'official'}.'</b>').'</li>'. |
|
'<li>'.&mt('Unofficial courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'unofficial'}.'</b>').'</li>'. |
|
'<li>'.&mt('Textbook courses: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'textbook'}.'</b>').'</li>'. |
|
'<li>'.&mt('Communities: [_1] s','<b>'.$defaultshash{'coursedefaults'}{'mysqltables'}{'community'}.'</b>').'</li>'. |
|
'</ul>'. |
|
'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Lifetime of "Temporary" MySQL tables (student performance data) on homeserver remains default: [_1] s',$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 10758 sub modify_coursedefaults {
|
Line 9963 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
$resulttext .= '<li>'.&mt('Student credits not in use for courses in this domain').'</li>'; |
} |
} |
} elsif ($item eq 'canclone') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}) eq 'HASH') { |
|
if (ref($defaultshash{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
|
my $clonecodes = join(' '.&mt('and').' ',@{$defaultshash{'coursedefaults'}{'canclone'}{'instcode'}}); |
|
$resulttext .= '<li>'.&mt('By default, official courses can be cloned from existing courses with the same: [_1]','<b>'.$clonecodes.'</b>').'</li>'; |
|
} |
|
} elsif ($defaultshash{'coursedefaults'}{'canclone'} eq 'domain') { |
|
$resulttext .= '<li>'.&mt('By default, a course requester can clone any course from his/her domain.').'</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('By default, only course owner and coordinators may clone a course.').'</li>'; |
|
} |
|
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 11187 sub modify_usersessions {
|
Line 10381 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 11214 sub modify_usersessions {
|
Line 10392 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 11247 sub modify_usersessions {
|
Line 10406 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 11318 sub modify_usersessions {
|
Line 10474 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 11354 sub modify_loadbalancing {
|
Line 10495 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 11446 sub modify_loadbalancing {
|
Line 10586 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') { |
my $specifiedhost = $env{'form.loadbalancing_singleserver_'.$i.'_'.$type}; |
$rule = $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 11471 sub modify_loadbalancing {
|
Line 10608 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>'; |
$toupdate{$balancer} = 1; |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
|
&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 11523 sub modify_loadbalancing {
|
Line 10658 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') || |
($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
($rule eq 'balancer') || ($rule eq 'offloadedto')) { |
if (($type eq '_LC_ipchange') || ($type eq '_LC_ipchangesso')) { |
$balancetext = $ruletitles{$rule}; |
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 11563 sub modify_loadbalancing {
|
Line 10668 sub modify_loadbalancing {
|
} |
} |
} |
} |
} |
} |
if (keys(%toupdate)) { |
my $cachekey = &escape('loadbalancing').':'.&escape($dom); |
my %thismachine; |
&Apache::lonnet::remote_devalidate_cache($balancer,[$cachekey]); |
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 11722 sub active_dc_picker {
|
Line 10810 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 11731 sub active_dc_picker {
|
Line 10819 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 12223 function updateCaptcha(caller,context) {
|
Line 11311 function updateCaptcha(caller,context) {
|
var pubitem; |
var pubitem; |
var privtext; |
var privtext; |
var pubtext; |
var pubtext; |
var versionitem; |
|
var versiontext; |
|
if (document.getElementById(context+'_recaptchapub')) { |
if (document.getElementById(context+'_recaptchapub')) { |
pubitem = document.getElementById(context+'_recaptchapub'); |
pubitem = document.getElementById(context+'_recaptchapub'); |
} else { |
} else { |
Line 12245 function updateCaptcha(caller,context) {
|
Line 11331 function updateCaptcha(caller,context) {
|
} else { |
} else { |
return; |
return; |
} |
} |
if (document.getElementById(context+'_recaptchaversion')) { |
|
versionitem = document.getElementById(context+'_recaptchaversion'); |
|
} else { |
|
return; |
|
} |
|
if (document.getElementById(context+'_recaptchavertxt')) { |
|
versiontext = document.getElementById(context+'_recaptchavertxt'); |
|
} else { |
|
return; |
|
} |
|
if (caller.checked) { |
if (caller.checked) { |
if (caller.value == 'recaptcha') { |
if (caller.value == 'recaptcha') { |
pubitem.type = 'text'; |
pubitem.type = 'text'; |
Line 12263 function updateCaptcha(caller,context) {
|
Line 11339 function updateCaptcha(caller,context) {
|
privitem.size = '40'; |
privitem.size = '40'; |
pubtext.innerHTML = "$lt{'pub'}"; |
pubtext.innerHTML = "$lt{'pub'}"; |
privtext.innerHTML = "$lt{'priv'}"; |
privtext.innerHTML = "$lt{'priv'}"; |
versionitem.type = 'text'; |
|
versionitem.size = '3'; |
|
versiontext.innerHTML = "$lt{'ver'}"; |
|
} else { |
} else { |
pubitem.type = 'hidden'; |
pubitem.type = 'hidden'; |
privitem.type = 'hidden'; |
privitem.type = 'hidden'; |
versionitem.type = 'hidden'; |
|
pubtext.innerHTML = ''; |
pubtext.innerHTML = ''; |
privtext.innerHTML = ''; |
privtext.innerHTML = ''; |
versiontext.innerHTML = ''; |
|
} |
} |
} |
} |
return; |
return; |
Line 12295 function toggleDisplay(domForm,caller) {
|
Line 11366 function toggleDisplay(domForm,caller) {
|
if (document.getElementById(caller)) { |
if (document.getElementById(caller)) { |
var divitem = document.getElementById(caller); |
var divitem = document.getElementById(caller); |
var optionsElement = domForm.coursecredits; |
var optionsElement = domForm.coursecredits; |
var checkval = 1; |
|
var dispval = 'block'; |
|
if (caller == 'emailoptions') { |
if (caller == 'emailoptions') { |
optionsElement = domForm.cancreate_email; |
optionsElement = domForm.cancreate_email; |
} |
} |
if (caller == 'studentsubmission') { |
|
optionsElement = domForm.postsubmit; |
|
} |
|
if (caller == 'cloneinstcode') { |
|
optionsElement = domForm.canclone; |
|
checkval = 'instcode'; |
|
} |
|
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 12314 function toggleDisplay(domForm,caller) {
|
Line 11376 function toggleDisplay(domForm,caller) {
|
currval = optionsElement[i].value; |
currval = optionsElement[i].value; |
} |
} |
} |
} |
if (currval == checkval) { |
if (currval == 1) { |
divitem.style.display = dispval; |
divitem.style.display = 'block'; |
} else { |
} else { |
divitem.style.display = 'none'; |
divitem.style.display = 'none'; |
} |
} |
Line 12338 sub captcha_phrases {
|
Line 11400 sub captcha_phrases {
|
original => 'original (CAPTCHA)', |
original => 'original (CAPTCHA)', |
recaptcha => 'successor (ReCAPTCHA)', |
recaptcha => 'successor (ReCAPTCHA)', |
notused => 'unused', |
notused => 'unused', |
ver => 'ReCAPTCHA version (1 or 2)', |
|
); |
); |
} |
} |
|
|
Line 12349 sub devalidate_remote_domconfs {
|
Line 11410 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)) { |
if (keys(%servers) > 1) { |
foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
my @cached; |
my @cached; |