Diff for /loncom/auth/switchserver.pm between versions 1.4 and 1.5

version 1.4, 2005/10/28 21:51:43 version 1.5, 2005/11/29 20:59:37
Line 37  use Apache::lonlocal; Line 37  use Apache::lonlocal;
   
 sub init_env {  sub init_env {
     my ($r) = @_;      my ($r) = @_;
       
       if (-e $env{'user.environment'}) {
    return  $env{'user.environment'};
       }
     my $requrl=$r->uri;      my $requrl=$r->uri;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));      my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};      my $lonid=$cookies{'lonID'};
Line 53  sub init_env { Line 57  sub init_env {
   
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);      &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
           
     return $handle;      return $r->dir_config('lonIDsDir')."/$handle.id";
 }  }
   
 sub handler {  sub handler {
     my $r = shift;      my ($r) = @_;
       
           
     my $handle=&init_env($r);      my $handle=&init_env($r);
     if (!defined($handle)) { return FORBIDDEN; }      if (!defined($handle)) { return FORBIDDEN; }
   
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['otherserver','role']);      ['otherserver','role']);
      
     my $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};      my $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};
     if (!$env{'form.otherserver'}) {      if (!$env{'form.otherserver'}) {
  $env{'form.otherserver'}=&Apache::lonnet::spareserver(30000,undef,1);   $env{'form.otherserver'}=&Apache::lonnet::spareserver(30000,undef,1);
  $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};   $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};
     }      }
   
     if (!defined($switch_to)) { return FORBIDDEN; }      if (!defined($switch_to)) { return FORBIDDEN; }
   
     if ($env{'form.role'} &&       if ($env{'form.role'} && 
  !exists($env{'user.role.'.$env{'form.role'}})) { return FORBIDDEN; }   !exists($env{'user.role.'.$env{'form.role'}})) { return FORBIDDEN; }
   
     #remove session env, and log event      #remove session env, and log event
     unlink($r->dir_config('lonIDsDir')."/$handle.id");      unlink($handle);
     my %temp=('switchserver' => time.':'.$env{'form.otherserver'},      my %temp=('switchserver' => time.':'.$env{'form.otherserver'},
       $env{'form.role'});        $env{'form.role'});
     &Apache::lonnet::put('email_status',\%temp);      &Apache::lonnet::put('email_status',\%temp);

Removed from v.1.4  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>