--- loncom/lonnet/perl/lonnet.pm	2000/05/01 20:19:38	1.12
+++ loncom/lonnet/perl/lonnet.pm	2001/05/28 16:38:14	1.125
@@ -3,31 +3,121 @@
 #
 # Functions for use by content handlers:
 #
+# metadata_query(sql-query-string,custom-metadata-regex) : 
+#                                    returns file handle of where sql and
+#                                    regex results will be stored for query
 # plaintext(short)   : plain text explanation of short term
-# allowed(short,url) : returns codes for allowed actions
-# appendenv(hash)    : adds hash to session environment
-# store(hash)        : stores hash permanently for this url
-# restore            : returns hash for this url
+# fileembstyle(ext)  : embed style in page for file extension
+# filedescription(ext) : descriptor text for file extension
+# allowed(short,url) : returns codes for allowed actions 
+#                      F: full access
+#                      U,I,K: authentication modes (cxx only)
+#                      '': forbidden
+#                      1: user needs to choose course
+#                      2: browse allowed
+# definerole(rolename,sys,dom,cou) : define a custom role rolename
+#                      set privileges in format of lonTabs/roles.tab for
+#                      system, domain and course level, 
+# assignrole(udom,uname,url,role,end,start) : give a role to a user for the
+#                      level given by url. Optional start and end dates
+#                      (leave empty string or zero for "no date") 
+# assigncustomrole (udom,uname,url,rdom,rnam,rolename,end,start) : give a
+#                      custom role to a user for the level given by url.
+#                      Specify name and domain of role author, and role name
+# revokerole (udom,uname,url,role) : Revoke a role for url
+# revokecustomrole (udom,uname,url,rdom,rnam,rolename) : Revoke a custom role
+# appenv(hash)       : adds hash to session environment
+# delenv(varname)    : deletes all environment entries starting with varname
+# store(hashref,symb,courseid,udom,uname)
+#                    : stores hash permanently for this url
+#                      hashref needs to be given, and should be a \%hashname
+#                      the remaining args aren't required and if they aren't
+#                      passed or are '' they will be derived from the ENV
+# cstore(hashref,symb,courseid,udom,uname)
+#                    : same as store but uses the critical interface to 
+#                      guarentee a store
+# restore(symb,courseid,udom,uname)
+#                    : returns hash for this symb, all args are optional
+#                      if they aren't given they will be derived from the 
+#                      current enviroment
 # 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 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
+# EXT(name)          : value of a variable
+# symblist(map,hash) : Updates symbolic storage links
+# symbread([filename]) : returns the data handle (filename optional)
+# rndseed()          : returns a random seed 
+# receipt()          : returns a receipt to be given out to users 
+# 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 fairly 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
+# usection(domain,user,courseid) : output of section name/number or '' for
+#                                  "not in course" and '-1' for "no section"
+# userenvironment(domain,user,what) : puts out any environment parameter 
+#                                     for a user
+# idput(domain,hash) : writes IDs for users from hash (name=>id,name=>id)
+# idget(domain,array): returns hash with usernames (id=>name,id=>name) for
+#                      an array of IDs
+# idrget(domain,array): returns hash with IDs for usernames (name=>id,...) for
+#                       an array of names
+# metadata(file,entry): returns the metadata entry for a file. entry='keys'
+#                       returns a comma separated list of keys
 #
 # 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,
 # 11/8,11/16,11/18,11/22,11/23,12/22,
 # 01/06,01/13,02/24,02/28,02/29,
 # 03/01,03/02,03/06,03/07,03/13,
-# 04/05 Gerd Kortemeyer
-
+# 04/05,05/29,05/31,06/01,
+# 06/05,06/26 Gerd Kortemeyer
+# 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,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,10/27,10/28,10/29, 
+# 10/30,10/31,
+# 11/2,11/14,11/15,11/16,11/20,11/21,11/22,11/25,11/27,
+# 12/02,12/12,12/13,12/14,12/28,12/29 Gerd Kortemeyer
+# 05/01/01 Guy Albertelli
+# 05/01,06/01,09/01 Gerd Kortemeyer
+# 09/01 Guy Albertelli
+# 09/01,10/01,11/01 Gerd Kortemeyer
+# 02/27/01 Scott Harrison
+# 3/2 Gerd Kortemeyer
+# 3/15,3/19 Scott Harrison
+# 3/19,3/20 Gerd Kortemeyer
+# 3/22,3/27,4/2,4/16,4/17 Scott Harrison
+# 5/26,5/28 Gerd Kortemeyer
+#
 package Apache::lonnet;
 
 use strict;
 use Apache::File;
 use LWP::UserAgent();
+use HTTP::Headers;
 use vars 
-qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp $readit);
+qw(%perlvar %hostname %homecache %spareid %hostdom %libserv %pr %prp %fe %fd $readit %metacache);
 use IO::Socket;
+use GDBM_File;
 use Apache::Constants qw(:common :http);
+use HTML::TokeParser;
+use Fcntl qw(:flock);
 
 # --------------------------------------------------------------------- Logging
 
