version 1.126, 2009/10/06 21:58:30
|
version 1.131, 2009/12/04 13:50:48
|
Line 85 sub handler {
|
Line 85 sub handler {
|
if ($env{'form.firsturl'} ne '') { |
if ($env{'form.firsturl'} ne '') { |
$dest = $env{'form.firsturl'}; |
$dest = $env{'form.firsturl'}; |
} |
} |
|
|
|
my $dom = &Apache::lonnet::default_login_domain(); |
|
my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); |
|
|
|
my $loginhelp_page = $helpconfig{'helpsettings'}{'loginhelpurl'}; |
|
if ($loginhelp_page eq '') { |
|
$loginhelp_page = '/adm/loginproblems.html'; |
|
} |
$r->print( |
$r->print( |
$start_page |
$start_page |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<h1>'.&mt('You are already logged in!').'</h1>' |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
.'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].', |
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>' |
'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>').'</p>' |
.'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>' |
.'<p><a href="'.$loginhelp_page.'">'.&mt('Login problems?').'</a></p>' |
.$end_page |
.$dom.' '.$end_page |
); |
); |
return OK; |
return OK; |
} |
} |
Line 113 sub handler {
|
Line 121 sub handler {
|
|
|
my $lonhost = $r->dir_config('lonHostID'); |
my $lonhost = $r->dir_config('lonHostID'); |
my $domain = &Apache::lonnet::default_login_domain(); |
my $domain = &Apache::lonnet::default_login_domain(); |
my %domconfig = &Apache::loncommon::get_domainconf($domain); |
my %domconfhash = &Apache::loncommon::get_domainconf($domain); |
if ($lonhost ne '') { |
if ($lonhost ne '') { |
if (ref($domconfig{login}) eq 'HASH') { |
my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost}; |
if (ref($domconfig{login}{loginvia}) eq 'HASH') { |
if (($loginvia ne '') && ($loginvia ne $lonhost)) { |
if ($domconfig{login}{loginvia}{$lonhost}) { |
if (&Apache::lonnet::hostname($loginvia) ne '') { |
my $loginvia = $domconfig{login}{loginvia}{$lonhost}; |
$r->print(&redirect_page($loginvia)); |
my %servers = &Apache::lonnet::get_servers($domain); |
return OK; |
if (($servers{$loginvia} ne '') && ($loginvia ne $lonhost)) { |
|
$r->print(&redirect_page($loginvia)); |
|
return OK; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 342 $r->print(&Apache::loncommon::start_page
|
Line 345 $r->print(&Apache::loncommon::start_page
|
# ----------------------------------------------------------------------- Texts |
# ----------------------------------------------------------------------- Texts |
|
|
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'un' => 'Username', |
'un' => 'Username', |
'pw' => 'Password', |
'pw' => 'Password', |
'dom' => 'Domain', |
'dom' => 'Domain', |
'perc' => 'percent', |
'perc' => 'percent', |
'load' => 'Server Load', |
'load' => 'Server Load', |
'userload' => 'User Load', |
'userload' => 'User Load', |
'catalog' => 'Course Catalog', |
'catalog' => 'Course/Community Catalog', |
'log' => 'Log in', |
'log' => 'Log in', |
'help' => 'Log-in Help', |
'help' => 'Log-in Help', |
'serv' => 'Server', |
'serv' => 'Server', |
'servadm' => 'Server Administration', |
'servadm' => 'Server Administration', |
'helpdesk' => 'Contact Helpdesk', |
'helpdesk' => 'Contact Helpdesk', |
'forgotpw' => 'Forgot password?', |
'forgotpw' => 'Forgot password?', |
'newuser' => 'New User?', |
'newuser' => 'New User?', |
); |
); |
# -------------------------------------------------- Change password field name |
# -------------------------------------------------- Change password field name |
|
|
my $forgotpw = &forgotpwdisplay(%lt); |
my $forgotpw = &forgotpwdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
my $loginhelp = &loginhelpdisplay(%lt); |
|
|
Line 395 if (($showcoursecat eq '') || ($showcour
|
Line 399 if (($showcoursecat eq '') || ($showcour
|
} |
} |
my $newuserlink; |
my $newuserlink; |
if ($shownewuserlink) { |
if ($shownewuserlink) { |
$newuserlink = &newuser_link($lt{'newuser'}).'<br />'; |
$newuserlink = &newuser_link($lt{'newuser'}); |
} |
} |
my $logintitle; |
my $logintitle; |
if ($loginheader eq 'text') { |
if ($loginheader eq 'text') { |
Line 417 my $loginform=(<<LFORM);
|
Line 421 my $loginform=(<<LFORM);
|
<input type="hidden" name="lextkey" value="$lextkey" /> |
<input type="hidden" name="lextkey" value="$lextkey" /> |
<input type="hidden" name="uextkey" value="$uextkey" /> |
<input type="hidden" name="uextkey" value="$uextkey" /> |
<b><label for="uname">$lt{'un'}</label>:</b><br /> |
<b><label for="uname">$lt{'un'}</label>:</b><br /> |
<input type="text" name="uname" size="15" value="$authusername" /><br /> |
<input type="text" name="uname" id="uname" size="15" value="$authusername" /><br /> |
<b><label for="upass$now">$lt{'pw'}</label>:</b><br /> |
<b><label for="upass$now">$lt{'pw'}</label>:</b><br /> |
<input type="password" name="upass$now" size="15" /><br /> |
<input type="password" name="upass$now" id="upass$now" size="15" /><br /> |
<b><label for="udom">$lt{'dom'}</label>:</b><br /> |
<b><label for="udom">$lt{'dom'}</label>:</b><br /> |
<input type="text" name="udom" size="15" value="$authdomain" /><br /> |
<input type="text" name="udom" id="udom" size="15" value="$authdomain" /><br /> |
<input type="submit" value="$lt{'log'}" /> |
<input type="submit" value="$lt{'log'}" /> |
</form> |
</form> |
LFORM |
LFORM |
Line 454 HEADER
|
Line 458 HEADER
|
</div> |
</div> |
|
|
<div class="LC_loginpage_loginInfo"> |
<div class="LC_loginpage_loginInfo"> |
$loginhelp<br /> |
$loginhelp<br /> |
$forgotpw<br /> |
$forgotpw<br /> |
$contactblock<br /> |
<br /> |
$newuserlink |
$contactblock<br /> |
$coursecatalog |
<br /> |
|
$newuserlink<br /> |
|
$coursecatalog |
</div> |
</div> |
</div> |
</div> |
ENDTOP |
ENDTOP |
Line 545 sub contactdisplay {
|
Line 551 sub contactdisplay {
|
$showhelpdesk = 1; |
$showhelpdesk = 1; |
} |
} |
if ($servadm && $showadminmail) { |
if ($servadm && $showadminmail) { |
$contactblock .= '<b> '.$$lt{'servadm'}.':</b><br />'. |
$contactblock .= $$lt{'servadm'}.':<br />'. |
'<tt> '.$servadm.'</tt><br /> <br />'; |
'<tt>'.$servadm.'</tt><br />'; |
} |
} |
if ($showhelpdesk) { |
if ($showhelpdesk) { |
$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />'; |
$contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />'; |
Line 567 function helpdesk() {
|
Line 573 function helpdesk() {
|
</script> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
} |
} |
$contactblock .= <<"ENDBLOCK"; |
$contactblock .= $version; |
$version |
|
ENDBLOCK |
|
return $contactblock; |
return $contactblock; |
} |
} |
|
|
Line 586 sub loginhelpdisplay {
|
Line 590 sub loginhelpdisplay {
|
my (%lt) = @_; |
my (%lt) = @_; |
my $login_help = 1; |
my $login_help = 1; |
if ($login_help) { |
if ($login_help) { |
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; |
my $dom = &Apache::lonnet::default_login_domain(); |
|
my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom); |
|
my $loginhelp_url = $helpconfig{'helpsettings'}{'loginhelpurl'}; |
|
if ($loginhelp_url ne '') { |
|
return '<a href="'.$loginhelp_url.'">'.$lt{'help'}.'</a>'; |
|
} else { |
|
return '<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a>'; |
|
} |
} |
} |
return; |
return; |
} |
} |
Line 600 END
|
Line 611 END
|
|
|
sub newuser_link { |
sub newuser_link { |
my ($linkname) = @_; |
my ($linkname) = @_; |
return ' <a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />'; |
return '<a href="/adm/createaccount">'.$linkname.'</a>'; |
} |
} |
|
|
1; |
1; |