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

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.30 and 1.31

version 1.30, 2000/09/06 14:25:17 version 1.31, 2000/09/25 20:28:54
Line 37 Line 37
 # dirlist(url)       : gets a directory listing  # dirlist(url)       : gets a directory listing
 # condval(index)     : value of condition index based on state  # condval(index)     : value of condition index based on state
 # varval(name)       : value of a variable  # varval(name)       : value of a variable
 # refreshstate()     : refresh the state information string   # refreshstate()     : refresh the state information string
   # symblist(map,hash) : Updates symbolic storage links
   # rndseed()          : returns a random seed  
 #  #
 # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,  # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
 # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,  # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
Line 49 Line 51
 # 06/26 Ben Tyszka  # 06/26 Ben Tyszka
 # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer  # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer
 # 08/14 Ben Tyszka  # 08/14 Ben Tyszka
 # 08/22,08/28,08/31,09/01,09/02,09/04,09/05 Gerd Kortemeyer  # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25 Gerd Kortemeyer
   
 package Apache::lonnet;  package Apache::lonnet;
   
Line 60  use HTTP::Headers; Line 62  use HTTP::Headers;
 use vars   use vars 
 qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp %fe %fd $readit);  qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp %fe %fd $readit);
 use IO::Socket;  use IO::Socket;
   use GDBM_File;
 use Apache::Constants qw(:common :http);  use Apache::Constants qw(:common :http);
   
 # --------------------------------------------------------------------- Logging  # --------------------------------------------------------------------- Logging
Line 406  sub log { Line 409  sub log {
 # ----------------------------------------------------------------------- Store  # ----------------------------------------------------------------------- Store
   
 sub store {  sub store {
     my %storehash=shift;      my %storehash=@_;
       my $symb;
       unless ($symb=escape(&symbread())) { return ''; }
       my $namespace;
       unless ($namespace=$ENV{'request.course.uri'}) { return ''; }
       $namespace=~s/\//\_\_/g;
       $namespace=~s/\./\_/g;
       $namespace=escape($namespace);
     my $namevalue='';      my $namevalue='';
     map {      map {
         $namevalue.=escape($_).'='.escape($storehash{$_}).'&';          $namevalue.=escape($_).'='.escape($storehash{$_}).'&';
     } keys %storehash;      } keys %storehash;
     $namevalue=~s/\&$//;      $namevalue=~s/\&$//;
     return reply("store:$ENV{'user.domain'}:$ENV{'user.name'}:"      return reply(
                ."$ENV{'user.class'}:$ENV{'request.filename'}:$namevalue",       "store:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$symb:$namevalue",
  "$ENV{'user.home'}");   "$ENV{'user.home'}");
 }  }
   
 # --------------------------------------------------------------------- Restore  # --------------------------------------------------------------------- Restore
   
 sub restore {  sub restore {
     my $answer=reply("restore:$ENV{'user.domain'}:$ENV{'user.name'}:"      my $symb;
                ."$ENV{'user.class'}:$ENV{'request.filename'}",      unless ($symb=escape(&symbread())) { return ''; }
                 "$ENV{'user.home'}");      my $namespace;
       unless ($namespace=$ENV{'request.course.uri'}) { return ''; }
       $namespace=~s/\//\_\_/g;
       $namespace=~s/\./\_/g;
       $namespace=escape($namespace);
       my $answer=reply(
                 "restore:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$symb",
                 "$ENV{'user.home'}");
     my %returnhash=();      my %returnhash=();
     map {      map {
  my ($name,$value)=split(/\=/,$_);   my ($name,$value)=split(/\=/,$_);
         $returnhash{&unescape($name)}=&unescape($value);          $returnhash{&unescape($name)}=&unescape($value);
     } split(/\&/,$answer);      } split(/\&/,$answer);
       map {
           $returnhash{$_}=$returnhash{$returnhash{'version'}.':'.$_};
       } split(/\:/,$returnhash{$returnhash{'version'}.':keys'});
     return %returnhash;      return %returnhash;
 }  }
   
Line 776  sub filedecription { Line 796  sub filedecription {
 sub assignrole {  sub assignrole {
     my ($udom,$uname,$url,$role,$end,$start)=@_;      my ($udom,$uname,$url,$role,$end,$start)=@_;
     my $mrole;      my $mrole;
     $url=~s/^\///;      $url=declutter($url);
     $url=~s/^res\///;  
     if ($role =~ /^cr\//) {      if ($role =~ /^cr\//) {
         unless ($url=~/\.course$/) { return 'invalid'; }          unless ($url=~/\.course$/) { return 'invalid'; }
  unless (allowed('ccr',$url)) { return 'refused'; }   unless (allowed('ccr',$url)) { return 'refused'; }
Line 930  sub varval { Line 949  sub varval {
     return $value;      return $value;
 }  }
   
   # ------------------------------------------------- Update symbolic store links
   
   sub symblist {
       my ($mapname,%newhash)=@_;
       $mapname=declutter($mapname);
       my %hash;
       if (($ENV{'request.course.fn'}) && (%newhash)) {
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                         &GDBM_WRCREAT,0640)) {
       map {
                   $hash{declutter($_)}=$mapname.'___'.$newhash{$_};
               } keys %newhash;
               if (untie(%hash)) {
    return 'ok';
               }
           }
       }
       return 'error';
   }
   
   # ------------------------------------------------------ Return symb list entry
   
   sub symbread {
       my %hash;
       my $syval;
       if (($ENV{'request.course.fn'}) && ($ENV{'request.filename'})) {
           if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                         &GDBM_READER,0640)) {
               my $thisfn=declutter($ENV{'request.filename'});
       $syval=$hash{$thisfn};
               if (untie(%hash)) {
                   unless ($syval=~/\_\d+$/) {
      unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
                         return '';
                      }    
                      $syval.=$1;
           }
                   $syval.='___'.$thisfn;
    return $syval;
               }
           }
       }
       return '';
   }
   
   # ---------------------------------------------------------- Return random seed
   
   sub rndseed {
       my $symb;
       unless ($symb=&symbread()) { return ''; }
   }
   
   # ------------------------------------------------------------- Declutters URLs
   
   sub declutter {
       my $thisfn=shift;
       $thisfn=~s/^$perlvar{'lonDocRoot'}//;
       $thisfn=~s/^\///;
       $thisfn=~s/^res\///;
       return $thisfn;
   }
   
 # -------------------------------------------------------- Escape Special Chars  # -------------------------------------------------------- Escape Special Chars
   
 sub escape {  sub escape {
Removed from v.1.30  
changed lines
  Added in v.1.31

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