--- loncom/lonnet/perl/lonnet.pm	2000/09/26 20:07:24	1.32
+++ loncom/lonnet/perl/lonnet.pm	2000/10/26 10:40:01	1.50
@@ -25,21 +25,33 @@
 # revokecustomrole (udom,uname,url,rdom,rnam,rolename) : Revoke a custom role
 # appenv(hash)       : adds hash to session environment
 # store(hash)        : stores hash permanently for this url
+# cstore(hash)       : critical store
 # restore            : returns hash for this url
 # eget(namesp,array) : returns hash with keys from array filled in from namesp
 # get(namesp,array)  : returns hash with keys from array filled in from namesp
-# del(namesp,array)  : deletes keys out of arry from namesp
+# del(namesp,array)  : deletes keys out of array from namesp
 # put(namesp,hash)   : stores hash in namesp
+# cput(namesp,hash)  : critical put
 # dump(namesp)       : dumps the complete namespace into a hash
 # ssi(url,hash)      : does a complete request cycle on url to localhost, posts
 #                      hash
+# coursedescription(id) : returns and caches course description for id
 # repcopy(filename)  : replicate file
 # dirlist(url)       : gets a directory listing
+# directcondval(index) : reading condition value of single condition from 
+#                        state string
 # condval(index)     : value of condition index based on state
 # varval(name)       : value of a variable
 # refreshstate()     : refresh the state information string
 # symblist(map,hash) : Updates symbolic storage links
+# symbread([filename]) : returns the data handle (filename optional)
 # rndseed()          : returns a random seed  
+# getfile(filename)  : returns the contents of filename, or a -1 if it can't
+#                      be found, replicates and subscribes to the file
+# filelocation(dir,file) : returns a farily clean absolute reference to file 
+#                          from the directory dir
+# hreflocation(dir,file) : same as filelocation, but for hrefs
+# log(domain,user,home,msg) : write to permanent log for user
 #
 # 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,
@@ -51,7 +63,10 @@
 # 06/26 Ben Tyszka
 # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer
 # 08/14 Ben Tyszka
-# 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25 Gerd Kortemeyer
+# 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
+# 10/04 Gerd Kortemeyer
+# 10/04 Guy Albertelli
+# 10/06,10/09,10/10,10/11,10/14,10/20,10/23,10/25,10/26 Gerd Kortemeyer
 
 package Apache::lonnet;
 
