--- loncom/auth/lonlogin.pm 2012/04/11 11:40:07 1.150
+++ loncom/auth/lonlogin.pm 2013/09/13 21:28:18 1.156
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.150 2012/04/11 11:40:07 goltermann Exp $
+# $Id: lonlogin.pm,v 1.156 2013/09/13 21:28:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -111,7 +111,8 @@ sub handler {
# ----------------------------------------------------------- Process Interface
$env{'form.interface'}=~s/\W//g;
- my $httpbrowser=$ENV{"HTTP_USER_AGENT"};
+ (undef,undef,undef,undef,undef,undef,my $clientmobile) =
+ &Apache::loncommon::decode_user_agent();
my $iconpath=
&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
@@ -229,23 +230,23 @@ sub handler {
if ($spares) {
$spares.= '
';
}
-my %all_hostnames = &Apache::lonnet::all_hostnames();
-foreach my $hostid (sort
+ my %all_hostnames = &Apache::lonnet::all_hostnames();
+ foreach my $hostid (sort
{
&Apache::lonnet::hostname($a) cmp
&Apache::lonnet::hostname($b);
}
keys(%all_hostnames)) {
- next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
- my $hostname = &Apache::lonnet::hostname($hostid);
- next if (($last eq $hostname) || ($hostname eq ''));
- $spares.='
'.
- $hostname.'';
- $last=$hostname;
-}
-$r->print(
+ next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
+ my $hostname = &Apache::lonnet::hostname($hostid);
+ next if (($last eq $hostname) || ($hostname eq ''));
+ $spares.='
'.
+ $hostname.'';
+ $last=$hostname;
+ }
+ $r->print(
''
.'
'.&mt('Please attempt to login to one of the following servers:') - .'
' - .$spares); - } - $r->print('' - .'' - ); -return OK; -} + if ($spares) { + $r->print(''.&mt('Please attempt to login to one of the following servers:') + .'
' + .$spares); + } + $r->print('