[LON-CAPA-cvs] cvs: loncom /auth lonauth.pm /interface lonsupportreq.pm

[raeburn]

raeburn		Mon Aug 27 02:02:57 2012 EDT

  Modified files:              
    /loncom/auth	lonauth.pm 
    /loncom/interface	lonsupportreq.pm 
  Log:
  - Use custom log-in help page if defined for user's domain (or default domain
    if no user domain).
  
  
Index: loncom/auth/lonauth.pm
diff -u loncom/auth/lonauth.pm:1.122 loncom/auth/lonauth.pm:1.123
--- loncom/auth/lonauth.pm:1.122	Mon Aug 27 00:52:45 2012
+++ loncom/auth/lonauth.pm	Mon Aug 27 02:02:20 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.122 2012/08/27 00:52:45 raeburn Exp $
+# $Id: lonauth.pm,v 1.123 2012/08/27 02:02:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -173,13 +173,18 @@
     my $end_page   = &Apache::loncommon::end_page();
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
+    my $loginhelp = &loginhelpdisplay($form->{'udom'});
+    if ($loginhelp) {
+        $loginhelp = '<p><a href="'.$loginhelp.'">'.&mt('Login problems?').'</a></p>';
+    }
+
     $r->print(
        $start_page
       .'<h1>'.&mt('Sorry ...').'</h1>'
       .'<p class="LC_warning">'.&mt($message).'</p>'
       .'<p>'.&mt('Please [_1]log in again[_2].','<a href="'.$retry.'">','</a>')
       .'</p>'
-      .'<p><a href="/adm/loginproblems.html">'.&mt('Login problems?').'</a></p>'
+      .$loginhelp
       .$end_page
     );
  }
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.67 loncom/interface/lonsupportreq.pm:1.68
--- loncom/interface/lonsupportreq.pm:1.67	Wed Apr 18 17:30:24 2012
+++ loncom/interface/lonsupportreq.pm	Mon Aug 27 02:02:57 2012
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.67 2012/04/18 17:30:24 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.68 2012/08/27 02:02:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
+use Apache::lonauth();
 use Apache::courseclassifier;
 use LONCAPA qw(:DEFAULT :match);
  
@@ -915,6 +916,10 @@
     if ($origurl eq '') {
         $origurl = 'javascript:history.go(-1)';
     }
+    my $loginhelp = &Apache::lonauth::loginhelpdisplay();
+    if ($loginhelp eq '') {
+        $loginhelp = '/adm/loginproblems.html';
+    }
     $r->print(<<"END");
 <table width="620" border="0" cellspacing="0" cellpadding="0" style="height: 55px;">
  <tr>
@@ -927,7 +932,7 @@
       </legend>
  <table id="LC_helpmenu_links">
    <tr>
-    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" /> <b><a href="/adm/loginproblems.html">$lt{'login'}</a></b> </span></td>
+    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" style="vertical-align:middle" /> <b><a href="$loginhelp">$lt{'login'}</a></b> </span></td>
     <td align="center"><span class="LC_nobreak"> <b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" style="vertical-align:middle" /> $lt{'ask'}</a></b> </span></td>$getstartlink
     <td align="center"><span class="LC_nobreak"> <b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" style="vertical-align:middle" /> $lt{'back'}</a></b> </span></td>
    </tr>