@@ -196,6 +211,15 @@ sub critical {
 
 sub appenv {
     my %newenv=@_;
+    map {
+	if (($newenv{$_}=~/^user\.role/) || ($newenv{$_}=~/^user\.priv/)) {
+            &logthis("<font color=blue>WARNING: ".
+                "Attempt to modify environment ".$_." to ".$newenv{$_});
+	    delete($newenv{$_});
+        } else {
+            $ENV{$_}=$newenv{$_};
+        }
+    } keys %newenv;
     my @oldenv;
     {
      my $fh;
@@ -403,7 +427,7 @@ sub ssi {
 
 sub log {
     my ($dom,$nam,$hom,$what)=@_;
-    return reply("log:$dom:$nam:$what",$hom);
+    return critical("log:$dom:$nam:$what",$hom);
 }
 
 # ----------------------------------------------------------------------- Store
@@ -413,10 +437,7 @@ sub store {
     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);
+    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $namevalue='';
     map {
         $namevalue.=escape($_).'='.escape($storehash{$_}).'&';
@@ -427,16 +448,31 @@ sub store {
 		 "$ENV{'user.home'}");
 }
 
+# -------------------------------------------------------------- Critical Store
+
+sub cstore {
+    my %storehash=@_;
+    my $symb;
+    unless ($symb=escape(&symbread())) { return ''; }
+    my $namespace;
+    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
+    my $namevalue='';
+    map {
+        $namevalue.=escape($_).'='.escape($storehash{$_}).'&';
+    } keys %storehash;
+    $namevalue=~s/\&$//;
+    return critical(
+     "store:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$symb:$namevalue",
+		 "$ENV{'user.home'}");
+}
+
 # --------------------------------------------------------------------- Restore
 
 sub restore {
     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);
+    unless ($namespace=$ENV{'request.course.id'}) { return ''; }
     my $answer=reply(
               "restore:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$symb",
               "$ENV{'user.home'}");
@@ -451,6 +487,40 @@ sub restore {
     return %returnhash;
 }
 
+# ---------------------------------------------------------- Course Description
+
+sub coursedescription {
+    my $courseid=shift;
+    $courseid=~s/^\///;
+    $courseid=~s/\_/\//g;
+    my ($cdomain,$cnum)=split(/\//,$courseid);
+    my $chome=homeserver($cnum,$cdomain);
+    if ($chome ne 'no_host') {
+       my $rep=reply("dump:$cdomain:$cnum:environment",$chome);
+       if ($rep ne 'con_lost') {
+	   my %cachehash=();
+           my %returnhash=('home'   => $chome, 
+                           'domain' => $cdomain,
+                           'num'    => $cnum);
+           map {
+               my ($name,$value)=split(/\=/,$_);
+               $name=&unescape($name);
+               $value=&unescape($value);
+               $returnhash{$name}=$value;
+               if ($name eq 'description') {
+		   $cachehash{$courseid}=$value;
+               }
+           } split(/\&/,$rep);
+           $returnhash{'url'}='/res/'.declutter($returnhash{'url'});
+           $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'.
+	       $ENV{'user.name'}.'_'.$cdomain.'_'.$cnum;
+	   put ('coursedescriptions',%cachehash);
+           return %returnhash;
+       }
+    }
+    return ();
+}
+
 # -------------------------------------------------------- Get user priviledges
 
 sub rolesinit {
@@ -482,6 +552,7 @@ sub rolesinit {
                 }
             }
             if (($area ne '') && ($trole ne '')) {
+	       my $spec=$trole.'.'.$area;
                my ($tdummy,$tdomain,$trest)=split(/\//,$area);
                if ($trole =~ /^cr\//) {
 		   my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
@@ -493,21 +564,27 @@ sub rolesinit {
                       if (($roledef ne 'con_lost') && ($roledef ne '')) {
                          my ($syspriv,$dompriv,$coursepriv)=
 			     split(/\_/,unescape($roledef));
- 	                 $allroles{'/'}.=':'.$syspriv;
+ 	                 $allroles{'cm./'}.=':'.$syspriv;
+                         $allroles{$spec.'./'}.=':'.$syspriv;
                          if ($tdomain ne '') {
-                             $allroles{'/'.$tdomain.'/'}.=':'.$dompriv;
+                             $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+                             $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
                              if ($trest ne '') {
-		                $allroles{$area}.=':'.$coursepriv;
+		                $allroles{'cm.'.$area}.=':'.$coursepriv;
+		                $allroles{$spec.'.'.$area}.=':'.$coursepriv;
                              }
 	                 }
                       }
                    }
                } else {
-	           $allroles{'/'}.=':'.$pr{$trole.':s'};
+	           $allroles{'cm./'}.=':'.$pr{$trole.':s'};
+	           $allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
                    if ($tdomain ne '') {
-                      $allroles{'/'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+                     $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+                     $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
                       if ($trest ne '') {
-		          $allroles{$area}.=':'.$pr{$trole.':c'};
+		          $allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+		          $allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
                       }
 	           }
 	       }
@@ -549,10 +626,11 @@ sub get {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
    map {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
-   } @pairs;
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
    return %returnhash;
 }
 
@@ -597,6 +675,20 @@ sub put {
                  $ENV{'user.home'});
 }
 
+# ------------------------------------------------------ critical put interface
+
+sub cput {
+   my ($namespace,%storehash)=@_;
+   my $items='';
+   map {
+       $items.=escape($_).'='.escape($storehash{$_}).'&';
+   } keys %storehash;
+   $items=~s/\&$//;
+   return critical
+           ("put:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$items",
+                 $ENV{'user.home'});
+}
+
 # -------------------------------------------------------------- eget interface
 
 sub eget {
@@ -610,10 +702,11 @@ sub eget {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
    map {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unescape($key)}=unescape($value);
-   } @pairs;
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
    return %returnhash;
 }
 
@@ -664,13 +757,13 @@ sub allowed {
 
    } else {
 
-       unless(defined($ENV{'request.course.uri'})) {
+       unless(defined($ENV{'request.course.id'})) {
 	   return '1';
        }
 
 # Get access priviledges for course
 
-       if ($ENV{'user.priv./'.$ENV{'request.course.uri'}}=~/$priv\&([^\:]*)/) {
+       if ($ENV{'user.priv./'.$ENV{'request.course.id'}}=~/$priv\&([^\:]*)/) {
           $thisallowed.=$1;
        }
 
@@ -683,7 +776,7 @@ sub allowed {
        $#uriparts--;
        my $uripath=join('/',@uriparts);
        my $uricond=-1;
-       if ($ENV{'acc.res.'.$ENV{'request.course'}.'.'.$uripath}=~
+       if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$uripath}=~
 	   /\&$urifile\:(\d+)\&/) {
 	   $uricond=$1;
        } elsif (($fe{$uritype} eq 'emb') || ($fe{$uritype} eq 'img')) {
@@ -694,7 +787,7 @@ sub allowed {
           $urifile=$uriparts[$#uriparts];
           $#uriparts--;
           $uripath=join('/',@uriparts);
-          if ($ENV{'acc.res.'.$ENV{'request.course'}.'.'.$uripath}=~
+          if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$uripath}=~
 	     /\&$urifile\:(\d+)\&/) {
 	     $uricond=$1;
 	  }
@@ -712,7 +805,7 @@ sub allowed {
 # Restricted by state?
 
            if ($thisallowed=~/X/) {
-	      if (&condval($uricond)>1) {
+	      if (&condval($uricond)) {
 	         return '2';
               } else {
                  return '';
@@ -895,11 +988,20 @@ sub dirlist {
 
 # -------------------------------------------------------- Value of a Condition
 
+sub directcondval {
+    my $number=shift;
+    if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
+       return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
+    } else {
+       return 2;
+    }
+}
+
 sub condval {
     my $condidx=shift;
     my $result=0;
-    if ($ENV{'request.course'}) {
-       if (defined($ENV{'acc.cond.'.$ENV{'request.course'}.'.'.$condidx})) {
+    if ($ENV{'request.course.id'}) {
+       if (defined($ENV{'acc.cond.'.$ENV{'request.course.id'}.'.'.$condidx})) {
           my $operand='|';
 	  my @stack;
           map {
@@ -915,15 +1017,14 @@ sub condval {
               } elsif (($_ eq '&') || ($_ eq '|')) {
                   $operand=$_;
               } else {
-                  my $new=
-                       substr($ENV{'user.state.'.$ENV{'request.course'}},$_,1);
+                  my $new=directcondval($_);
                   if ($operand eq '&') {
                      $result=$result>$new?$new:$result;
                   } else {
                      $result=$result>$new?$result:$new;
                   }                  
               }
-          } ($ENV{'acc.cond.'.$ENV{'request.course'}.'.'.$condidx}=~
+          } ($ENV{'acc.cond.'.$ENV{'request.course.id'}.'.'.$condidx}=~
              /(\d+|\(|\)|\&|\|)/g);
        }
     }
@@ -933,20 +1034,84 @@ sub condval {
 # --------------------------------------------------------- Value of a Variable
 
 sub varval {
-    my ($realm,$space,@components)=split(/\./,shift);
-    my $value='';
+    my $varname=shift;
+    my ($realm,$space,$qualifier,@therest)=split(/\./,$varname);
+    my $rest;
+    if ($therest[0]) {
+       $rest=join('.',@therest);
+    } else {
+       $rest='';
+    }
     if ($realm eq 'user') {
-	if ($space=~/^resource/) {
-	    $space=~s/^resource\[//;
-            $space=~s/\]$//;
-
+# --------------------------------------------------------------- user.resource
+	if ($space eq 'resource') {
+# ----------------------------------------------------------------- user.access
+        } elsif ($space eq 'access') {
+            return &allowed($qualifier,$rest);
+# ------------------------------------------ user.preferences, user.environment
+        } elsif (($space eq 'preferences') || ($space eq 'environment')) {
+            return $ENV{join('.',('environment',$qualifier,$rest))};
+# ----------------------------------------------------------------- user.course
+        } elsif ($space eq 'course') {
+            return $ENV{join('.',('request.course',$qualifier))};
+# ------------------------------------------------------------------- user.role
+        } elsif ($space eq 'role') {
+            my ($role,$where)=split(/\./,$ENV{'request.role'});
+            if ($qualifier eq 'value') {
+		return $role;
+            } elsif ($qualifier eq 'extent') {
+                return $where;
+            }
+# ----------------------------------------------------------------- user.domain
+        } elsif ($space eq 'domain') {
+            return $ENV{'user.domain'};
+# ------------------------------------------------------------------- user.name
+        } elsif ($space eq 'name') {
+            return $ENV{'user.name'};
+# ---------------------------------------------------- Any other user namespace
         } else {
+            my $item=($rest)?$qualifier.'.'.$rest:$qualifier;
+            my %reply=&get($space,$item);
+            return $reply{$item};
+        }
+    } elsif ($realm eq 'request') {
+# ------------------------------------------------------------- request.browser
+        if ($space eq 'browser') {
+	    return $ENV{'browser.'.$qualifier};
+        } elsif ($space eq 'filename') {
+            return $ENV{'request.filename'};
         }
     } elsif ($realm eq 'course') {
-    } elsif ($realm eq 'session') {
+# ---------------------------------------------------------- course.description
+        if ($space eq 'description') {
+            my %reply=&coursedescription($ENV{'request.course.id'});
+            return $reply{'description'};
+# ------------------------------------------------------------------- course.id
+        } elsif ($space eq 'id') {
+            return $ENV{'request.course.id'};
+# -------------------------------------------------- Any other course namespace
+        } else {
+	    my ($cdom,$cnam)=split(/\_/,$ENV{'request.course.id'});
+	    my $chome=&homeserver($cnam,$cdom);
+            my $item=join('.',($qualifier,$rest));
+            return &unescape
+                   (&reply('get:'.$cdom.':'.$cnam.':'.&escape($space).':'.
+			   &escape($item),$chome));
+        }
+    } elsif ($realm eq 'userdata') {
+        my $uhome=&homeserver($qualifier,$space);
+# ----------------------------------------------- userdata.domain.name.resource
+# ---------------------------------------------------- Any other user namespace
+    } elsif ($realm eq 'environment') {
+# ----------------------------------------------------------------- environment
+        return $ENV{join('.',($space,$qualifier,$rest))};
     } elsif ($realm eq 'system') {
+# ----------------------------------------------------------------- system.time
+	if ($space eq 'time') {
+	    return time;
+        }
     }
-    return $value;
+    return '';
 }
 
 # ------------------------------------------------- Update symbolic store links
@@ -972,25 +1137,65 @@ sub symblist {
 # ------------------------------------------------------ Return symb list entry
 
 sub symbread {
+    my $thisfn=shift;
+    unless ($thisfn) {
+	$thisfn=$ENV{'request.filename'};
+    }
+    $thisfn=declutter($thisfn);
     my %hash;
-    my $syval;
-    if (($ENV{'request.course.fn'}) && ($ENV{'request.filename'})) {
+    my %bighash;
+    my $syval='';
+    if (($ENV{'request.course.fn'}) && ($thisfn)) {
         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;
-            }
+            untie(%hash);
+        }
+# ---------------------------------------------------------- There was an entry
+        if ($syval) {
+           unless ($syval=~/\_\d+$/) {
+	       unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
+                  &appenv('request.ambiguous' => $thisfn);
+                  return '';
+               }    
+               $syval.=$1;
+	   }
+        } else {
+# ------------------------------------------------------- Was not in symb table
+           if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                            &GDBM_READER,0640)) {
+# ---------------------------------------------- Get ID(s) for current resource
+              my $ids=$bighash{'ids_/res/'.$thisfn};
+              if ($ids) {
+# ------------------------------------------------------------------- Has ID(s)
+                 my @possibilities=split(/\,/,$ids);
+                 if ($#possibilities==0) {
+# ----------------------------------------------- There is only one possibility
+		     my ($mapid,$resid)=split(/\./,$ids);
+                     $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
+                 } else {
+# ------------------------------------------ There is more than one possibility
+                     my $realpossible=0;
+                     map {
+			 my $file=$bighash{'src_'.$_};
+                         if (&allowed('bre',$file)) {
+         		    my ($mapid,$resid)=split(/\./,$_);
+                            if ($bighash{'map_type_'.$mapid} ne 'page') {
+				$realpossible++;
+                                $syval=declutter($bighash{'map_id_'.$mapid}).
+                                       '___'.$resid;
+                            }
+			 }
+                     } @possibilities;
+		     if ($realpossible!=1) { $syval=''; }
+                 }
+	      }
+              untie(%bighash)
+           } 
         }
+        if ($syval) { return $syval.'___'.$thisfn; }
     }
+    &appenv('request.ambiguous' => $thisfn);
     return '';
 }
 
@@ -1010,7 +1215,7 @@ sub numval {
 
 sub rndseed {
     my $symb;
-    unless ($symb=&symbread()) { return ''; }
+    unless ($symb=&symbread()) { return time; }
     my $symbchck=unpack("%32C*",$symb);
     my $symbseed=numval($symb)%$symbchck;
     my $namechck=unpack("%32C*",$ENV{'user.name'});
@@ -1018,11 +1223,50 @@ sub rndseed {
     return int( $symbseed
 	       .$nameseed
                .unpack("%32C*",$ENV{'user.domain'})
-               .unpack("%32C*",$ENV{'request.course.uri'})
+               .unpack("%32C*",$ENV{'request.course.id'})
                .$namechck
                .$symbchck);
 }
 
+# ------------------------------------------------------------ Serves up a file
+# returns either the contents of the file or a -1
+sub getfile {
+  my $file=shift;
+  &repcopy($file);
+  if (! -e $file ) { return -1; };
+  my $fh=Apache::File->new($file);
+  my $a='';
+  while (<$fh>) { $a .=$_; }
+  return $a
+}
+
+sub filelocation {
+  my ($dir,$file) = @_;
+  my $location;
+  $file=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
+  $file=~s/^$perlvar{'lonDocRoot'}//;
+  $file=~s:^/*res::;
+  if ( !( $file =~ m:^/:) ) {
+    $location = $dir. '/'.$file;
+  } else {
+    $location = '/home/httpd/html/res'.$file;
+  }
+  $location=~s://+:/:g; # remove duplicate /
+  while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
+  return $location;
+}
+
+sub hreflocation {
+    my ($dir,$file)=@_;
+    unless (($_=~/^http:\/\//i) || ($_=~/^\//)) {
+       my $finalpath=filelocation($dir,$file);
+       $finalpath=~s/^\/home\/httpd\/html//;
+       return $finalpath;
+    } else {
+       return $file;
+    }
+}
+
 # ------------------------------------------------------------- Declutters URLs
 
 sub declutter {