--- loncom/auth/lonauth.pm	2003/11/12 16:55:40	1.59
+++ loncom/auth/lonauth.pm	2004/01/13 16:29:40	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.59 2003/11/12 16:55:40 www Exp $
+# $Id: lonauth.pm,v 1.61 2004/01/13 16:29:40 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -184,10 +184,11 @@ sub success {
     my $setflags=&Apache::lonmenu::setflags();
     my $maincall=&Apache::lonmenu::maincall();
     my $bodytag=&Apache::loncommon::bodytag('Successful Login');
+    my $add=&addcontent();
 # ------------------------------------------------- Output for successful login
 
     $r->send_cgi_header(<<ENDHEADER);
-Content-type: text/html
+Content-type: text/html$add
 Set-cookie: $cookie
 
 ENDHEADER
@@ -220,8 +221,9 @@ ENDSUCCESS
 sub failed {
     my ($r,$message) = @_;
     my $bodytag=&Apache::loncommon::bodytag('Unsuccessful Login');
+    my $add=&addcontent();
     $r->send_cgi_header(<<ENDFHEADER);
-Content-type: text/html
+Content-type: text/html$add
 
 ENDFHEADER
     $r->print(<<ENDFAILED);
@@ -241,6 +243,17 @@ $bodytag
 ENDFAILED
 }
 
+# --------------------------------------------------------------------- Charset
+
+sub addcontent {
+    my $encoding=&Apache::lonlocal::current_encoding;
+    if ($encoding) {
+	return '; charset='.$encoding;
+    } else {
+	return '';
+    }
+}
+
 # ------------------------------------------------------------------ Rerouting!
 
 sub reroute {
@@ -331,7 +344,12 @@ ENDFAILED
 	failed($r,'Username, password and domain need to be specified.');
         return OK;
     }
+
+# split user logging in and "su"-user
+
+    ($FORM{'uname'},$FORM{'suname'})=split(/\:/,$FORM{'uname'});
     $FORM{'uname'} =~ s/\W//g;
+    $FORM{'suname'} =~ s/\W//g;
     $FORM{'udom'}  =~ s/\W//g;
 
     my $role   = $r->dir_config('lonRole');
@@ -388,8 +406,29 @@ ENDFAILED
 	($firsturl=~/^\/adm\/(logout|remote)/)) {
 	$firsturl='/adm/roles';
     }
-
-    success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
+# --------------------------------- Are we attempting to login as somebody else?
+    if ($FORM{'suname'}) {
+# ------------ see if the original user has enough privileges to pull this stunt
+	if (&Apache::lonnet::privileged($FORM{'uname'},$FORM{'udom'})) {
+# ---------------------------------------------------- see if the su-user exists
+	    unless (&Apache::lonnet::homeserver($FORM{'suname'},$FORM{'udom'})
+		eq 'no_host') {
+		&Apache::lonnet::logthis(&Apache::lonnet::homeserver($FORM{'suname'},$FORM{'udom'}));
+# ------------------------------ see if the su-user is not too highly privileged
+		unless (&Apache::lonnet::privileged($FORM{'suname'},$FORM{'udom'})) {
+# -------------------------------------------------------- actually switch users
+		    &Apache::lonnet::logperm('User '.$FORM{'uname'}.' at '.$FORM{'udom'}.
+			' logging in as '.$FORM{'suname'});
+		    $FORM{'uname'}=$FORM{'suname'};
+		} else {
+		    &Apache::lonnet::logthis('Attempted switch user to privileged user');
+		}
+	    }
+	} else {
+	    &Apache::lonnet::logthis('Non-privileged user attempting switch user');
+	}
+    }
+    &success($r,$FORM{'uname'},$FORM{'udom'},$authhost,$firsturl);
     return OK;
 }