version 1.122, 2009/12/04 14:17:38
|
version 1.128, 2010/03/03 16:43:41
|
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 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 653 sub print_login {
|
Line 664 sub print_login {
|
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
my $choice = $choices{'disallowlogin'}; |
my $choice = $choices{'disallowlogin'}; |
$css_class = ' class="LC_odd_row"'; |
$css_class = ' class="LC_odd_row"'; |
$datatable .= '<tr'.$css_class.'><td>'.$choices{'disallowlogin'}.'</td>'. |
$datatable .= '<tr'.$css_class.'><td>'.$choice.'</td>'. |
'<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<td align="right"><table><tr><th>'.$choices{'hostid'}.'</th>'. |
'<th>'.$choices{'serverurl'}.'</th></tr>'."\n"; |
'<th>'.$choices{'server'}.'</th>'. |
|
'<th>'.$choices{'serverpath'}.'</th>'. |
|
'<th>'.$choices{'custompath'}.'</th>'. |
|
'<th><span class="LC_nobreak">'.$choices{'exempt'}.'</span></th></tr>'."\n"; |
my %disallowed; |
my %disallowed; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (ref($settings->{'loginvia'}) eq 'HASH') { |
if (ref($settings->{'loginvia'}) eq 'HASH') { |
Line 664 sub print_login {
|
Line 678 sub print_login {
|
} |
} |
foreach my $lonhost (sort(keys(%servers))) { |
foreach my $lonhost (sort(keys(%servers))) { |
my $direct = 'selected="selected"'; |
my $direct = 'selected="selected"'; |
if ($disallowed{$lonhost} eq '') { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
$direct = ''; |
if ($disallowed{$lonhost}{'server'} ne '') { |
|
$direct = ''; |
|
} |
} |
} |
$datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'. |
$datatable .= '<tr><td>'.$servers{$lonhost}.'</td>'. |
'<td><select name="'.$lonhost.'_serverurl">'. |
'<td><select name="'.$lonhost.'_server">'. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'<option value=""'.$direct.'>'.$choices{'directlogin'}. |
'</option>'; |
'</option>'; |
foreach my $hostid (keys(%servers)) { |
foreach my $hostid (keys(%servers)) { |
next if ($servers{$hostid} eq $servers{$lonhost}); |
next if ($servers{$hostid} eq $servers{$lonhost}); |
my $selected = ''; |
my $selected = ''; |
if ($hostid eq $disallowed{$lonhost}) { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
$selected = 'selected="selected"'; |
if ($hostid eq $disallowed{$lonhost}{'server'}) { |
|
$selected = 'selected="selected"'; |
|
} |
} |
} |
$datatable .= '<option value="'.$hostid.'"'.$selected.'>'. |
$datatable .= '<option value="'.$hostid.'"'.$selected.'>'. |
$servers{$hostid}.'</option>'; |
$servers{$hostid}.'</option>'; |
} |
} |
$datatable .= '</select></td></tr>'; |
$datatable .= '</select></td>'. |
|
'<td><select name="'.$lonhost.'_serverpath">'; |
|
foreach my $path ('','/','/adm/login','/adm/roles','custom') { |
|
my $pathname = $path; |
|
if ($path eq 'custom') { |
|
$pathname = &mt('Custom Path').' ->'; |
|
} |
|
my $selected = ''; |
|
if (ref($disallowed{$lonhost}) eq 'HASH') { |
|
if ($path eq $disallowed{$lonhost}{'serverpath'}) { |
|
$selected = 'selected="selected"'; |
|
} |
|
} elsif ($path eq '') { |
|
$selected = 'selected="selected"'; |
|
} |
|
$datatable .= '<option value="'.$path.'"'.$selected.'>'.$pathname.'</option>'; |
|
} |
|
$datatable .= '</select></td>'; |
|
my ($custom,$exempt); |
|
if (ref($disallowed{$lonhost}) eq 'HASH') { |
|
$custom = $disallowed{$lonhost}{'custompath'}; |
|
$exempt = $disallowed{$lonhost}{'exempt'}; |
|
} |
|
$datatable .= '<td><input type="text" name="'.$lonhost.'_custompath" size="6" value="'.$custom.'" /></td>'. |
|
'<td><input type="text" name="'.$lonhost.'_exempt" size="8" value="'.$exempt.'" /></td>'. |
|
'</tr>'; |
} |
} |
$datatable .= '</table></td></tr>'; |
$datatable .= '</table></td></tr>'; |
return $datatable; |
return $datatable; |
Line 824 sub login_choices {
|
Line 867 sub login_choices {
|
adminmail => "Display Administrator's E-mail Address?", |
adminmail => "Display Administrator's E-mail Address?", |
disallowlogin => "Login page requests redirected", |
disallowlogin => "Login page requests redirected", |
hostid => "Server", |
hostid => "Server", |
serverurl => "Redirect to log-in via:", |
server => "Redirect to:", |
|
serverpath => "Path", |
|
custompath => "Custom", |
|
exempt => "Exempt IP(s)", |
directlogin => "No redirect", |
directlogin => "No redirect", |
newuser => "Link to create a user account", |
newuser => "Link to create a user account", |
img => "Header", |
img => "Header", |
Line 1316 sub print_quotas {
|
Line 1362 sub print_quotas {
|
$cell{$item} .= '<span class="LC_nobreak"><label>'. |
$cell{$item} .= '<span class="LC_nobreak"><label>'. |
'<input type="radio" name="crsreq_'.$item. |
'<input type="radio" name="crsreq_'.$item. |
'_'.$type.'" value="'.$val.'"'.$checked.' />'. |
'_'.$type.'" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label> '; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$cell{$item} .= '<input type="text" name="crsreq_'. |
$cell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit_'.$type.'" size="1" '. |
$item.'_limit_'.$type.'" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$cell{$item} .= '</span> '; |
$cell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$cell{$item} .= $titles{'unlimited'} |
$cell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1424 sub print_quotas {
|
Line 1470 sub print_quotas {
|
'_default" value="'.$val.'"'.$checked.' />'. |
'_default" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label>'; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$defcell{$item} .= '<input type="text" name="crsreq_'. |
$defcell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit_default" size="1" '. |
$item.'_limit_default" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$defcell{$item} .= '</span> '; |
$defcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$defcell{$item} .= $titles{'unlimited'} |
$defcell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1527 sub print_quotas {
|
Line 1573 sub print_quotas {
|
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
'__LC_adv" value="'.$val.'"'.$checked.' />'. |
$titles{$option}.'</label>'; |
$titles{$option}.'</label>'; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$advcell{$item} .= '<input type="text" name="crsreq_'. |
$advcell{$item} .= ' <input type="text" name="crsreq_'. |
$item.'_limit__LC_adv" size="1" '. |
$item.'_limit__LC_adv" size="1" '. |
'value="'.$currlimit.'" />'; |
'value="'.$currlimit.'" />'; |
} |
} |
$advcell{$item} .= '</span> '; |
$advcell{$item} .= '</span> '; |
if ($option eq 'autolimit') { |
if ($option eq 'autolimit') { |
$advcell{$item} .= $titles{'unlimited'} |
$advcell{$item} .= $titles{'unlimited'}; |
} |
} |
} |
} |
} else { |
} else { |
Line 1761 sub print_autoupdate {
|
Line 1807 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 3444 sub modify_login {
|
Line 3541 sub modify_login {
|
} |
} |
|
|
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
|
my @loginvia_attribs = ('serverpath','custompath','exempt'); |
if (keys(%servers) > 1) { |
if (keys(%servers) > 1) { |
foreach my $lonhost (keys(%servers)) { |
foreach my $lonhost (keys(%servers)) { |
next if ($env{'form.'.$lonhost.'_serverurl'} eq $lonhost); |
next if ($env{'form.'.$lonhost.'_server'} eq $lonhost); |
if ($env{'form.'.$lonhost.'_serverurl'} eq $curr_loginvia{$lonhost}) { |
if (ref($curr_loginvia{$lonhost}) eq 'HASH') { |
$loginhash{login}{loginvia}{$lonhost} = $curr_loginvia{$lonhost}; next; |
if ($env{'form.'.$lonhost.'_server'} eq $curr_loginvia{$lonhost}{'server'}) { |
} |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $curr_loginvia{$lonhost}{'server'}; |
if ($curr_loginvia{$lonhost} ne '') { |
} elsif ($curr_loginvia{$lonhost}{'server'} ne '') { |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
$changes{'loginvia'}{$lonhost} = 1; |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} else { |
|
$loginhash{login}{loginvia}{$lonhost}{'server'} = ''; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
} else { |
|
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
|
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
} |
|
if ($loginhash{login}{loginvia}{$lonhost}{'server'} eq '') { |
|
foreach my $item (@loginvia_attribs) { |
|
$loginhash{login}{loginvia}{$lonhost}{$item} = ''; |
|
} |
|
} else { |
|
foreach my $item (@loginvia_attribs) { |
|
my $new = $env{'form.'.$lonhost.'_'.$item}; |
|
if (($item eq 'serverpath') && ($new eq 'custom')) { |
|
$env{'form.'.$lonhost.'_custompath'} =~ s/\s+//g; |
|
if ($env{'form.'.$lonhost.'_custompath'} eq '') { |
|
$new = '/'; |
|
} |
|
} |
|
if (($item eq 'custompath') && |
|
($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) { |
|
$new = ''; |
|
} |
|
if ($new ne $curr_loginvia{$lonhost}{$item}) { |
|
$changes{'loginvia'}{$lonhost} = 1; |
|
} |
|
if ($item eq 'exempt') { |
|
$new =~ s/^\s+//; |
|
$new =~ s/\s+$//; |
|
my @poss_ips = split(/\s*[,:]\s*/,$new); |
|
my @okips; |
|
foreach my $ip (@poss_ips) { |
|
if ($ip =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/) { |
|
if (($1 <= 255) && ($2 <= 255) && ($3 <= 255) && ($4 <= 255)) { |
|
push(@okips,$ip); |
|
} |
|
} |
|
} |
|
if (@okips > 0) { |
|
$new = join(',',@okips); |
|
} else { |
|
$new = ''; |
|
} |
|
} |
|
|
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
|
} |
|
} |
} else { |
} else { |
if (defined($servers{$env{'form.'.$lonhost.'_serverurl'}})) { |
if (defined($servers{$env{'form.'.$lonhost.'_server'}})) { |
$loginhash{login}{loginvia}{$lonhost} = $env{'form.'.$lonhost.'_serverurl'}; |
$loginhash{login}{loginvia}{$lonhost}{'server'} = $env{'form.'.$lonhost.'_server'}; |
$changes{'loginvia'}{$lonhost} = 1; |
$changes{'loginvia'}{$lonhost} = 1; |
|
foreach my $item (@loginvia_attribs) { |
|
my $new = $env{'form.'.$lonhost.'_'.$item}; |
|
if (($item eq 'serverpath') && ($new eq 'custom')) { |
|
if ($env{'form.'.$lonhost.'_custompath'} eq '') { |
|
$new = '/'; |
|
} |
|
} |
|
if (($item eq 'custompath') && |
|
($env{'form.'.$lonhost.'_serverpath'} ne 'custom')) { |
|
$new = ''; |
|
} |
|
$loginhash{login}{loginvia}{$lonhost}{$item} = $new; |
|
} |
} |
} |
} |
} |
} |
} |
Line 3512 sub modify_login {
|
Line 3676 sub modify_login {
|
if (ref($changes{$item}) eq 'HASH') { |
if (ref($changes{$item}) eq 'HASH') { |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>'; |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
foreach my $lonhost (sort(keys(%{$changes{$item}}))) { |
if ($servers{$env{'form.'.$lonhost.'_serverurl'}} ne '') { |
if (defined($servers{$loginhash{login}{loginvia}{$lonhost}{'server'}})) { |
$resulttext .= '<li>'.&mt('Server: [_1] log-in page now redirects to [_2]',$lonhost,$servers{$env{'form.'.$lonhost.'_serverurl'}}).'</li>'; |
if (ref($loginhash{login}{loginvia}{$lonhost}) eq 'HASH') { |
|
my $protocol = $Apache::lonnet::protocol{$env{'form.'.$lonhost.'_server'}}; |
|
$protocol = 'http' if ($protocol ne 'https'); |
|
my $target = $protocol.'://'.$servers{$env{'form.'.$lonhost.'_server'}}; |
|
|
|
if ($loginhash{login}{loginvia}{$lonhost}{'serverpath'} eq 'custom') { |
|
$target .= $loginhash{login}{loginvia}{$lonhost}{'custompath'}; |
|
} else { |
|
$target .= $loginhash{login}{loginvia}{$lonhost}{'serverpath'}; |
|
} |
|
$resulttext .= '<li>'.&mt('Server: [_1] log-in page redirects to [_2].',$servers{$lonhost},'<a href="'.$target.'">'.$target.'</a>'); |
|
if ($loginhash{login}{loginvia}{$lonhost}{'exempt'} ne '') { |
|
$resulttext .= ' '.&mt('No redirection for clients from following IPs:').' '.$loginhash{login}{loginvia}{$lonhost}{'exempt'}; |
|
} |
|
$resulttext .= '</li>'; |
|
} else { |
|
$resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$lonhost).'</li>'; |
|
} |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Server: [_1] now has standard log-in page.',$lonhost).'</li>'; |
$resulttext .= '<li>'.&mt('Server: [_1] has standard log-in page.',$servers{$lonhost}).'</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul></li>'; |
$resulttext .= '</ul></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 4633 sub modify_autoupdate {
|
Line 4814 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 5387 sub modify_usermodification {
|
Line 5640 sub modify_usermodification {
|
} |
} |
my @modifiable; |
my @modifiable; |
if ($context eq 'selfcreate') { |
if ($context eq 'selfcreate') { |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1] ',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): '); |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Self-creation of account by users with status: [_1]',$rolename).'</span> - '.&mt('modifiable fields (if institutional data blank): '); |
} else { |
} else { |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: '); |
$resulttext .= '<li><span class="LC_cusr_emph">'.&mt('Target user with [_1] role',$rolename).'</span> - '.&mt('modifiable fields: '); |
} |
} |
Line 5624 sub modify_coursecategories {
|
Line 5877 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 6033 sub modify_helpsettings {
|
Line 6284 sub modify_helpsettings {
|
} |
} |
} |
} |
|
|
my $putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
|
|
my $putresult; |
|
|
|
if (keys(%changes) > 0) { |
|
$putresult = &Apache::lonnet::put_dom('configuration',\%helphash,$dom); |
|
} else { |
|
$putresult = 'ok'; |
|
} |
|
|
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
Line 6204 sub dom_servers {
|
Line 6462 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; |