[BACK]Return to loncacc.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/loncacc.pm between versions 1.40 and 1.44

version 1.40, 2005/07/12 07:00:28 version 1.44, 2007/02/01 07:13:04
Line 31  package Apache::loncacc; Line 31  package Apache::loncacc;
   
 use strict;  use strict;
 use Apache::Constants qw(:common :http :methods REDIRECT);  use Apache::Constants qw(:common :http :methods REDIRECT);
 use Apache::File;  
 use CGI::Cookie();  use CGI::Cookie();
 use Fcntl qw(:flock);  
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonacc();
   use LONCAPA qw(:DEFAULT :match);
   
 sub constructaccess {  sub constructaccess {
     my ($url,$ownerdomain)=@_;      my ($url,$ownerdomain)=@_;
     my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//);      my ($ownername)=($url=~m{/(?:\~|priv/|home/)($match_username)/});
     unless (($ownername) && ($ownerdomain)) { return ''; }      unless (($ownername) && ($ownerdomain)) { return ''; }
     # We do not allow editing of previous versions of files.      # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }      if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
Line 48  sub constructaccess { Line 47  sub constructaccess {
     if ($ownername eq $env{'user.name'}) {      if ($ownername eq $env{'user.name'}) {
  foreach my $domain (@possibledomains) {   foreach my $domain (@possibledomains) {
     if ($domain eq $env{'user.domain'}) {      if ($domain eq $env{'user.domain'}) {
       &Apache::lonnet::logthis("good1!");
  return ($ownername,$domain);   return ($ownername,$domain);
     }      }
  }   }
     }      }
       
     foreach my $domain (@possibledomains) {      foreach my $domain (@possibledomains) {
  if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) ||   if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) ||
     exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) {      exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) {
       &Apache::lonnet::logthis("good2!");
     return ($ownername,$domain);      return ($ownername,$domain);
  }   }
     }      }
       &Apache::lonnet::logthis("boo! hiss!");
     return '';      return '';
 }  }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
   
     my $requrl=$r->uri;      my $requrl=$r->uri;
     $env{'request.editurl'}=$requrl;      $env{'request.editurl'}=$requrl;
     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'};
     my $cookie;      my $cookie;
     if ($lonid) {      if ($lonid) {
  my $handle=$lonid->value;        my $handle=&LONCAPA::clean_handle($lonid->value);
         $handle=~s/\W//g;  
         my $lonidsdir=$r->dir_config('lonIDsDir');          my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {          if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
   
Line 95  sub handler { Line 96  sub handler {
   
 # -------------------------------------------------------- Load POST parameters  # -------------------------------------------------------- Load POST parameters
   
     &Apache::loncommon::get_posted_cgi($r);      &Apache::lonacc::get_posted_cgi($r);
   
             return OK;               return OK; 
         } else {           } else { 
Removed from v.1.40  
changed lines
  Added in v.1.44

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