--- loncom/auth/lonlogin.pm	2009/05/22 17:01:28	1.122
+++ loncom/auth/lonlogin.pm	2009/12/01 14:23:49	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.122 2009/05/22 17:01:28 bisitz Exp $
+# $Id: lonlogin.pm,v 1.130 2009/12/01 14:23:49 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,7 +46,7 @@ sub handler {
 	(join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
 	      $ENV{'REDIRECT_QUERY_STRING'}),
 	 ['interface','username','domain','firsturl','localpath','localres',
-	  'token']);
+	  'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }
@@ -81,11 +81,15 @@ sub handler {
 	    &Apache::loncommon::start_page('Already logged in');
 	my $end_page = 
 	    &Apache::loncommon::end_page();
+        my $dest = '/adm/roles';
+        if ($env{'form.firsturl'} ne '') {
+            $dest = $env{'form.firsturl'}; 
+        }
 	$r->print(
                   $start_page
                  .'<h1>'.&mt('You are already logged in!').'</h1>'
                  .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].',
-                  '<a href="/adm/roles">','</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>'
                  .$end_page
                  );
@@ -107,7 +111,19 @@ sub handler {
     my $iconpath= 
 	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
 
+    my $lonhost = $r->dir_config('lonHostID');
     my $domain = &Apache::lonnet::default_login_domain();
+    my %domconfhash = &Apache::loncommon::get_domainconf($domain);
+    if ($lonhost ne '') {
+        my $loginvia = $domconfhash{$domain.'.login.loginvia_'.$lonhost};
+        if (($loginvia ne '') && ($loginvia ne $lonhost)) {
+            if (&Apache::lonnet::hostname($loginvia) ne '') {
+                $r->print(&redirect_page($loginvia));
+                return OK;
+            }
+        }
+    }
+
     if (($env{'form.domain'}) && 
 	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
 	$domain=$env{'form.domain'};
@@ -115,7 +131,6 @@ sub handler {
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
     my $servadm = $r->dir_config('lonAdmEMail');
-    my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
@@ -170,8 +185,18 @@ sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }
 
 # -------------------------------------------------------- Store away log token
+    my $tokenextras;
+    if ($env{'form.role'}) {
+        $tokenextras = '&role='.&escape($env{'form.role'});
+    }
+    if ($env{'form.symb'}) {
+        if (!$tokenextras) {
+            $tokenextras = '&';
+        }
+        $tokenextras .= '&symb='.&escape($env{'form.symb'});
+    }
     my $logtoken=Apache::lonnet::reply(
-       'tmpput:'.$ukey.$lkey.'&'.$firsturl,
+       'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);
 
 # ------------------- If we cannot talk to ourselves, we are in serious trouble
@@ -312,21 +337,21 @@ $r->print(&Apache::loncommon::start_page
 # ----------------------------------------------------------------------- Texts
 
 my %lt=&Apache::lonlocal::texthash(
-	  'un'  => 'Username',
-	  'pw'  => 'Password',
-	  'dom' => 'Domain',
-	  'perc' => 'percent',
-	  'load' => 'Server Load',
-	  'userload' => 'User Load',
-	  'catalog' => 'Course Catalog',
-	  'log' => 'Log in',
-	  'help' => 'Log-in Help',
-	  'serv' => 'Server',
-	  'servadm' => 'Server Administration',
-	  'helpdesk' => 'Contact Helpdesk',
-	  'forgotpw' => 'Forgot password?',
-	  'newuser'  => 'New User?',
-	  );
+          'un'       => 'Username',
+          'pw'       => 'Password',
+          'dom'      => 'Domain',
+          'perc'     => 'percent',
+          'load'     => 'Server Load',
+          'userload' => 'User Load',
+          'catalog'  => 'Course/Community Catalog',
+          'log'      => 'Log in',
+          'help'     => 'Log-in Help',
+          'serv'     => 'Server',
+          'servadm'  => 'Server Administration',
+          'helpdesk' => 'Contact Helpdesk',
+          'forgotpw' => 'Forgot password?',
+          'newuser'  => 'New User?',
+       );
 # -------------------------------------------------- Change password field name
 my $forgotpw = &forgotpwdisplay(%lt);
 my $loginhelp = &loginhelpdisplay(%lt);
@@ -365,7 +390,7 @@ if (($showcoursecat eq '') || ($showcour
 }
 my $newuserlink;
 if ($shownewuserlink) {
-    $newuserlink = &newuser_link($lt{'newuser'}).'<br />';
+    $newuserlink = &newuser_link($lt{'newuser'});
 }
 my $logintitle;
 if ($loginheader eq 'text') {
@@ -387,11 +412,11 @@ my $loginform=(<<LFORM);
   <input type="hidden" name="lextkey" value="$lextkey" />
   <input type="hidden" name="uextkey" value="$uextkey" />
   <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 />
-  <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 />
-  <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'}" />
 </form>
 LFORM
@@ -424,11 +449,13 @@ HEADER
 </div>
   
 <div class="LC_loginpage_loginInfo">
-        $loginhelp<br />
-        $forgotpw<br />
-	$contactblock<br />
-        $newuserlink
-        $coursecatalog
+  $loginhelp<br />
+  $forgotpw<br />
+  <br />
+  $contactblock<br />
+  <br />
+  $newuserlink<br />
+  $coursecatalog
 </div>
 </div>
 ENDTOP
@@ -492,6 +519,20 @@ ENDDOCUMENT
     return OK;
 }
 
+sub redirect_page {
+    my ($desthost) = @_;
+    my $protocol = $Apache::lonnet::protocol{$desthost};
+    $protocol = 'http' if ($protocol ne 'https');
+    my $url = $protocol.'://'.&Apache::lonnet::hostname($desthost).'/';
+    if ($env{'form.firsturl'} ne '') {
+        $url .='?firsturl='.$env{'form.firsturl'};
+    }
+    my $start_page = &Apache::loncommon::start_page('Switching Server',undef,
+                                                    {'redirect' => [0,$url],});
+    my $end_page   = &Apache::loncommon::end_page();
+    return $start_page.$end_page;
+}
+
 sub contactdisplay {
     my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
@@ -501,8 +542,8 @@ sub contactdisplay {
         $showhelpdesk = 1;
     }
     if ($servadm && $showadminmail) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
+        $contactblock .= $$lt{'servadm'}.':<br />'.
+                         '<tt>'.$servadm.'</tt><br />';
     }
     if ($showhelpdesk) {
         $contactblock .= '<a href="javascript:helpdesk()">'.$lt->{'helpdesk'}.'</a><br />';
@@ -523,9 +564,7 @@ function helpdesk() {
 </script>
 ENDSCRIPT
     }
-    $contactblock .= <<"ENDBLOCK";
-     &nbsp;&nbsp;&nbsp;$version
-ENDBLOCK
+    $contactblock .= $version;
     return $contactblock;
 }
 
@@ -556,7 +595,7 @@ END
 
 sub newuser_link {
     my ($linkname) = @_;
-    return '&nbsp;&nbsp;&nbsp;<a href="/adm/createaccount"><b>'.$linkname.'</b></a><br />';
+    return '<a href="/adm/createaccount">'.$linkname.'</a>';
 }
 
 1;