|
version 1.264, 2015/05/21 22:59:16
|
version 1.274, 2016/07/24 14:34:59
|
|
Line 103 $datatable - HTML containing form eleme
|
Line 103 $datatable - HTML containing form eleme
|
| |
|
| In the case of course requests, radio buttons are displayed for each institutional |
In the case of course requests, radio buttons are displayed for each institutional |
| affiliate type (and also default, and _LC_adv) for each of the course types |
affiliate type (and also default, and _LC_adv) for each of the course types |
| (official, unofficial, community, and textbook). In each case the radio buttons |
(official, unofficial, community, textbook, and placement). |
| allow the selection of one of four values: |
In each case the radio buttons allow the selection of one of four values: |
| |
|
| 0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
0, approval, validate, autolimit=N (where N is blank, or a positive integer). |
| which have the following effects: |
which have the following effects: |
|
Line 173 use File::Copy;
|
Line 173 use File::Copy;
|
| use Locale::Language; |
use Locale::Language; |
| use DateTime::TimeZone; |
use DateTime::TimeZone; |
| use DateTime::Locale; |
use DateTime::Locale; |
| |
use Time::HiRes qw( sleep ); |
| |
|
| my $registered_cleanup; |
my $registered_cleanup; |
| my $modified_urls; |
my $modified_urls; |
|
Line 215 sub handler {
|
Line 216 sub handler {
|
| 'contacts','defaults','scantron','coursecategories', |
'contacts','defaults','scantron','coursecategories', |
| 'serverstatuses','requestcourses','helpsettings', |
'serverstatuses','requestcourses','helpsettings', |
| 'coursedefaults','usersessions','loadbalancing', |
'coursedefaults','usersessions','loadbalancing', |
| 'requestauthor','selfenrollment','inststatus'],$dom); |
'requestauthor','selfenrollment','inststatus', |
| |
'ltitools'],$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','helpsettings', |
'serverstatuses','helpsettings','coursedefaults', |
| 'coursedefaults','selfenrollment','usersessions'); |
'ltitools','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 472 sub handler {
|
Line 474 sub handler {
|
| print => \&print_loadbalancing, |
print => \&print_loadbalancing, |
| modify => \&modify_loadbalancing, |
modify => \&modify_loadbalancing, |
| }, |
}, |
| |
'ltitools' => |
| |
{text => 'External Tools (LTI)', |
| |
help => 'Domain_configuration_LTI_Tools', |
| |
header => [{col1 => 'Setting', |
| |
col2 => 'Value',}], |
| |
print => \&print_ltitools, |
| |
modify => \&modify_ltitools, |
| |
}, |
| |
|
| ); |
); |
| if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
| $prefs{'login'} = { text => 'Log-in page options', |
$prefs{'login'} = { text => 'Log-in page options', |
|
Line 645 sub process_changes {
|
Line 656 sub process_changes {
|
| $output = &modify_usersessions($dom,$lastactref,%domconfig); |
$output = &modify_usersessions($dom,$lastactref,%domconfig); |
| } elsif ($action eq 'loadbalancing') { |
} elsif ($action eq 'loadbalancing') { |
| $output = &modify_loadbalancing($dom,%domconfig); |
$output = &modify_loadbalancing($dom,%domconfig); |
| |
} elsif ($action eq 'ltitools') { |
| |
$output = &modify_ltitools($r,$dom,$action,$lastactref,%domconfig); |
| } |
} |
| return $output; |
return $output; |
| } |
} |
|
Line 904 sub print_config_box {
|
Line 917 sub print_config_box {
|
| 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 'directorysrch') || |
| ($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing')) { |
($action eq 'contacts') || ($action eq 'serverstatuses') || ($action eq 'loadbalancing') || |
| |
($action eq 'ltitools')) { |
| $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 1710 sub print_quotas {
|
Line 1724 sub print_quotas {
|
| my $typecount = 0; |
my $typecount = 0; |
| my ($css_class,%titles); |
my ($css_class,%titles); |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| @usertools = ('official','unofficial','community','textbook'); |
@usertools = ('official','unofficial','community','textbook','placement'); |
| @options =('norequest','approval','validate','autolimit'); |
@options =('norequest','approval','validate','autolimit'); |
| %validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
| %titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
|
Line 2162 sub print_studentcode {
|
Line 2176 sub print_studentcode {
|
| my ($settings,$rowtotal) = @_; |
my ($settings,$rowtotal) = @_; |
| my $rownum = 0; |
my $rownum = 0; |
| my ($output,%current); |
my ($output,%current); |
| my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook','placement'); |
| if (ref($settings) eq 'HASH') { |
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) { |
|
Line 2258 sub print_textbookcourses {
|
Line 2272 sub print_textbookcourses {
|
| (' 'x2). |
(' 'x2). |
| '<span class="LC_nobreak">'.&mt('Thumbnail:'); |
'<span class="LC_nobreak">'.&mt('Thumbnail:'); |
| if ($image) { |
if ($image) { |
| $datatable .= '<span class="LC_nobreak">'. |
$datatable .= $imgsrc. |
| $imgsrc. |
|
| '<label><input type="checkbox" name="'.$type.'_image_del"'. |
'<label><input type="checkbox" name="'.$type.'_image_del"'. |
| ' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
' value="'.$key.'" />'.&mt('Delete?').'</label></span> '. |
| '<span class="LC_nobreak"> '.&mt('Replace:').' '; |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
|
Line 2413 $jstext{'templates'};
|
Line 2426 $jstext{'templates'};
|
| ENDSCRIPT |
ENDSCRIPT |
| } |
} |
| |
|
| |
sub ltitools_javascript { |
| |
my ($settings) = @_; |
| |
return unless(ref($settings) eq 'HASH'); |
| |
my (%ordered,$total,%jstext); |
| |
$total = 0; |
| |
foreach my $item (keys(%{$settings})) { |
| |
if (ref($settings->{$item}) eq 'HASH') { |
| |
my $num = $settings->{$item}{'order'}; |
| |
$ordered{$num} = $item; |
| |
} |
| |
} |
| |
$total = scalar(keys(%{$settings})); |
| |
my @jsarray = (); |
| |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
| |
push(@jsarray,$ordered{$item}); |
| |
} |
| |
my $jstext = ' var ltitools = Array('."'".join("','",@jsarray)."'".');'."\n"; |
| |
return <<"ENDSCRIPT"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
function reorderLTI(form,item) { |
| |
var changedVal; |
| |
$jstext |
| |
var newpos = 'ltitools_add_pos'; |
| |
var maxh = 1 + $total; |
| |
var current = new Array; |
| |
var newitemVal = form.elements[newpos].options[form.elements[newpos].selectedIndex].value; |
| |
if (item == newpos) { |
| |
changedVal = newitemVal; |
| |
} else { |
| |
changedVal = form.elements[item].options[form.elements[item].selectedIndex].value; |
| |
current[newitemVal] = newpos; |
| |
} |
| |
for (var i=0; i<ltitools.length; i++) { |
| |
var elementName = 'ltitools_'+ltitools[i]; |
| |
if (elementName != item) { |
| |
if (form.elements[elementName]) { |
| |
var currVal = form.elements[elementName].options[form.elements[elementName].selectedIndex].value; |
| |
current[currVal] = elementName; |
| |
} |
| |
} |
| |
} |
| |
var oldVal; |
| |
for (var j=0; j<maxh; j++) { |
| |
if (current[j] == undefined) { |
| |
oldVal = j; |
| |
} |
| |
} |
| |
if (oldVal < changedVal) { |
| |
for (var k=oldVal+1; k<=changedVal ; k++) { |
| |
var elementName = current[k]; |
| |
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex - 1; |
| |
} |
| |
} else { |
| |
for (var k=changedVal; k<oldVal; k++) { |
| |
var elementName = current[k]; |
| |
form.elements[elementName].selectedIndex = form.elements[elementName].selectedIndex + 1; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
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); |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff,$failsafe); |
| 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 2450 sub print_autoenroll {
|
Line 2531 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 2485 sub print_autoenroll {
|
Line 2569 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>'. |
| $$rowtotal += 3; |
'<td>'.&mt('Failsafe for no drops when institutional data missing').'</td>'. |
| |
'<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 2898 sub radiobutton_prefs {
|
Line 2986 sub radiobutton_prefs {
|
| return ($datatable,$itemcount); |
return ($datatable,$itemcount); |
| } |
} |
| |
|
| |
sub print_ltitools { |
| |
my ($dom,$settings,$rowtotal) = @_; |
| |
my $rownum = 0; |
| |
my $css_class; |
| |
my $itemcount = 1; |
| |
my $maxnum = 0; |
| |
my %ordered; |
| |
if (ref($settings) eq 'HASH') { |
| |
foreach my $item (keys(%{$settings})) { |
| |
if (ref($settings->{$item}) eq 'HASH') { |
| |
my $num = $settings->{$item}{'order'}; |
| |
$ordered{$num} = $item; |
| |
} |
| |
} |
| |
} |
| |
my $confname = $dom.'-domainconfig'; |
| |
my $switchserver = &check_switchserver($dom,$confname); |
| |
my $maxnum = scalar(keys(%ordered)); |
| |
my $datatable = <itools_javascript($settings); |
| |
my %lt = <itools_names(); |
| |
my @courseroles = ('cc','in','ta','ep','st'); |
| |
my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
| |
my @fields = ('fullname','firstname','lastname','email','user','roles'); |
| |
if (keys(%ordered)) { |
| |
my @items = sort { $a <=> $b } keys(%ordered); |
| |
for (my $i=0; $i<@items; $i++) { |
| |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| |
my $item = $ordered{$items[$i]}; |
| |
my ($title,$key,$secret,$url,$imgsrc,$version); |
| |
if (ref($settings->{$item}) eq 'HASH') { |
| |
$title = $settings->{$item}->{'title'}; |
| |
$url = $settings->{$item}->{'url'}; |
| |
$key = $settings->{$item}->{'key'}; |
| |
$secret = $settings->{$item}->{'secret'}; |
| |
my $image = $settings->{$item}->{'image'}; |
| |
if ($image ne '') { |
| |
$imgsrc = '<img src="'.$image.'" alt="'.&mt('Tool Provider icon').'" />'; |
| |
} |
| |
} |
| |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_".$item."'".');"'; |
| |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">' |
| |
.'<select name="ltitools_'.$item.'"'.$chgstr.'>'; |
| |
for (my $k=0; $k<=$maxnum; $k++) { |
| |
my $vpos = $k+1; |
| |
my $selstr; |
| |
if ($k == $i) { |
| |
$selstr = ' selected="selected" '; |
| |
} |
| |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
| |
} |
| |
$datatable .= '</select>'.(' 'x2). |
| |
'<label><input type="checkbox" name="ltitools_del" value="'.$item.'" />'. |
| |
&mt('Delete?').'</label></span></td>'. |
| |
'<td colspan="2">'. |
| |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
| |
'<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_title_'.$i.'" value="'.$title.'" /></span> '. |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_version_'.$i.'">'. |
| |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '. |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_msgtype_'.$i.'">'. |
| |
'<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '. |
| |
'<br /><br />'. |
| |
'<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_url_'.$i.'"'. |
| |
' value="'.$url.'" /></span>'. |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'key'}. |
| |
'<input type="text" size="25" name="ltitools_key_'.$i.'" value="'.$key.'" /></span> '. |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'secret'}.':'. |
| |
'<input type="password" size="20" name="ltitools_secret_'.$i.'" value="'.$secret.'" />'. |
| |
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_secret_'.$i.'.type='."'text'".' } else { this.form.ltitools_secret_'.$i.'.type='."'password'".' }" />'.&mt('Visible input').'</label>'. |
| |
'<input type="hidden" name="ltitools_id_'.$i.'" value="'.$item.'" /></span>'. |
| |
'</fieldset>'. |
| |
'<fieldset><legend>'.&mt('Optional settings').'</legend>'. |
| |
'<span class="LC_nobreak">'.&mt('Display target:'); |
| |
my %currdisp; |
| |
if (ref($settings->{$item}->{'display'}) eq 'HASH') { |
| |
if ($settings->{$item}->{'display'}->{'target'} eq 'window') { |
| |
$currdisp{'window'} = ' checked="checked"'; |
| |
} else { |
| |
$currdisp{'iframe'} = ' checked="checked"'; |
| |
} |
| |
if ($settings->{$item}->{'display'}->{'width'} =~ /^(\d+)$/) { |
| |
$currdisp{'width'} = $1; |
| |
} |
| |
if ($settings->{$item}->{'display'}->{'height'} =~ /^(\d+)$/) { |
| |
$currdisp{'height'} = $1; |
| |
} |
| |
} else { |
| |
$currdisp{'iframe'} = ' checked="checked"'; |
| |
} |
| |
foreach my $disp ('iframe','window') { |
| |
$datatable .= '<label><input type="radio" name="ltitools_target_'.$i.'" value="'.$disp.'"'.$currdisp{$disp}.' />'. |
| |
$lt{$disp}.'</label>'.(' 'x2); |
| |
} |
| |
$datatable .= (' 'x4); |
| |
foreach my $dimen ('width','height') { |
| |
$datatable .= '<label>'.$lt{$dimen}.' '. |
| |
'<input type="text" name="ltitools_'.$dimen.'_'.$i.'" size="5" value="'.$currdisp{$dimen}.'" /></label>'. |
| |
(' 'x2); |
| |
} |
| |
$datatable .= '<br />'; |
| |
foreach my $extra ('passback','roster') { |
| |
my $checkedon = ''; |
| |
my $checkedoff = ' checked="checked"'; |
| |
if ($settings->{$item}->{$extra}) { |
| |
$checkedon = $checkedoff; |
| |
$checkedoff = ''; |
| |
} |
| |
$datatable .= $lt{$extra}.' '. |
| |
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="1"'.$checkedon.' />'. |
| |
&mt('Yes').'</label>'.(' 'x2). |
| |
'<label><input type="radio" name="ltitools_'.$extra.'_'.$i.'" value="0"'.$checkedoff.' />'. |
| |
&mt('No').'</label>'.(' 'x4); |
| |
} |
| |
$datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.': '; |
| |
if ($imgsrc) { |
| |
$datatable .= $imgsrc. |
| |
'<label><input type="checkbox" name="ltitools_image_del"'. |
| |
' value="'.$item.'" />'.&mt('Delete?').'</label></span> '. |
| |
'<span class="LC_nobreak"> '.&mt('Replace:').' '; |
| |
} else { |
| |
$datatable .= '('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
| |
} |
| |
if ($switchserver) { |
| |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
| |
} else { |
| |
$datatable .= '<input type="file" name="ltitools_image_'.$i.'" value="" />'; |
| |
} |
| |
$datatable .= '</span></fieldset>'; |
| |
my (%checkedfields,%rolemaps); |
| |
if (ref($settings->{$item}) eq 'HASH') { |
| |
if (ref($settings->{$item}->{'fields'}) eq 'HASH') { |
| |
%checkedfields = %{$settings->{$item}->{'fields'}}; |
| |
} |
| |
if (ref($settings->{$item}->{'roles'}) eq 'HASH') { |
| |
%rolemaps = %{$settings->{$item}->{'roles'}}; |
| |
$checkedfields{'roles'} = 1; |
| |
} |
| |
} |
| |
$datatable .= '<fieldset><legend>'.&mt('User data sent on launch').'</legend>'. |
| |
'<span class="LC_nobreak">'; |
| |
foreach my $field (@fields) { |
| |
my $checked; |
| |
if ($checkedfields{$field}) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<label>'. |
| |
'<input type="checkbox" name="ltitools_fields_'.$i.'" value="'.$field.'"'.$checked.' />'. |
| |
$lt{$field}.'</label>'.(' ' x2); |
| |
} |
| |
$datatable .= '</span></fieldset>'. |
| |
'<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>'; |
| |
foreach my $role (@courseroles) { |
| |
my ($selected,$selectnone); |
| |
if (!$rolemaps{$role}) { |
| |
$selectnone = ' selected="selected"'; |
| |
} |
| |
$datatable .= '<td align="center">'. |
| |
&Apache::lonnet::plaintext($role,'Course').'<br />'. |
| |
'<select name="ltitools_roles_'.$role.'_'.$i.'">'. |
| |
'<option value=""'.$selectnone.'>'.&mt('Select').'</option>'; |
| |
foreach my $ltirole (@ltiroles) { |
| |
unless ($selectnone) { |
| |
if ($rolemaps{$role} eq $ltirole) { |
| |
$selected = ' selected="selected"'; |
| |
} else { |
| |
$selected = ''; |
| |
} |
| |
} |
| |
$datatable .= '<option value="'.$ltirole.'"'.$selected.'>'.$ltirole.'</option>'; |
| |
} |
| |
$datatable .= '</select></td>'; |
| |
} |
| |
$datatable .= '</tr></table></fieldset>'; |
| |
my %courseconfig; |
| |
if (ref($settings->{$item}) eq 'HASH') { |
| |
if (ref($settings->{$item}->{'crsconf'}) eq 'HASH') { |
| |
%courseconfig = %{$settings->{$item}->{'crsconf'}}; |
| |
} |
| |
} |
| |
$datatable .= '<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
| |
foreach my $item ('label','title','target') { |
| |
my $checked; |
| |
if ($courseconfig{$item}) { |
| |
$checked = ' checked="checked"'; |
| |
} |
| |
$datatable .= '<label>'. |
| |
'<input type="checkbox" name="ltitools_courseconfig_'.$i.'" value="'.$item.'"'.$checked.' />'. |
| |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
| |
} |
| |
$datatable .= '</span></fieldset>'. |
| |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
| |
'<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'; |
| |
if (ref($settings->{$item}->{'custom'}) eq 'HASH') { |
| |
my %custom = %{$settings->{$item}->{'custom'}}; |
| |
if (keys(%custom) > 0) { |
| |
foreach my $key (sort(keys(%custom))) { |
| |
$datatable .= '<tr><td><span class="LC_nobreak">'. |
| |
'<label><input type="checkbox" name="ltitools_customdel_'.$i.'" value="'. |
| |
$key.'" />'.&mt('Delete').'</label></span></td><td>'.$key.'</td>'. |
| |
'<td><input type="text" name="ltitools_customval_'.$key.'_'.$i.'"'. |
| |
' value="'.$custom{$key}.'" /></td></tr>'; |
| |
} |
| |
} |
| |
} |
| |
$datatable .= '<tr><td><span class="LC_nobreak">'. |
| |
'<label><input type="checkbox" name="ltitools_customadd" value="'.$i.'" />'. |
| |
&mt('Add').'</label></span></td><td><input type="text" name="ltitools_custom_name_'.$i.'" />'. |
| |
'</td><td><input type="text" name="ltitools_custom_value_'.$i.'" /></td></tr>'; |
| |
$datatable .= '</table></fieldset></td></tr>'."\n"; |
| |
$itemcount ++; |
| |
} |
| |
} |
| |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| |
my $chgstr = ' onchange="javascript:reorderLTI(this.form,'."'ltitools_add_pos'".');"'; |
| |
$datatable .= '<tr '.$css_class.'><td><span class="LC_nobreak">'."\n". |
| |
'<input type="hidden" name="ltitools_maxnum" value="'.$maxnum.'" />'."\n". |
| |
'<select name="ltitools_add_pos"'.$chgstr.'>'; |
| |
for (my $k=0; $k<$maxnum+1; $k++) { |
| |
my $vpos = $k+1; |
| |
my $selstr; |
| |
if ($k == $maxnum) { |
| |
$selstr = ' selected="selected" '; |
| |
} |
| |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
| |
} |
| |
$datatable .= '</select> '."\n". |
| |
'<input type="checkbox" name="ltitools_add" value="1" />'.&mt('Add').'</td>'."\n". |
| |
'<td colspan="2">'. |
| |
'<fieldset><legend>'.&mt('Required settings').'</legend>'. |
| |
'<span class="LC_nobreak">'.$lt{'title'}.':<input type="text" size="30" name="ltitools_add_title" value="" /></span> '."\n". |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'version'}.':<select name="ltitools_add_version">'. |
| |
'<option value="LTI-1p0" selected="selected">1.1</option></select></span> '."\n". |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'msgtype'}.':<select name="ltitools_add_msgtype">'. |
| |
'<option value="basic-lti-launch-request" selected="selected">Launch</option></select></span> '. |
| |
'<br />'. |
| |
'<span class="LC_nobreak">'.$lt{'url'}.':<input type="text" size="30" name="ltitools_add_url" value="" /></span> '."\n". |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'key'}.':<input type="text" size="25" name="ltitools_add_key" value="" /></span> '."\n". |
| |
(' 'x2). |
| |
'<span class="LC_nobreak">'.$lt{'secret'}.':<input type="password" size="20" name="ltitools_add_secret" value="" />'. |
| |
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.ltitools_add_secret.type='."'text'".' } else { this.form.ltitools_add_secret.type='."'password'".' }" />'.&mt('Visible input').'</label></span> '."\n". |
| |
'</fieldset>'. |
| |
'<fieldset><legend>'.&mt('Optional settings').'</legend>'. |
| |
'<span class="LC_nobreak">'.&mt('Display target:'); |
| |
my %defaultdisp; |
| |
$defaultdisp{'iframe'} = ' checked="checked"'; |
| |
foreach my $disp ('iframe','window') { |
| |
$datatable .= '<label><input type="radio" name="ltitools_add_target" value="'.$disp.'"'.$defaultdisp{$disp}.' />'. |
| |
$lt{$disp}.'</label>'.(' 'x2); |
| |
} |
| |
$datatable .= (' 'x4); |
| |
foreach my $dimen ('width','height') { |
| |
$datatable .= '<label>'.$lt{$dimen}.' '. |
| |
'<input type="text" name="ltitools_add_'.$dimen.'" size="5" /></label>'. |
| |
(' 'x2); |
| |
} |
| |
$datatable .= '<br />'; |
| |
foreach my $extra ('passback','roster') { |
| |
$datatable .= $lt{$extra}.' '. |
| |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="1" />'. |
| |
&mt('Yes').'</label>'.(' 'x2). |
| |
'<label><input type="radio" name="ltitools_add_'.$extra.'" value="0" checked="checked" />'. |
| |
&mt('No').'</label>'.(' 'x4); |
| |
} |
| |
$datatable .= '<br /><br /><span class="LC_nobreak">'.$lt{'icon'}.': '. |
| |
'('.&mt('if larger than 21x21 pixels, image will be scaled').') '; |
| |
if ($switchserver) { |
| |
$datatable .= &mt('Upload to library server: [_1]',$switchserver); |
| |
} else { |
| |
$datatable .= '<input type="file" name="ltitools_add_image" value="" />'; |
| |
} |
| |
$datatable .= '</span></fieldset>'. |
| |
'<fieldset><legend>'.&mt('User data sent on launch').'</legend>'. |
| |
'<span class="LC_nobreak">'; |
| |
foreach my $field (@fields) { |
| |
$datatable .= '<label>'. |
| |
'<input type="checkbox" name="ltitools_add_fields" value="'.$field.'" />'. |
| |
$lt{$field}.'</label>'.(' ' x2); |
| |
} |
| |
$datatable .= '</span></fieldset>'. |
| |
'<fieldset><legend>'.&mt('Role mapping').'</legend><table><tr>'; |
| |
foreach my $role (@courseroles) { |
| |
my ($checked,$checkednone); |
| |
$datatable .= '<td align="center">'. |
| |
&Apache::lonnet::plaintext($role,'Course').'<br />'. |
| |
'<select name="ltitools_add_roles_'.$role.'">'. |
| |
'<option value="" selected="selected">'.&mt('Select').'</option>'; |
| |
foreach my $ltirole (@ltiroles) { |
| |
$datatable .= '<option value="'.$ltirole.'">'.$ltirole.'</option>'; |
| |
} |
| |
$datatable .= '</select></td>'; |
| |
} |
| |
$datatable .= '</tr></table></fieldset>'. |
| |
'<fieldset><legend>'.&mt('Configurable in course').'</legend><span class="LC_nobreak">'; |
| |
foreach my $item ('label','title','target') { |
| |
$datatable .= '<label>'. |
| |
'<input type="checkbox" name="ltitools_courseconfig" value="'.$item.'" checked="checked" />'. |
| |
$lt{'crs'.$item}.'</label>'.(' ' x2)."\n"; |
| |
} |
| |
$datatable .= '</span></fieldset>'. |
| |
'<fieldset><legend>'.&mt('Custom items sent on launch').'</legend>'. |
| |
'<table><tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th><th>'.&mt('Value').'</th></tr>'. |
| |
'<tr><td><span class="LC_nobreak">'. |
| |
'<label><input type="checkbox" name="ltitools_add_custom" value="1" />'. |
| |
&mt('Add').'</label></span></td><td><input type="text" name="ltitools_add_custom_name" />'. |
| |
'</td><td><input type="text" name="ltitools_add_custom_value" /></td></tr>'. |
| |
'</table></fieldset></td></tr>'."\n". |
| |
'</td>'."\n". |
| |
'</tr>'."\n"; |
| |
$itemcount ++; |
| |
return $datatable; |
| |
} |
| |
|
| |
sub ltitools_names { |
| |
my %lt = &Apache::lonlocal::texthash( |
| |
'title' => 'Title', |
| |
'version' => 'Version', |
| |
'msgtype' => 'Message Type', |
| |
'url' => 'URL', |
| |
'key' => 'Key', |
| |
'secret' => 'Secret', |
| |
'icon' => 'Icon', |
| |
'user' => 'Username:domain', |
| |
'fullname' => 'Full Name', |
| |
'firstname' => 'First Name', |
| |
'lastname' => 'Last Name', |
| |
'email' => 'E-mail', |
| |
'roles' => 'Role', |
| |
'window' => 'Window/Tab', |
| |
'iframe' => 'iFrame', |
| |
'height' => 'Height', |
| |
'width' => 'Width', |
| |
'passback' => 'Tool can return grades:', |
| |
'roster' => 'Tool can retrieve roster:', |
| |
'crstarget' => 'Display target', |
| |
'crslabel' => 'Course label', |
| |
'crstitle' => 'Course title', |
| |
); |
| |
return %lt; |
| |
} |
| |
|
| sub print_coursedefaults { |
sub print_coursedefaults { |
| my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
| my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
my ($css_class,$datatable,%checkedon,%checkedoff,%defaultchecked,@toggles); |
|
Line 3003 sub print_coursedefaults {
|
Line 3437 sub print_coursedefaults {
|
| my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout); |
my ($currdefresponder,%defcredits,%curruploadquota,%deftimeout); |
| my $currusecredits = 0; |
my $currusecredits = 0; |
| my $postsubmitclient = 1; |
my $postsubmitclient = 1; |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| $currdefresponder = $settings->{'anonsurvey_threshold'}; |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
| if (ref($settings->{'uploadquota'}) eq 'HASH') { |
if (ref($settings->{'uploadquota'}) eq 'HASH') { |
|
Line 3137 sub print_selfenrollment {
|
Line 3571 sub print_selfenrollment {
|
| my ($position,$dom,$settings,$rowtotal) = @_; |
my ($position,$dom,$settings,$rowtotal) = @_; |
| my ($css_class,$datatable); |
my ($css_class,$datatable); |
| my $itemcount = 1; |
my $itemcount = 1; |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
| if (($position eq 'top') || ($position eq 'middle')) { |
if (($position eq 'top') || ($position eq 'middle')) { |
| my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
my ($rowsref,$titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
| my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
|
Line 4156 sub tool_titles {
|
Line 4590 sub tool_titles {
|
| unofficial => 'Unofficial courses', |
unofficial => 'Unofficial courses', |
| community => 'Communities', |
community => 'Communities', |
| textbook => 'Textbook courses', |
textbook => 'Textbook courses', |
| |
placement => 'Placement tests', |
| ); |
); |
| return %titles; |
return %titles; |
| } |
} |
|
Line 4166 sub courserequest_titles {
|
Line 4601 sub courserequest_titles {
|
| unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
| community => 'Communities', |
community => 'Communities', |
| textbook => 'Textbook', |
textbook => 'Textbook', |
| |
placement => 'Placement tests', |
| norequest => 'Not allowed', |
norequest => 'Not allowed', |
| approval => 'Approval by Dom. Coord.', |
approval => 'Approval by Dom. Coord.', |
| validate => 'With validation', |
validate => 'With validation', |
|
Line 4555 sub email_as_username {
|
Line 4991 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 4573 sub captcha_choice {
|
Line 5010 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 4606 sub captcha_choice {
|
Line 5048 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 5140 sub print_coursecategories {
|
Line 5586 sub print_coursecategories {
|
| my $toggle_catscomm_dom = ' checked="checked" '; |
my $toggle_catscomm_dom = ' checked="checked" '; |
| my $can_catcomm_comm = ' '; |
my $can_catcomm_comm = ' '; |
| my $can_catcomm_dom = ' checked="checked" '; |
my $can_catcomm_dom = ' checked="checked" '; |
| |
my $toggle_catsplace_place = ' '; |
| |
my $toggle_catsplace_dom = ' checked="checked" '; |
| |
my $can_catplace_place = ' '; |
| |
my $can_catplace_dom = ' checked="checked" '; |
| |
|
| if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
| if ($settings->{'togglecats'} eq 'crs') { |
if ($settings->{'togglecats'} eq 'crs') { |
|
Line 5158 sub print_coursecategories {
|
Line 5608 sub print_coursecategories {
|
| $can_catcomm_comm = $can_catcomm_dom; |
$can_catcomm_comm = $can_catcomm_dom; |
| $can_catcomm_dom = ' '; |
$can_catcomm_dom = ' '; |
| } |
} |
| |
if ($settings->{'togglecatsplace'} eq 'place') { |
| |
$toggle_catsplace_place = $toggle_catsplace_dom; |
| |
$toggle_catsplace_dom = ' '; |
| |
} |
| |
if ($settings->{'categorizeplace'} eq 'place') { |
| |
$can_catplace_place = $can_catplace_dom; |
| |
$can_catplace_dom = ' '; |
| |
} |
| } |
} |
| my %title = &Apache::lonlocal::texthash ( |
my %title = &Apache::lonlocal::texthash ( |
| togglecats => 'Show/Hide a course in catalog', |
togglecats => 'Show/Hide a course in catalog', |
| togglecatscomm => 'Show/Hide a community in catalog', |
togglecatscomm => 'Show/Hide a community in catalog', |
| categorize => 'Assign a category to a course', |
togglecatsplace => 'Show/Hide a placement test in catalog', |
| categorizecomm => 'Assign a category to a community', |
categorize => 'Assign a category to a course', |
| |
categorizecomm => 'Assign a category to a community', |
| |
categorizeplace => 'Assign a category to a placement test', |
| ); |
); |
| my %level = &Apache::lonlocal::texthash ( |
my %level = &Apache::lonlocal::texthash ( |
| dom => 'Set in Domain', |
dom => 'Set in Domain', |
| crs => 'Set in Course', |
crs => 'Set in Course', |
| comm => 'Set in Community', |
comm => 'Set in Community', |
| |
place => 'Set in Placement Test', |
| ); |
); |
| $datatable = '<tr class="LC_odd_row">'. |
$datatable = '<tr class="LC_odd_row">'. |
| '<td>'.$title{'togglecats'}.'</td>'. |
'<td>'.$title{'togglecats'}.'</td>'. |
|
Line 5198 sub print_coursecategories {
|
Line 5659 sub print_coursecategories {
|
| $can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
$can_catcomm_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
| '<label><input type="radio" name="categorizecomm"'. |
'<label><input type="radio" name="categorizecomm"'. |
| $can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
$can_catcomm_comm.'value="comm" />'.$level{'comm'}.'</label></span></td>'. |
| |
'</tr><tr>'. |
| |
'<td>'.$title{'togglecatsplace'}.'</td>'. |
| |
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
| |
'<input type="radio" name="togglecatsplace"'. |
| |
$toggle_catsplace_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
| |
'<label><input type="radio" name="togglecatscomm"'. |
| |
$toggle_catsplace_place.' value="comm" />'.$level{'place'}.'</label></span></td>'. |
| |
'</tr><tr>'. |
| |
'<td>'.$title{'categorizeplace'}.'</td>'. |
| |
'<td class="LC_right_item"><span class="LC_nobreak">'. |
| |
'<label><input type="radio" name="categorizeplace"'. |
| |
$can_catplace_dom.' value="dom" />'.$level{'dom'}.'</label> '. |
| |
'<label><input type="radio" name="categorizeplace"'. |
| |
$can_catplace_place.'value="place" />'.$level{'place'}.'</label></span></td>'. |
| '</tr>'; |
'</tr>'; |
| $$rowtotal += 4; |
$$rowtotal += 6; |
| } else { |
} else { |
| my $css_class; |
my $css_class; |
| my $itemcount = 1; |
my $itemcount = 1; |
|
Line 5224 sub print_coursecategories {
|
Line 5699 sub print_coursecategories {
|
| my %default_names = ( |
my %default_names = ( |
| instcode => &mt('Official courses'), |
instcode => &mt('Official courses'), |
| communities => &mt('Communities'), |
communities => &mt('Communities'), |
| |
placement => &mt('Placement Tests'), |
| ); |
); |
| |
|
| if ((!grep(/^instcode$/,@{$cats[0]})) || |
if ((!grep(/^instcode$/,@{$cats[0]})) || |
| ($cathash->{'instcode::0'} eq '') || |
($cathash->{'instcode::0'} eq '') || |
| (!grep(/^communities$/,@{$cats[0]})) || |
(!grep(/^communities$/,@{$cats[0]})) || |
| ($cathash->{'communities::0'} eq '')) { |
($cathash->{'communities::0'} eq '') || |
| |
(!grep(/^placement$/,@{$cats[0]})) || |
| |
($cathash->{'placement::0'} eq '')) { |
| $maxnum ++; |
$maxnum ++; |
| } |
} |
| my $lastidx; |
my $lastidx; |
|
Line 5250 sub print_coursecategories {
|
Line 5728 sub print_coursecategories {
|
| $datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
$datatable .= '<option value="'.$k.'"'.$selstr.'>'.$vpos.'</option>'; |
| } |
} |
| $datatable .= '</select></span></td><td>'; |
$datatable .= '</select></span></td><td>'; |
| if ($parent eq 'instcode' || $parent eq 'communities') { |
if ($parent eq 'instcode' || $parent eq 'communities' || $parent eq 'placement') { |
| $datatable .= '<span class="LC_nobreak">' |
$datatable .= '<span class="LC_nobreak">' |
| .$default_names{$parent}.'</span>'; |
.$default_names{$parent}.'</span>'; |
| if ($parent eq 'instcode') { |
if ($parent eq 'instcode') { |
|
Line 5273 sub print_coursecategories {
|
Line 5751 sub print_coursecategories {
|
| $datatable .= '<label><input type="radio" name="' |
$datatable .= '<label><input type="radio" name="' |
| .$parent.'" value="0" />' |
.$parent.'" value="0" />' |
| .&mt('Do not display').'</label></span>'; |
.&mt('Do not display').'</label></span>'; |
| if ($parent eq 'communities') { |
if (($parent eq 'communities') || ($parent eq 'placement')) { |
| $datatable .= '</td></tr></table>'; |
$datatable .= '</td></tr></table>'; |
| } |
} |
| $datatable .= '</td>'; |
$datatable .= '</td>'; |
|
Line 5305 sub print_coursecategories {
|
Line 5783 sub print_coursecategories {
|
| .'<input type="text" size="20" name="addcategory_name" value="" /></td>' |
.'<input type="text" size="20" name="addcategory_name" value="" /></td>' |
| .'</tr>'."\n"; |
.'</tr>'."\n"; |
| $itemcount ++; |
$itemcount ++; |
| foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities','placement') { |
| if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) { |
if ((!grep(/^\Q$default\E$/,@{$cats[0]})) || ($cathash->{$default.'::0'} eq '')) { |
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"'; |
my $chgstr = ' onchange="javascript:reorderCats(this.form,'."'','$default"."_pos','$lastidx'".');"'; |
|
Line 5486 sub coursecategories_javascript {
|
Line 5964 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 $placement_reserved = &mt('The name: [_1] is a reserved category.','"placement"'); |
| |
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(\$placement_reserved); |
| |
&js_escape(\$choose_again); |
| $output = <<"ENDSCRIPT"; |
$output = <<"ENDSCRIPT"; |
| <script type="text/javascript"> |
<script type="text/javascript"> |
| // <![CDATA[ |
// <![CDATA[ |
|
Line 5555 function categoryCheck(form) {
|
Line 6038 function categoryCheck(form) {
|
| alert('$communities_reserved\\n$choose_again'); |
alert('$communities_reserved\\n$choose_again'); |
| return false; |
return false; |
| } |
} |
| |
if (form.elements['addcategory_name'].value == 'placement') { |
| |
alert('$placement_reserved\\n$choose_again'); |
| |
return false; |
| |
} |
| return true; |
return true; |
| } |
} |
| |
|
|
Line 5571 sub initialize_categories {
|
Line 6058 sub initialize_categories {
|
| my %default_names = ( |
my %default_names = ( |
| instcode => 'Official courses (with institutional codes)', |
instcode => 'Official courses (with institutional codes)', |
| communities => 'Communities', |
communities => 'Communities', |
| |
placement => 'Placement Tests', |
| ); |
); |
| my $select0 = ' selected="selected"'; |
my $select0 = ' selected="selected"'; |
| my $select1 = ''; |
my $select1 = ''; |
| foreach my $default ('instcode','communities') { |
foreach my $default ('instcode','communities','placement') { |
| $css_class = $itemcount%2?' class="LC_odd_row"':''; |
$css_class = $itemcount%2?' class="LC_odd_row"':''; |
| $chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; |
$chgstr = ' onchange="javascript:reorderCats(this.form,'."'',$default"."_pos','0'".');"'; |
| if ($default eq 'communities') { |
if (($default eq 'communities') || ($default eq 'placement')) { |
| $select1 = $select0; |
$select1 = $select0; |
| $select0 = ''; |
$select0 = ''; |
| } |
} |
|
Line 6163 sub modify_login {
|
Line 6651 sub modify_login {
|
| if ($domservers{$lonhost}) { |
if ($domservers{$lonhost}) { |
| if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
if (ref($domconfig{'login'}{'headtag'}{$lonhost}) eq 'HASH') { |
| $currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'}; |
$currheadtagurls{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'url'}; |
| $currexempt{$lonhost} = $domconfig{'login'}{'headtagexempt'}{$lonhost}{'exempt'} |
$currexempt{$lonhost} = $domconfig{'login'}{'headtag'}{$lonhost}{'exempt'}; |
| } |
} |
| } |
} |
| } |
} |
|
Line 6388 sub modify_login {
|
Line 6876 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 6880 sub check_authorstatus {
|
Line 7375 sub check_authorstatus {
|
| |
|
| sub publishlogo { |
sub publishlogo { |
| my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_; |
my ($r,$action,$formname,$dom,$confname,$subdir,$thumbwidth,$thumbheight,$savefileas) = @_; |
| my ($output,$fname,$logourl); |
my ($output,$fname,$logourl,$madethumb); |
| if ($action eq 'upload') { |
if ($action eq 'upload') { |
| $fname=$env{'form.'.$formname.'.filename'}; |
$fname=$env{'form.'.$formname.'.filename'}; |
| chop($env{'form.'.$formname}); |
chop($env{'form.'.$formname}); |
|
Line 7008 $env{'user.name'}.':'.$env{'user.domain'
|
Line 7503 $env{'user.name'}.':'.$env{'user.domain'
|
| $r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
$r->set_handlers('PerlCleanupHandler' => [\¬ifysubscribed,@{$handlers}]); |
| $registered_cleanup=1; |
$registered_cleanup=1; |
| } |
} |
| |
$madethumb = 1; |
| } else { |
} else { |
| print $logfile "\nUnable to write ".$copyfile. |
print $logfile "\nUnable to write ".$copyfile. |
| ':'.$!."\n"; |
':'.$!."\n"; |
|
Line 7020 $env{'user.name'}.':'.$env{'user.domain'
|
Line 7516 $env{'user.name'}.':'.$env{'user.domain'
|
| $output = $versionresult; |
$output = $versionresult; |
| } |
} |
| } |
} |
| return ($output,$logourl); |
return ($output,$logourl,$madethumb); |
| } |
} |
| |
|
| sub logo_versioning { |
sub logo_versioning { |
|
Line 7174 sub modify_quotas {
|
Line 7670 sub modify_quotas {
|
| $context = $action; |
$context = $action; |
| } |
} |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| @usertools = ('official','unofficial','community','textbook'); |
@usertools = ('official','unofficial','community','textbook','placement'); |
| @options =('norequest','approval','validate','autolimit'); |
@options =('norequest','approval','validate','autolimit'); |
| %validations = &Apache::lonnet::auto_courserequest_checks($dom); |
%validations = &Apache::lonnet::auto_courserequest_checks($dom); |
| %titles = &courserequest_titles(); |
%titles = &courserequest_titles(); |
|
Line 7223 sub modify_quotas {
|
Line 7719 sub modify_quotas {
|
| my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval'); |
my @approvalnotify = &Apache::loncommon::get_env_multiple('form.'.$context.'notifyapproval'); |
| @approvalnotify = sort(@approvalnotify); |
@approvalnotify = sort(@approvalnotify); |
| $confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
$confhash{'notify'}{'approval'} = join(',',@approvalnotify); |
| my @crstypes = ('official','unofficial','community','textbook'); |
my @crstypes = ('official','unofficial','community','textbook','placement'); |
| my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode'); |
my @hasuniquecode = &Apache::loncommon::get_env_multiple('form.uniquecode'); |
| foreach my $type (@hasuniquecode) { |
foreach my $type (@hasuniquecode) { |
| if (grep(/^\Q$type\E$/,@crstypes)) { |
if (grep(/^\Q$type\E$/,@crstypes)) { |
|
Line 7414 sub modify_quotas {
|
Line 7910 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'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
| if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
| @changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
if (ref($domconfig{'requestcourses'}{'validation'}{$item}) eq 'ARRAY') { |
| $domconfig{'requestcourses'}{'validation'}{$item}); |
@changed = &Apache::loncommon::compare_arrays($confhash{'validation'}{$item}, |
| |
$domconfig{'requestcourses'}{'validation'}{$item}); |
| |
} else { |
| |
@changed = @{$confhash{'validation'}{$item}}; |
| |
} |
| } else { |
} else { |
| @changed = @{$confhash{'validation'}{$item}}; |
@changed = @{$confhash{'validation'}{$item}}; |
| } |
} |
|
Line 7438 sub modify_quotas {
|
Line 7938 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'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
| if ($domconfig{'requestcourses'}{'validation'}{$item} ne $confhash{'validation'}{$item}) { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
| $changes{'validation'}{$item} = $confhash{'validation'}{$item}; |
if ($domconfig{'requestcourses'}{'validation'}{$item} ne $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 7458 sub modify_quotas {
|
Line 7964 sub modify_quotas {
|
| } |
} |
| } |
} |
| if (ref($confhash{'validation'}) eq 'HASH') { |
if (ref($confhash{'validation'}) eq 'HASH') { |
| if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
| if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
| unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
| if ($confhash{'validation'}{'dc'} eq '') { |
unless ($confhash{'validation'}{'dc'} eq $domconfig{'requestcourses'}{'validation'}{'dc'}) { |
| $changes{'validation'}{'dc'} = &mt('None'); |
if ($confhash{'validation'}{'dc'} eq '') { |
| } else { |
$changes{'validation'}{'dc'} = &mt('None'); |
| $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
} else { |
| |
$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'}; |
| } |
} |
| } elsif ($confhash{'validation'}{'dc'} ne '') { |
} elsif ($confhash{'validation'}{'dc'} ne '') { |
| $changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
$changes{'validation'}{'dc'} = $confhash{'validation'}{'dc'}; |
| } |
} |
| } elsif (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
} else { |
| if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
| $changes{'validation'}{'dc'} = &mt('None'); |
if (ref($domconfig{'requestcourses'}{'validation'}) eq 'HASH') { |
| |
if ($domconfig{'requestcourses'}{'validation'}{'dc'}) { |
| |
$changes{'validation'}{'dc'} = &mt('None'); |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 7871 sub process_textbook_image {
|
Line 8385 sub process_textbook_image {
|
| return ($url,$error); |
return ($url,$error); |
| } |
} |
| |
|
| |
sub modify_ltitools { |
| |
my ($r,$dom,$action,$lastactref,%domconfig) = @_; |
| |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom,1); |
| |
my ($newid,@allpos,%changes,%confhash,$errors,$resulttext); |
| |
my $confname = $dom.'-domainconfig'; |
| |
my $servadm = $r->dir_config('lonAdmEMail'); |
| |
my ($configuserok,$author_ok,$switchserver) = &config_check($dom,$confname,$servadm); |
| |
my (%posslti,%possfield); |
| |
my @courseroles = ('cc','in','ta','ep','st'); |
| |
my @ltiroles = qw(Instructor ContentDeveloper TeachingAssistant Learner); |
| |
map { $posslti{$_} = 1; } @ltiroles; |
| |
my @allfields = ('fullname','firstname','lastname','email','user','roles'); |
| |
map { $possfield{$_} = 1; } @allfields; |
| |
my %lt = <itools_names(); |
| |
if ($env{'form.ltitools_add'}) { |
| |
my $title = $env{'form.ltitools_add_title'}; |
| |
$title =~ s/(`)/'/g; |
| |
($newid,my $error) = &get_ltitools_id($dom,$title); |
| |
if ($newid) { |
| |
my $position = $env{'form.ltitools_add_pos'}; |
| |
$position =~ s/\D+//g; |
| |
if ($position ne '') { |
| |
$allpos[$position] = $newid; |
| |
} |
| |
$changes{$newid} = 1; |
| |
foreach my $item ('title','url','key','secret') { |
| |
$env{'form.ltitools_add_'.$item} =~ s/(`)/'/g; |
| |
if ($env{'form.ltitools_add_'.$item}) { |
| |
$confhash{$newid}{$item} = $env{'form.ltitools_add_'.$item}; |
| |
} |
| |
} |
| |
if ($env{'form.ltitools_add_version'} eq 'LTI-1p0') { |
| |
$confhash{$newid}{'version'} = $env{'form.ltitools_add_version'}; |
| |
} |
| |
if ($env{'form.ltitools_add_msgtype'} eq 'basic-lti-launch-request') { |
| |
$confhash{$newid}{'msgtype'} = $env{'form.ltitools_add_msgtype'}; |
| |
} |
| |
foreach my $item ('width','height') { |
| |
$env{'form.ltitools_add_'.$item} =~ s/^\s+//; |
| |
$env{'form.ltitools_add_'.$item} =~ s/\s+$//; |
| |
if ($env{'form.ltitools_add_'.$item} =~ /^\d+$/) { |
| |
$confhash{$newid}{'display'}{$item} = $env{'form.ltitools_add_'.$item}; |
| |
} |
| |
} |
| |
if ($env{'form.ltitools_add_target'} eq 'window') { |
| |
$confhash{$newid}{'display'}{'target'} = $env{'form.ltitools_add_target'}; |
| |
} else { |
| |
$confhash{$newid}{'display'}{'target'} = 'iframe'; |
| |
} |
| |
foreach my $item ('passback','roster') { |
| |
if ($env{'form.ltitools_add_'.$item}) { |
| |
$confhash{$newid}{$item} = 1; |
| |
} |
| |
} |
| |
if ($env{'form.ltitools_add_image.filename'} ne '') { |
| |
my ($imageurl,$error) = |
| |
&process_ltitools_image($r,$dom,$confname,'ltitools_add_image',$dom, |
| |
$configuserok,$switchserver,$author_ok); |
| |
if ($imageurl) { |
| |
$confhash{$newid}{'image'} = $imageurl; |
| |
} |
| |
if ($error) { |
| |
&Apache::lonnet::logthis($error); |
| |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| |
} |
| |
} |
| |
my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_add_fields'); |
| |
foreach my $field (@fields) { |
| |
if ($possfield{$field}) { |
| |
if ($field eq 'roles') { |
| |
foreach my $role (@courseroles) { |
| |
my $choice = $env{'form.ltitools_add_roles_'.$role}; |
| |
if (($choice ne '') && ($posslti{$choice})) { |
| |
$confhash{$newid}{'roles'}{$role} = $choice; |
| |
if ($role eq 'cc') { |
| |
$confhash{$newid}{'roles'}{'co'} = $choice; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$confhash{$newid}{'fields'}{$field} = 1; |
| |
} |
| |
} |
| |
} |
| |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig'); |
| |
foreach my $item (@courseconfig) { |
| |
$confhash{$newid}{'crsconf'}{$item} = 1; |
| |
} |
| |
if ($env{'form.ltitools_add_custom'}) { |
| |
my $name = $env{'form.ltitools_add_custom_name'}; |
| |
my $value = $env{'form.ltitools_add_custom_value'}; |
| |
$value =~ s/(`)/'/g; |
| |
$name =~ s/(`)/'/g; |
| |
$confhash{$newid}{'custom'}{$name} = $value; |
| |
} |
| |
} else { |
| |
my $error = &mt('Failed to acquire unique ID for new external tool'); |
| |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| |
} |
| |
} |
| |
if (ref($domconfig{$action}) eq 'HASH') { |
| |
my %deletions; |
| |
my @todelete = &Apache::loncommon::get_env_multiple('form.ltitools_del'); |
| |
if (@todelete) { |
| |
map { $deletions{$_} = 1; } @todelete; |
| |
} |
| |
my %customadds; |
| |
my @newcustom = &Apache::loncommon::get_env_multiple('form.ltitools_customadd'); |
| |
if (@newcustom) { |
| |
map { $customadds{$_} = 1; } @newcustom; |
| |
} |
| |
my %imgdeletions; |
| |
my @todeleteimages = &Apache::loncommon::get_env_multiple('form.ltitools_image_del'); |
| |
if (@todeleteimages) { |
| |
map { $imgdeletions{$_} = 1; } @todeleteimages; |
| |
} |
| |
my $maxnum = $env{'form.ltitools_maxnum'}; |
| |
for (my $i=0; $i<=$maxnum; $i++) { |
| |
my $itemid = $env{'form.ltitools_id_'.$i}; |
| |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
| |
if ($deletions{$itemid}) { |
| |
if ($domconfig{$action}{$itemid}{'image'}) { |
| |
#FIXME need to obsolete item in RES space |
| |
} |
| |
$changes{$itemid} = $domconfig{$action}{$itemid}{'title'}; |
| |
next; |
| |
} else { |
| |
my $newpos = $env{'form.ltitools_'.$itemid}; |
| |
$newpos =~ s/\D+//g; |
| |
foreach my $item ('title','url','key','secret') { |
| |
$confhash{$itemid}{$item} = $env{'form.ltitools_'.$item.'_'.$i}; |
| |
if ($domconfig{$action}{$itemid}{$item} ne $confhash{$itemid}{$item}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
if ($env{'form.ltitools_version_'.$i} eq 'LTI-1p0') { |
| |
$confhash{$itemid}{'version'} = $env{'form.ltitools_version_'.$i}; |
| |
} |
| |
if ($env{'form.ltitools_msgtype_'.$i} eq 'basic-lti-launch-request') { |
| |
$confhash{$itemid}{'msgtype'} = $env{'form.ltitools_msgtype_'.$i}; |
| |
} |
| |
foreach my $size ('width','height') { |
| |
$env{'form.ltitools_'.$size.'_'.$i} =~ s/^\s+//; |
| |
$env{'form.ltitools_'.$size.'_'.$i} =~ s/\s+$//; |
| |
if ($env{'form.ltitools_'.$size.'_'.$i} =~ /^\d+$/) { |
| |
$confhash{$itemid}{'display'}{$size} = $env{'form.ltitools_'.$size.'_'.$i}; |
| |
if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'display'}{$size} ne $confhash{$itemid}{'display'}{$size}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} else { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} |
| |
if ($env{'form.ltitools_target_'.$i} eq 'window') { |
| |
$confhash{$itemid}{'display'}{'target'} = $env{'form.ltitools_target_'.$i}; |
| |
} else { |
| |
$confhash{$itemid}{'display'}{'target'} = 'iframe'; |
| |
} |
| |
if (ref($domconfig{$action}{$itemid}{'display'}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'display'}{'target'} ne $confhash{$itemid}{'display'}{'target'}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} else { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
foreach my $extra ('passback','roster') { |
| |
if ($env{'form.ltitools_'.$extra.'_'.$i}) { |
| |
$confhash{$itemid}{$extra} = 1; |
| |
} |
| |
if ($domconfig{$action}{$itemid}{$extra} ne $confhash{$itemid}{$extra}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
my @courseconfig = &Apache::loncommon::get_env_multiple('form.ltitools_courseconfig_'.$i); |
| |
foreach my $item ('label','title','target') { |
| |
if (grep(/^\Q$item\E$/,@courseconfig)) { |
| |
$confhash{$itemid}{'crsconf'}{$item} = 1; |
| |
if (ref($domconfig{$action}{$itemid}{'crsconf'}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'crsconf'}{$item} ne $confhash{$itemid}{'crsconf'}{$item}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} else { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} |
| |
my @fields = &Apache::loncommon::get_env_multiple('form.ltitools_fields_'.$i); |
| |
foreach my $field (@fields) { |
| |
if ($possfield{$field}) { |
| |
if ($field eq 'roles') { |
| |
foreach my $role (@courseroles) { |
| |
my $choice = $env{'form.ltitools_roles_'.$role.'_'.$i}; |
| |
if (($choice ne '') && ($posslti{$choice})) { |
| |
$confhash{$itemid}{'roles'}{$role} = $choice; |
| |
if ($role eq 'cc') { |
| |
$confhash{$itemid}{'roles'}{'co'} = $choice; |
| |
} |
| |
} |
| |
if (ref($domconfig{$action}{$itemid}{'roles'}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'roles'}{$role} ne $confhash{$itemid}{'roles'}{$role}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} elsif ($confhash{$itemid}{'roles'}{$role}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} else { |
| |
$confhash{$itemid}{'fields'}{$field} = 1; |
| |
if (ref($domconfig{$action}{$itemid}{'fields'}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'fields'}{$field} ne $confhash{$itemid}{'fields'}{$field}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} else { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
$allpos[$newpos] = $itemid; |
| |
} |
| |
if ($imgdeletions{$itemid}) { |
| |
$changes{$itemid} = 1; |
| |
#FIXME need to obsolete item in RES space |
| |
} elsif ($env{'form.ltitools_image_'.$i.'.filename'}) { |
| |
my ($imgurl,$error) = &process_ltitools_image($r,$dom,$confname,'ltitools_image_'.$i, |
| |
$itemid,$configuserok,$switchserver, |
| |
$author_ok); |
| |
if ($imgurl) { |
| |
$confhash{$itemid}{'image'} = $imgurl; |
| |
$changes{$itemid} = 1; |
| |
} |
| |
if ($error) { |
| |
&Apache::lonnet::logthis($error); |
| |
$errors .= '<li><span class="LC_error">'.$error.'</span></li>'; |
| |
} |
| |
} elsif ($domconfig{$action}{$itemid}{'image'}) { |
| |
$confhash{$itemid}{'image'} = |
| |
$domconfig{$action}{$itemid}{'image'}; |
| |
} |
| |
if ($customadds{$i}) { |
| |
my $name = $env{'form.ltitools_custom_name_'.$i}; |
| |
$name =~ s/(`)/'/g; |
| |
$name =~ s/^\s+//; |
| |
$name =~ s/\s+$//; |
| |
my $value = $env{'form.ltitools_custom_value_'.$i}; |
| |
$value =~ s/(`)/'/g; |
| |
$value =~ s/^\s+//; |
| |
$value =~ s/\s+$//; |
| |
if ($name ne '') { |
| |
$confhash{$itemid}{'custom'}{$name} = $value; |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
my %customdels; |
| |
my @customdeletions = &Apache::loncommon::get_env_multiple('form.ltitools_customdel_'.$i); |
| |
if (@customdeletions) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
map { $customdels{$_} = 1; } @customdeletions; |
| |
if (ref($domconfig{$action}{$itemid}{'custom'}) eq 'HASH') { |
| |
foreach my $key (keys(%{$domconfig{$action}{$itemid}{'custom'}})) { |
| |
unless ($customdels{$key}) { |
| |
if ($env{'form.ltitools_customval_'.$key.'_'.$i} ne '') { |
| |
$confhash{$itemid}{'custom'}{$key} = $env{'form.ltitools_customval_'.$key.'_'.$i}; |
| |
} |
| |
if ($domconfig{$action}{$itemid}{'custom'}{$key} ne $env{'form.ltitools_customval_'.$key.'_'.$i}) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless ($changes{$itemid}) { |
| |
foreach my $key (keys(%{$domconfig{$action}{$itemid}})) { |
| |
if (ref($domconfig{$action}{$itemid}{$key}) eq 'HASH') { |
| |
if (ref($confhash{$itemid}{$key}) eq 'HASH') { |
| |
foreach my $innerkey (keys(%{$domconfig{$action}{$itemid}{$key}})) { |
| |
unless (exists($confhash{$itemid}{$key}{$innerkey})) { |
| |
$changes{$itemid} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} elsif (keys(%{$domconfig{$action}{$itemid}{$key}}) > 0) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
last if ($changes{$itemid}); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (@allpos > 0) { |
| |
my $idx = 0; |
| |
foreach my $itemid (@allpos) { |
| |
if ($itemid ne '') { |
| |
$confhash{$itemid}{'order'} = $idx; |
| |
if (ref($domconfig{$action}) eq 'HASH') { |
| |
if (ref($domconfig{$action}{$itemid}) eq 'HASH') { |
| |
if ($domconfig{$action}{$itemid}{'order'} ne $idx) { |
| |
$changes{$itemid} = 1; |
| |
} |
| |
} |
| |
} |
| |
$idx ++; |
| |
} |
| |
} |
| |
} |
| |
my %ltitoolshash = ( |
| |
$action => { %confhash } |
| |
); |
| |
my $putresult = &Apache::lonnet::put_dom('configuration',\%ltitoolshash, |
| |
$dom); |
| |
if ($putresult eq 'ok') { |
| |
if (keys(%changes) > 0) { |
| |
my $cachetime = 24*60*60; |
| |
&Apache::lonnet::do_cache_new('ltitools',$dom,\%confhash,$cachetime); |
| |
if (ref($lastactref) eq 'HASH') { |
| |
$lastactref->{'ltitools'} = 1; |
| |
} |
| |
$resulttext = &mt('Changes made:').'<ul>'; |
| |
my %bynum; |
| |
foreach my $itemid (sort(keys(%changes))) { |
| |
my $position = $confhash{$itemid}{'order'}; |
| |
$bynum{$position} = $itemid; |
| |
} |
| |
foreach my $pos (sort { $a <=> $b } keys(%bynum)) { |
| |
my $itemid = $bynum{$pos}; |
| |
if (ref($confhash{$itemid}) ne 'HASH') { |
| |
$resulttext .= '<li>'.&mt('Deleted: [_1]',$changes{$itemid}).'</li>'; |
| |
} else { |
| |
$resulttext .= '<li><b>'.$confhash{$itemid}{'title'}.'</b>'; |
| |
if ($confhash{$itemid}{'image'}) { |
| |
$resulttext .= ' '. |
| |
'<img src="'.$confhash{$itemid}{'image'}.'"'. |
| |
' alt="'.&mt('Tool Provider icon').'" />'; |
| |
} |
| |
$resulttext .= '</li><ul>'; |
| |
my $position = $pos + 1; |
| |
$resulttext .= '<li>'.&mt('Order: [_1]',$position).'</li>'; |
| |
foreach my $item ('version','msgtype','url','key') { |
| |
if ($confhash{$itemid}{$item} ne '') { |
| |
$resulttext .= '<li>'.$lt{$item}.': '.$confhash{$itemid}{$item}.'</li>'; |
| |
} |
| |
} |
| |
if ($confhash{$itemid}{'secret'} ne '') { |
| |
$resulttext .= '<li>'.$lt{'secret'}.': '; |
| |
my $num = length($confhash{$itemid}{'secret'}); |
| |
$resulttext .= ('*'x$num).'</li>'; |
| |
} |
| |
$resulttext .= '<li>'.&mt('Configurable in course:'); |
| |
my @possconfig = ('label','title','target'); |
| |
my $numconfig = 0; |
| |
if (ref($confhash{$itemid}{'crsconf'}) eq 'HASH') { |
| |
foreach my $item (@possconfig) { |
| |
if ($confhash{$itemid}{'crsconf'}{$item}) { |
| |
$numconfig ++; |
| |
$resulttext .= ' '.$lt{'crs'.$item}; |
| |
} |
| |
} |
| |
} |
| |
if (!$numconfig) { |
| |
$resulttext .= &mt('None'); |
| |
} |
| |
$resulttext .= '</li>'; |
| |
foreach my $item ('passback','roster') { |
| |
$resulttext .= '<li>'.$lt{$item}.' '; |
| |
if ($confhash{$itemid}{$item}) { |
| |
$resulttext .= &mt('Yes'); |
| |
} else { |
| |
$resulttext .= &mt('No'); |
| |
} |
| |
$resulttext .= '</li>'; |
| |
} |
| |
if (ref($confhash{$itemid}{'display'}) eq 'HASH') { |
| |
my $displaylist; |
| |
if ($confhash{$itemid}{'display'}{'target'}) { |
| |
$displaylist = &mt('Display target').': '. |
| |
$confhash{$itemid}{'display'}{'target'}.','; |
| |
} |
| |
foreach my $size ('width','height') { |
| |
if ($confhash{$itemid}{'display'}{$size}) { |
| |
$displaylist .= (' 'x2).$lt{$size}.': '. |
| |
$confhash{$itemid}{'display'}{$size}.','; |
| |
} |
| |
} |
| |
if ($displaylist) { |
| |
$displaylist =~ s/,$//; |
| |
$resulttext .= '<li>'.$displaylist.'</li>'; |
| |
} |
| |
} |
| |
if (ref($confhash{$itemid}{'fields'}) eq 'HASH') { |
| |
my $fieldlist; |
| |
foreach my $field (@allfields) { |
| |
if ($confhash{$itemid}{'fields'}{$field}) { |
| |
$fieldlist .= (' 'x2).$lt{$field}.','; |
| |
} |
| |
} |
| |
if ($fieldlist) { |
| |
$fieldlist =~ s/,$//; |
| |
$resulttext .= '<li>'.&mt('Data sent').':'.$fieldlist.'</li>'; |
| |
} |
| |
} |
| |
if (ref($confhash{$itemid}{'roles'}) eq 'HASH') { |
| |
my $rolemaps; |
| |
foreach my $role (@courseroles) { |
| |
if ($confhash{$itemid}{'roles'}{$role}) { |
| |
$rolemaps .= (' 'x2).&Apache::lonnet::plaintext($role,'Course').'='. |
| |
$confhash{$itemid}{'roles'}{$role}.','; |
| |
} |
| |
} |
| |
if ($rolemaps) { |
| |
$rolemaps =~ s/,$//; |
| |
$resulttext .= '<li>'.&mt('Role mapping:').$rolemaps.'</li>'; |
| |
} |
| |
} |
| |
if (ref($confhash{$itemid}{'custom'}) eq 'HASH') { |
| |
my $customlist; |
| |
if (keys(%{$confhash{$itemid}{'custom'}})) { |
| |
foreach my $key (sort(keys(%{$confhash{$itemid}{'custom'}}))) { |
| |
$customlist .= $key.':'.$confhash{$itemid}{'custom'}{$key}.(' 'x2); |
| |
} |
| |
} |
| |
if ($customlist) { |
| |
$resulttext .= '<li>'.&mt('Custom items').':'.$customlist.'</li>'; |
| |
} |
| |
} |
| |
$resulttext .= '</ul></li>'; |
| |
} |
| |
} |
| |
$resulttext .= '</ul>'; |
| |
} else { |
| |
$resulttext = &mt('No changes made.'); |
| |
} |
| |
} else { |
| |
$errors .= '<li><span class="LC_error">'.&mt('Failed to save changes').'</span></li>'; |
| |
} |
| |
if ($errors) { |
| |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
| |
$errors.'</ul>'; |
| |
} |
| |
return $resulttext; |
| |
} |
| |
|
| |
sub process_ltitools_image { |
| |
my ($r,$dom,$confname,$caller,$itemid,$configuserok,$switchserver,$author_ok) = @_; |
| |
my $filename = $env{'form.'.$caller.'.filename'}; |
| |
my ($error,$url); |
| |
my ($width,$height) = (21,21); |
| |
if ($configuserok eq 'ok') { |
| |
if ($switchserver) { |
| |
$error = &mt('Upload of Tool Provider (LTI) icon is not permitted to this server: [_1]', |
| |
$switchserver); |
| |
} elsif ($author_ok eq 'ok') { |
| |
my ($result,$imageurl,$madethumb) = |
| |
&publishlogo($r,'upload',$caller,$dom,$confname, |
| |
"ltitools/$itemid/icon",$width,$height); |
| |
if ($result eq 'ok') { |
| |
if ($madethumb) { |
| |
my ($path,$imagefile) = ($imageurl =~ m{^(.+)/([^/]+)$}); |
| |
my $imagethumb = "$path/tn-".$imagefile; |
| |
$url = $imagethumb; |
| |
} else { |
| |
$url = $imageurl; |
| |
} |
| |
} else { |
| |
$error = &mt("Upload of [_1] failed because an error occurred publishing the file in RES space. Error was: [_2].",$filename,$result); |
| |
} |
| |
} else { |
| |
$error = &mt("Upload of [_1] failed because an author role could not be assigned to a Domain Configuration user ([_2]) in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$author_ok); |
| |
} |
| |
} else { |
| |
$error = &mt("Upload of [_1] failed because a Domain Configuration user ([_2]) could not be created in domain: [_3]. Error was: [_4].",$filename,$confname,$dom,$configuserok); |
| |
} |
| |
return ($url,$error); |
| |
} |
| |
|
| |
sub get_ltitools_id { |
| |
my ($cdom,$title) = @_; |
| |
# get lock on ltitools db |
| |
my $lockhash = { |
| |
lock => $env{'user.name'}. |
| |
':'.$env{'user.domain'}, |
| |
}; |
| |
my $tries = 0; |
| |
my $gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
| |
my ($id,$error); |
| |
|
| |
while (($gotlock ne 'ok') && ($tries<10)) { |
| |
$tries ++; |
| |
sleep (0.1); |
| |
$gotlock = &Apache::lonnet::newput_dom('ltitools',$lockhash,$cdom); |
| |
} |
| |
if ($gotlock eq 'ok') { |
| |
my %currids = &Apache::lonnet::dump_dom('ltitools',$cdom); |
| |
if ($currids{'lock'}) { |
| |
delete($currids{'lock'}); |
| |
if (keys(%currids)) { |
| |
my @curr = sort { $a <=> $b } keys(%currids); |
| |
if ($curr[-1] =~ /^\d+$/) { |
| |
$id = 1 + $curr[-1]; |
| |
} |
| |
} else { |
| |
$id = 1; |
| |
} |
| |
if ($id) { |
| |
unless (&Apache::lonnet::newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') { |
| |
$error = 'nostore'; |
| |
} |
| |
} else { |
| |
$error = 'nonumber'; |
| |
} |
| |
} |
| |
my $dellockoutcome = &Apache::lonnet::del_dom('ltitools',['lock'],$cdom); |
| |
} else { |
| |
$error = 'nolock'; |
| |
} |
| |
return ($id,$error); |
| |
} |
| |
|
| sub modify_autoenroll { |
sub modify_autoenroll { |
| my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
| my ($resulttext,%changes); |
my ($resulttext,%changes); |
|
Line 7883 sub modify_autoenroll {
|
Line 8918 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 7893 sub modify_autoenroll {
|
Line 8929 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 7924 sub modify_autoenroll {
|
Line 8966 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 7944 sub modify_autoenroll {
|
Line 8989 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 8571 sub modify_usercreation {
|
Line 9627 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 8795 sub modify_selfcreation {
|
Line 9852 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 9124 sub modify_selfcreation {
|
Line 10182 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 9285 sub modify_selfcreation {
|
Line 10344 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 9405 sub process_captcha {
|
Line 10468 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 9415 sub process_captcha {
|
Line 10478 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 9426 sub process_captcha {
|
Line 10495 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 9891 sub modify_coursecategories {
|
Line 10977 sub modify_coursecategories {
|
| if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) { |
if ($domconfig{'coursecategories'}{'categorizecomm'} ne $env{'form.categorizecomm'}) { |
| $changes{'categorizecomm'} = 1; |
$changes{'categorizecomm'} = 1; |
| $domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; |
$domconfig{'coursecategories'}{'categorizecomm'} = $env{'form.categorizecomm'}; |
| |
|
| |
} |
| |
if ($domconfig{'coursecategories'}{'togglecatsplace'} ne $env{'form.togglecatsplace'}) { |
| |
$changes{'togglecatsplace'} = 1; |
| |
$domconfig{'coursecategories'}{'togglecatsplace'} = $env{'form.togglecatsplace'}; |
| |
} |
| |
if ($domconfig{'coursecategories'}{'categorizeplace'} ne $env{'form.categorizeplace'}) { |
| |
$changes{'categorizeplace'} = 1; |
| |
$domconfig{'coursecategories'}{'categorizeplace'} = $env{'form.categorizeplace'}; |
| } |
} |
| foreach my $item (@catitems) { |
foreach my $item (@catitems) { |
| if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { |
if (grep(/^\Q$env{'form.coursecat_'.$item}\E$/,@cattypes)) { |
|
Line 9905 sub modify_coursecategories {
|
Line 11000 sub modify_coursecategories {
|
| $changes{'categorize'} = 1; |
$changes{'categorize'} = 1; |
| $changes{'togglecatscomm'} = 1; |
$changes{'togglecatscomm'} = 1; |
| $changes{'categorizecomm'} = 1; |
$changes{'categorizecomm'} = 1; |
| |
$changes{'togglecatsplace'} = 1; |
| |
$changes{'categorizeplace'} = 1; |
| $domconfig{'coursecategories'} = { |
$domconfig{'coursecategories'} = { |
| togglecats => $env{'form.togglecats'}, |
togglecats => $env{'form.togglecats'}, |
| categorize => $env{'form.categorize'}, |
categorize => $env{'form.categorize'}, |
| togglecatscomm => $env{'form.togglecatscomm'}, |
togglecatscomm => $env{'form.togglecatscomm'}, |
| categorizecomm => $env{'form.categorizecomm'}, |
categorizecomm => $env{'form.categorizecomm'}, |
| |
togglecatsplace => $env{'form.togglecatsplace'}, |
| |
categorizeplace => $env{'form.categorizeplace'}, |
| }; |
}; |
| foreach my $item (@catitems) { |
foreach my $item (@catitems) { |
| if ($env{'form.coursecat_'.$item} ne 'std') { |
if ($env{'form.coursecat_'.$item} ne 'std') { |
|
Line 9927 sub modify_coursecategories {
|
Line 11026 sub modify_coursecategories {
|
| if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '') && ($env{'form.communities'} == 0)) { |
if (($domconfig{'coursecategories'}{'cats'}{'communities::0'} ne '') && ($env{'form.communities'} == 0)) { |
| push(@deletecategory,'communities::0'); |
push(@deletecategory,'communities::0'); |
| } |
} |
| |
if (($domconfig{'coursecategories'}{'cats'}{'placement::0'} ne '') && ($env{'form.placement'} == 0)) { |
| |
push(@deletecategory,'placement::0'); |
| |
} |
| } |
} |
| my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail); |
my (@predelcats,@predeltrails,%predelallitems,%sort_by_deltrail); |
| if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
|
Line 9989 sub modify_coursecategories {
|
Line 11091 sub modify_coursecategories {
|
| $adds{$newitem} = 1; |
$adds{$newitem} = 1; |
| } |
} |
| } |
} |
| |
if ($env{'form.placement'} eq '1') { |
| |
if (ref($cathash) eq 'HASH') { |
| |
my $newitem = 'placement::0'; |
| |
if ($cathash->{$newitem} eq '') { |
| |
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'}; |
| |
$adds{$newitem} = 1; |
| |
} |
| |
} else { |
| |
my $newitem = 'placement::0'; |
| |
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.placement_pos'}; |
| |
$adds{$newitem} = 1; |
| |
} |
| |
} |
| if ($env{'form.addcategory_name'} ne '') { |
if ($env{'form.addcategory_name'} ne '') { |
| if (($env{'form.addcategory_name'} ne 'instcode') && |
if (($env{'form.addcategory_name'} ne 'instcode') && |
| ($env{'form.addcategory_name'} ne 'communities')) { |
($env{'form.addcategory_name'} ne 'communities') && |
| |
($env{'form.addcategory_name'} ne 'placement')) { |
| my $newitem = &escape($env{'form.addcategory_name'}).'::0'; |
my $newitem = &escape($env{'form.addcategory_name'}).'::0'; |
| $domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; |
$domconfig{'coursecategories'}{'cats'}{$newitem} = $env{'form.addcategory_pos'}; |
| $adds{$newitem} = 1; |
$adds{$newitem} = 1; |
|
Line 10324 sub modify_coursedefaults {
|
Line 11440 sub modify_coursedefaults {
|
| ); |
); |
| my @toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
my @toggles = ('canuse_pdfforms','uselcmath','usejsme'); |
| my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
my @numbers = ('anonsurvey_threshold','uploadquota_official','uploadquota_unofficial', |
| 'uploadquota_community','uploadquota_textbook'); |
'uploadquota_community','uploadquota_textbook','uploadquota_placement'); |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
| my %staticdefaults = ( |
my %staticdefaults = ( |
| anonsurvey_threshold => 10, |
anonsurvey_threshold => 10, |
| uploadquota => 500, |
uploadquota => 500, |
|
Line 10588 sub modify_coursedefaults {
|
Line 11704 sub modify_coursedefaults {
|
| '<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'. |
'<li>'.&mt('Official courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'official'}.'</b>').'</li>'. |
| '<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'. |
'<li>'.&mt('Unofficial courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'unofficial'}.'</b>').'</li>'. |
| '<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'. |
'<li>'.&mt('Textbook courses: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'textbook'}.'</b>').'</li>'. |
| |
'<li>'.&mt('Placement tests: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'placement'}.'</b>').'</li>'. |
| '<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'. |
'<li>'.&mt('Communities: [_1] MB','<b>'.$defaultshash{'coursedefaults'}{'uploadquota'}{'community'}.'</b>').'</li>'. |
| '</ul>'. |
'</ul>'. |
| '</li>'; |
'</li>'; |
|
Line 10624 sub modify_coursedefaults {
|
Line 11740 sub modify_coursedefaults {
|
| $resulttext .= &mt('Unofficial courses'); |
$resulttext .= &mt('Unofficial courses'); |
| } elsif ($type eq 'textbook') { |
} elsif ($type eq 'textbook') { |
| $resulttext .= &mt('Textbook courses'); |
$resulttext .= &mt('Textbook courses'); |
| |
} elsif ($type eq 'placement') { |
| |
$resulttext .= &mt('Placement tests'); |
| } |
} |
| $resulttext .= ' -- '.$display.'</li>'; |
$resulttext .= ' -- '.$display.'</li>'; |
| } |
} |
|
Line 10675 sub modify_coursedefaults {
|
Line 11793 sub modify_coursedefaults {
|
| sub modify_selfenrollment { |
sub modify_selfenrollment { |
| my ($dom,$lastactref,%domconfig) = @_; |
my ($dom,$lastactref,%domconfig) = @_; |
| my ($resulttext,$errors,%changes,%selfenrollhash,%ordered); |
my ($resulttext,$errors,%changes,%selfenrollhash,%ordered); |
| my @types = ('official','unofficial','community','textbook'); |
my @types = ('official','unofficial','community','textbook','placement'); |
| my %titles = &tool_titles(); |
my %titles = &tool_titles(); |
| my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
my %descs = &Apache::lonuserutils::selfenroll_default_descs(); |
| ($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
($ordered{'admin'},my $titlesref) = &Apache::lonuserutils::get_selfenroll_titles(); |
|
Line 12113 function updateCaptcha(caller,context) {
|
Line 13231 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 12133 function updateCaptcha(caller,context) {
|
Line 13253 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 12141 function updateCaptcha(caller,context) {
|
Line 13271 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 12211 sub captcha_phrases {
|
Line 13346 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 12220 sub devalidate_remote_domconfs {
|
Line 13356 sub devalidate_remote_domconfs {
|
| my %servers = &Apache::lonnet::internet_dom_servers($dom); |
my %servers = &Apache::lonnet::internet_dom_servers($dom); |
| 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','ltitools'); |
| if (keys(%servers)) { |
if (keys(%servers)) { |
| foreach my $server (keys(%servers)) { |
foreach my $server (keys(%servers)) { |
| next if ($thismachine{$server}); |
next if ($thismachine{$server}); |
![[BACK]](/icons/back.gif){kind=icon}
Return to domainprefs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface