version 1.160.6.68, 2016/08/07 00:28:39
|
version 1.160.6.72, 2016/09/18 19:24:14
|
Line 304 sub handler {
|
Line 304 sub handler {
|
modify => \&modify_autocreate, |
modify => \&modify_autocreate, |
}, |
}, |
'directorysrch' => |
'directorysrch' => |
{ text => 'Institutional directory searches', |
{ text => 'Directory searches', |
help => 'Domain_Configuration_InstDirectory_Search', |
help => 'Domain_Configuration_InstDirectory_Search', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Institutional Directory Setting', |
|
col2 => 'Value',}, |
|
{col1 => 'LON-CAPA Directory Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
print => \&print_directorysrch, |
print => \&print_directorysrch, |
modify => \&modify_directorysrch, |
modify => \&modify_directorysrch, |
Line 656 sub print_config_box {
|
Line 658 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 'directorysrch') || |
(($action eq 'login') && ($numheaders < 4))) { |
(($action eq 'login') && ($numheaders < 4))) { |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
} |
} |
Line 673 sub print_config_box {
|
Line 676 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
if (($action eq 'autoupdate') || ($action eq 'usercreation') || ($action eq 'selfcreation') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'usermodification') || ($action eq 'defaults') || ($action eq 'coursedefaults') || |
($action eq 'selfenrollment') || ($action eq 'usersessions')) { |
($action eq 'selfenrollment') || ($action eq 'usersessions') || ($action eq 'directorysrch')) { |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$settings,\$rowtotal); |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
$output .= $item->{'print'}->('top',$dom,$item,$settings,\$rowtotal); |
Line 728 sub print_config_box {
|
Line 731 sub print_config_box {
|
} |
} |
$rowtotal ++; |
$rowtotal ++; |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
} elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') || |
($action eq 'defaults')) { |
($action eq 'defaults') || ($action eq 'directorysrch')) { |
$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 == 4) { |
Line 841 sub print_config_box {
|
Line 844 sub print_config_box {
|
<td> |
<td> |
<table class="LC_nested"> |
<table class="LC_nested"> |
<tr class="LC_info_row">'; |
<tr class="LC_info_row">'; |
if (($action eq 'login') || ($action eq 'directorysrch')) { |
if ($action eq 'login') { |
$output .= ' |
$output .= ' |
<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>'; |
<td class="LC_left_item" colspan="2">'.&mt($item->{'header'}->[0]->{'col1'}).'</td>'; |
} elsif ($action eq 'serverstatuses') { |
} elsif ($action eq 'serverstatuses') { |
Line 885 sub print_config_box {
|
Line 888 sub print_config_box {
|
$rowtotal ++; |
$rowtotal ++; |
if ($action eq 'quotas') { |
if ($action eq 'quotas') { |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || ($action eq 'directorysrch') || |
} elsif (($action eq 'autoenroll') || ($action eq 'autocreate') || |
($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) { |
($action eq 'contacts') || ($action eq 'serverstatuses') || |
|
($action eq 'loadbalancing')) { |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
$output .= $item->{'print'}->($dom,$settings,\$rowtotal); |
} elsif ($action eq 'scantron') { |
} elsif ($action eq 'scantron') { |
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
$output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); |
Line 2604 sub print_autocreate {
|
Line 2608 sub print_autocreate {
|
} |
} |
|
|
sub print_directorysrch { |
sub print_directorysrch { |
my ($dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
my $srchon = ' '; |
my $datatable; |
my $srchoff = ' checked="checked" '; |
if ($position eq 'top') { |
my ($exacton,$containson,$beginson); |
my $instsrchon = ' '; |
my $localon = ' '; |
my $instsrchoff = ' checked="checked" '; |
my $localoff = ' checked="checked" '; |
my ($exacton,$containson,$beginson); |
if (ref($settings) eq 'HASH') { |
my $instlocalon = ' '; |
if ($settings->{'available'} eq '1') { |
my $instlocaloff = ' checked="checked" '; |
$srchon = $srchoff; |
if (ref($settings) eq 'HASH') { |
$srchoff = ' '; |
if ($settings->{'available'} eq '1') { |
} |
$instsrchon = $instsrchoff; |
if ($settings->{'localonly'} eq '1') { |
$instsrchoff = ' '; |
$localon = $localoff; |
} |
$localoff = ' '; |
if ($settings->{'localonly'} eq '1') { |
} |
$instlocalon = $instlocaloff; |
if (ref($settings->{'searchtypes'}) eq 'ARRAY') { |
$instlocaloff = ' '; |
foreach my $type (@{$settings->{'searchtypes'}}) { |
} |
if ($type eq 'exact') { |
if (ref($settings->{'searchtypes'}) eq 'ARRAY') { |
|
foreach my $type (@{$settings->{'searchtypes'}}) { |
|
if ($type eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($type eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($type eq 'begins') { |
|
$beginson = ' checked="checked" '; |
|
} |
|
} |
|
} else { |
|
if ($settings->{'searchtypes'} eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'specify') { |
$exacton = ' checked="checked" '; |
$exacton = ' checked="checked" '; |
} elsif ($type eq 'contains') { |
|
$containson = ' checked="checked" '; |
$containson = ' checked="checked" '; |
} elsif ($type eq 'begins') { |
|
$beginson = ' checked="checked" '; |
|
} |
} |
} |
} |
} else { |
|
if ($settings->{'searchtypes'} eq 'exact') { |
|
$exacton = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'contains') { |
|
$containson = ' checked="checked" '; |
|
} elsif ($settings->{'searchtypes'} eq 'specify') { |
|
$exacton = ' checked="checked" '; |
|
$containson = ' checked="checked" '; |
|
} |
|
} |
} |
} |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
|
my $numinrow = 4; |
my $numinrow = 4; |
my $cansrchrow = 0; |
my $cansrchrow = 0; |
my $datatable='<tr class="LC_odd_row">'. |
$datatable='<tr class="LC_odd_row">'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Directory search available?').'</span></td>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Institutional directory search available?').'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="dirsrch_available"'. |
'<input type="radio" name="dirsrch_available"'. |
$srchon.' value="1" />'.&mt('Yes').'</label> '. |
$instsrchon.' value="1" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="dirsrch_available"'. |
'<label><input type="radio" name="dirsrch_available"'. |
$srchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
$instsrchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
'</tr><tr>'. |
'</tr><tr>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search?').'</span></td>'. |
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search institution?').'</span></td>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
'<input type="radio" name="dirsrch_localonly"'. |
'<input type="radio" name="dirsrch_instlocalonly"'. |
$localoff.' value="0" />'.&mt('Yes').'</label> '. |
$instlocaloff.' value="0" />'.&mt('Yes').'</label> '. |
'<label><input type="radio" name="dirsrch_localonly"'. |
'<label><input type="radio" name="dirsrch_instlocalonly"'. |
$localon.' value="1" />'.&mt('No').'</label></span></td>'. |
$instlocalon.' value="1" />'.&mt('No').'</label></span></td>'. |
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
$$rowtotal += 2; |
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$datatable .= &insttypes_row($settings,$types,$usertypes,$dom, |
$numinrow,$othertitle,'cansearch'); |
$numinrow,$othertitle,'cansearch'); |
$cansrchrow = 1; |
$cansrchrow = 1; |
|
} |
} |
} |
} |
if ($cansrchrow) { |
if ($cansrchrow) { |
$$rowtotal ++; |
$$rowtotal ++; |
$datatable .= '<tr>'; |
$datatable .= '<tr>'; |
} else { |
} else { |
$datatable .= '<tr class="LC_odd_row">'; |
$datatable .= '<tr class="LC_odd_row">'; |
} |
} |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods'). |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Supported search methods'). |
'</span></td><td class="LC_left_item" colspan="2"><table><tr>'; |
'</span></td><td class="LC_left_item" colspan="2"><table><tr>'; |
foreach my $title (@{$titleorder}) { |
foreach my $title (@{$titleorder}) { |
if (defined($searchtitles->{$title})) { |
if (defined($searchtitles->{$title})) { |
my $check = ' '; |
my $check = ' '; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'searchby'}) eq 'ARRAY') { |
if (ref($settings->{'searchby'}) eq 'ARRAY') { |
if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) { |
if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) { |
$check = ' checked="checked" '; |
$check = ' checked="checked" '; |
} |
} |
} |
} |
} |
|
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchby" '. |
|
'value="'.$title.'"'.$check.'/>'. |
|
$searchtitles->{$title}.'</label></span></td>'; |
} |
} |
$datatable .= '<td class="LC_left_item">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchby" '. |
|
'value="'.$title.'"'.$check.'/>'. |
|
$searchtitles->{$title}.'</label></span></td>'; |
|
} |
} |
} |
$datatable .= '</tr></table></td></tr>'; |
$datatable .= '</tr></table></td></tr>'; |
$$rowtotal ++; |
$$rowtotal ++; |
if ($cansrchrow) { |
if ($cansrchrow) { |
$datatable .= '<tr class="LC_odd_row">'; |
$datatable .= '<tr class="LC_odd_row">'; |
} else { |
|
$datatable .= '<tr>'; |
|
} |
|
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'. |
|
'<td class="LC_left_item" colspan="2">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchtypes" '. |
|
$exacton.' value="exact" />'.&mt('Exact match'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$beginson.' value="begins" />'.&mt('Begins with'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$containson.' value="contains" />'.&mt('Contains'). |
|
'</label></span></td></tr>'; |
|
$$rowtotal ++; |
} else { |
} else { |
$datatable .= '<tr>'; |
my $domsrchon = ' checked="checked" '; |
|
my $domsrchoff = ' '; |
|
my $domlocalon = ' '; |
|
my $domlocaloff = ' checked="checked" '; |
|
if (ref($settings) eq 'HASH') { |
|
if ($settings->{'lclocalonly'} eq '1') { |
|
$domlocalon = $domlocaloff; |
|
$domlocaloff = ' '; |
|
} |
|
if ($settings->{'lcavailable'} eq '0') { |
|
$domsrchoff = $domsrchon; |
|
$domsrchon = ' '; |
|
} |
|
} |
|
$datatable='<tr class="LC_odd_row">'. |
|
'<td colspan="2"><span class ="LC_nobreak">'.&mt('LON-CAPA directory search available?').'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="dirsrch_domavailable"'. |
|
$domsrchon.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="dirsrch_domavailable"'. |
|
$domsrchoff.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr><tr>'. |
|
'<td colspan="2"><span class ="LC_nobreak">'.&mt('Other domains can search LON-CAPA domain?').'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="dirsrch_domlocalonly"'. |
|
$domlocaloff.' value="0" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="dirsrch_domlocalonly"'. |
|
$domlocalon.' value="1" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$$rowtotal += 2; |
} |
} |
$datatable .= '<td><span class ="LC_nobreak">'.&mt('Search latitude').'</span></td>'. |
|
'<td class="LC_left_item" colspan="2">'. |
|
'<span class="LC_nobreak"><label>'. |
|
'<input type="checkbox" name="searchtypes" '. |
|
$exacton.' value="exact" />'.&mt('Exact match'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$beginson.' value="begins" />'.&mt('Begins with'). |
|
'</label> '. |
|
'<label><input type="checkbox" name="searchtypes" '. |
|
$containson.' value="contains" />'.&mt('Contains'). |
|
'</label></span></td></tr>'; |
|
$$rowtotal ++; |
|
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 2899 sub print_coursedefaults {
|
Line 2937 sub print_coursedefaults {
|
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
usejsme => 'Molecule editor uses JSME (HTML5) in place of JME (Java)', |
postsubmit => 'Disable submit button/keypress following student submission', |
postsubmit => 'Disable submit button/keypress following student submission', |
canclone => "People who may clone a course (besides course's owner and coordinators)", |
canclone => "People who may clone a course (besides course's owner and coordinators)", |
|
mysqltables => 'Lifetime (s) of "Temporary" MySQL tables (student performance data) on homeserver', |
); |
); |
my %staticdefaults = ( |
my %staticdefaults = ( |
anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
uploadquota => 500, |
uploadquota => 500, |
postsubmit => 60, |
postsubmit => 60, |
|
mysqltables => 172800, |
); |
); |
if ($position eq 'top') { |
if ($position eq 'top') { |
%defaultchecked = ( |
%defaultchecked = ( |
Line 2987 sub print_coursedefaults {
|
Line 3027 sub print_coursedefaults {
|
$itemcount ++; |
$itemcount ++; |
} else { |
} else { |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout); |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout,%currmysql); |
my $currusecredits = 0; |
my $currusecredits = 0; |
my $postsubmitclient = 1; |
my $postsubmitclient = 1; |
my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook'); |
Line 3031 sub print_coursedefaults {
|
Line 3071 sub print_coursedefaults {
|
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
$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 { |
} else { |
foreach my $type (@types) { |
foreach my $type (@types) { |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
$deftimeout{$type} = $staticdefaults{'postsubmit'}; |
Line 3108 sub print_coursedefaults {
|
Line 3157 sub print_coursedefaults {
|
$additional .= '</tr></table></div>'."\n"; |
$additional .= '</tr></table></div>'."\n"; |
%defaultchecked = ('postsubmit' => 'on'); |
%defaultchecked = ('postsubmit' => 'on'); |
@toggles = ('postsubmit'); |
@toggles = ('postsubmit'); |
my $current = { |
$current = { |
'postsubmit' => $postsubmitclient, |
'postsubmit' => $postsubmitclient, |
}; |
}; |
($table,$itemcount) = |
($table,$itemcount) = |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
&radiobutton_prefs($current,\@toggles,\%defaultchecked, |
\%choices,$itemcount,$onclick,$additional,'left'); |
\%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 ++; |
|
|
} |
} |
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
Line 4542 sub email_as_username {
|
Line 4605 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 4560 sub captcha_choice {
|
Line 4624 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 4593 sub captcha_choice {
|
Line 4662 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></td></tr></table>'."\n". |
$currpriv.'" size="40" /></span><br />'. |
|
'<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 6380 sub modify_login {
|
Line 6453 sub modify_login {
|
$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 8254 sub modify_directorysrch {
|
Line 8334 sub modify_directorysrch {
|
$currdirsrch{$key} = $domconfig{'directorysrch'}{$key}; |
$currdirsrch{$key} = $domconfig{'directorysrch'}{$key}; |
} |
} |
} |
} |
my %title = ( available => 'Directory search available', |
my %title = ( available => 'Institutional directory search available', |
localonly => 'Other domains can search', |
localonly => 'Other domains can search institution', |
|
lcavailable => 'LON-CAPA directory search available', |
|
lclocalonly => 'Other domains can search LON-CAPA domain', |
searchby => 'Search types', |
searchby => 'Search types', |
searchtypes => 'Search latitude'); |
searchtypes => 'Search latitude'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
Line 8329 sub modify_directorysrch {
|
Line 8411 sub modify_directorysrch {
|
my %dirsrch_hash = ( |
my %dirsrch_hash = ( |
directorysrch => { available => $env{'form.dirsrch_available'}, |
directorysrch => { available => $env{'form.dirsrch_available'}, |
cansearch => \@cansearch, |
cansearch => \@cansearch, |
localonly => $env{'form.dirsrch_localonly'}, |
localonly => $env{'form.dirsrch_instlocalonly'}, |
|
lclocalonly => $env{'form.dirsrch_domlocalonly'}, |
|
lcavailable => $env{'form.dirsrch_domavailable'}, |
searchby => \@searchby, |
searchby => \@searchby, |
searchtypes => \@searchtypes, |
searchtypes => \@searchtypes, |
} |
} |
Line 8346 sub modify_directorysrch {
|
Line 8430 sub modify_directorysrch {
|
$changes{'available'} = 1; |
$changes{'available'} = 1; |
} |
} |
} |
} |
if (exists($currdirsrch{'localonly'})) { |
if (exists($currdirsrch{'lcavailable'})) { |
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_localonly'}) { |
if ($currdirsrch{'lcavailable'} ne $env{'form.dirsrch_domavailable'}) { |
$changes{'localonly'} = 1; |
$changes{'lcavailable'} = 1; |
} |
} |
} else { |
} else { |
if ($env{'form.dirsrch_localonly'} eq '1') { |
if ($env{'form.dirsrch_lcavailable'} eq '1') { |
|
$changes{'lcavailable'} = 1; |
|
} |
|
} |
|
if (exists($currdirsrch{'localonly'})) { |
|
if ($currdirsrch{'localonly'} ne $env{'form.dirsrch_instlocalonly'}) { |
|
$changes{'localonly'} = 1; |
|
} |
|
} else { |
|
if ($env{'form.dirsrch_instlocalonly'} eq '1') { |
$changes{'localonly'} = 1; |
$changes{'localonly'} = 1; |
} |
} |
} |
} |
|
if (exists($currdirsrch{'lclocalonly'})) { |
|
if ($currdirsrch{'lclocalonly'} ne $env{'form.dirsrch_domlocalonly'}) { |
|
$changes{'lclocalonly'} = 1; |
|
} |
|
} else { |
|
if ($env{'form.dirsrch_domlocalonly'} eq '1') { |
|
$changes{'lclocalonly'} = 1; |
|
} |
|
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'available'}) { |
if ($changes{'available'}) { |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'available'} set to: $offon[$env{'form.dirsrch_available'}]").'</li>'; |
} |
} |
|
if ($changes{'lcavailable'}) { |
|
$resulttext .= '<li>'.&mt("$title{'lcavailable'} set to: $offon[$env{'form.dirsrch_domavailable'}]").'</li>'; |
|
} |
if ($changes{'localonly'}) { |
if ($changes{'localonly'}) { |
$resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_localonly'}]").'</li>'; |
$resulttext .= '<li>'.&mt("$title{'localonly'} set to: $otherdoms[$env{'form.dirsrch_instlocalonly'}]").'</li>'; |
|
} |
|
if ($changes{'lclocalonly'}) { |
|
$resulttext .= '<li>'.&mt("$title{'lclocalonly'} set to: $otherdoms[$env{'form.dirsrch_domlocalonly'}]").'</li>'; |
} |
} |
|
|
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
if (ref($changes{'cansearch'}) eq 'ARRAY') { |
my $chgtext; |
my $chgtext; |
if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
Line 8414 sub modify_directorysrch {
|
Line 8521 sub modify_directorysrch {
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to institution directory search settings'); |
$resulttext = &mt('No changes made to directory search settings'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
Line 8601 sub modify_usercreation {
|
Line 8708 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 8825 sub modify_selfcreation {
|
Line 8933 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') || ($item eq 'shibenv')) { |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
$curr_usercreation{$key}{$item} = $domconfig{'usercreation'}{$key}{$item}; |
Line 9154 sub modify_selfcreation {
|
Line 9263 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 9315 sub modify_selfcreation {
|
Line 9425 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') { |
Line 9435 sub process_captcha {
|
Line 9549 sub process_captcha {
|
$changes->{'captcha'} = 1; |
$changes->{'captcha'} = 1; |
} |
} |
} |
} |
my ($newpub,$newpriv,$currpub,$currpriv); |
my ($newpub,$newpriv,$currpub,$currpriv,$newversion,$currversion); |
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'}; |
Line 9445 sub process_captcha {
|
Line 9559 sub process_captcha {
|
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 9456 sub process_captcha {
|
Line 9576 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 10353 sub modify_coursedefaults {
|
Line 10490 sub modify_coursedefaults {
|
); |
); |
my @toggles = ('uselcmath','usejsme'); |
my @toggles = ('uselcmath','usejsme'); |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
'uploadquota_community','uploadquota_textbook'); |
'uploadquota_community','uploadquota_textbook','mysqltables_official', |
|
'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, |
postsubmit => 60, |
|
mysqltables => 172800, |
); |
); |
|
|
$defaultshash{'coursedefaults'} = {}; |
$defaultshash{'coursedefaults'} = {}; |
Line 10399 sub modify_coursedefaults {
|
Line 10538 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
$defaultshash{'coursedefaults'}{$item} = $newdef; |
} else { |
} else { |
my ($type) = ($item =~ /^\Quploadquota_\E(\w+)$/); |
my ($setting,$type) = ($item =~ /^(uploadquota|mysqltables)_(\w+)$/); |
if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
if (ref($domconfig{'coursedefaults'}{$setting}) eq 'HASH') { |
$currdef = $domconfig{'coursedefaults'}{'uploadquota'}{$type}; |
$currdef = $domconfig{'coursedefaults'}{$setting}{$type}; |
} |
} |
$newdef =~ s/[^\w.\-]//g; |
$newdef =~ s/[^\w.\-]//g; |
$defaultshash{'coursedefaults'}{'uploadquota'}{$type} = $newdef; |
$defaultshash{'coursedefaults'}{$setting}{$type} = $newdef; |
} |
} |
if ($currdef ne $newdef) { |
if ($currdef ne $newdef) { |
my $staticdef; |
my $staticdef; |
Line 10412 sub modify_coursedefaults {
|
Line 10551 sub modify_coursedefaults {
|
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{$item})) { |
$changes{$item} = 1; |
$changes{$item} = 1; |
} |
} |
} else { |
} elsif ($item =~ /^(uploadquota|mysqltables)_/) { |
unless (($currdef eq '') && ($newdef == $staticdefaults{'uploadquota'})) { |
my $setting = $1; |
$changes{'uploadquota'} = 1; |
unless (($currdef eq '') && ($newdef == $staticdefaults{$setting})) { |
|
$changes{$setting} = 1; |
} |
} |
} |
} |
} |
} |
Line 10539 sub modify_coursedefaults {
|
Line 10679 sub modify_coursedefaults {
|
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{'uploadquota'}) || ($changes{'postsubmit'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'coursecredits'}) || ($changes{'uselcmath'}) || ($changes{'usejsme'}) || |
($changes{'canclone'})) { |
($changes{'canclone'}) || ($changes{'mysqltables'})) { |
foreach my $item ('uselcmath','usejsme') { |
foreach my $item ('uselcmath','usejsme') { |
if ($changes{$item}) { |
if ($changes{$item}) { |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
$domdefaults{$item}=$defaultshash{'coursedefaults'}{$item}; |
Line 10618 sub modify_coursedefaults {
|
Line 10758 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') { |
} elsif ($item eq 'postsubmit') { |
if ($domdefaults{'postsubmit'} eq 'off') { |
if ($domdefaults{'postsubmit'} eq 'off') { |
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
$resulttext .= '<li>'.&mt('Submit button(s) remain enabled on page after student makes submission.'); |
Line 12136 function updateCaptcha(caller,context) {
|
Line 12288 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 12156 function updateCaptcha(caller,context) {
|
Line 12310 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 12164 function updateCaptcha(caller,context) {
|
Line 12328 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 12234 sub captcha_phrases {
|
Line 12403 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)', |
); |
); |
} |
} |
|
|