version 1.18, 2007/06/01 01:14:51
|
version 1.21, 2007/06/07 23:19:42
|
Line 133 sub handler {
|
Line 133 sub handler {
|
my %helphash; |
my %helphash; |
my $numprefs = @prefs; |
my $numprefs = @prefs; |
&print_header($r,$phase); |
&print_header($r,$phase); |
|
if (keys(%domconfig) == 0) { |
|
my $primarylibserv = &Apache::lonnet::domain($dom,'primary'); |
|
my $perlvarref = &LONCAPA::Configuration::read_conf('loncapa.conf'); |
|
my $hostid = $perlvarref->{'lonHostID'}; |
|
if ($hostid ne $primarylibserv) { |
|
my %designhash = &Apache::loncommon::get_domainconf($dom); |
|
my @loginimages = ('img','logo','domlogo'); |
|
my $custom_img_count = 0; |
|
foreach my $img (@loginimages) { |
|
if ($designhash{$dom.'.login.'.$img} ne '') { |
|
$custom_img_count ++; |
|
} |
|
} |
|
foreach my $role (@roles) { |
|
if ($designhash{$dom.'.'.$role.'.img'} ne '') { |
|
$custom_img_count ++; |
|
} |
|
} |
|
if ($custom_img_count > 0) { |
|
my $switch_server = &check_switchserver($dom,$confname); |
|
$r->print(&mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.&mt("While this remains so, you must switch to the domain's primary library server in order to update settings.").'<br /><br />'.&mt("Thereafter, you will be able to update settings from this screen when logged in to any server in the LON-CAPA network (with a DC role selected in the domain), although you will still need to switch to the domain's primary library server to upload new images or logos.").'<br /><br />'.$switch_server.' '.&mt('to primary library server for domain: [_1]',$dom)); |
|
return OK; |
|
} |
|
} |
|
} |
$r->print('<table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">'); |
$r->print('<table border="0" width="100%" cellpadding="2" cellspacing="4"><tr><td align="left" valign="top" width="45%">'); |
foreach my $item (@prefs) { |
foreach my $item (@prefs) { |
if ($item->{'action'} eq 'login') { |
if ($item->{'action'} eq 'login') { |
Line 853 sub print_autoupdate {
|
Line 878 sub print_autoupdate {
|
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
$othertitle = &mt('Other users'); |
$othertitle = &mt('Other users'); |
} |
} |
my @fields = ('lastname','firstname','middlename','gen','email','id'); |
my @fields = ('lastname','firstname','middlename','gen', |
|
'permanentemail','id'); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
id => 'Student/Employee ID', |
id => 'Student/Employee ID', |
email => 'E-mail address', |
permanentemail => 'E-mail address', |
lastname => 'Last Name', |
lastname => 'Last Name', |
firstname => 'First Name', |
firstname => 'First Name', |
middlename => 'Middle Name', |
middlename => 'Middle Name', |
Line 1267 sub check_dimensions {
|
Line 1293 sub check_dimensions {
|
} |
} |
chomp($imageinfo); |
chomp($imageinfo); |
my ($fullsize) = |
my ($fullsize) = |
($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)\s+/); |
($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/); |
if ($fullsize) { |
if ($fullsize) { |
($fullwidth,$fullheight) = split(/x/,$fullsize); |
($fullwidth,$fullheight) = split(/x/,$fullsize); |
} |
} |
Line 1519 sub check_switchserver {
|
Line 1545 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; } } |
$allowed=0; |
|
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.'/">'.&mt('Switch Server').'</a>'; |
} |
} |
Line 1662 sub modify_autoupdate {
|
Line 1687 sub modify_autoupdate {
|
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom); |
my %fieldtitles = &Apache::lonlocal::texthash ( |
my %fieldtitles = &Apache::lonlocal::texthash ( |
id => 'Student/Employee ID', |
id => 'Student/Employee ID', |
email => 'E-mail address', |
permanentemail => 'E-mail address', |
lastname => 'Last Name', |
lastname => 'Last Name', |
firstname => 'First Name', |
firstname => 'First Name', |
middlename => 'Middle Name', |
middlename => 'Middle Name', |