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

Diff for /modules/gci/lonlogin.pm between versions 1.1 and 1.2

version 1.1, 2009/09/17 01:55:01 version 1.2, 2009/09/23 13:14:19
Line 46  sub handler { Line 46  sub handler {
  (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},   (join('&',$ENV{'QUERY_STRING'},$env{'request.querystring'},
       $ENV{'REDIRECT_QUERY_STRING'}),        $ENV{'REDIRECT_QUERY_STRING'}),
  ['interface','username','domain','firsturl','localpath','localres',   ['interface','username','domain','firsturl','localpath','localres',
   'token']);    'token','role','symb']);
     if (!defined($env{'form.firsturl'})) {      if (!defined($env{'form.firsturl'})) {
         &Apache::lonacc::get_posted_cgi($r,['firsturl']);          &Apache::lonacc::get_posted_cgi($r,['firsturl']);
     }      }
Line 84  sub handler { Line 84  sub handler {
  $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]logout[_4].',                   .'<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="/adm/roles">','</a>','<a href="/adm/logout">','</a>').'</p>'
                  .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'                   .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
                  .$end_page                   .$end_page
Line 179  sub handler { Line 179  sub handler {
     if ($uextkey>2147483647) { $uextkey-=4294967296; }      if ($uextkey>2147483647) { $uextkey-=4294967296; }
   
 # -------------------------------------------------------- Store away log token  # -------------------------------------------------------- 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(      my $logtoken=Apache::lonnet::reply(
        'tmpput:'.$ukey.$lkey.'&'.$firsturl,         'tmpput:'.$ukey.$lkey.'&'.$firsturl,
        $lonhost);         $lonhost);
Line 281  sub handler { Line 291  sub handler {
     my $now=time;      my $now=time;
     my $js = (<<ENDSCRIPT);      my $js = (<<ENDSCRIPT);
   
  <script language="JavaScript">   <script type="text/javascript" language="JavaScript">
   // <![CDATA[
     function send(caller)      function send(caller)
     {      {
   
Line 340  sub handler { Line 351  sub handler {
         return false;          return false;
     }      }
  </script>   </script>
   // ]]>
 ENDSCRIPT  ENDSCRIPT
   
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
Line 464  my %lt=&Apache::lonlocal::texthash( Line 475  my %lt=&Apache::lonlocal::texthash(
      </td>       </td>
      <td width="10">&nbsp;</td>       <td width="10">&nbsp;</td>
      <td valign="top">       <td valign="top">
       <form name="client" method="post" onsubmit="return(send());">        <form name="client" method="post" action="" onsubmit="return(send());">
       <table class="LC_loginbox_right">        <table class="LC_loginbox_right">
        <tr>         <tr>
         <td colspan="3" height="23" class="LC_loginbox_strip">&nbsp;</td>          <td colspan="3" height="23" class="LC_loginbox_strip">&nbsp;</td>
Line 569  END_OF_BLOCK2 Line 580  END_OF_BLOCK2
 <h1>The Learning<i>Online</i> Network with CAPA</h1>  <h1>The Learning<i>Online</i> Network with CAPA</h1>
 <h2>$lt{'tbli'}</h2>$announcements  <h2>$lt{'tbli'}</h2>$announcements
 <h3>$lt{'options_headline'}</h3>  <h3>$lt{'options_headline'}</h3>
 <form name="client" onsubmit="return(send())">  <form name="client" action="" onsubmit="return(send())">
 <label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />  <label><input type="checkbox" name="imagesuppress" /> $lt{'sprs_img'}</label><br />
 <label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />  <label><input type="checkbox" name="appletsuppress" /> $lt{'sprs_applet'}</label><br />
 <label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />  <label><input type="checkbox" name="embedsuppress" /> $lt{'sprs_embed'}</label><br />
Line 580  END_OF_BLOCK2 Line 591  END_OF_BLOCK2
 ENDACCESSOPTIONS  ENDACCESSOPTIONS
     }      }
     $r->print('      $r->print('
      <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.'" />
 ');  ');
     unless ($fullgraph) {      unless ($fullgraph) {
         my $logintitle;          my $logintitle;
Line 597  ENDACCESSOPTIONS Line 608  ENDACCESSOPTIONS
                             .'</font></div></noscript></td>';                              .'</font></div></noscript></td>';
         $r->print(<<ENDTEXTUAL);          $r->print(<<ENDTEXTUAL);
      <hr />       <hr />
      <table border=0 cellspacing=0 cellpadding=0>       <table border=0 cellspacing="0" cellpadding="0">
       <tr>$logintitle</tr>        <tr>$logintitle</tr>
       <tr>$noscript_warning</tr>        <tr>$noscript_warning</tr>
       <tr>        <tr>
Line 676  sub contactdisplay { Line 687  sub contactdisplay {
         my $thisurl = &escape('/adm/login');          my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";          $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">  <script type="text/javascript">
   // <![CDATA[
 function helpdesk() {  function helpdesk() {
     var codedom = document.client.udom.value;      var codedom = document.client.udom.value;
     if (codedom == '') {      if (codedom == '') {
Line 685  function helpdesk() { Line 697  function helpdesk() {
     document.location.href = "/adm/helpdesk?"+querystr;      document.location.href = "/adm/helpdesk?"+querystr;
     return;      return;
 }  }
   // ]]>
 </script>  </script>
 ENDSCRIPT  ENDSCRIPT
     }      }
Removed from v.1.1  
changed lines
  Added in v.1.2

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