--- loncom/auth/lonauth.pm 2003/04/03 16:50:46 1.47
+++ loncom/auth/lonauth.pm 2003/10/30 00:54:57 1.58
@@ -1,7 +1,7 @@
# The LearningOnline Network
# User Authentication Module
#
-# $Id: lonauth.pm,v 1.47 2003/04/03 16:50:46 www Exp $
+# $Id: lonauth.pm,v 1.58 2003/10/30 00:54:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -46,6 +46,7 @@ use Apache::loncommon();
use Apache::lonnet();
use Apache::lonmenu();
use Fcntl qw(:flock);
+use Apache::lonlocal;
my %FORM;
@@ -107,6 +108,12 @@ sub success {
$FORM{'interface'}=$userenv{'interface'};
}
$ENV{'environment.remote'}=$userenv{'remote'};
+# --------------- Do not trust query string to be put directly into environment
+ foreach ('imagesuppress','appletsuppress',
+ 'embedsuppress','fontenhance','blackwhite',
+ 'interface','localpath','localres') {
+ $FORM{$_}=~s/[\n\r\=]//gs;
+ }
# --------------------------------------------------------- Write first profile
{
@@ -126,10 +133,15 @@ sub success {
print $idf "browser.mathml=$clientmathml\n";
print $idf "browser.unicode=$clientunicode\n";
print $idf "browser.os=$clientos\n";
+ if ($FORM{'localpath'}) {
+ print $idf "browser.localpath=$FORM{'localpath'}\n";
+ print $idf "browser.localres=$FORM{'localres'}\n";
+ }
print $idf "request.course.fn=\n";
print $idf "request.course.uri=\n";
print $idf "request.course.sec=\n";
print $idf "request.role=cm\n";
+ print $idf "request.role.adv=$ENV{'user.adv'}\n";
print $idf "request.host=$ENV{'REMOTE_ADDR'}\n";
if ($FORM{'interface'}) {
$FORM{'interface'}=~s/\W//gs;
@@ -147,6 +159,7 @@ sub success {
$idf->close();
}
$ENV{'request.role'}='cm';
+ $ENV{'request.role.adv'}=$ENV{'user.adv'};
$ENV{'browser.type'}=$clientbrowser;
# -------------------------------------------------------------------- Log this
@@ -178,6 +191,12 @@ Content-type: text/html
Set-cookie: $cookie
ENDHEADER
+ my %lt=&Apache::lonlocal::texthash(
+ 'wel' => 'Welcome',
+ 'mes' => 'Welcome to the LearningOnline Network with CAPA. Please wait while your session is being set up',
+ 'pro' => 'Problems',
+ 'log' => 'loginproblems.html',
+ );
$r->print(<
@@ -187,11 +206,9 @@ $startupremote
$bodytag
$setflags
$windowinfo
-Welcome!
-Welcome to the LearningOnline Network with CAPA.
-Please wait while your session
-is being set up.
-Problems?
+$lt{'wel'}
+$lt{'mes'}.
+$lt{'pro'}?
$maincall