@@ -70,8 +160,7 @@ sub reply {
     my ($cmd,$server)=@_;
     my $answer=subreply($cmd,$server);
     if ($answer eq 'con_lost') { $answer=subreply($cmd,$server); }
-    if (($answer=~/^error:/) || ($answer=~/^refused/) || 
-        ($answer=~/^rejected/)) {
+    if (($answer=~/^refused/) || ($answer=~/^rejected/)) {
        &logthis("<font color=blue>WARNING:".
                 " $cmd to $server returned $answer</font>");
     }
@@ -111,6 +200,11 @@ sub reconlonc {
 
 sub critical {
     my ($cmd,$server)=@_;
+    unless ($hostname{$server}) {
+        &logthis("<font color=blue>WARNING:".
+               " Critical message to unknown server ($server)</font>");
+        return 'no_such_host';
+    }
     my $answer=reply($cmd,$server);
     if ($answer eq 'con_lost') {
         my $pingreply=reply('ping',$server);
@@ -160,19 +254,43 @@ 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 $lockfh;
+    unless ($lockfh=Apache::File->new("$ENV{'user.environment'}")) {
+       return 'error: '.$!;
+    }
+    unless (flock($lockfh,LOCK_EX)) {
+         &logthis("<font color=blue>WARNING: ".
+                  'Could not obtain exclusive lock in appenv: '.$!);
+         $lockfh->close();
+         return 'error: '.$!;
+    }
+
     my @oldenv;
     {
      my $fh;
      unless ($fh=Apache::File->new("$ENV{'user.environment'}")) {
-	return 'error';
+	return 'error: '.$!;
      }
      @oldenv=<$fh>;
+     $fh->close();
     }
     for (my $i=0; $i<=$#oldenv; $i++) {
         chomp($oldenv[$i]);
         if ($oldenv[$i] ne '') {
            my ($name,$value)=split(/=/,$oldenv[$i]);
-	   $newenv{$name}=$value;
+           unless (defined($newenv{$name})) {
+	      $newenv{$name}=$value;
+	   }
         }
     }
     {
@@ -184,6 +302,52 @@ sub appenv {
      foreach $newname (keys %newenv) {
 	 print $fh "$newname=$newenv{$newname}\n";
      }
+     $fh->close();
+    }
+
+    $lockfh->close();
+    return 'ok';
+}
+# ----------------------------------------------------- Delete from Environment
+
+sub delenv {
+    my $delthis=shift;
+    my %newenv=();
+    if (($delthis=~/user\.role/) || ($delthis=~/user\.priv/)) {
+        &logthis("<font color=blue>WARNING: ".
+                "Attempt to delete from environment ".$delthis);
+        return 'error';
+    }
+    my @oldenv;
+    {
+     my $fh;
+     unless ($fh=Apache::File->new("$ENV{'user.environment'}")) {
+	return 'error';
+     }
+     unless (flock($fh,LOCK_SH)) {
+         &logthis("<font color=blue>WARNING: ".
+                  'Could not obtain shared lock in delenv: '.$!);
+         $fh->close();
+         return 'error: '.$!;
+     }
+     @oldenv=<$fh>;
+     $fh->close();
+    }
+    {
+     my $fh;
+     unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) {
+	return 'error';
+     }
+     unless (flock($fh,LOCK_EX)) {
+         &logthis("<font color=blue>WARNING: ".
+                  'Could not obtain exclusive lock in delenv: '.$!);
+         $fh->close();
+         return 'error: '.$!;
+     }
+     map {
+	 unless ($_=~/^$delthis/) { print $fh $_; }
+     } @oldenv;
+     $fh->close();
     }
     return 'ok';
 }
@@ -265,6 +429,111 @@ sub homeserver {
     return 'no_host';
 }
 
+# ------------------------------------- Find the usernames behind a list of IDs
+
+sub idget {
+    my ($udom,@ids)=@_;
+    my %returnhash=();
+    
+    my $tryserver;
+    foreach $tryserver (keys %libserv) {
+       if ($hostdom{$tryserver} eq $udom) {
+	  my $idlist=join('&',@ids);
+          $idlist=~tr/A-Z/a-z/; 
+	  my $reply=&reply("idget:$udom:".$idlist,$tryserver);
+          my @answer=();
+          if (($reply ne 'con_lost') && ($reply!~/^error\:/)) {
+	      @answer=split(/\&/,$reply);
+          }                    ;
+          my $i;
+          for ($i=0;$i<=$#ids;$i++) {
+              if ($answer[$i]) {
+		  $returnhash{$ids[$i]}=$answer[$i];
+              } 
+          }
+       }
+    }    
+    return %returnhash;
+}
+
+# ------------------------------------- Find the IDs behind a list of usernames
+
+sub idrget {
+    my ($udom,@unames)=@_;
+    my %returnhash=();
+    map {
+        $returnhash{$_}=(&userenvironment($udom,$_,'id'))[1];
+    } @unames;
+    return %returnhash;
+}
+
+# ------------------------------- Store away a list of names and associated IDs
+
+sub idput {
+    my ($udom,%ids)=@_;
+    my %servers=();
+    map {
+        my $uhom=&homeserver($_,$udom);
+        if ($uhom ne 'no_host') {
+            my $id=&escape($ids{$_});
+            $id=~tr/A-Z/a-z/;
+            my $unam=&escape($_);
+	    if ($servers{$uhom}) {
+		$servers{$uhom}.='&'.$id.'='.$unam;
+            } else {
+                $servers{$uhom}=$id.'='.$unam;
+            }
+            &critical('put:'.$udom.':'.$unam.':environment:id='.$id,$uhom);
+        }
+    } keys %ids;
+    map {
+        &critical('idput:'.$udom.':'.$servers{$_},$_);
+    } keys %servers;
+}
+
+# ------------------------------------- Find the section of student in a course
+
+sub usection {
+    my ($udom,$unam,$courseid)=@_;
+    $courseid=~s/\_/\//g;
+    $courseid=~s/^(\w)/\/$1/;
+    map {
+        my ($key,$value)=split(/\=/,$_);
+        $key=&unescape($key);
+        if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+            my $section=$1;
+            if ($key eq $courseid.'_st') { $section=''; }
+	    my ($dummy,$end,$start)=split(/\_/,&unescape($value));
+            my $now=time;
+            my $notactive=0;
+            if ($start) {
+		if ($now<$start) { $notactive=1; }
+            }
+            if ($end) {
+                if ($now>$end) { $notactive=1; }
+            } 
+            unless ($notactive) { return $section; }
+        }
+    } split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
+                        &homeserver($unam,$udom)));
+    return '-1';
+}
+
+# ------------------------------------- Read an entry from a user's environment
+
+sub userenvironment {
+    my ($udom,$unam,@what)=@_;
+    my %returnhash=();
+    my @answer=split(/\&/,
+                &reply('get:'.$udom.':'.$unam.':environment:'.join('&',@what),
+                      &homeserver($unam,$udom)));
+    my $i;
+    for ($i=0;$i<=$#what;$i++) {
+	$returnhash{$what[$i]}=&unescape($answer[$i]);
+    }
+    return %returnhash;
+}
+
 # ----------------------------- Subscribe to a resource, return URL if possible
 
 sub subscribe {
@@ -277,6 +546,9 @@ sub subscribe {
         return 'not_found'; 
     }
     my $answer=reply("sub:$fname",$home);
+    if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
+	$answer.=' by '.$home;
+    }
     return $answer;
 }
     
