version 1.123.2.2, 2010/09/12 22:12:52
|
version 1.125, 2010/02/16 17:31:47
|
Line 199 sub handler {
|
Line 199 sub handler {
|
} |
} |
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['login','rolecolors', |
&Apache::lonnet::get_dom('configuration',['login','rolecolors', |
'quotas','autoenroll','autoupdate','directorysrch', |
'quotas','autoenroll','autoupdate','autocreate', |
'usercreation','usermodification','contacts','defaults', |
'directorysrch','usercreation','usermodification', |
'scantron','coursecategories','serverstatuses', |
'contacts','defaults','scantron','coursecategories', |
'requestcourses','helpsettings','coursedefaults'],$dom); |
'serverstatuses','requestcourses','helpsettings', |
|
'coursedefaults'],$dom); |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', |
'autoupdate','directorysrch','contacts', |
'autoupdate','autocreate','directorysrch','contacts', |
'usercreation','usermodification','scantron', |
'usercreation','usermodification','scantron', |
'requestcourses','coursecategories','serverstatuses','helpsettings', |
'requestcourses','coursecategories','serverstatuses','helpsettings', |
'coursedefaults'); |
'coursedefaults'); |
Line 255 sub handler {
|
Line 256 sub handler {
|
{col1 => 'User population', |
{col1 => 'User population', |
col2 => 'Updataeable user data'}], |
col2 => 'Updataeable user data'}], |
}, |
}, |
|
'autocreate' => |
|
{ text => 'Auto-course creation settings', |
|
help => 'Domain_Configuration_Auto_Creation', |
|
header => [{col1 => 'Configuration Setting', |
|
col2 => 'Value',}], |
|
}, |
'directorysrch' => |
'directorysrch' => |
{ text => 'Institutional directory searches', |
{ text => 'Institutional directory searches', |
help => 'Domain_Configuration_InstDirectory_Search', |
help => 'Domain_Configuration_InstDirectory_Search', |
Line 328 sub handler {
|
Line 335 sub handler {
|
{col1 => 'Unauthenticated Help Settings', |
{col1 => 'Unauthenticated Help Settings', |
col2 => ''}], |
col2 => ''}], |
}, |
}, |
'coursedefaults' => |
'coursedefaults' => |
{text => 'Course/Community defaults', |
{text => 'Course/Community defaults', |
help => 'Domain_Configuration_Course_Defaults', |
help => 'Domain_Configuration_Course_Defaults', |
header => [{col1 => 'Defaults which can be overridden for each course by a DC', |
header => [{col1 => 'Setting', |
col2 => 'Value',}], |
col2 => 'Value',}], |
}, |
}, |
'privacy' => |
'privacy' => |
Line 418 sub process_changes {
|
Line 425 sub process_changes {
|
$output = &modify_autoenroll($dom,%domconfig); |
$output = &modify_autoenroll($dom,%domconfig); |
} elsif ($action eq 'autoupdate') { |
} elsif ($action eq 'autoupdate') { |
$output = &modify_autoupdate($dom,%domconfig); |
$output = &modify_autoupdate($dom,%domconfig); |
|
} elsif ($action eq 'autocreate') { |
|
$output = &modify_autocreate($dom,%domconfig); |
} elsif ($action eq 'directorysrch') { |
} elsif ($action eq 'directorysrch') { |
$output = &modify_directorysrch($dom,%domconfig); |
$output = &modify_directorysrch($dom,%domconfig); |
} elsif ($action eq 'usercreation') { |
} elsif ($action eq 'usercreation') { |
Line 619 sub print_config_box {
|
Line 628 sub print_config_box {
|
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
$output .= &print_quotas($dom,$settings,\$rowtotal,$action); |
} elsif ($action eq 'autoenroll') { |
} elsif ($action eq 'autoenroll') { |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
$output .= &print_autoenroll($dom,$settings,\$rowtotal); |
|
} elsif ($action eq 'autocreate') { |
|
$output .= &print_autocreate($dom,$settings,\$rowtotal); |
} elsif ($action eq 'directorysrch') { |
} elsif ($action eq 'directorysrch') { |
$output .= &print_directorysrch($dom,$settings,\$rowtotal); |
$output .= &print_directorysrch($dom,$settings,\$rowtotal); |
} elsif ($action eq 'contacts') { |
} elsif ($action eq 'contacts') { |
Line 1761 sub print_autoupdate {
|
Line 1772 sub print_autoupdate {
|
return $datatable; |
return $datatable; |
} |
} |
|
|
|
sub print_autocreate { |
|
my ($dom,$settings,$rowtotal) = @_; |
|
my (%createon,%createoff); |
|
my $curr_dc; |
|
my @types = ('xml','req'); |
|
if (ref($settings) eq 'HASH') { |
|
foreach my $item (@types) { |
|
$createoff{$item} = ' checked="checked" '; |
|
$createon{$item} = ' '; |
|
if (exists($settings->{$item})) { |
|
if ($settings->{$item}) { |
|
$createon{$item} = ' checked="checked" '; |
|
$createoff{$item} = ' '; |
|
} |
|
} |
|
} |
|
$curr_dc = $settings->{'xmldc'}; |
|
} else { |
|
foreach my $item (@types) { |
|
$createoff{$item} = ' checked="checked" '; |
|
$createon{$item} = ' '; |
|
} |
|
} |
|
$$rowtotal += 2; |
|
my $datatable='<tr class="LC_odd_row">'. |
|
'<td>'.&mt('Create pending official courses from XML files').'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autocreate_xml"'. |
|
$createon{'xml'}.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="autocreate_xml"'. |
|
$createoff{'xml'}.' value="0" />'.&mt('No').'</label></span>'; |
|
my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); |
|
if ($numdc > 1) { |
|
$datatable .= '</td><tr><td>'. |
|
&mt('XML files processed as: (choose Dom. Coord.)'). |
|
'</td><td class="LC_left_item">'.$dctable.'</td></tr>'. |
|
'<tr class="LC_odd_row">'; |
|
$$rowtotal ++ ; |
|
} else { |
|
$datatable .= '</td></tr><tr>'; |
|
} |
|
$datatable .= '<td>'.&mt('Create pending requests for official courses (if validated)').'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autocreate_req"'. |
|
$createon{'req'}.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="autocreate_req"'. |
|
$createoff{'req'}.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
return $datatable; |
|
} |
|
|
sub print_directorysrch { |
sub print_directorysrch { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $srchon = ' '; |
my $srchon = ' '; |
Line 2092 sub print_coursedefaults {
|
Line 2154 sub print_coursedefaults {
|
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my $itemcount = 1; |
my $itemcount = 1; |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); |
$css_class = $itemcount%2 ? ' class="LC_odd_row"' : ''; |
%choices = |
my %choices = |
|
&Apache::lonlocal::texthash ( |
&Apache::lonlocal::texthash ( |
anonsurvey_threshold => 'Responder count needed before showing submissions for anonymous surveys', |
canuse_pdfforms => 'Course/Community users can create/upload PDF forms', |
); |
); |
my $currdefresponder; |
%defaultchecked = ('canuse_pdfforms' => 'off'); |
if (ref($settings) eq 'HASH') { |
@toggles = ('canuse_pdfforms',); |
$currdefresponder = $settings->{'anonsurvey_threshold'}; |
($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, |
} |
\%choices,$itemcount); |
if (!$currdefresponder) { |
|
$currdefresponder = 10; |
|
} elsif ($currdefresponder < 1) { |
|
$currdefresponder = 1; |
|
} |
|
$datatable .= |
|
'<tr'.$css_class.'><td><span class="LC_nobreak">'.$choices{'anonsurvey_threshold'}. |
|
'</span></td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak">'. |
|
'<input type="text" name="anonsurvey_threshold"'. |
|
' value="'.$currdefresponder.'" size="5" /></span>'. |
|
'</td></tr>'; |
|
$$rowtotal += $itemcount; |
$$rowtotal += $itemcount; |
return $datatable; |
return $datatable; |
} |
} |
Line 4646 sub modify_autoupdate {
|
Line 4695 sub modify_autoupdate {
|
return $resulttext; |
return $resulttext; |
} |
} |
|
|
|
sub modify_autocreate { |
|
my ($dom,%domconfig) = @_; |
|
my ($resulttext,%changes,%currautocreate,%newvals,%autocreatehash); |
|
if (ref($domconfig{'autocreate'}) eq 'HASH') { |
|
foreach my $key (keys(%{$domconfig{'autocreate'}})) { |
|
$currautocreate{$key} = $domconfig{'autocreate'}{$key}; |
|
} |
|
} |
|
my %title= ( xml => 'Auto-creation of courses in XML course description files', |
|
req => 'Auto-creation of validated requests for official courses', |
|
xmldc => 'Identity of course creator of courses from XML files', |
|
); |
|
my @types = ('xml','req'); |
|
foreach my $item (@types) { |
|
$newvals{$item} = $env{'form.autocreate_'.$item}; |
|
$newvals{$item} =~ s/\D//g; |
|
$newvals{$item} = 0 if ($newvals{$item} eq ''); |
|
} |
|
$newvals{'xmldc'} = $env{'form.autocreate_xmldc'}; |
|
my %domcoords = &get_active_dcs($dom); |
|
unless (exists($domcoords{$newvals{'xmldc'}})) { |
|
$newvals{'xmldc'} = ''; |
|
} |
|
%autocreatehash = ( |
|
autocreate => { xml => $newvals{'xml'}, |
|
req => $newvals{'req'}, |
|
} |
|
); |
|
if ($newvals{'xmldc'} ne '') { |
|
$autocreatehash{'autocreate'}{'xmldc'} = $newvals{'xmldc'}; |
|
} |
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%autocreatehash, |
|
$dom); |
|
if ($putresult eq 'ok') { |
|
my @items = @types; |
|
if ($newvals{'xml'}) { |
|
push(@items,'xmldc'); |
|
} |
|
foreach my $item (@items) { |
|
if (exists($currautocreate{$item})) { |
|
if ($currautocreate{$item} ne $newvals{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} elsif ($newvals{$item}) { |
|
$changes{$item} = 1; |
|
} |
|
} |
|
if (keys(%changes) > 0) { |
|
my @offon = ('off','on'); |
|
$resulttext = &mt('Changes made:').'<ul>'; |
|
foreach my $item (@types) { |
|
if ($changes{$item}) { |
|
my $newtxt = $offon[$newvals{$item}]; |
|
$resulttext .= '<li>'.&mt("$title{$item} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
|
} |
|
} |
|
if ($changes{'xmldc'}) { |
|
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); |
|
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); |
|
$resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
|
} |
|
$resulttext .= '</ul>'; |
|
} else { |
|
$resulttext = &mt('No changes made to auto-creation settings'); |
|
} |
|
} else { |
|
$resulttext = '<span class="LC_error">'. |
|
&mt('An error occurred: [_1]',$putresult).'</span>'; |
|
} |
|
return $resulttext; |
|
} |
|
|
sub modify_directorysrch { |
sub modify_directorysrch { |
my ($dom,%domconfig) = @_; |
my ($dom,%domconfig) = @_; |
my ($resulttext,%changes); |
my ($resulttext,%changes); |
Line 5449 sub modify_defaults {
|
Line 5570 sub modify_defaults {
|
if ($newvalues{$item} ne '') { |
if ($newvalues{$item} ne '') { |
if ($newvalues{$item} =~ /^(\w+)/) { |
if ($newvalues{$item} =~ /^(\w+)/) { |
my $langcode = $1; |
my $langcode = $1; |
if (($langcode ne 'gci') && ($langcode ne 'gct') && |
if ($langcode ne 'x_chef') { |
($langcode ne 'x_chef')) { |
|
if (code2language($langcode) eq '') { |
if (code2language($langcode) eq '') { |
push(@errors,$item); |
push(@errors,$item); |
} |
} |
Line 5638 sub modify_coursecategories {
|
Line 5758 sub modify_coursecategories {
|
} else { |
} else { |
$changes{'togglecats'} = 1; |
$changes{'togglecats'} = 1; |
$changes{'categorize'} = 1; |
$changes{'categorize'} = 1; |
$domconfig{'coursecategories'} = { |
|
togglecats => $env{'form.togglecats'}, |
|
categorize => $env{'form.categorize'}, |
|
}; |
|
$changes{'togglecatscomm'} = 1; |
$changes{'togglecatscomm'} = 1; |
$changes{'categorizecomm'} = 1; |
$changes{'categorizecomm'} = 1; |
$domconfig{'coursecategories'} = { |
$domconfig{'coursecategories'} = { |
togglecats => $env{'form.togglecatscomm'}, |
togglecats => $env{'form.togglecats'}, |
categorize => $env{'form.categorizecomm'}, |
categorize => $env{'form.categorize'}, |
|
togglecatscomm => $env{'form.togglecatscomm'}, |
|
categorizecomm => $env{'form.categorizecomm'}, |
}; |
}; |
} |
} |
if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
Line 6120 sub modify_coursedefaults {
|
Line 6238 sub modify_coursedefaults {
|
} |
} |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
$defaultshash{'coursedefaults'}{$item} = $env{'form.'.$item}; |
} |
} |
my $currdefresponder = $domconfig{'coursedefaults'}{'anonsurvey_threshold'}; |
|
my $newdefresponder = $env{'form.anonsurvey_threshold'}; |
|
$newdefresponder =~ s/\D//g; |
|
if ($newdefresponder eq '' || $newdefresponder < 1) { |
|
$newdefresponder = 1; |
|
} |
|
$defaultshash{'coursedefaults'}{'anonsurvey_threshold'} = $newdefresponder; |
|
if ($currdefresponder ne $newdefresponder) { |
|
unless ($currdefresponder eq '' && $newdefresponder == 10) { |
|
$changes{'anonsurvey_threshold'} = 1; |
|
} |
|
} |
|
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%defaultshash, |
$dom); |
$dom); |
Line 6151 sub modify_coursedefaults {
|
Line 6257 sub modify_coursedefaults {
|
} else { |
} else { |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
$resulttext .= '<li>'.&mt('Course/Community users can create/upload PDF forms set to "off"').'</li>'; |
} |
} |
} elsif ($item eq 'anonsurvey_threshold') { |
|
$resulttext .= '<li>'.&mt('Responder count required for display of anonymous survey submissions set to [_1].',$defaultshash{'coursedefaults'}{'anonsurvey_threshold'}).'</li>'; |
|
} |
} |
|
|
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 6240 sub dom_servers {
|
Line 6343 sub dom_servers {
|
return %uniqservers; |
return %uniqservers; |
} |
} |
|
|
|
sub get_active_dcs { |
|
my ($dom) = @_; |
|
my %dompersonnel = &Apache::lonnet::get_domain_roles($dom,['dc']); |
|
my %domcoords; |
|
my $numdcs = 0; |
|
my $now = time; |
|
foreach my $server (keys(%dompersonnel)) { |
|
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
|
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
|
my ($end,$start) = split(':',$dompersonnel{$server}{$user}); |
|
if (($end eq '') || ($end == 0) || ($end > $now)) { |
|
if ($start <= $now) { |
|
$domcoords{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
|
} |
|
} |
|
} |
|
} |
|
return %domcoords; |
|
} |
|
|
|
sub active_dc_picker { |
|
my ($dom,$curr_dc) = @_; |
|
my %domcoords = &get_active_dcs($dom); |
|
my @dcs = sort(keys(%domcoords)); |
|
my $numdcs = scalar(@dcs); |
|
my $datatable; |
|
my $numinrow = 2; |
|
if ($numdcs > 1) { |
|
$datatable = '<table>'; |
|
for (my $i=0; $i<@dcs; $i++) { |
|
my $rem = $i%($numinrow); |
|
if ($rem == 0) { |
|
if ($i > 0) { |
|
$datatable .= '</tr>'; |
|
} |
|
$datatable .= '<tr>'; |
|
} |
|
my $check = ' '; |
|
if ($curr_dc eq '') { |
|
if (!$i) { |
|
$check = ' checked="checked" '; |
|
} |
|
} elsif ($dcs[$i] eq $curr_dc) { |
|
$check = ' checked="checked" '; |
|
} |
|
if ($i == @dcs - 1) { |
|
my $colsleft = $numinrow - $rem; |
|
if ($colsleft > 1) { |
|
$datatable .= '<td colspan="'.$colsleft.'">'; |
|
} else { |
|
$datatable .= '<td>'; |
|
} |
|
} else { |
|
$datatable .= '<td>'; |
|
} |
|
my ($dcname,$dcdom) = split(':',$dcs[$i]); |
|
$datatable .= '<span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autocreate_xmldc"'. |
|
' value="'.$dcs[$i].'"'.$check.'/>'. |
|
&Apache::loncommon::plainname($dcname,$dcdom). |
|
'</label></span></td>'; |
|
} |
|
$datatable .= '</tr></table>'; |
|
} elsif (@dcs) { |
|
$datatable .= '<input type="hidden" name="autocreate_dc" value="'. |
|
$dcs[0].'" />'; |
|
} |
|
return ($numdcs,$datatable); |
|
} |
|
|
1; |
1; |