--- loncom/auth/lonlogin.pm	2006/11/01 21:27:50	1.82
+++ loncom/auth/lonlogin.pm	2007/10/09 16:48:51	1.94.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.82 2006/11/01 21:27:50 www Exp $
+# $Id: lonlogin.pm,v 1.94.2.1 2007/10/09 16:48:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,17 +40,6 @@ use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
-
-sub additional_machine_domains {
-    my @domains;
-    open(my $fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/expected_domains.tab');
-    while( my $line = <$fh>) {
-	$line =~ s/\s//g;
-	push(@domains,$line);
-    }
-    return @domains;
-}
-
 sub handler {
     my $r = shift;
 
@@ -84,8 +73,7 @@ sub handler {
     my $lonid=$cookies{'lonID'};
     my $cookie;
     if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
+	my $handle=&LONCAPA::clean_handle($lonid->value);
         my $lonidsdir=$r->dir_config('lonIDsDir');
 	if (-e "$lonidsdir/$handle.id") {
 # Is there an existing token file?
@@ -132,30 +120,24 @@ ENDFAILED
     }
 
     my $fullgraph=($env{'form.interface'} ne 'textual');
-    my $port_to_use=$r->dir_config('lonhttpdPort');
-    if (!defined($port_to_use)) {
-	$port_to_use='8080';
-    }
-    my $iconpath= 'http://'.$ENV{'HTTP_HOST'}.':'.$port_to_use.
-                  $r->dir_config('lonIconsURL');
-    my $domain  = $r->dir_config('lonDefDomain');
-    my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
-    foreach my $posdom (&Apache::lonnet::current_machine_domains(),
-			&additional_machine_domains()) {
-	if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
-    }
+
+    my $iconpath= 
+	&Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+
+    my $domain = &Apache::lonnet::default_login_domain();
     if (($env{'form.domain'}) && 
-	 ($Apache::lonnet::domaindescription{$env{'form.domain'}})) {
+	(&Apache::lonnet::domain($env{'form.domain'},'description'))) {
 	$domain=$env{'form.domain'};
     }
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
+    my $servadm = $r->dir_config('lonAdmEMail');
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
     my $expire  = $r->dir_config('lonExpire');
     my $version = $r->dir_config('lonVersion');
-    my $host_name = $Apache::lonnet::hostname{$lonhost};
+    my $host_name = &Apache::lonnet::hostname($lonhost);
 
 # --------------------------------------------- Default values for login fields
 
@@ -176,9 +158,8 @@ ENDFAILED
     my $otherserver= &Apache::lonnet::absolute_url($host_name);
     my $firsturl=
     ($env{'request.firsturl'}?$env{'request.firsturl'}:$env{'form.firsturl'});
-# ---------------------------------------- Are we access server and overloaded?
-    if (($role eq 'access') &&
-	(($userloadpercent>100.0)||($loadpercent>100.0))) {
+# ---------------------------------------------------------- Are we overloaded?
+    if ((($userloadpercent>100.0)||($loadpercent>100.0))) {
         my $unloaded=Apache::lonnet::spareserver($loadpercent,$userloadpercent);
 	if ($unloaded) { $otherserver=$unloaded; }
     }
@@ -217,33 +198,36 @@ ENDFAILED
 	my $last;
         foreach my $hostid (sort
 			    {
-				$Apache::lonnet::hostname{$a} cmp
-				    $Apache::lonnet::hostname{$b};
+				&Apache::lonnet::hostname($a) cmp
+				    &Apache::lonnet::hostname($b);
 			    }
 			    keys(%Apache::lonnet::spareid)) {
             next if ($hostid eq $lonhost);
-            next if ($last eq $Apache::lonnet::hostname{$hostid});
+	    my $hostname = &Apache::lonnet::hostname($hostid);
+	    next if ($last eq $hostname);
             $spares.='<br /><font size="+1"><a href="http://'.
-                $Apache::lonnet::hostname{$hostid}.
+                $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
-                $Apache::lonnet::hostname{$hostid}.'</a>'.
+                $hostname.'</a>'.
                 ' (preferred)</font>'.$/;
-	    $last=$Apache::lonnet::hostname{$hostid};
+	    $last=$hostname;
         }
         $spares.= '<br />';
+	my %all_hostnames = &Apache::lonnet::all_hostnames();
         foreach my $hostid (sort
 			    {
-				$Apache::lonnet::hostname{$a} cmp
-				    $Apache::lonnet::hostname{$b};
+				&Apache::lonnet::hostname($a) cmp
+				    &Apache::lonnet::hostname($b);
 			    }
-			    keys(%Apache::lonnet::hostname)) {
+			    keys(%all_hostnames)) {
             next if ($hostid eq $lonhost || $Apache::lonnet::spareid{$hostid});
-            next if ($last eq $Apache::lonnet::hostname{$hostid});
+	    my $hostname = &Apache::lonnet::hostname($hostid);
+            next if ($last eq $hostname);
             $spares.='<br /><a href="http://'.
-                $Apache::lonnet::hostname{$hostid}.
+                $hostname.
                 '/adm/login?domain='.$authdomain.'">'.
-                $Apache::lonnet::hostname{$hostid}.'</a>';
-	    $last=$Apache::lonnet::hostname{$hostid};
+                $hostname.'</a>';
+	    $last=$hostname;
         }
 	$r->print(<<ENDTROUBLE);
 <html>
@@ -259,8 +243,7 @@ ENDTROUBLE
     }
 
 # ----------------------------------------------- Apparently we are in business
-
-    my $domainlogo=&Apache::loncommon::domainlogo($domain);
+    $servadm=~s/\,/\<br \/\>/g;
 
 # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);
@@ -292,6 +275,11 @@ ENDHEADER
       ($fullgraph?&Apache::loncommon::designparm('login.sidebg',$domain):'#FFFFFF');
     my $logo=&Apache::loncommon::designparm('login.logo',$domain);
     my $img=&Apache::loncommon::designparm('login.img',$domain);
+    my $domainlogo=&Apache::loncommon::domainlogo($domain);
+    my $showadminmail=&Apache::loncommon::designparm('login.adminmail',                                                      $domain);
+    my $showcoursecat =
+        &Apache::loncommon::designparm('login.coursecatalog',$domain);
+
 
 # ----------------------------------------------------------------------- Texts
 
@@ -302,15 +290,20 @@ my %lt=&Apache::lonlocal::texthash(
 		  'perc' => 'percent',
 		  'load' => 'Load',
                   'userload' => 'User Load',
-                  'about'  => 'aboutlon.gif',
-                  'access' => 'accessbutton.gif',
+                  'about'  => 'About LON-CAPA',
+                  'access' => 'Accessibility Options',
+                  'catalog' => 'Course Catalog',
 		  'auth' => 'userauthentication.gif',
 		  'log' => 'Log in',
-		  'help' => 'Help',
+		  'help' => 'Log-in Help',
 		  'serv' => 'Server',
-                  'helpdesk' => 'Contact Helpdesk');
+                  'servadm' => 'Server Administration',
+                  'helpdesk' => 'Contact Helpdesk',
+                  'forgotpw' => 'Forgot password?');
 # -------------------------------------------------- Change password field name
     my $now=time;
+    my $forgotpw = &forgotpwdisplay(%lt);
+    my $loginhelp = &loginhelpdisplay(%lt);
 # ---------------------------------------------------------- Serve rest of page
     $r->print(<<ENDSCRIPT);
 
@@ -389,6 +382,10 @@ ENDSCRIPT
    <input type="hidden" name="localres" value="$env{'form.localres'}" />
   </form>
 ENDSERVERFORM
+    my $coursecatalog;
+    if (($showcoursecat eq '') || ($showcoursecat)) {
+        $coursecatalog = &coursecatalog_link($lt{'catalog'});
+    }
     if ($fullgraph) { $r->print(<<ENDTOP);
   <!-- The LON-CAPA Header -->
   <tr>
@@ -414,14 +411,23 @@ ENDSERVERFORM
   </tr>
   <tr>
    
-   <!-- A cell that will hold the 'access' and 'about' buttons -->
+   <!-- A cell that will hold the 'access', 'about', and 'catalog' links -->
    <!-- Row 3 Column 1 -->
-   <td valign="top" height=60 align="center" bgcolor="$sidebg">
-    <a href="/adm/login?interface=textual"><img src="$iconpath/$lt{'access'}" border=0 alt="Accessibility Options" /></a>
-    <br />
-    <a href="/adm/about.html"><img src="$iconpath/$lt{'about'}" border=0 alt="About LON-CAPA" /></a>
+   <td valign="top" height="60" align="left" bgcolor="$sidebg">
+    <table cellpadding="0" cellspacing="2" border="0">
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/login?interface=textual"><b>$lt{'access'}</b></a></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/about.html"><b>$lt{'about'}</b></a></td>
+     </tr>$coursecatalog
+     <tr>
+      <td colspan="2">&nbsp;</td>
+     </tr>
+    </table>
    </td>
-
    <!-- The shaded space between the two main columns -->
    <!-- Row 3 Column 2 -->
    <td width=27 height=60 background="$iconpath/fillleft.gif"><img src="$iconpath/fillleft.gif" alt="" /></td>
@@ -475,31 +481,38 @@ ENDNOOPT
      <table border=0 cellspacing=0 cellpadding=0>
       <tr><td bgcolor="$sidebg" colspan=2><img src="$iconpath/$lt{'auth'}" alt="User Authentication" /></td></tr>
       <tr>
-       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'un'}:</b></font></td>
+       <td bgcolor="$mainbg"><br /><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="uname">$lt{'un'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><br /><input type="text" name="uname" size="10" value="$authusername" /></td>
       </tr>
       <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'pw'}:</b></font></td>
+       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="upass$now">$lt{'pw'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><input type="password" name="upass$now" size="10" /></td>
       </tr>
       <tr>
-       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;$lt{'dom'}:</b></font></td>
+       <td bgcolor="$mainbg"><font size=-1><b>&nbsp;&nbsp;&nbsp;<label for="udom">$lt{'dom'}</label>:</b></font></td>
        <td bgcolor="$mainbg"><input type="text" name="udom" size="10" value="$authdomain" /></td>
       </tr>
       <tr>
-       <td bgcolor="$mainbg">&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">$lt{'help'}</a></td>
+       <td bgcolor="$mainbg">&nbsp;</td>
        <td bgcolor="$mainbg" valign="bottom" align="center">
         <br />
         <input type="submit" value="$lt{'log'}" />
        </td>
       </tr>
+      <tr>
+       <td bgcolor="$mainbg" valign="bottom" align="left" colspan="2">
+        $loginhelp
+        $forgotpw
+       </td>
+      </tr>
      </table>
      <!-- End sub-table -->
     </form>
 ENDLOGIN
     if ($fullgraph) {
         my $helpdeskscript;
-        my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
+        my $contactblock = &contactdisplay(\%lt,$servadm,$showadminmail,
+                                  $version,$authdomain,\$helpdeskscript);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -595,15 +608,19 @@ ENDDOCUMENT
 }
 
 sub contactdisplay {
-    my ($lt,$version,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$servadm,$showadminmail,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
     my $showhelpdesk = 0;
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $showhelpdesk = 1;
     }
+    if ($servadm && $showadminmail) {
+        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'servadm'}.':</b><br />'.
+                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$servadm.'</tt><br />&nbsp;<br />';
+    }
     if ($showhelpdesk) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()">'.$$lt{'helpdesk'}.'</a></b><br />';
+        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;<a href="javascript:helpdesk()"><font size="+1">'.$lt->{'helpdesk'}.'</font></a></b><br />';
         my $thisurl = &escape('/adm/login');
         $$helpdeskscript = <<"ENDSCRIPT";
 <script type="text/javascript">
@@ -624,7 +641,34 @@ ENDSCRIPT
 ENDBLOCK
     return $contactblock;
 }
- 
+
+sub forgotpwdisplay {
+    my (%lt) = @_;
+    my $prompt_for_resetpw = 1; 
+    if ($prompt_for_resetpw) {
+        return '<br />&nbsp;&nbsp;&nbsp;<a href="/adm/resetpw">'.$lt{'forgotpw'}.'</a></b><br /><br />';
+    }
+    return;
+}
+
+sub loginhelpdisplay {
+    my (%lt) = @_;
+    my $login_help = 1;
+    if ($login_help) {
+        return '&nbsp;&nbsp;&nbsp;<a href="/adm/loginproblems.html">'.$lt{'help'}.'</a></b>';
+    }
+    return;
+}
+
+sub coursecatalog_link {
+    my ($linkname) = @_;
+    return <<"END";
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/coursecatalog"><b>$linkname</b></a></td>
+     </tr>
+END
+}
 
 1;
 __END__