@@ -284,17 +556,21 @@ sub subscribe {
 
 sub repcopy {
     my $filename=shift;
+    $filename=~s/\/+/\//g;
     my $transname="$filename.in.transfer";
+    if ((-e $filename) || (-e $transname)) { return OK; }
     my $remoteurl=subscribe($filename);
-    if ($remoteurl eq 'con_lost') {
-	   &logthis("Subscribe returned con_lost: $filename");
+    if ($remoteurl =~ /^con_lost by/) {
+	   &logthis("Subscribe returned $remoteurl: $filename");
            return HTTP_SERVICE_UNAVAILABLE;
     } elsif ($remoteurl eq 'not_found') {
 	   &logthis("Subscribe returned not_found: $filename");
 	   return HTTP_NOT_FOUND;
-    } elsif ($remoteurl eq 'forbidden') {
-	   &logthis("Subscribe returned forbidden: $filename");
+    } elsif ($remoteurl =~ /^rejected by/) {
+	   &logthis("Subscribe returned $remoteurl: $filename");
            return FORBIDDEN;
+    } elsif ($remoteurl eq 'directory') {
+           return OK;
     } else {
            my @parts=split(/\//,$filename);
            my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
@@ -319,42 +595,223 @@ sub repcopy {
                        ." LWP get: $message: $filename</font>");
                return HTTP_SERVICE_UNAVAILABLE;
            } else {
+	       if ($remoteurl!~/\.meta$/) {
+                  my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
+                  my $mresponse=$ua->request($mrequest,$filename.'.meta');
+                  if ($mresponse->is_error()) {
+		      unlink($filename.'.meta');
+                      &logthis(
+                     "<font color=yellow>INFO: No metadata: $filename</font>");
+                  }
+	       }
                rename($transname,$filename);
                return OK;
            }
     }
 }
 
+# --------------------------------------------------------- Server Side Include
+
+sub ssi {
+
+    my ($fn,%form)=@_;
+
+    my $ua=new LWP::UserAgent;
+    
+    my $request;
+    
+    if (%form) {
+      $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
+      $request->content(join '&', map { "$_=$form{$_}" } keys %form);
+    } else {
+      $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
+    }
+
+    $request->header(Cookie => $ENV{'HTTP_COOKIE'});
+    my $response=$ua->request($request);
+
+    return $response->content;
+}
+
+# ------------------------------------------------------------------------- Log
+
+sub log {
+    my ($dom,$nam,$hom,$what)=@_;
+    return critical("log:$dom:$nam:$what",$hom);
+}
+
+# --------------------------------------------- Set Expire Date for Spreadsheet
+
+sub expirespread {
+    my ($uname,$udom,$stype,$usymb)=@_;
+    my $cid=$ENV{'request.course.id'}; 
+    if ($cid) {
+       my $now=time;
+       my $key=$uname.':'.$udom.':'.$stype.':'.$usymb;
+       return &reply('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+                            $ENV{'course.'.$cid.'.num'}.
+	        	    ':nohist_expirationdates:'.
+                            &escape($key).'='.$now,
+                            $ENV{'course.'.$cid.'.home'})
+    }
+    return 'ok';
+}
+
+# ----------------------------------------------------- Devalidate Spreadsheets
+
+sub devalidate {
+    my $symb=shift;
+    my $cid=$ENV{'request.course.id'}; 
+    if ($cid) {
+	my $key=$ENV{'user.name'}.':'.$ENV{'user.domain'}.':';
+        my $status=
+          &reply('del:'.$ENV{'course.'.$cid.'.domain'}.':'.
+                        $ENV{'course.'.$cid.'.num'}.
+	                ':nohist_calculatedsheets:'.
+                        &escape($key.'studentcalc:'),
+                        $ENV{'course.'.$cid.'.home'})
+          .' '.
+          &reply('del:'.$ENV{'user.domain'}.':'.
+                        $ENV{'user.name'}.
+		        ':nohist_calculatedsheets_'.$cid.':'.
+                        &escape($key.'assesscalc:'.$symb),
+                        $ENV{'user.home'});
+        unless ($status eq 'ok ok') {
+           &logthis('Could not devalidate spreadsheet '.
+                    $ENV{'user.name'}.' at '.$ENV{'user.domain'}.' for '.
+		    $symb.': '.$status);
+        } 
+    }
+}
+
 # ----------------------------------------------------------------------- Store
 
 sub store {
-    my %storehash=shift;
-    my $command=;
+    my ($storehash,$symb,$namespace,$domain,$stuname) = @_;
+    my $home='';
+
+    if ($stuname) {
+	$home=&homeserver($stuname,$domain);
+    }
+
+    if (!$symb) { unless ($symb=&symbread()) { return ''; } }
+
+    &devalidate($symb);
+
+    $symb=escape($symb);
+    if (!$namespace) { unless ($namespace=$ENV{'request.course.id'}) { return ''; } }
+    if (!$domain) { $domain=$ENV{'user.domain'}; }
+    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+    if (!$home) { $home=$ENV{'user.home'}; }
+    my $namevalue='';
+    map {
+        $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
+    } keys %$storehash;
+    $namevalue=~s/\&$//;
+    return reply("store:$domain:$stuname:$namespace:$symb:$namevalue","$home");
+}
+
+# -------------------------------------------------------------- Critical Store
+
+sub cstore {
+    my ($storehash,$symb,$namespace,$domain,$stuname) = @_;
+    my $home='';
+
+    if ($stuname) {
+	$home=&homeserver($stuname,$domain);
+    }
+
+    if (!$symb) { unless ($symb=&symbread()) { return ''; } }
+
+    &devalidate($symb);
+
+    $symb=escape($symb);
+    if (!$namespace) { unless ($namespace=$ENV{'request.course.id'}) { return ''; } }
+    if (!$domain) { $domain=$ENV{'user.domain'}; }
+    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+    if (!$home) { $home=$ENV{'user.home'}; }
+
     my $namevalue='';
     map {
-        $namevalue.=escape($_).'='.escape($storehash{$_}).'&';
-    } keys %storehash;
+        $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
+    } keys %$storehash;
     $namevalue=~s/\&$//;
-    return reply("store:$ENV{'user.domain'}:$ENV{'user.name'}:"
-               ."$ENV{'user.class'}:$ENV{'request.filename'}:$namevalue",
-		 "$ENV{'user.home'}");
+    return critical("store:$domain:$stuname:$namespace:$symb:$namevalue","$home");
 }
 
 # --------------------------------------------------------------------- Restore
 
 sub restore {
-    my $answer=reply("restore:$ENV{'user.domain'}:$ENV{'user.name'}:"
-               ."$ENV{'user.class'}:$ENV{'request.filename'}",
-                "$ENV{'user.home'}");
+    my ($symb,$namespace,$domain,$stuname) = @_;
+    my $home='';
+
+    if ($stuname) {
+	$home=&homeserver($stuname,$domain);
+    }
+
+    if (!$symb) {
+      unless ($symb=escape(&symbread())) { return ''; }
+    } else {
+      $symb=&escape($symb);
+    }
+    if (!$namespace) { unless ($namespace=$ENV{'request.course.id'}) { return ''; } }
+    if (!$domain) { $domain=$ENV{'user.domain'}; }
+    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+    if (!$home) { $home=$ENV{'user.home'}; }
+    my $answer=&reply("restore:$domain:$stuname:$namespace:$symb","$home");
+
     my %returnhash=();
     map {
 	my ($name,$value)=split(/\=/,$_);
         $returnhash{&unescape($name)}=&unescape($value);
     } split(/\&/,$answer);
-    return $returnhash;
+    my $version;
+    for ($version=1;$version<=$returnhash{'version'};$version++) {
+       map {
+          $returnhash{$_}=$returnhash{$version.':'.$_};
+       } split(/\:/,$returnhash{$version.':keys'});
+    }
+    return %returnhash;
 }
 
-# -------------------------------------------------------- Get user priviledges
+# ---------------------------------------------------------- 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 $normalid=$cdomain.'_'.$cnum;
+           my %envhash=();
+           my %returnhash=('home'   => $chome, 
+                           'domain' => $cdomain,
+                           'num'    => $cnum);
+           map {
+               my ($name,$value)=split(/\=/,$_);
+               $name=&unescape($name);
+               $value=&unescape($value);
+               $returnhash{$name}=$value;
+               $envhash{'course.'.$normalid.'.'.$name}=$value;
+           } split(/\&/,$rep);
+           $returnhash{'url'}='/res/'.declutter($returnhash{'url'});
+           $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'.
+	       $ENV{'user.name'}.'_'.$cdomain.'_'.$cnum;
+           $envhash{'course.'.$normalid.'.last_cache'}=time;
+           $envhash{'course.'.$normalid.'.home'}=$chome;
+           $envhash{'course.'.$normalid.'.domain'}=$cdomain;
+           $envhash{'course.'.$normalid.'.num'}=$cnum;
+           &appenv(%envhash);
+           return %returnhash;
+       }
+    }
+    return ();
+}
+
+# -------------------------------------------------------- Get user privileges
 
 sub rolesinit {
     my ($domain,$username,$authhost)=@_;
@@ -362,15 +819,18 @@ sub rolesinit {
     if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
     my %allroles=();
     my %thesepriv=();
-    my $userroles='';
     my $now=time;
+    my $userroles="user.login.time=$now\n";
     my $thesestr;
 
     if ($rolesdump ne '') {
         map {
-	  if ($_!~/rolesdef\&/) {
+	  if ($_!~/^rolesdef\&/) {
             my ($area,$role)=split(/=/,$_);
+            $area=~s/\_\w\w$//;
             my ($trole,$tend,$tstart)=split(/_/,$role);
+            $userroles.='user.role.'.$trole.'.'.$area.'='.
+                        $tstart.'.'.$tend."\n";
             if ($tend!=0) {
 	        if ($tend<$now) {
 	            $trole='';
@@ -382,50 +842,57 @@ sub rolesinit {
                 }
             }
             if (($area ne '') && ($trole ne '')) {
-               $userroles.='user.role.'.$trole.'.'.$area.'='.
-                           $tstart.'.'.$tend."\n";
+	       my $spec=$trole.'.'.$area;
                my ($tdummy,$tdomain,$trest)=split(/\//,$area);
                if ($trole =~ /^cr\//) {
 		   my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
                    my $homsvr=homeserver($rauthor,$rdomain);
                    if ($hostname{$homsvr} ne '') {
                       my $roledef=
-			  reply("get:$rdomain:$rauthor:roles:rolesdef&$rrole",
+			  reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole",
                                 $homsvr);
                       if (($roledef ne 'con_lost') && ($roledef ne '')) {
                          my ($syspriv,$dompriv,$coursepriv)=
-			     split(/&&/,$roledef);
- 	                 $allroles{'/'}.=':'.$syspriv;
+			     split(/\_/,unescape($roledef));
+ 	                 $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'};
                       }
 	           }
 	       }
             }
           } 
         } split(/&/,$rolesdump);
+        my $adv=0;
         map {
             %thesepriv=();
+            if ($_ ne 'st') { $adv=1; }
             map {
                 if ($_ ne '') {
-		    my ($priviledge,$restrictions)=split(/&/,$_);
+		    my ($privilege,$restrictions)=split(/&/,$_);
                     if ($restrictions eq '') {
-			$thesepriv{$priviledge}='F';
+			$thesepriv{$privilege}='F';
                     } else {
-                        if ($thesepriv{$priviledge} ne 'F') {
-			    $thesepriv{$priviledge}.=$restrictions;
+                        if ($thesepriv{$privilege} ne 'F') {
+			    $thesepriv{$privilege}.=$restrictions;
                         }
                     }
                 }
@@ -434,6 +901,7 @@ sub rolesinit {
             map { $thesestr.=':'.$_.'&'.$thesepriv{$_}; } keys %thesepriv;
             $userroles.='user.priv.'.$_.'='.$thesestr."\n";
         } keys %allroles;            
+        $userroles.='user.adv='.$adv."\n";
     }
     return $userroles;  
 }
@@ -451,9 +919,38 @@ sub get {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
+   map {
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
+   return %returnhash;
+}
+
+# --------------------------------------------------------------- del interface
+
+sub del {
+   my ($namespace,@storearr)=@_;
+   my $items='';
+   map {
+       $items.=escape($_).'&';
+   } @storearr;
+   $items=~s/\&$//;
+   return reply("del:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace:$items",
+                 $ENV{'user.home'});
+}
+
+# -------------------------------------------------------------- dump interface
+
+sub dump {
+   my $namespace=shift;
+   my $rep=reply("dump:$ENV{'user.domain'}:$ENV{'user.name'}:$namespace",
+                $ENV{'user.home'});
+   my @pairs=split(/\&/,$rep);
+   my %returnhash=();
    map {
       my ($key,$value)=split(/=/,$_);
-      $returnhash{unespace($key)}=unescape($value);
+      $returnhash{unescape($key)}=unescape($value);
    } @pairs;
    return %returnhash;
 }
@@ -471,6 +968,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 {
@@ -484,30 +995,242 @@ sub eget {
                  $ENV{'user.home'});
    my @pairs=split(/\&/,$rep);
    my %returnhash=();
+   my $i=0;
    map {
-      my ($key,$value)=split(/=/,$_);
-      $returnhash{unespace($key)}=unescape($value);
-   } @pairs;
+      $returnhash{$_}=unescape($pairs[$i]);
+      $i++;
+   } @storearr;
    return %returnhash;
 }
 
-# ------------------------------------------------- Check for a user priviledge
+# ------------------------------------------------- Check for a user privilege
 
 sub allowed {
     my ($priv,$uri)=@_;
-    $uri=~s/^\/res//;
-    $uri=~s/^\///;
+    $uri=&declutter($uri);
+
+# Free bre access to adm and meta resources
+
+    if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
+	return 'F';
+    }
+
     my $thisallowed='';
-    if ($ENV{'user.priv./'}=~/$priv\&([^\:]*)/) {
+    my $statecond=0;
+    my $courseprivid='';
+
+# Course
+
+    if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'}=~/$priv\&([^\:]*)/) {
        $thisallowed.=$1;
     }
-    if ($ENV{'user.priv./'.(split(/\//,$uri))[0].'/'}=~/$priv\&([^\:]*)/) {
+
+# Domain
+
+    if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.(split(/\//,$uri))[0].'/'}
+       =~/$priv\&([^\:]*)/) {
        $thisallowed.=$1;
     }
-    if ($ENV{'user.priv./'.$uri}=~/$priv\&([^\:]*)/) {
+
+# Course: uri itself is a course
+    my $courseuri=$uri;
+    $courseuri=~s/\_(\d)/\/$1/;
+    $courseuri=~s/^([^\/])/\/$1/;
+
+    if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri}
+       =~/$priv\&([^\:]*)/) {
        $thisallowed.=$1;
     }
-    return $thisallowed;
+
+# Full access at system, domain or course-wide level? Exit.
+
+    if ($thisallowed=~/F/) {
+	return 'F';
+    }
+
+# If this is generating or modifying users, exit with special codes
+
+    if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:'=~/\:$priv\:/) {
+	return $thisallowed;
+    }
+#
+# Gathered so far: system, domain and course wide privileges
+#
+# Course: See if uri or referer is an individual resource that is part of 
+# the course
+
+    if ($ENV{'request.course.id'}) {
+       $courseprivid=$ENV{'request.course.id'};
+       if ($ENV{'request.course.sec'}) {
+          $courseprivid.='/'.$ENV{'request.course.sec'};
+       }
+       $courseprivid=~s/\_/\//;
+       my $checkreferer=1;
+       my @uriparts=split(/\//,$uri);
+       my $filename=$uriparts[$#uriparts];
+       my $pathname=$uri;
+       $pathname=~s/\/$filename$//;
+       if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
+           /\&$filename\:([\d\|]+)\&/) {
+           $statecond=$1;
+           if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
+               =~/$priv\&([^\:]*)/) {
+               $thisallowed.=$1;
+               $checkreferer=0;
+           }
+       }
+       
+       if (($ENV{'HTTP_REFERER'}) && ($checkreferer)) {
+	  my $refuri=$ENV{'HTTP_REFERER'};
+          $refuri=~s/^http\:\/\/$ENV{'request.host'}//i;
+          $refuri=&declutter($refuri);
+          my @uriparts=split(/\//,$refuri);
+          my $filename=$uriparts[$#uriparts];
+          my $pathname=$refuri;
+          $pathname=~s/\/$filename$//;
+          my @filenameparts=split(/\./,$uri);
+          if (&fileembstyle($filenameparts[$#filenameparts]) ne 'ssi') {
+            if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
+              /\&$filename\:([\d\|]+)\&/) {
+              my $refstatecond=$1;
+              if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
+                  =~/$priv\&([^\:]*)/) {
+                  $thisallowed.=$1;
+                  $uri=$refuri;
+                  $statecond=$refstatecond;
+              }
+            }
+          }
+       }
+   }
+
+#
+# Gathered now: all privileges that could apply, and condition number
+# 
+#
+# Full or no access?
+#
+
+    if ($thisallowed=~/F/) {
+	return 'F';
+    }
+
+    unless ($thisallowed) {
+        return '';
+    }
+
+# Restrictions exist, deal with them
+#
+#   C:according to course preferences
+#   R:according to resource settings
+#   L:unless locked
+#   X:according to user session state
+#
+
+# Possibly locked functionality, check all courses
+# Locks might take effect only after 10 minutes cache expiration for other
+# courses, and 2 minutes for current course
+
+    my $envkey;
+    if ($thisallowed=~/L/) {
+        foreach $envkey (keys %ENV) {
+           if ($envkey=~/^user\.role\.(st|ta)\.([^\.]*)/) {
+               my $courseid=$2;
+               my $roleid=$1.'.'.$2;
+               $courseid=~s/^\///;
+               my $expiretime=600;
+               if ($ENV{'request.role'} eq $roleid) {
+		  $expiretime=120;
+               }
+	       my ($cdom,$cnum,$csec)=split(/\//,$courseid);
+               my $prefix='course.'.$cdom.'_'.$cnum.'.';
+               if ((time-$ENV{$prefix.'last_cache'})>$expiretime) {
+		   &coursedescription($courseid);
+               }
+               if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,$csec\,/)
+                || ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
+		   if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) {
+                       &log($ENV{'user.domain'},$ENV{'user.name'},
+                            $ENV{'user.host'},
+                            'Locked by res: '.$priv.' for '.$uri.' due to '.
+                            $cdom.'/'.$cnum.'/'.$csec.' expire '.
+                            $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
+		       return '';
+                   }
+               }
+               if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,$csec\,/)
+                || ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) {
+		   if ($ENV{'priv.'.$priv.'.lock.expire'}>time) {
+                       &log($ENV{'user.domain'},$ENV{'user.name'},
+                            $ENV{'user.host'},
+                            'Locked by priv: '.$priv.' for '.$uri.' due to '.
+                            $cdom.'/'.$cnum.'/'.$csec.' expire '.
+                            $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
+		       return '';
+                   }
+               }
+	   }
+       }
+    }
+   
+#
+# Rest of the restrictions depend on selected course
+#
+
+    unless ($ENV{'request.course.id'}) {
+       return '1';
+    }
+
+#
+# Now user is definitely in a course
+#
+
+
+# Course preferences
+
+   if ($thisallowed=~/C/) {
+       my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
+       if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.roles.denied'}
+	   =~/\,$rolecode\,/) {
+           &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
+                'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
+                $ENV{'request.course.id'});
+           return '';
+       }
+   }
+
+# Resource preferences
+
+   if ($thisallowed=~/R/) {
+       my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
+       my $filename=$perlvar{'lonDocRoot'}.'/res/'.$uri.'.meta';
+       if (-e $filename) {
+           my @content;
+           {
+	     my $fh=Apache::File->new($filename);
+             @content=<$fh>;
+	   }
+           if (join('',@content)=~
+                    /\<roledeny[^\>]*\>[^\<]*$rolecode[^\<]*\<\/roledeny\>/) {
+	       &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
+                    'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
+           return '';
+
+           }
+       }
+   }
+
+# Restricted by state?
+
+   if ($thisallowed=~/X/) {
+      if (&condval($statecond)) {
+	 return '2';
+      } else {
+         return '';
+      }
+   }
+
+   return 'F';
 }
 
 # ----------------------------------------------------------------- Define Role
@@ -515,24 +1238,826 @@ sub allowed {
 sub definerole {
   if (allowed('mcr','/')) {
     my ($rolename,$sysrole,$domrole,$courole)=@_;
+    map {
+	my ($crole,$cqual)=split(/\&/,$_);
+        if ($pr{'cr:s'}!~/$crole/) { return "refused:s:$crole"; }
+        if ($pr{'cr:s'}=~/$crole\&/) {
+	    if ($pr{'cr:s'}!~/$crole\&\w*$cqual/) { 
+               return "refused:s:$crole&$cqual"; 
+            }
+        }
+    } split('/',$sysrole);
+    map {
+	my ($crole,$cqual)=split(/\&/,$_);
+        if ($pr{'cr:d'}!~/$crole/) { return "refused:d:$crole"; }
+        if ($pr{'cr:d'}=~/$crole\&/) {
+	    if ($pr{'cr:d'}!~/$crole\&\w*$cqual/) { 
+               return "refused:d:$crole&$cqual"; 
+            }
+        }
+    } split('/',$domrole);
+    map {
+	my ($crole,$cqual)=split(/\&/,$_);
+        if ($pr{'cr:c'}!~/$crole/) { return "refused:c:$crole"; }
+        if ($pr{'cr:c'}=~/$crole\&/) {
+	    if ($pr{'cr:c'}!~/$crole\&\w*$cqual/) { 
+               return "refused:c:$crole&$cqual"; 
+            }
+        }
+    } split('/',$courole);
     my $command="encrypt:rolesput:$ENV{'user.domain'}:$ENV{'user.name'}:".
                 "$ENV{'user.domain'}:$ENV{'user.name'}:".
-	        "rolesdef&$rolename=$sysrole&&$domrole&&$courole";
+	        "rolesdef_$rolename=".
+                escape($sysrole.'_'.$domrole.'_'.$courole);
     return reply($command,$ENV{'user.home'});
   } else {
     return 'refused';
   }
 }
 
+# ---------------- Make a metadata query against the network of library servers
+
+sub metadata_query {
+    my ($query,$custom,$customshow)=@_;
+    # need to put in a library server loop here and return a hash
+    my %rhash;
+    for my $server (keys %libserv) {
+	unless ($custom or $customshow) {
+	    my $reply=&reply("querysend:".&escape($query),$server);
+	    $rhash{$server}=$reply;
+	}
+	else {
+	    my $reply=&reply("querysend:".&escape($query).':'.
+			     &escape($custom).':'.&escape($customshow),
+			     $server);
+	    $rhash{$server}=$reply;
+	}
+    }
+    return \%rhash;
+}
+
 # ------------------------------------------------------------------ Plain Text
 
 sub plaintext {
-    return $prp{$_};
+    my $short=shift;
+    return $prp{$short};
+}
+
+# ------------------------------------------------------------------ Plain Text
+
+sub fileembstyle {
+    my $ending=shift;
+    return $fe{$ending};
+}
+
+# ------------------------------------------------------------ Description Text
+
+sub filedescription {
+    my $ending=shift;
+    return $fd{$ending};
 }
 
 # ----------------------------------------------------------------- Assign Role
 
 sub assignrole {
+    my ($udom,$uname,$url,$role,$end,$start)=@_;
+    my $mrole;
+    if ($role =~ /^cr\//) {
+	unless (&allowed('ccr',$url)) {
+           &logthis('Refused custom assignrole: '.
+             $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
+		    $ENV{'user.name'}.' at '.$ENV{'user.domain'});
+           return 'refused'; 
+        }
+        $mrole='cr';
+    } else {
+        my $cwosec=$url;
+        $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
+        unless (&allowed('c'.$role,$cwosec)) { 
+           &logthis('Refused assignrole: '.
+             $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
+		    $ENV{'user.name'}.' at '.$ENV{'user.domain'});
+           return 'refused'; 
+        }
+        $mrole=$role;
+    }
+    my $command="encrypt:rolesput:$ENV{'user.domain'}:$ENV{'user.name'}:".
+                "$udom:$uname:$url".'_'."$mrole=$role";
+    if ($end) { $command.='_'.$end; }
+    if ($start) {
+	if ($end) { 
+           $command.='_'.$start; 
+        } else {
+           $command.='_0_'.$start;
+        }
+    }
+    return &reply($command,&homeserver($uname,$udom));
+}
+
+# --------------------------------------------------------------- Modify a user
+
+
+sub modifyuser {
+    my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene)=@_;
+    &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '.
+             $umode.', '.$first.', '.$middle.', '.
+	     $last.', '.$gene.' by '.
+             $ENV{'user.name'}.' at '.$ENV{'user.domain'});  
+    my $uhome=&homeserver($uname,$udom);
+# ----------------------------------------------------------------- Create User
+    if (($uhome eq 'no_host') && ($umode) && ($upass)) {
+        my $unhome='';
+	if ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'} eq $udom) {
+	    $unhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+        } else {
+            my $tryserver;
+            my $loadm=10000000;
+            foreach $tryserver (keys %libserv) {
+	       if ($hostdom{$tryserver} eq $udom) {
+                  my $answer=reply('load',$tryserver);
+                  if (($answer=~/\d+/) && ($answer<$loadm)) {
+		      $loadm=$answer;
+                      $unhome=$tryserver;
+                  }
+	       }
+	    }
+        }
+        if (($unhome eq '') || ($unhome eq 'no_host')) {
+	    return 'error: find home';
+        }
+        my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':'.$umode.':'.
+                         &escape($upass),$unhome);
+	unless ($reply eq 'ok') {
+            return 'error: '.$reply;
+        }   
+        $uhome=&homeserver($uname,$udom);
+        if (($uhome eq '') || ($uhome eq 'no_host') || ($uhome ne $unhome)) {
+	    return 'error: verify home';
+        }
+    }
+# ---------------------------------------------------------------------- Add ID
+    if ($uid) {
+       $uid=~tr/A-Z/a-z/;
+       my %uidhash=&idrget($udom,$uname);
+       if (($uidhash{$uname}) && ($uidhash{$uname}!~/error\:/)) {
+	  unless ($uid eq $uidhash{$uname}) {
+	      return 'error: mismatch '.$uidhash{$uname}.' versus '.$uid;
+          }
+       } else {
+	  &idput($udom,($uname => $uid));
+       }
+    }
+# -------------------------------------------------------------- Add names, etc
+    my $names=&reply('get:'.$udom.':'.$uname.
+                     ':environment:firstname&middlename&lastname&generation',
+                     $uhome);
+    my ($efirst,$emiddle,$elast,$egene)=split(/\&/,$names);
+    if ($first)  { $efirst  = &escape($first); }
+    if ($middle) { $emiddle = &escape($middle); }
+    if ($last)   { $elast   = &escape($last); }
+    if ($gene)   { $egene   = &escape($gene); }
+    my $reply=&reply('put:'.$udom.':'.$uname.
+           ':environment:firstname='.$efirst.
+                      '&middlename='.$emiddle.
+                        '&lastname='.$elast.
+                      '&generation='.$egene,$uhome);
+    if ($reply ne 'ok') {
+	return 'error: '.$reply;
+    }
+    &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
+             $umode.', '.$first.', '.$middle.', '.
+	     $last.', '.$gene.' by '.
+             $ENV{'user.name'}.' at '.$ENV{'user.domain'});
+    return 'ok'; 
+}
+
+# -------------------------------------------------------------- Modify student
+
+sub modifystudent {
+    my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
+        $end,$start)=@_;
+    my $cid='';
+    unless ($cid=$ENV{'request.course.id'}) {
+	return 'not_in_class';
+    }
+# --------------------------------------------------------------- Make the user
+    my $reply=&modifyuser
+	($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene);
+    unless ($reply eq 'ok') { return $reply; }
+    my $uhome=&homeserver($uname,$udom);
+    if (($uhome eq '') || ($uhome eq 'no_host')) { 
+	return 'error: no such user';
+    }
+# -------------------------------------------------- Add student to course list
+    my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
+                      &escape($uname.':'.$udom).'='.
+                      &escape($end.':'.$start),
+	              $ENV{'course.'.$cid.'.home'});
+    unless (($reply eq 'ok') || ($reply eq 'delayed')) {
+	return 'error: '.$reply;
+    }
+# ---------------------------------------------------- Add student role to user
+    my $uurl='/'.$cid;
+    $uurl=~s/\_/\//g;
+    if ($usec) {
+	$uurl.='/'.$usec;
+    }
+    return &assignrole($udom,$uname,$uurl,'st',$end,$start);
+}
+
+# ------------------------------------------------- Write to course preferences
+
+sub writecoursepref {
+    my ($courseid,%prefs)=@_;
+    $courseid=~s/^\///;
+    $courseid=~s/\_/\//g;
+    my ($cdomain,$cnum)=split(/\//,$courseid);
+    my $chome=homeserver($cnum,$cdomain);
+    if (($chome eq '') || ($chome eq 'no_host')) { 
+	return 'error: no such course';
+    }
+    my $cstring='';
+    map {
+	$cstring.=escape($_).'='.escape($prefs{$_}).'&';
+    } keys %prefs;
+    $cstring=~s/\&$//;
+    return reply('put:'.$cdomain.':'.$cnum.':environment:'.$cstring,$chome);
+}
+
+# ---------------------------------------------------------- Make/modify course
+
+sub createcourse {
+    my ($udom,$description,$url)=@_;
+    $url=&declutter($url);
+    my $cid='';
+    unless (&allowed('ccc',$ENV{'user.domain'})) {
+        return 'refused';
+    }
+    unless ($udom eq $ENV{'user.domain'}) {
+        return 'refused';
+    }
+# ------------------------------------------------------------------- Create ID
+   my $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
+       unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+# ----------------------------------------------- Make sure that does not exist
+   my $uhome=&homeserver($uname,$udom);
+   unless (($uhome eq '') || ($uhome eq 'no_host')) {
+       $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
+        unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+       $uhome=&homeserver($uname,$udom);       
+       unless (($uhome eq '') || ($uhome eq 'no_host')) {
+           return 'error: unable to generate unique course-ID';
+       } 
+   }
+# ------------------------------------------------------------- Make the course
+    my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::',
+                      $ENV{'user.home'});
+    unless ($reply eq 'ok') { return 'error: '.$reply; }
+    my $uhome=&homeserver($uname,$udom);
+    if (($uhome eq '') || ($uhome eq 'no_host')) { 
+	return 'error: no such course';
+    }
+    &writecoursepref($udom.'_'.$uname,
+                     ('description' => $description,
+                      'url'         => $url));
+    return '/'.$udom.'/'.$uname;
+}
+
+# ---------------------------------------------------------- Assign Custom Role
+
+sub assigncustomrole {
+    my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start)=@_;
+    return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename,
+                       $end,$start);
+}
+
+# ----------------------------------------------------------------- Revoke Role
+
+sub revokerole {
+    my ($udom,$uname,$url,$role)=@_;
+    my $now=time;
+    return &assignrole($udom,$uname,$url,$role,$now);
+}
+
+# ---------------------------------------------------------- Revoke Custom Role
+
+sub revokecustomrole {
+    my ($udom,$uname,$url,$rdom,$rnam,$rolename)=@_;
+    my $now=time;
+    return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now);
+}
+
+# ------------------------------------------------------------ Directory lister
+
+sub dirlist {
+    my $uri=shift;
+    $uri=~s/^\///;
+    $uri=~s/\/$//;
+    my ($res,$udom,$uname,@rest)=split(/\//,$uri);
+    if ($udom) {
+     if ($uname) {
+       my $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/'.$uri,
+                      homeserver($uname,$udom));
+       return split(/:/,$listing);
+     } else {
+       my $tryserver;
+       my %allusers=();
+       foreach $tryserver (keys %libserv) {
+	  if ($hostdom{$tryserver} eq $udom) {
+             my $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.$udom,
+			       $tryserver);
+             if (($listing ne 'no_such_dir') && ($listing ne 'empty')
+              && ($listing ne 'con_lost')) {
+                map {
+                  my ($entry,@stat)=split(/&/,$_);
+                  $allusers{$entry}=1;
+                } split(/:/,$listing);
+             }
+	  }
+       }
+       my $alluserstr='';
+       map {
+           $alluserstr.=$_.'&user:';
+       } sort keys %allusers;
+       $alluserstr=~s/:$//;
+       return split(/:/,$alluserstr);
+     } 
+   } else {
+       my $tryserver;
+       my %alldom=();
+       foreach $tryserver (keys %libserv) {
+	   $alldom{$hostdom{$tryserver}}=1;
+       }
+       my $alldomstr='';
+       map {
+          $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:';
+       } sort keys %alldom;
+       $alldomstr=~s/:$//;
+       return split(/:/,$alldomstr);       
+   }
+}
+
+# -------------------------------------------------------- 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;
+    my $allpathcond='';
+    map {
+       if (defined($ENV{'acc.cond.'.$ENV{'request.course.id'}.'.'.$_})) {
+	   $allpathcond.=
+               '('.$ENV{'acc.cond.'.$ENV{'request.course.id'}.'.'.$_}.')|';
+       }
+    } split(/\|/,$condidx);
+    $allpathcond=~s/\|$//;
+    if ($ENV{'request.course.id'}) {
+       if ($allpathcond) {
+          my $operand='|';
+	  my @stack;
+          map {
+              if ($_ eq '(') {
+                 push @stack,($operand,$result)
+              } elsif ($_ eq ')') {
+                  my $before=pop @stack;
+		  if (pop @stack eq '&') {
+		      $result=$result>$before?$before:$result;
+                  } else {
+                      $result=$result>$before?$result:$before;
+                  }
+              } elsif (($_ eq '&') || ($_ eq '|')) {
+                  $operand=$_;
+              } else {
+                  my $new=directcondval($_);
+                  if ($operand eq '&') {
+                     $result=$result>$new?$new:$result;
+                  } else {
+                     $result=$result>$new?$result:$new;
+                  }                  
+              }
+          } ($allpathcond=~/(\d+|\(|\)|\&|\|)/g);
+       }
+    }
+    return $result;
+}
+
+# --------------------------------------------------------- Value of a Variable
+
+sub EXT {
+    my $varname=shift;
+    unless ($varname) { return ''; }
+    my ($realm,$space,$qualifier,@therest)=split(/\./,$varname);
+    my $rest;
+    if ($therest[0]) {
+       $rest=join('.',@therest);
+    } else {
+       $rest='';
+    }
+    my $qualifierrest=$qualifier;
+    if ($rest) { $qualifierrest.='.'.$rest; }
+    my $spacequalifierrest=$space;
+    if ($qualifierrest) { $spacequalifierrest.='.'.$qualifierrest; }
+    if ($realm eq 'user') {
+# --------------------------------------------------------------- user.resource
+	if ($space eq 'resource') {
+	    my %restored=&restore();
+            return $restored{$qualifierrest};
+# ----------------------------------------------------------------- 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',$qualifierrest))};
+# ----------------------------------------------------------------- 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};
+# ------------------------------------------------------------ request.filename
+        } else {
+            return $ENV{'request.'.$spacequalifierrest};
+        }
+    } elsif ($realm eq 'course') {
+# ---------------------------------------------------------- course.description
+        my $section='';
+        if ($ENV{'request.course.sec'}) {
+	    $section='_'.$ENV{'request.course.sec'};
+        }
+        return $ENV{'course.'.$ENV{'request.course.id'}.$section.'.'.
+                              $spacequalifierrest};
+    } elsif ($realm eq 'resource') {
+      if ($ENV{'request.course.id'}) {
+# ----------------------------------------------------- Cascading lookup scheme
+       my $symbp=&symbread();
+       my $mapp=(split(/\_\_\_/,$symbp))[0];
+
+       my $symbparm=$symbp.'.'.$spacequalifierrest;
+       my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
+
+       my $seclevel=
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$spacequalifierrest;
+       my $seclevelr=
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$symbparm;
+       my $seclevelm=
+            $ENV{'request.course.id'}.'.['.
+		$ENV{'request.course.sec'}.'].'.$mapparm;
+
+       my $courselevel=
+            $ENV{'request.course.id'}.'.'.$spacequalifierrest;
+       my $courselevelr=
+            $ENV{'request.course.id'}.'.'.$symbparm;
+       my $courselevelm=
+            $ENV{'request.course.id'}.'.'.$mapparm;
+
+# ----------------------------------------------------------- first, check user
+      my %resourcedata=get('resourcedata',
+                           ($courselevelr,$courselevelm,$courselevel));
+      if (($resourcedata{$courselevelr}!~/^error\:/) &&
+          ($resourcedata{$courselevelr}!~/^con_lost/)) {
+
+       if ($resourcedata{$courselevelr}) { 
+          return $resourcedata{$courselevelr}; }
+       if ($resourcedata{$courselevelm}) { 
+          return $resourcedata{$courselevelm}; }
+       if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; }
+
+      } else {
+	  if ($resourcedata{$courselevelr}!~/No such file/) {
+	    &logthis("<font color=blue>WARNING:".
+		   " Trying to get resource data for ".$ENV{'user.name'}." at "
+                   .$ENV{'user.domain'}.": ".$resourcedata{$courselevelr}.
+                 "</font>");
+	  }
+      }
+
+# -------------------------------------------------------- second, check course
+
+        my $reply=&reply('get:'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+              $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
+	      ':resourcedata:'.
+   &escape($seclevelr).'&'.&escape($seclevelm).'&'.&escape($seclevel).'&'.
+   &escape($courselevelr).'&'.&escape($courselevelm).'&'.&escape($courselevel),
+		   $ENV{'course.'.$ENV{'request.course.id'}.'.home'});
+      if ($reply!~/^error\:/) {
+	  map {
+	      if ($_) { return &unescape($_); }
+          } split(/\&/,$reply);
+      }
+      if (($reply=~/^con_lost/) || ($reply=~/^error\:/)) {
+	  &logthis("<font color=blue>WARNING:".
+                " Getting ".$reply." asking for ".$varname." for ".
+                $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.
+                ' at '.
+                $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.
+                ' from '.
+                $ENV{'course.'.$ENV{'request.course.id'}.'.home'}.
+                 "</font>");
+      }
+# ------------------------------------------------------ third, check map parms
+       my %parmhash=();
+       my $thisparm='';       
+       if (tie(%parmhash,'GDBM_File',
+          $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
+           $thisparm=$parmhash{$symbparm};
+	   untie(%parmhash);
+       }
+       if ($thisparm) { return $thisparm; }
+     }
+     
+# --------------------------------------------- last, look in resource metadata
+
+      $spacequalifierrest=~s/\./\_/;
+      my $metadata=&metadata($ENV{'request.filename'},$spacequalifierrest);
+      if ($metadata) { return $metadata; }
+      $metadata=&metadata($ENV{'request.filename'},
+                                         'parameter_'.$spacequalifierrest);
+      if ($metadata) { return $metadata; }
+
+# ---------------------------------------------------- Any other user namespace
+    } elsif ($realm eq 'environment') {
+# ----------------------------------------------------------------- environment
+        return $ENV{$spacequalifierrest};
+    } elsif ($realm eq 'system') {
+# ----------------------------------------------------------------- system.time
+	if ($space eq 'time') {
+	    return time;
+        }
+    }
+    return '';
+}
+
+# ---------------------------------------------------------------- Get metadata
+
+sub metadata {
+    my ($uri,$what)=@_;
+
+    $uri=&declutter($uri);
+    my $filename=$uri;
+    $uri=~s/\.meta$//;
+    unless ($metacache{$uri.':keys'}) {
+        unless ($filename=~/\.meta$/) { $filename.='.meta'; }
+	my $metastring=&getfile($perlvar{'lonDocRoot'}.'/res/'.$filename);
+        my $parser=HTML::TokeParser->new(\$metastring);
+        my $token;
+        while ($token=$parser->get_token) {
+           if ($token->[0] eq 'S') {
+	      my $entry=$token->[1];
+              my $unikey=$entry;
+              if (defined($token->[2]->{'part'})) { 
+                 $unikey.='_'.$token->[2]->{'part'}; 
+	      }
+              if (defined($token->[2]->{'name'})) { 
+                 $unikey.='_'.$token->[2]->{'name'}; 
+	      }
+              if ($metacache{$uri.':keys'}) {
+                 $metacache{$uri.':keys'}.=','.$unikey;
+              } else {
+                 $metacache{$uri.':keys'}=$unikey;
+	      }
+              map {
+		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
+              } @{$token->[3]};
+              unless (
+                 $metacache{$uri.':'.$unikey}=$parser->get_text('/'.$entry)
+		      ) { $metacache{$uri.':'.$unikey}=
+			      $metacache{$uri.':'.$unikey.'.default'};
+		      }
+          }
+       }
+    }
+    return $metacache{$uri.':'.$what};
+}
+
+# ------------------------------------------------- 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 $thisfn=shift;
+    unless ($thisfn) {
+	$thisfn=$ENV{'request.filename'};
+    }
+    $thisfn=declutter($thisfn);
+    my %hash;
+    my %bighash;
+    my $syval='';
+    if (($ENV{'request.course.fn'}) && ($thisfn)) {
+        if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
+                      &GDBM_READER,0640)) {
+	    $syval=$hash{$thisfn};
+            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};
+              unless ($ids) { 
+                 $ids=$bighash{'ids_/'.$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 '';
+}
+
+# ---------------------------------------------------------- Return random seed
+
+sub numval {
+    my $txt=shift;
+    $txt=~tr/A-J/0-9/;
+    $txt=~tr/a-j/0-9/;
+    $txt=~tr/K-T/0-9/;
+    $txt=~tr/k-t/0-9/;
+    $txt=~tr/U-Z/0-5/;
+    $txt=~tr/u-z/0-5/;
+    $txt=~s/\D//g;
+    return int($txt);
+}    
+
+sub rndseed {
+    my $symb;
+    unless ($symb=&symbread()) { return time; }
+    { 
+      use integer;
+      my $symbchck=unpack("%32C*",$symb) << 27;
+      my $symbseed=numval($symb) << 22;
+      my $namechck=unpack("%32C*",$ENV{'user.name'}) << 17;
+      my $nameseed=numval($ENV{'user.name'}) << 12;
+      my $domainseed=unpack("%32C*",$ENV{'user.domain'}) << 7;
+      my $courseseed=unpack("%32C*",$ENV{'request.course.id'});
+      my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
+      #uncommenting these lines can break things!
+      #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+      #&Apache::lonxml::debug("rndseed :$num:$symb");
+      return $num;
+    }
+}
+
+sub ireceipt {
+    my ($funame,$fudom,$fucourseid,$fusymb)=@_;
+    my $cuname=unpack("%32C*",$funame);
+    my $cudom=unpack("%32C*",$fudom);
+    my $cucourseid=unpack("%32C*",$fucourseid);
+    my $cusymb=unpack("%32C*",$fusymb);
+    my $cunique=unpack("%32C*",$perlvar{'lonReceipt'});
+    return unpack("%32C*",$perlvar{'lonHostID'}).'-'.
+           ($cunique%$cuname+
+            $cunique%$cudom+
+            $cusymb%$cuname+
+            $cusymb%$cudom+
+            $cucourseid%$cuname+
+            $cucourseid%$cudom);
+}
+
+sub receipt {
+    return &ireceipt($ENV{'user.name'},$ENV{'user.domain'},
+                     $ENV{'request.course.id'},&symbread());
+}
+  
+# ------------------------------------------------------------ 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
+  if ($file=~m:^/~:) { # is a contruction space reference
+    $location = $file;
+    $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
+  } else {
+    $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 {
+    my $thisfn=shift;
+    $thisfn=~s/^$perlvar{'lonDocRoot'}//;
+    $thisfn=~s/^\///;
+    $thisfn=~s/^res\///;
+    return $thisfn;
 }
 
 # -------------------------------------------------------- Escape Special Chars
@@ -613,12 +2138,24 @@ if ($readit ne 'done') {
     }
 }
 
+# ------------------------------------------------------------- Read file types
+{
+    my $config=Apache::File->new("$perlvar{'lonTabDir'}/filetypes.tab");
+
+    while (my $configline=<$config>) {
+       chomp($configline);
+       my ($ending,$emb,@descr)=split(/\s+/,$configline);
+       if ($descr[0] ne '') { 
+         $fe{$ending}=$emb;
+         $fd{$ending}=join(' ',@descr);
+       }
+    }
+}
+
+%metacache=();
+
 $readit='done';
 &logthis('<font color=yellow>INFO: Read configuration</font>');
 }
 }
 1;
-
-
-
-