--- loncom/auth/lonlogin.pm 2003/05/08 22:23:19 1.42 +++ loncom/auth/lonlogin.pm 2003/08/25 15:24:43 1.46 @@ -1,7 +1,7 @@ # The LearningOnline Network # Login Screen # -# $Id: lonlogin.pm,v 1.42 2003/05/08 22:23:19 albertel Exp $ +# $Id: lonlogin.pm,v 1.46 2003/08/25 15:24:43 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,7 +51,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'}, - ['interface','username','domain','firsturl']); + ['interface','username','domain','firsturl','localpath','localres']); # ----------------------------------------------------------- Process Interface $ENV{'form.interface'}=~s/\W//g; @@ -73,6 +73,10 @@ sub handler { my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use. $r->dir_config('lonIconsURL'); my $domain = $r->dir_config('lonDefDomain'); + if (($ENV{'form.domain'}) && + ($Apache::lonnet::domaindescription{$ENV{'form.domain'}})) { + $domain=$ENV{'form.domain'}; + } my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); my $servadm = $r->dir_config('lonAdmEMail'); @@ -81,6 +85,7 @@ sub handler { my $tabdir = $r->dir_config('lonTabDir'); my $include = $r->dir_config('lonIncludes'); my $expire = $r->dir_config('lonExpire'); + my $version = $r->dir_config('lonVersion'); # --------------------------------------------- Default values for login fields @@ -107,6 +112,8 @@ sub handler { $otherserver=Apache::lonnet::spareserver($loadpercent,$userloadpercent); } +# ----------------------------------------------------------- Get announcements + my $announcements=&Apache::lonnet::getannounce(); # -------------------------------------------------------- Set login parameters my @hexstr=('0','1','2','3','4','5','6','7', @@ -182,20 +189,20 @@ ENDHEADER # ----------------------------------------------------------- Front page design my $pgbg= - ($fullgraph?&Apache::loncommon::designparm('login.pgbg'):'#FFFFFF'); + ($fullgraph?&Apache::loncommon::designparm('login.pgbg',$domain):'#FFFFFF'); my $font= - ($fullgraph?&Apache::loncommon::designparm('login.font'):'#000000'); + ($fullgraph?&Apache::loncommon::designparm('login.font',$domain):'#000000'); my $link= - ($fullgraph?&Apache::loncommon::designparm('login.link'):'#0000FF'); + ($fullgraph?&Apache::loncommon::designparm('login.link',$domain):'#0000FF'); my $vlink= - ($fullgraph?&Apache::loncommon::designparm('login.vlink'):'#0000FF'); - my $alink=&Apache::loncommon::designparm('login.alink'); + ($fullgraph?&Apache::loncommon::designparm('login.vlink',$domain):'#0000FF'); + my $alink=&Apache::loncommon::designparm('login.alink',$domain); my $mainbg= - ($fullgraph?&Apache::loncommon::designparm('login.mainbg'):'#FFFFFF'); + ($fullgraph?&Apache::loncommon::designparm('login.mainbg',$domain):'#FFFFFF'); my $sidebg= - ($fullgraph?&Apache::loncommon::designparm('login.sidebg'):'#FFFFFF'); - my $logo=&Apache::loncommon::designparm('login.logo'); - my $img=&Apache::loncommon::designparm('login.img'); + ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF'); + my $logo=&Apache::loncommon::designparm('login.logo',$domain); + my $img=&Apache::loncommon::designparm('login.img',$domain); # ---------------------------------------------------------- Serve rest of page @@ -263,6 +270,8 @@ ENDSCRIPT + + ENDSERVERFORM if ($fullgraph) { $r->print(< - +
@@ -320,7 +329,7 @@ ENDSERVERFORM ENDTOP } else { - $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'); + $r->print('

The LearningOnline Network with CAPA

Text-based Interface Login

'.$announcements); } $r->print('
'); unless ($fullgraph) { @@ -383,6 +392,9 @@ ENDLOGIN + +$announcements + @@ -430,7 +442,8 @@ ENDLOGIN    System Administration:
      $sysadm
   Server Administration:
-       $servadm
 
+       $servadm
 
+    $version