version 1.176, 2012/12/11 22:55:27
|
version 1.180, 2012/12/20 13:15:36
|
Line 431 sub handler {
|
Line 431 sub handler {
|
} |
} |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
&Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,$js); |
} else { |
} else { |
|
# check if domconfig user exists for the domain. |
|
my $servadm = $r->dir_config('lonAdmEMail'); |
|
my ($configuserok,$author_ok,$switchserver) = |
|
&config_check($dom,$confname,$servadm); |
|
unless ($configuserok eq 'ok') { |
|
&Apache::lonconfigsettings::print_header($r,$phase,$context). |
|
&mt('The domain configuration user "[_1]" has yet to be created.', |
|
$confname). |
|
'<br />'; |
|
if ($switchserver) { |
|
&mt('Ordinarily, that domain configuration user is created when the ./UPDATE script is run to install LON-CAPA for the first time.'). |
|
'<br />'. |
|
&mt('However, that does not apply when new domains are added to a multi-domain server, and ./UPDATE has not been run recently.'). |
|
'<br />'. |
|
&mt('The "[_1]" user can be created automatically when a Domain Coordinator visits the web-based "Set domain configuration" screen, in a session hosted on the primary library server.',$confname). |
|
'<br />'. |
|
&mt("To do that now, use the following link: [_1],$switchserver); |
|
} else { |
|
&mt('To create that user from the command line run the ./UPDATE script found in the top level directory of the extracted LON-CAPA tarball.'). |
|
'<br />'. |
|
&mt('Once that is done, you will be able to use the web-based "Set domain configuration" to configure the domain'); |
|
} |
|
$r->print(&Apache::loncommon::end_page()); |
|
return OK; |
|
} |
if (keys(%domconfig) == 0) { |
if (keys(%domconfig) == 0) { |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
Line 815 sub print_login {
|
Line 840 sub print_login {
|
'<td><select name="'.$lonhost.'_server">'. |
'<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 (sort keys(%servers)) { |
next if ($servers{$hostid} eq $servers{$lonhost}); |
next if ($servers{$hostid} eq $servers{$lonhost}); |
my $selected = ''; |
my $selected = ''; |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
if (ref($disallowed{$lonhost}) eq 'HASH') { |
Line 5670 sub check_switchserver {
|
Line 5695 sub check_switchserver {
|
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } } |
if (!$allowed) { |
if (!$allowed) { |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/">'.&mt('Switch Server').'</a>'; |
$switchserver='<a href="/adm/switchserver?otherserver='.$home.'&role=dc./'.$dom.'/&destinationurl=/adm/domainprefs">'.&mt('Switch Server').'</a>'; |
} |
} |
return $switchserver; |
return $switchserver; |
} |
} |
Line 6317 sub modify_autocreate {
|
Line 6342 sub modify_autocreate {
|
foreach my $item (@types) { |
foreach my $item (@types) { |
if ($changes{$item}) { |
if ($changes{$item}) { |
my $newtxt = $offon[$newvals{$item}]; |
my $newtxt = $offon[$newvals{$item}]; |
$resulttext .= '<li>'.&mt("$title{$item} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
$resulttext .= '<li>'. |
|
&mt("$title{$item} set to [_1]$newtxt [_2]", |
|
'<b>','</b>'). |
|
'</li>'; |
} |
} |
} |
} |
if ($changes{'xmldc'}) { |
if ($changes{'xmldc'}) { |
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); |
my ($dcname,$dcdom) = split(':',$newvals{'xmldc'}); |
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); |
my $newtxt = &Apache::loncommon::plainname($dcname,$dcdom); |
$resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]$newtxt [_2]",'<b>','</b>').'</li>'; |
$resulttext .= '<li>'.&mt("$title{'xmldc'} set to [_1]",'<b>'.$newtxt.'</b>').'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 6469 sub modify_directorysrch {
|
Line 6497 sub modify_directorysrch {
|
} else { |
} else { |
$chgtext =~ s/\; $//; |
$chgtext =~ s/\; $//; |
} |
} |
$resulttext .= '<li>'.&mt("Users from domain '<span class=\"LC_cusr_emph\">[_1]</span>' permitted to search the institutional directory set to: [_2]",$dom,$chgtext).'</li>'; |
$resulttext .= |
|
'<li>'. |
|
&mt("Users from domain '[_1]' permitted to search the institutional directory set to: [_2]", |
|
'<span class="LC_cusr_emph">'.$dom.'</span>',$chgtext). |
|
'</li>'; |
} |
} |
} |
} |
} |
} |
Line 6497 sub modify_directorysrch {
|
Line 6529 sub modify_directorysrch {
|
} |
} |
} |
} |
$chgtext =~ s/\; $//; |
$chgtext =~ s/\; $//; |
$resulttext .= '<li>'.&mt("$title{'searchtypes'} set to: \"[_1]\"",$chgtext).'</li>'; |
$resulttext .= '<li>'.&mt($title{'searchtypes'}.' set to: "[_1]"',$chgtext).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
Line 7083 sub process_captcha {
|
Line 7115 sub process_captcha {
|
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
if (ref($current->{'recaptchakeys'}) eq 'HASH') { |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpub = $current->{'recaptchakeys'}{'public'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$currpriv = $current->{'recaptchakeys'}{'private'}; |
$newsettings->{'recaptchakeys'} = { |
unless ($newsettings->{'captcha'} eq 'recaptcha') { |
public => '', |
$newsettings->{'recaptchakeys'} = { |
private => '', |
public => '', |
} |
private => '', |
|
} |
|
} |
} |
} |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if (($newpub ne $currpub) || ($newpriv ne $currpriv)) { |
if ($container eq 'cancreate') { |
if ($container eq 'cancreate') { |
Line 8462 sub active_dc_picker {
|
Line 8496 sub active_dc_picker {
|
'<input type="radio" name="autocreate_xmldc"'. |
'<input type="radio" name="autocreate_xmldc"'. |
' value="'.$dcs[$i].'"'.$check.'/>'. |
' value="'.$dcs[$i].'"'.$check.'/>'. |
&Apache::loncommon::plainname($dcname,$dcdom). |
&Apache::loncommon::plainname($dcname,$dcdom). |
|
' ('.$dcname.':'.$dcdom.')'. |
'</label></span></td>'; |
'</label></span></td>'; |
} |
} |
$datatable .= '</tr></table>'; |
$datatable .= '</tr></table>'; |