--- loncom/auth/lonlogin.pm	2006/08/29 20:12:43	1.79
+++ loncom/auth/lonlogin.pm	2007/01/14 02:00:04	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.79 2006/08/29 20:12:43 albertel Exp $
+# $Id: lonlogin.pm,v 1.87 2007/01/14 02:00:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,6 @@ use Apache::migrateuser();
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
-
 sub handler {
     my $r = shift;
 
@@ -74,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?
@@ -128,19 +126,13 @@ ENDFAILED
     }
     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()) {
-	if (lc($posdom) eq lc($testdomain)) { $domain=$posdom; }
-    }
+    my $domain = &Apache::lonnet::default_login_domain();
     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');
-    my $sysadm  = $r->dir_config('lonSysEMail');
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
     my $include = $r->dir_config('lonIncludes');
@@ -164,7 +156,7 @@ ENDFAILED
     my $userloadpercent=&Apache::lonnet::userload();
 
 # ------------------------------------------------------- Do the load balancing
-    my $otherserver= &Apache::loncommon::absolute_url($host_name);
+    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?
@@ -243,7 +235,6 @@ ENDFAILED
 <img src="/adm/lonKaputt/lonlogo_broken.gif" align="right" />
 <h3>This LON-CAPA server is temporarily not available for login</h3>
 <p>Please attempt to login to one of the following servers:</p>$spares
-<p>If the problem persists, please contact <tt>$servadm</tt>.</p>
 </body>
 </html>
 ENDTROUBLE
@@ -253,8 +244,6 @@ ENDTROUBLE
 # ----------------------------------------------- Apparently we are in business
 
     my $domainlogo=&Apache::loncommon::domainlogo($domain);
-    $servadm=~s/\,/\<br \/\>/g;
-    $sysadm=~s/\,/\<br \/\>/g;
 
 # --------------------------------------------------- Print login screen header
     $r->print(<<ENDHEADER);
@@ -296,17 +285,19 @@ 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',
-                  'servadm' => 'Server Administration',
-                  'sysadm' => 'System Administration',
-                  'helpdesk' => 'Contact Helpdesk');
+                  '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);
 
@@ -410,14 +401,27 @@ 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>
+     <tr>
+      <td>&nbsp;</td>
+      <td><a href="/adm/coursecatalog"><b>$lt{'catalog'}</b></a></td>
+     </tr>
+     <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>
@@ -451,9 +455,6 @@ ENDTOP
 <label><input type="checkbox" name="embedsuppress" /> Suppress rendering of embedded multimedia</label><br />
 <label><input type="checkbox" name="fontenhance" /> Increase font size</label><br />
 <label><input type="checkbox" name="blackwhite" /> Switch to black and white mode</label><br />
-<p>If you have accessibility needs that are not addressed by this interface, 
-please
-contact the system administrator at <tt>$sysadm</tt>.</p><br />
 <input type="checkbox" name="remember" /> Remember these settings for next login<hr />
 ENDACCESSOPTIONS
 } else {
@@ -486,19 +487,25 @@ ENDNOOPT
        <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,$sysadm,$servadm,$version,$authdomain,\$helpdeskscript);
+        my $contactblock = &contactdisplay(\%lt,$version,$authdomain,\$helpdeskscript);
 	$r->print(<<ENDDOCUMENT);
    </td>
 
@@ -594,25 +601,15 @@ ENDDOCUMENT
 }
 
 sub contactdisplay {
-    my ($lt,$sysadm,$servadm,$version,$authdomain,$helpdeskscript) = @_;
+    my ($lt,$version,$authdomain,$helpdeskscript) = @_;
     my $contactblock;
-    my $showsysadm = 1;
-    my $showservadm = 1;
     my $showhelpdesk = 0;
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $showhelpdesk = 1;
     }
-    if ($showsysadm) {
-        $contactblock .= '<b>&nbsp;&nbsp;&nbsp;'.$$lt{'sysadm'}.':</b><br />'.
-                         '<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.$sysadm.'</tt><br />';
-    }
-    if ($showservadm) {
-        $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">
@@ -633,7 +630,24 @@ 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;
+}
 
 1;
 __END__