--- loncom/auth/lonacc.pm	2019/08/01 02:51:45	1.159.2.8
+++ loncom/auth/lonacc.pm	2015/12/03 20:40:21	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.8 2019/08/01 02:51:45 raeburn Exp $
+# $Id: lonacc.pm,v 1.162 2015/12/03 20:40:21 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,6 +109,7 @@ sub cleanup {
     my ($r)=@_;
     if (! $r->is_initial_req()) { return DECLINED; }
     &Apache::lonnet::save_cache();
+    &Apache::lontexconvert::jsMath_reset();
     return OK;
 }
 
@@ -159,7 +160,7 @@ sub get_posted_cgi {
                         if (length($value) == 1) {
                             $value=~s/[\r\n]$//;
                         }
-                    } elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) {
+                    } elsif ($fname =~ /\.(xls|doc|ppt)x$/i) {
                         $value=~s/[\r\n]$//;
                     }
                     if (ref($fields) eq 'ARRAY') {
@@ -202,6 +203,14 @@ sub get_posted_cgi {
 			$fname='';
 			$fmime='';
 		    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
 		    $i++;
 		}
 	    } else {
@@ -281,6 +290,7 @@ sub upload_size_allowed {
 sub sso_login {
     my ($r,$handle,$username) = @_;
 
+    my $lonidsdir=$r->dir_config('lonIDsDir');
     if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') ||
         (defined($env{'user.name'}) && (defined($env{'user.domain'}))
 	  && ($handle ne ''))) {
@@ -330,28 +340,10 @@ sub sso_login {
         }
         unless ($hosthere) {
             ($is_balancer,$otherserver) =
-                &Apache::lonnet::check_loadbalancing($user,$domain,'login');
-            if ($is_balancer) {
-                # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
-                my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
-                if (($found_server) && ($balancer_cookie =~ /^\Q$domain\E_\Q$user\E_/)) {
-                    $otherserver = $found_server;
-                } elsif ($otherserver eq '') {
-                    my $lowest_load;
-                    ($otherserver,undef,undef,undef,$lowest_load) = &Apache::lonnet::choose_server($domain);
-                    if ($lowest_load > 100) {
-                        $otherserver = &Apache::lonnet::spareserver($lowest_load,$lowest_load,1,$domain);
-                    }
-                    if ($otherserver ne '') {
-                        my @hosts = &Apache::lonnet::current_machine_ids();
-                        if (grep(/^\Q$otherserver\E$/,@hosts)) {
-                            $hosthere = $otherserver;
-                        }
-                    }
-                }
-            }
+                &Apache::lonnet::check_loadbalancing($user,$domain);
         }
-	if (($is_balancer) && (!$hosthere)) {
+
+	if ($is_balancer) {
 	    # login but immediately go to switch server to find us a new 
 	    # machine
 	    &Apache::lonauth::success($r,$user,$domain,$home,'noredirect');
@@ -369,7 +361,14 @@ sub sso_login {
 	} else {
 	    # need to login them in, so generate the need data that
 	    # migrate expects to do login
-            my $ip = $r->get_remote_host();
+	    my $ip;
+	    my $c = $r->connection;
+	    eval {
+	        $ip = $c->remote_ip();
+	    };
+	    if ($@) {
+	        $ip = $c->client_ip();
+	    }
 	    my %info=('ip'        => $ip,
 		      'domain'    => $domain,
 		      'username'  => $user,
@@ -393,9 +392,6 @@ sub sso_login {
                 $info{'sso.reloginserver'} = 
                     $r->dir_config('lonSSOReloginServer'); 
             }
-            if (($is_balancer) && ($hosthere)) {
-                $info{'noloadbalance'} = $hosthere;
-            }
 	    my $token = 
 		&Apache::lonnet::tmpput(\%info,
 					$r->dir_config('lonHostID'));
@@ -501,7 +497,7 @@ sub handler {
                 my $preserved;
                 foreach my $pair (split(/&/,$query)) {
                     my ($name, $value) = split(/=/,$pair);
-                    unless (($name eq 'symb') || ($name eq 'usehttp')) {
+                    unless ($name eq 'symb') {
                         $preserved .= $pair.'&';
                     }
                     if (($env{'request.course.id'}) && ($name eq 'folderpath')) {
@@ -556,7 +552,7 @@ sub handler {
         my $checkexempt;
         if ($env{'user.loadbalexempt'} eq $r->dir_config('lonHostID')) {
             if ($env{'user.loadbalcheck.time'} + 600 > time) {
-                $checkexempt = 1;
+                $checkexempt = 1;    
             }
         }
         if ($env{'user.noloadbalance'} eq $r->dir_config('lonHostID')) {
@@ -566,23 +562,12 @@ sub handler {
             ($is_balancer,$otherserver) =
                 &Apache::lonnet::check_loadbalancing($env{'user.name'},
                                                      $env{'user.domain'});
-            if ($is_balancer) {
-                unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
-                    # Check if browser sent a LON-CAPA load balancer cookie (and this is a balancer)
-                    my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r);
-                    if (($found_server) && ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
-                        $otherserver = $found_server;
-                    }
-                }
-            }
         }
         if ($is_balancer) {
-            unless (($requrl eq '/adm/switchserver') && (!$r->is_initial_req())) {
-                $r->set_handlers('PerlResponseHandler'=>
-                                 [\&Apache::switchserver::handler]);
-                if ($otherserver ne '') {
-                    $env{'form.otherserver'} = $otherserver;
-                }
+            $r->set_handlers('PerlResponseHandler'=>
+                             [\&Apache::switchserver::handler]);
+            if ($otherserver ne '') {
+                $env{'form.otherserver'} = $otherserver;
             }
             unless (($env{'form.origurl'}) || ($r->uri eq '/adm/roles') ||
                     ($r->uri eq '/adm/switchserver') || ($r->uri eq '/adm/sso')) {
@@ -774,7 +759,7 @@ sub handler {
 # ------------------------------------ See if this is a viewable portfolio file
     if (&Apache::lonnet::is_portfolio_url($requrl)) {
         my $clientip = $r->get_remote_host();
-	my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
+        my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip);
 	if ($access eq 'A') {
 	    &Apache::restrictedaccess::setup_handler($r);
 	    return OK;