[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm lonlogin.pm /interface lonmsg.pm

[www]

www		Wed Apr  2 09:57:33 2003 EDT

  Modified files:              
    /loncom/auth	lonacc.pm lonlogin.pm 
    /loncom/interface	lonmsg.pm 
  Log:
  Direct notification email directly to login screen.
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.39 loncom/auth/lonacc.pm:1.40
--- loncom/auth/lonacc.pm:1.39	Fri Feb 28 13:14:44 2003
+++ loncom/auth/lonacc.pm	Wed Apr  2 09:57:32 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.39 2003/02/28 18:14:44 www Exp $
+# $Id: lonacc.pm,v 1.40 2003/04/02 14:57:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -228,10 +228,11 @@
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
     if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
-        ($requrl=~/^\/adm\/(roles|logout)/) ||
+        ($requrl=~/^\/adm\/(roles|logout|email)/) ||
         ($requrl=~m|^/prtspool/|)) {
 # -------------------------- Store where they wanted to go and get login screen
-       $ENV{'request.firsturl'}=$requrl;
+	$ENV{'request.querystring'}=$r->args;
+	$ENV{'request.firsturl'}=$requrl;
        return FORBIDDEN;
    } else {
 # --------------------------------------------------------------------- Goodbye
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.38 loncom/auth/lonlogin.pm:1.39
--- loncom/auth/lonlogin.pm:1.38	Mon Mar 10 09:29:37 2003
+++ loncom/auth/lonlogin.pm	Wed Apr  2 09:57:32 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.38 2003/03/10 14:29:37 www Exp $
+# $Id: lonlogin.pm,v 1.39 2003/04/02 14:57:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,8 +50,9 @@
 
 
     &Apache::loncommon::get_unprocessed_cgi
-     ($ENV{'QUERY_STRING'},['interface','username','domain','firsturl']);
-
+     ($ENV{'QUERY_STRING'}.'&'.$ENV{'request.querystring'},
+      ['interface','username','domain','firsturl']);
+ 
 # ----------------------------------------------------------- Process Interface
     $ENV{'form.interface'}=~s/\W//g;
 
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.53 loncom/interface/lonmsg.pm:1.54
--- loncom/interface/lonmsg.pm:1.53	Tue Apr  1 19:50:46 2003
+++ loncom/interface/lonmsg.pm	Wed Apr  2 09:57:32 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.53 2003/04/02 00:50:46 www Exp $
+# $Id: lonmsg.pm,v 1.54 2003/04/02 14:57:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,7 +165,7 @@
     my $critical=($crit?' critical':'');
     my $url='http://'.
       $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
-      '/adm/login&username='.$touname.'&domain='.$toudom;
+      '/adm/email?username='.$touname.'&domain='.$toudom;
     my $body=(<<ENDMSG);
 You received a$critical message from $sender in LON-CAPA. The subject is