[BACK]Return to lonlogin.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / modules / gci

Diff for /modules/gci/lonlogin.pm between versions 1.4 and 1.9

version 1.4, 2009/10/03 01:41:27 version 1.9, 2010/01/11 02:31:32
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use Apache::migrateuser();  use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
   use HTML::Entities();
     
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 82  sub handler { Line 83  sub handler {
  my $end_page =    my $end_page = 
     &Apache::loncommon::end_page();      &Apache::loncommon::end_page();
         my $dest = '/adm/roles';          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 '') {          if ($env{'form.firsturl'} ne '') {
             $dest = $env{'form.firsturl'};              $dest = $env{'form.firsturl'};
         }          }
Line 139  sub handler { Line 147  sub handler {
     my $version = $r->dir_config('lonVersion');      my $version = $r->dir_config('lonVersion');
     my $host_name = &Apache::lonnet::hostname($lonhost);      my $host_name = &Apache::lonnet::hostname($lonhost);
     if ($domain eq 'gcitest') {      if ($domain eq 'gcitest') {
           $lonhost = 'gcitestl1';
           $host_name = 'gcitest.lite.msu.edu';
         $sitename = 'GCI Testing Center';          $sitename = 'GCI Testing Center';
         $shortsitename = 'Testing Center';          $shortsitename = 'Testing Center';
         $existing = 'Student with Testing Center account?';          $existing = 'Student with Testing Center account?';
Line 197  sub handler { Line 207  sub handler {
     if ($env{'form.role'}) {      if ($env{'form.role'}) {
         $tokenextras = '&role='.&escape($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 ($env{'form.symb'}) {
         if (!$tokenextras) {          if (!$tokenextras) {
             $tokenextras = '&';              $tokenextras = '&';
Line 204  sub handler { Line 219  sub handler {
         $tokenextras .= '&symb='.&escape($env{'form.symb'});          $tokenextras .= '&symb='.&escape($env{'form.symb'});
     }      }
     my $logtoken=Apache::lonnet::reply(      my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl,         'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
        $lonhost);         $lonhost);
   
 # ------------------- If we cannot talk to ourselves, we are in serious trouble  # ------------------- If we cannot talk to ourselves, we are in serious trouble
Line 480  END_OF_BLOCK1 Line 495  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>               <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>
            <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>
            <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>               <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>
Line 570  END_OF_BLOCK2 Line 587  END_OF_BLOCK2
   </tr>    </tr>
   <tr>    <tr>
     <td colspan="4">      <td colspan="4">
         <div align="left">
       <table border="0" cellspacing="0" cellpadding="0">        <table border="0" cellspacing="0" cellpadding="0">
         <tr>          <tr>
           <td width="10">&nbsp;</td>            <td width="10">&nbsp;</td>
        <td><font size="-1">         <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>.        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>       </font>
          </td>           </td>
          <td width="10">&nbsp;</td>           <td width="10">&nbsp;</td>
        </tr>         </tr>
      </table>       </table>
        </div>
    </td>     </td>
   </tr>    </tr>
   <tr>    <tr>
Removed from v.1.4  
changed lines
  Added in v.1.9

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>