--- modules/gci/lonlogin.pm	2009/11/19 15:22:20	1.5
+++ modules/gci/lonlogin.pm	2010/01/11 02:31:32	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.5 2009/11/19 15:22:20 gci Exp $
+# $Id: lonlogin.pm,v 1.9 2010/01/11 02:31:32 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonlocal;
 use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
+use HTML::Entities();
  
 sub handler {
     my $r = shift;
@@ -82,6 +83,13 @@ sub handler {
 	my $end_page = 
 	    &Apache::loncommon::end_page();
         my $dest = '/adm/roles';
+        if ($env{'form.role'}) {
+            $dest .= '?selectrole=1&'.$env{'form.role'}.'=1'; 
+        }
+        if ($env{'form.symb'}) {
+            $dest .= ($dest =~ /\?/) ? '&' : '?'; 
+            $dest .= 'destinationurl='.&HTML::Entities::encode($env{'form.symb'},'"&<>');
+        }
         if ($env{'form.firsturl'} ne '') {
             $dest = $env{'form.firsturl'};
         }
@@ -199,6 +207,11 @@ sub handler {
     if ($env{'form.role'}) {
         $tokenextras = '&role='.&escape($env{'form.role'});
     }
+    if ($domain eq 'gci') {
+        unless ($env{'form.symb'} eq '/adm/statistics') {
+            $env{'form.symb'} = '/adm/gci_info';
+        }
+    }
     if ($env{'form.symb'}) {
         if (!$tokenextras) {
             $tokenextras = '&';
@@ -206,7 +219,7 @@ sub handler {
         $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
@@ -482,7 +495,9 @@ END_OF_BLOCK1
              <td align="right" valign="top" width="11" height="11"><img src="/images/login/$domain/r2_c6.png" width="11" height="11" border="0" alt=""></td>
            </tr>
            <tr>
-             <td align="center" valign="top" colspan="3">New to GCI WebCenter: <a href="javascript:send('newaccount')" style="color: #ffffff">Click here to sign up</a><br /></td>
+             <td>&nbsp;</td>
+             <td align="center" valign="middle"><span style="white-space: nowrap;">New to GCI WebCenter:&nbsp;<a href="javascript:send('newaccount')" style="color: #ffffff">Click here to sign up</a></span></td>
+             <td>&nbsp;</td>
            </tr>
            <tr>
              <td align="left" valign="bottom" width="11" height="11"><img src="/images/login/$domain/r8_c4.png" width="11" height="11" border="0" alt=""></td>
@@ -572,17 +587,19 @@ END_OF_BLOCK2
   </tr>
   <tr>
     <td colspan="4">
+      <div align="left">
       <table border="0" cellspacing="0" cellpadding="0">
         <tr>
           <td width="10">&nbsp;</td>
        <td><font size="-1">
-     <b>Note</b>:<br>
+     <b>Note</b>:<br />
       If log-in fails, it may be because your browser is not accepting session cookies, or javascript is disabled. <a href="http://loncapa.msu.edu/student/cookies.html">Learn more</a>.
      </font>
          </td>
          <td width="10">&nbsp;</td>
        </tr>
      </table>
+     </div>
    </td>
   </tr>
   <tr>