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

Diff for /loncom/auth/lonlogin.pm between versions 1.15 and 1.16

version 1.15, 2002/03/23 21:06:54 version 1.16, 2002/05/23 20:00:11
Line 46  sub handler { Line 46  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
   
       &Apache::loncommon::get_unprocessed_cgi
                            ($ENV{'QUERY_STRING'},['interface']);
   
       my $fullgraph=($ENV{'form.interface'} ne 'textual');
   
     my $iconpath= $r->dir_config('lonIconsURL');      my $iconpath= $r->dir_config('lonIconsURL');
     my $domain  = $r->dir_config('lonDefDomain');      my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');      my $role    = $r->dir_config('lonRole');
Line 108  ENDHEADER Line 114  ENDHEADER
         $r->print(<$jsh>);          $r->print(<$jsh>);
     }      }
 # ---------------------------------------------------------- Serve rest of page  # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDSCRIPT);
   
 <body bgcolor="#006600" text="#000000" link="#999999" vlink="#999999"  <body bgcolor="#006600" text="#000000" link="#999999" vlink="#999999"
  onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>   onLoad="init();" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
Line 132  ENDHEADER Line 138  ENDHEADER
         this.document.server.submit();          this.document.server.submit();
     }      }
  </script>   </script>
   ENDSCRIPT
   
  <!-- The Main Table -->      if ($fullgraph) {
  <table width="100%" cellpadding=0 cellspacing=0 border=0>   $r->print(
     '<table width="100%" cellpadding=0 cellspacing=0 border=0>');
       }
   
       $r->print(<<ENDSERVERFORM);
   <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">    <form name="server" action="$otherserver/adm/authenticate" method="post" target="_top">
    <input type=hidden name=logtoken value="$logtoken">     <input type=hidden name=logtoken value="$logtoken">
    <input type=hidden name=serverid value="$lonhost">     <input type=hidden name=serverid value="$lonhost">
Line 143  ENDHEADER Line 153  ENDHEADER
    <input type=hidden name=upass value="">     <input type=hidden name=upass value="">
    <input type=hidden name=udom value="">     <input type=hidden name=udom value="">
   </form>    </form>
   ENDSERVERFORM
       if ($fullgraph) { $r->print(<<ENDTOP);
   <!-- The LON-CAPA Header -->    <!-- The LON-CAPA Header -->
   <tr>    <tr>
   
Line 171  ENDHEADER Line 182  ENDHEADER
    <!-- A cell that will hold the 'access' and 'about' buttons -->     <!-- A cell that will hold the 'access' and 'about' buttons -->
    <!-- Row 3 Column 1 -->     <!-- Row 3 Column 1 -->
    <td valign="top" height=60 align="center" bgcolor="#cccccc">     <td valign="top" height=60 align="center" bgcolor="#cccccc">
     <a href="/adm/accessibility.html"><img src="$iconpath/accessbutton.gif" border=0 /></a>      <a href="/adm/login?interface=textual"><img src="$iconpath/accessbutton.gif" border=0 /></a>
     <br />      <br />
     <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 /></a>      <a href="/adm/about.html"><img src="$iconpath/aboutlon.gif" border=0 /></a>
    </td>     </td>
Line 196  ENDHEADER Line 207  ENDHEADER
    <!-- The entry form -->     <!-- The entry form -->
    <!-- Row 4 Column 1 -->     <!-- Row 4 Column 1 -->
    <td align="center" valign="middle" bgcolor="#cccccc">     <td align="center" valign="middle" bgcolor="#cccccc">
   ENDTOP
   }
       $r->print(<<ENDLOGIN);
     <form name="client">      <form name="client">
      <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">
Line 223  ENDHEADER Line 237  ENDHEADER
       </tr>        </tr>
      </table>       </table>
      <!-- End sub-table -->       <!-- End sub-table -->
   
     </form>      </form>
   ENDLOGIN
       if ($fullgraph) {
    $r->print(<<ENDDOCUMENT);
    </td>     </td>
   
    <!-- Row 4 Column 2 -->     <!-- Row 4 Column 2 -->
Line 297  ENDHEADER Line 313  ENDHEADER
    <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" /></td>     <td align="right" background="$iconpath/fillbottom.gif"><img src="$iconpath/lowerright.gif" /></td>
   </tr>    </tr>
  </table>   </table>
 </body>  
 </html>  
   
 ENDDOCUMENT  ENDDOCUMENT
   }
       $r->print('</body></html>');
     return OK;      return OK;
 }   } 
   
Removed from v.1.15  
changed lines
  Added in v.1.16

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