loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.714 and 1.787

-version 1.714, 2006/03/03 23:22:18
+version 1.787, 2006/09/29 18:23:25
  Line 38  use vars
  qw(%perlvar %hostname %badServerCache %iphost %spareid %hostdom
     %libserv %pr %prp $memcache %packagetab
     %courselogs %accesshash %userrolehash %domainrolehash $processmarker $dumpcount
-    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf
+    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %coursetypebuf
     %domaindescription %domain_auth_def %domain_auth_arg_def
     %domain_lang_def %domain_city %domain_longi %domain_lati %domain_primary
     $tmpdir $_64bit %env);
  use IO::Socket;
  use GDBM_File;
- use Apache::Constants qw(:common :http);
  use HTML::LCParser;
  use HTML::Parser;
  use Fcntl qw(:flock);
- Line 53  use Storable qw(lock_store lock_nstore l
+ Line 52  use Storable qw(lock_store lock_nstore l
  use Time::HiRes qw( gettimeofday tv_interval );
  use Cache::Memcached;
  use Digest::MD5;
+ use lib '/home/httpd/lib/perl';
+ use LONCAPA;
+ use LONCAPA::Configuration;
  my $readit;
  my $max_connection_retries = 10;     # Or some such value.
- Line 86  delayed.
+ Line 88  delayed.
  # --------------------------------------------------------------------- Logging
+ {
+     my $logid;
+     sub instructor_log {
+ 	my ($hash_name,$storehash,$delflag,$uname,$udom)=@_;
+ 	$logid++;
+ 	my $id=time().'00000'.$$.'00000'.$logid;
+ 	return &Apache::lonnet::put('nohist_'.$hash_name,
+ 				    { $id => {
+ 					'exe_uname' => $env{'user.name'},
+ 					'exe_udom'  => $env{'user.domain'},
+ 					'exe_time'  => time(),
+ 					'exe_ip'    => $ENV{'REMOTE_ADDR'},
+ 					'delflag'   => $delflag,
+ 					'logentry'  => $storehash,
+ 					'uname'     => $uname,
+ 					'udom'      => $udom,
+ 				    }
+ 				  },
+ 				    $env{'course.'.$env{'request.course.id'}.'.domain'},
+ 				    $env{'course.'.$env{'request.course.id'}.'.num'}
+ 				    );
+     }
+ }
  sub logtouch {
      my $execdir=$perlvar{'lonDaemons'};
- Line 256  sub critical {
+ Line 281  sub critical {
      return $answer;
  }
- # ------------------------------------------- Transfer profile into environment
+ # ------------------------------------------- check if return value is an error
- sub transfer_profile_to_env {
+ sub error {
+     my ($result) = @_;
+     if ($result =~ /^(con_lost|no_such_host|error: (\d+) (.*))/) {
+ 	if ($2 == 2) { return undef; }
+ 	return $1;
+     }
+     return undef;
+ }
+ sub convert_and_load_session_env {
      my ($lonidsdir,$handle)=@_;
      my @profile;
      {
- Line 267  sub transfer_profile_to_env {
+ Line 301  sub transfer_profile_to_env {
  	@profile=<$idf>;
  	close($idf);
      }
-     my $envi;
+     my %temp_env;
-     my %Remove;
+     foreach my $line (@profile) {
-     for ($envi=0;$envi<=$#profile;$envi++) {
+ 	if ($line !~ m/=/) {
- 	chomp($profile[$envi]);
+ 	    return 0;
- 	my ($envname,$envvalue)=split(/=/,$profile[$envi],2);
+ 	}
- 	$env{$envname} = $envvalue;
+ 	chomp($line);
+ 	my ($envname,$envvalue)=split(/=/,$line,2);
+ 	$temp_env{&unescape($envname)} = &unescape($envvalue);
+     }
+     unlink("$lonidsdir/$handle.id");
+     if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id",&GDBM_WRCREAT(),
+)) {
+ 	%disk_env = %temp_env;
+ 	@env{keys(%temp_env)} = @disk_env{keys(%temp_env)};
+ 	untie(%disk_env);
+     }
+     return 1;
+ }
+ # ------------------------------------------- Transfer profile into environment
+ my $env_loaded;
+ sub transfer_profile_to_env {
+     if ($env_loaded) { return; }
+     my ($lonidsdir,$handle)=@_;
+     if (!defined($lonidsdir)) {
+ 	$lonidsdir = $perlvar{'lonIDsDir'};
+     }
+     if (!defined($handle)) {
+         ($handle) = ($env{'user.environment'} =~m|/([^/]+)\.id$| );
+     }
+     my $convert;
+     {
+     	open(my $idf,"$lonidsdir/$handle.id");
+ 	flock($idf,LOCK_SH);
+ 	if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id",
+ 		&GDBM_READER(),0640)) {
+ 	    @env{keys(%disk_env)} = @disk_env{keys(%disk_env)};
+ 	    untie(%disk_env);
+ 	} else {
+ 	    $convert = 1;
+ 	}
+     }
+     if ($convert) {
+ 	if (!&convert_and_load_session_env($lonidsdir,$handle)) {
+ 	    &logthis("Failed to load session, or convert session.");
+ 	}
+     }
+     my %remove;
+     while ( my $envname = each(%env) ) {
          if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) {
              if ($time < time-300) {
-                 $Remove{$key}++;
+                 $remove{$key}++;
              }
          }
      }
      $env{'user.environment'} = "$lonidsdir/$handle.id";
-     foreach my $expired_key (keys(%Remove)) {
+     $env_loaded=1;
+     foreach my $expired_key (keys(%remove)) {
          &delenv($expired_key);
      }
  }
- Line 299  sub appenv {
+ Line 381  sub appenv {
              $env{$key}=$newenv{$key};
          }
      }
+     if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(),
-     my $lockfh;
+)) {
-     unless (open($lockfh,"$env{'user.environment'}")) {
+ 	while (my ($key,$value) = each(%newenv)) {
- 	return 'error: '.$!;
+ 	    $disk_env{$key} = $value;
-     }
-     unless (flock($lockfh,LOCK_EX)) {
-          &logthis("<font color=\"blue\">WARNING: ".
-                   'Could not obtain exclusive lock in appenv: '.$!);
-          close($lockfh);
-          return 'error: '.$!;
-     }
-     my @oldenv;
-     {
- 	my $fh;
- 	unless (open($fh,"$env{'user.environment'}")) {
- 	    return 'error: '.$!;
- 	}
- 	@oldenv=<$fh>;
- 	close($fh);
-     }
-     for (my $i=0; $i<=$#oldenv; $i++) {
-         chomp($oldenv[$i]);
-         if ($oldenv[$i] ne '') {
- 	    my ($name,$value)=split(/=/,$oldenv[$i],2);
- 	    unless (defined($newenv{$name})) {
- 		$newenv{$name}=$value;
- 	    }
-         }
-     }
-     {
- 	my $fh;
- 	unless (open($fh,">$env{'user.environment'}")) {
- 	    return 'error';
- 	}
- 	my $newname;
- 	foreach $newname (keys %newenv) {
- 	    print $fh "$newname=$newenv{$newname}\n";
  	}
- 	close($fh);
+ 	untie(%disk_env);
      }
-     close($lockfh);
      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;
+     if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(),
-     {
+)) {
- 	my $fh;
+ 	foreach my $key (keys(%disk_env)) {
- 	unless (open($fh,"$env{'user.environment'}")) {
+ 	    if ($key=~/^$delthis/) {
- 	    return 'error';
- 	}
- 	unless (flock($fh,LOCK_SH)) {
- 	    &logthis("<font color=\"blue\">WARNING: ".
- 		     'Could not obtain shared lock in delenv: '.$!);
- 	    close($fh);
- 	    return 'error: '.$!;
- 	}
- 	@oldenv=<$fh>;
- 	close($fh);
-     }
-     {
- 	my $fh;
- 	unless (open($fh,">$env{'user.environment'}")) {
- 	    return 'error';
- 	}
- 	unless (flock($fh,LOCK_EX)) {
- 	    &logthis("<font color=\"blue\">WARNING: ".
- 		     'Could not obtain exclusive lock in delenv: '.$!);
- 	    close($fh);
- 	    return 'error: '.$!;
- 	}
- 	foreach my $cur_key (@oldenv) {
- 	    if ($cur_key=~/^$delthis/) {
-                 my ($key,undef) = split('=',$cur_key,2);
                  delete($env{$key});
-             } else {
+                 delete($disk_env{$key});
-                 print $fh $cur_key;
              }
  	}
- 	close($fh);
+ 	untie(%disk_env);
      }
      return 'ok';
  }
- Line 445  sub overloaderror {
+ Line 464  sub overloaderror {
  sub spareserver {
      my ($loadpercent,$userloadpercent,$want_server_name) = @_;
-     my $tryserver;
+     my $spare_server;
-     my $spareserver='';
      if ($userloadpercent !~ /\d/) { $userloadpercent=0; }
-     my $lowestserver=$loadpercent > $userloadpercent?
+     my $lowest_load=($loadpercent > $userloadpercent) ? $loadpercent
- 	             $loadpercent :  $userloadpercent;
+                                                      :  $userloadpercent;
-     foreach $tryserver (keys(%spareid)) {
- 	my $loadans=&reply('load',$tryserver);
+     foreach my $try_server (@{ $spareid{'primary'} }) {
- 	my $userloadans=&reply('userload',$tryserver);
+ 	($spare_server, $lowest_load) =
- 	if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
+ 	    &compare_server_load($try_server, $spare_server, $lowest_load);
- 	    next; #didn't get a number from the server
+     }
- 	}
- 	my $answer;
+     my $found_server = ($spare_server ne '' && $lowest_load < 100);
- 	if ($loadans =~ /\d/) {
- 	    if ($userloadans =~ /\d/) {
+     if (!$found_server) {
- 		#both are numbers, pick the bigger one
+ 	foreach my $try_server (@{ $spareid{'default'} }) {
- 		$answer=$loadans > $userloadans?
+ 	    ($spare_server, $lowest_load) =
- 		    $loadans :  $userloadans;
+ 		&compare_server_load($try_server, $spare_server, $lowest_load);
- 	    } else {
- 		$answer = $loadans;
- 	    }
- 	} else {
- 	    $answer = $userloadans;
- 	}
- 	if (($answer =~ /\d/) && ($answer<$lowestserver)) {
- 	    if ($want_server_name) {
- 		$spareserver=$tryserver;
- 	    } else {
- 		$spareserver="http://$hostname{$tryserver}";
- 	    }
- 	    $lowestserver=$answer;
  	}
      }
-     return $spareserver;
+     if (!$want_server_name) {
+ 	$spare_server="http://$hostname{$spare_server}";
+     }
+     return $spare_server;
  }
+ sub compare_server_load {
+     my ($try_server, $spare_server, $lowest_load) = @_;
+     my $loadans     = &reply('load',    $try_server);
+     my $userloadans = &reply('userload',$try_server);
+     if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
+ 	next; #didn't get a number from the server
+     }
+     my $load;
+     if ($loadans =~ /\d/) {
+ 	if ($userloadans =~ /\d/) {
+ 	    #both are numbers, pick the bigger one
+ 	    $load = ($loadans > $userloadans) ? $loadans
+ 		                              : $userloadans;
+ 	} else {
+ 	    $load = $loadans;
+ 	}
+     } else {
+ 	$load = $userloadans;
+     }
+     if (($load =~ /\d/) && ($load < $lowest_load)) {
+ 	$spare_server = $try_server;
+ 	$lowest_load  = $load;
+     }
+     return ($spare_server,$lowest_load);
+ }
  # --------------------------------------------- Try to change a user's password
  sub changepass {
- Line 840  sub getsection {
+ Line 878  sub getsection {
  }
  sub save_cache {
-     my ($r)=@_;
-     if (! $r->is_initial_req()) { return DECLINED; }
      &purge_remembered();
+     #&Apache::loncommon::validate_page();
      undef(%env);
-     return OK;
+     undef($env_loaded);
  }
  my $to_remember=-1;
- Line 996  sub retrievestudentphoto {
+ Line 1033  sub retrievestudentphoto {
  # -------------------------------------------------------------------- New chat
  sub chatsend {
-     my ($newentry,$anon)=@_;
+     my ($newentry,$anon,$group)=@_;
      my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $chome=$env{'course.'.$env{'request.course.id'}.'.home'};
      &reply('chatsend:'.$cdom.':'.$cnum.':'.
  	   &escape($env{'user.domain'}.':'.$env{'user.name'}.':'.$anon.':'.
- 		   &escape($newentry)),$chome);
+ 		   &escape($newentry)).':'.$group,$chome);
  }
  # ------------------------------------------ Find current version of a resource
- Line 1130  sub ssi_body {
+ Line 1167  sub ssi_body {
      }
      my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                       &ssi($filelink,%form));
-     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
+     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
      $output=~s/^.*?\<body[^\>]*\>//si;
      $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
      return $output;
- Line 1138  sub ssi_body {
+ Line 1175  sub ssi_body {
  # --------------------------------------------------------- Server Side Include
+ sub absolute_url {
+     my ($host_name) = @_;
+     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
+     if ($host_name eq '') {
+ 	$host_name = $ENV{'SERVER_NAME'};
+     }
+     return $protocol.$host_name;
+ }
+ sub absolute_url {
+     my ($host_name) = @_;
+     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
+     if ($host_name eq '') {
+ 	$host_name = $ENV{'SERVER_NAME'};
+     }
+     return $protocol.$host_name;
+ }
  sub ssi {
      my ($fn,%form)=@_;
- Line 1149  sub ssi {
+ Line 1204  sub ssi {
      $form{'no_update_last_known'}=1;
      if (%form) {
-       $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
+       $request=new HTTP::Request('POST',&absolute_url().$fn);
        $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));
      } else {
-       $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
+       $request=new HTTP::Request('GET',&absolute_url().$fn);
      }
      $request->header(Cookie => $ENV{'HTTP_COOKIE'});
- Line 1320  sub clean_filename {
+ Line 1375  sub clean_filename {
  # --------------- Take an uploaded file and put it into the userfiles directory
  # input: $formname - the contents of the file are in $env{"form.$formname"}
- #                    the desired filenam is in $env{"form.$formname"}
+ #                    the desired filenam is in $env{"form.$formname.filename"}
  #        $coursedoc - if true up to the current course
  #                     if false
  #        $subdir - directory in userfile to store the file into
- Line 1331  sub clean_filename {
+ Line 1386  sub clean_filename {
  sub userfileupload {
-     my ($formname,$coursedoc,$subdir,$parser,$allfiles,$codebase)=@_;
+     my ($formname,$coursedoc,$subdir,$parser,$allfiles,$codebase,$destuname,$destudom)=@_;
      if (!defined($subdir)) { $subdir='unknown'; }
      my $fname=$env{'form.'.$formname.'.filename'};
      $fname=&clean_filename($fname);
- Line 1352  sub userfileupload {
+ Line 1407  sub userfileupload {
          open(my $fh,'>'.$fullpath.'/'.$fname);
          print $fh $env{'form.'.$formname};
          close($fh);
          return $fullpath.'/'.$fname;
+     } elsif (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) { #files uploaded to create course page are handled differently
+         my $filepath = 'tmp/addcourse/'.$destudom.'/web/'.$env{'user.name'}.
+                        '_'.$env{'user.domain'}.'/pending';
+         my @parts=split(/\//,$filepath);
+         my $fullpath = $perlvar{'lonDaemons'};
+         for (my $i=0;$i<@parts;$i++) {
+             $fullpath .= '/'.$parts[$i];
+             if ((-e $fullpath)!=1) {
+                 mkdir($fullpath,0777);
+             }
+         }
+         open(my $fh,'>'.$fullpath.'/'.$fname);
+         print $fh $env{'form.'.$formname};
+         close($fh);
+         return $fullpath.'/'.$fname;
      }
  # Create the directory if not present
      $fname="$subdir/$fname";
      if ($coursedoc) {
- Line 1369  sub userfileupload {
+ Line 1440  sub userfileupload {
  				       $fname,$formname,$parser,
  				       $allfiles,$codebase);
          }
+     } elsif (defined($destuname)) {
+         my $docuname=$destuname;
+         my $docudom=$destudom;
+ 	return &finishuserfileupload($docuname,$docudom,$formname,
+ 				     $fname,$parser,$allfiles,$codebase);
      } else {
          my $docuname=$env{'user.name'};
          my $docudom=$env{'user.domain'};
- Line 1609  sub flushcourselogs {
+ Line 1686  sub flushcourselogs {
          if ($courseidbuffer{$coursehombuf{$crsid}}) {
             $courseidbuffer{$coursehombuf{$crsid}}.='&'.
  			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid});
          } else {
             $courseidbuffer{$coursehombuf{$crsid}}=
  			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid});
          }
      }
  #
- Line 1716  sub courselog {
+ Line 1793  sub courselog {
         $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'};
      $courseownerbuf{$env{'request.course.id'}}=
         $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+     $coursetypebuf{$env{'request.course.id'}}=
+        $env{'course.'.$env{'request.course.id'}.'.type'};
      if (defined $courselogs{$env{'request.course.id'}}) {
  	$courselogs{$env{'request.course.id'}}.='&'.$what;
      } else {
- Line 1815  sub get_course_adv_roles {
+ Line 1894  sub get_course_adv_roles {
  	    (!$nothide{$username.':'.$domain})) { next; }
  	if ($role eq 'cr') { next; }
          my $key=&plaintext($role);
- 	if ($role =~ /^cr/) {
- 	    $key=(split('/',$role))[3];
- 	}
          if ($section) { $key.=' (Sec/Grp '.$section.')'; }
          if ($returnhash{$key}) {
  	    $returnhash{$key}.=','.$username.':'.$domain;
- Line 1886  sub courseidput {
+ Line 1962  sub courseidput {
  }
  sub courseiddump {
-     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref)=@_;
+     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref,$typefilter)=@_;
      my %returnhash=();
      unless ($domfilter) { $domfilter=''; }
      foreach my $tryserver (keys %libserv) {
- Line 1895  sub courseiddump {
+ Line 1971  sub courseiddump {
  	        foreach (
                   split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
  			       $sincefilter.':'.&escape($descfilter).':'.
-                                &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter),
+                                &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter),
                                 $tryserver))) {
  		    my ($key,$value)=split(/\=/,$_);
                      if (($key) && ($value)) {
- Line 1913  sub courseiddump {
+ Line 1989  sub courseiddump {
  sub dcmailput {
      my ($domain,$msgid,$message,$server)=@_;
      my $status = &Apache::lonnet::critical(
-        'dcmailput:'.$domain.':'.&Apache::lonnet::escape($msgid).'='.
+        'dcmailput:'.$domain.':'.&escape($msgid).'='.
-        &Apache::lonnet::escape($message),$server);
+        &escape($message),$server);
      return $status;
  }
- Line 2561  sub restore {
+ Line 2637  sub restore {
  # ---------------------------------------------------------- Course Description
  sub coursedescription {
-     my $courseid=shift;
+     my ($courseid,$args)=@_;
      $courseid=~s/^\///;
      $courseid=~s/\_/\//g;
      my ($cdomain,$cnum)=split(/\//,$courseid);
- Line 2571  sub coursedescription {
+ Line 2647  sub coursedescription {
      # trying and trying and trying to get the course description.
      my %envhash=();
      my %returnhash=();
-     $envhash{'course.'.$normalid.'.last_cache'}=time;
+     my $expiretime=600;
+     if ($env{'request.course.id'} eq $normalid) {
+ 	$expiretime=120;
+     }
+     my $prefix='course.'.$cdomain.'_'.$cnum.'.';
+     if (!$args->{'freshen_cache'}
+ 	&& ((time-$env{$prefix.'last_cache'}) < $expiretime) ) {
+ 	foreach my $key (keys(%env)) {
+ 	    next if ($key !~ /^\Q$prefix\E(.*)/);
+ 	    my ($setting) = $1;
+ 	    $returnhash{$setting} = $env{$key};
+ 	}
+ 	return %returnhash;
+     }
+     # get the data agin
+     if (!$args->{'one_time'}) {
+ 	$envhash{'course.'.$normalid.'.last_cache'}=time;
+     }
      if ($chome ne 'no_host') {
         %returnhash=&dump('environment',$cdomain,$cnum);
         if (!exists($returnhash{'con_lost'})) {
             $returnhash{'home'}= $chome;
  	   $returnhash{'domain'} = $cdomain;
  	   $returnhash{'num'} = $cnum;
+            if (!defined($returnhash{'type'})) {
+                $returnhash{'type'} = 'Course';
+            }
             while (my ($name,$value) = each %returnhash) {
                 $envhash{'course.'.$normalid.'.'.$name}=$value;
             }
- Line 2589  sub coursedescription {
+ Line 2688  sub coursedescription {
             $envhash{'course.'.$normalid.'.num'}=$cnum;
         }
      }
-     &appenv(%envhash);
+     if (!$args->{'one_time'}) {
+ 	&appenv(%envhash);
+     }
      return %returnhash;
  }
- Line 2632  sub rolesinit {
+ Line 2733  sub rolesinit {
      my %allroles=();
      my %allgroups=();
      my $now=time;
-     my $userroles="user.login.time=$now\n";
+     my %userroles = ('user.login.time' => $now);
      my $group_privs;
      if ($rolesdump ne '') {
- Line 2655  sub rolesinit {
+ Line 2756  sub rolesinit {
  	    } else {
  		($trole,$tend,$tstart)=split(/_/,$role);
  	    }
-             $userroles.=&set_arearole($trole,$area,$tstart,$tend,$domain,$username);
+ 	    my %new_role = &set_arearole($trole,$area,$tstart,$tend,$domain,
+ 					 $username);
+ 	    @userroles{keys(%new_role)} = @new_role{keys(%new_role)};
              if (($tend!=0) && ($tend<$now)) { $trole=''; }
              if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
              if (($area ne '') && ($trole ne '')) {
- Line 2671  sub rolesinit {
+ Line 2774  sub rolesinit {
              }
            }
          }
-         my ($author,$adv) = &set_userprivs(\$userroles,\%allroles,\%allgroups);
+         my ($author,$adv) = &set_userprivs(\%userroles,\%allroles,\%allgroups);
-         $userroles.='user.adv='.$adv."\n".
+         $userroles{'user.adv'}    = $adv;
- 	            'user.author='.$author."\n";
+ 	$userroles{'user.author'} = $author;
          $env{'user.adv'}=$adv;
      }
-     return $userroles;
+     return \%userroles;
  }
  sub set_arearole {
      my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
  # log the associated role with the area
      &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
-     return 'user.role.'.$trole.'.'.$area.'='.$tstart.'.'.$tend."\n";
+     return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend);
  }
  sub custom_roleprivs {
- Line 2751  sub set_userprivs {
+ Line 2854  sub set_userprivs {
      if (keys(%{$allgroups}) > 0) {
          foreach my $role (keys %{$allroles}) {
              my ($trole,$area,$sec,$extendedarea);
-             if ($role =~ m|^(\w+)\.(/\w+/\w+)(/?\w*)|) {
+             if ($role =~ m-^(\w+|cr/\w+/\w+/\w+)\.(/\w+/\w+)(/?\w*)-) {
                  $trole = $1;
                  $area = $2;
                  $sec = $3;
- Line 2785  sub set_userprivs {
+ Line 2888  sub set_userprivs {
          }
          my $thesestr='';
          foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
-         $$userroles.='user.priv.'.$_.'='.$thesestr."\n";
+         $userroles->{'user.priv.'.$_} = $thesestr;
      }
      return ($author,$adv);
  }
- Line 2836  sub del {
+ Line 2939  sub del {
  # -------------------------------------------------------------- dump interface
  sub dump {
+     my ($namespace,$udomain,$uname,$regexp,$range)=@_;
+     if (!$udomain) { $udomain=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $uhome=&homeserver($uname,$udomain);
+     if ($regexp) {
+ 	$regexp=&escape($regexp);
+     } else {
+ 	$regexp='.';
+     }
+     my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
+     my @pairs=split(/\&/,$rep);
+     my %returnhash=();
+     foreach my $item (@pairs) {
+ 	my ($key,$value)=split(/=/,$item,2);
+ 	$key = &unescape($key);
+ 	next if ($key =~ /^error: 2 /);
+ 	$returnhash{$key}=&thaw_unescape($value);
+     }
+     return %returnhash;
+ }
+ # --------------------------------------------------------- dumpstore interface
+ sub dumpstore {
     my ($namespace,$udomain,$uname,$regexp,$range)=@_;
-    if (!$udomain) { $udomain=$env{'user.domain'}; }
+    return &dump($namespace,$udomain,$uname,$regexp,$range);
-    if (!$uname) { $uname=$env{'user.name'}; }
-    my $uhome=&homeserver($uname,$udomain);
-    if ($regexp) {
-        $regexp=&escape($regexp);
-    } else {
-        $regexp='.';
-    }
-    my $rep=reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
-    my @pairs=split(/\&/,$rep);
-    my %returnhash=();
-    foreach (@pairs) {
-       my ($key,$value)=split(/=/,$_,2);
-       $returnhash{unescape($key)}=&thaw_unescape($value);
-    }
-    return %returnhash;
  }
  # -------------------------------------------------------------- keys interface
- Line 2996  sub newput {
+ Line 3108  sub newput {
  # ---------------------------------------------------------  putstore interface
  sub putstore {
-    my ($namespace,$storehash,$udomain,$uname)=@_;
+    my ($namespace,$symb,$version,$storehash,$udomain,$uname)=@_;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
-    my %allitems = ();
+    foreach my $key (keys(%$storehash)) {
-    foreach (keys %$storehash) {
+        $items.= &escape($key).'='.&freeze_escape($storehash->{$key}).'&';
-        if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) {
-            my $key = $1.':keys:'.$2;
-            $allitems{$key} .= $3.':';
-        }
-        $items.=$_.'='.&freeze_escape($$storehash{$_}).'&';
-    }
-    foreach (keys %allitems) {
-        $allitems{$_} =~ s/\:$//;
-        $items.= $_.'='.$allitems{$_}.'&';
     }
     $items=~s/\&$//;
-    return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
+    my $esc_symb=&escape($symb);
+    my $esc_v=&escape($version);
+    my $reply =
+        &reply("putstore:$udomain:$uname:$namespace:$esc_symb:$esc_v:$items",
+ 	      $uhome);
+    if ($reply eq 'unknown_cmd') {
+        # gfall back to way things use to be done
+        return &old_putstore($namespace,$symb,$version,$storehash,$udomain,
+ 			    $uname);
+    }
+    return $reply;
+ }
+ sub old_putstore {
+     my ($namespace,$symb,$version,$storehash,$udomain,$uname)=@_;
+     if (!$udomain) { $udomain=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $uhome=&homeserver($uname,$udomain);
+     my %newstorehash;
+     foreach (keys %$storehash) {
+ 	my $key = $version.':'.&escape($symb).':'.$_;
+ 	$newstorehash{$key} = $storehash->{$_};
+     }
+     my $items='';
+     my %allitems = ();
+     foreach (keys %newstorehash) {
+ 	if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) {
+ 	    my $key = $1.':keys:'.$2;
+ 	    $allitems{$key} .= $3.':';
+ 	}
+ 	$items.=$_.'='.&freeze_escape($newstorehash{$_}).'&';
+     }
+     foreach (keys %allitems) {
+ 	$allitems{$_} =~ s/\:$//;
+ 	$items.= $_.'='.$allitems{$_}.'&';
+     }
+     $items=~s/\&$//;
+     return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
  }
  # ------------------------------------------------------ critical put interface
- Line 3026  sub cput {
+ Line 3166  sub cput {
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
     foreach (keys %$storehash) {
-        $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+        $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
     }
     $items=~s/\&$//;
     return &critical("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 3086  sub tmpdel {
+ Line 3226  sub tmpdel {
      return &reply("tmpdel:$token",$server);
  }
+ # -------------------------------------------------- portfolio access checking
+ sub portfolio_access {
+     my ($requrl) = @_;
+     my (undef,$udom,$unum,$file_name,$group) = &parse_portfolio_url($requrl);
+     my $result = &get_portfolio_access($udom,$unum,$file_name,$group);
+     if ($result eq 'ok') {
+        return 'F';
+     } elsif ($result =~ /^[^:]+:guest_/) {
+        return 'A';
+     }
+     return '';
+ }
+ sub get_portfolio_access {
+     my ($udom,$unum,$file_name,$group,$access_hash) = @_;
+     if (!ref($access_hash)) {
+ 	my $current_perms = &get_portfile_permissions($udom,$unum);
+ 	my %access_controls = &get_access_controls($current_perms,$group,
+ 						   $file_name);
+ 	$access_hash = $access_controls{$file_name};
+     }
+     my ($public,$guest,@domains,@users,@courses,@groups);
+     my $now = time;
+     if (ref($access_hash) eq 'HASH') {
+         foreach my $key (keys(%{$access_hash})) {
+             my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+             if ($start > $now) {
+                 next;
+             }
+             if ($end && $end<$now) {
+                 next;
+             }
+             if ($scope eq 'public') {
+                 $public = $key;
+                 last;
+             } elsif ($scope eq 'guest') {
+                 $guest = $key;
+             } elsif ($scope eq 'domains') {
+                 push(@domains,$key);
+             } elsif ($scope eq 'users') {
+                 push(@users,$key);
+             } elsif ($scope eq 'course') {
+                 push(@courses,$key);
+             } elsif ($scope eq 'group') {
+                 push(@groups,$key);
+             }
+         }
+         if ($public) {
+             return 'ok';
+         }
+         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+             if ($guest) {
+                 return $guest;
+             }
+         } else {
+             if (@domains > 0) {
+                 foreach my $domkey (@domains) {
+                     if (ref($access_hash->{$domkey}{'dom'}) eq 'ARRAY') {
+                         if (grep(/^\Q$env{'user.domain'}\E$/,@{$access_hash->{$domkey}{'dom'}})) {
+                             return 'ok';
+                         }
+                     }
+                 }
+             }
+             if (@users > 0) {
+                 foreach my $userkey (@users) {
+                     if (exists($access_hash->{$userkey}{'users'}{$env{'user.name'}.':'.$env{'user.domain'}})) {
+                         return 'ok';
+                     }
+                 }
+             }
+             my %roleshash;
+             my @courses_and_groups = @courses;
+             push(@courses_and_groups,@groups);
+             if (@courses_and_groups > 0) {
+                 my (%allgroups,%allroles);
+                 my ($start,$end,$role,$sec,$group);
+                 foreach my $envkey (%env) {
+                     if ($envkey =~ m-^user\.role\.(gr|cc|in|ta|ep|st)\./([^/]+)/([^/]+)/?([^/]*)$-) {
+                         my $cid = $2.'_'.$3;
+                         if ($1 eq 'gr') {
+                             $group = $4;
+                             $allgroups{$cid}{$group} = $env{$envkey};
+                         } else {
+                             if ($4 eq '') {
+                                 $sec = 'none';
+                             } else {
+                                 $sec = $4;
+                             }
+                             $allroles{$cid}{$1}{$sec} = $env{$envkey};
+                         }
+                     } elsif ($envkey =~ m-^user\.role\./cr/(\w+/\w+/\w*)./([^/]+)/([^/]+)/?([^/]*)$-) {
+                         my $cid = $2.'_'.$3;
+                         if ($4 eq '') {
+                             $sec = 'none';
+                         } else {
+                             $sec = $4;
+                         }
+                         $allroles{$cid}{$1}{$sec} = $env{$envkey};
+                     }
+                 }
+                 if (keys(%allroles) == 0) {
+                     return;
+                 }
+                 foreach my $key (@courses_and_groups) {
+                     my %content = %{$$access_hash{$key}};
+                     my $cnum = $content{'number'};
+                     my $cdom = $content{'domain'};
+                     my $cid = $cdom.'_'.$cnum;
+                     if (!exists($allroles{$cid})) {
+                         next;
+                     }
+                     foreach my $role_id (keys(%{$content{'roles'}})) {
+                         my @sections = @{$content{'roles'}{$role_id}{'section'}};
+                         my @groups = @{$content{'roles'}{$role_id}{'group'}};
+                         my @status = @{$content{'roles'}{$role_id}{'access'}};
+                         my @roles = @{$content{'roles'}{$role_id}{'role'}};
+                         foreach my $role (keys(%{$allroles{$cid}})) {
+                             if ((grep/^all$/,@roles) || (grep/^\Q$role\E$/,@roles)) {
+                                 foreach my $sec (keys(%{$allroles{$cid}{$role}})) {
+                                     if (&course_group_datechecker($allroles{$cid}{$role}{$sec},$now,\@status) eq 'ok') {
+                                         if (grep/^all$/,@sections) {
+                                             return 'ok';
+                                         } else {
+                                             if (grep/^$sec$/,@sections) {
+                                                 return 'ok';
+                                             }
+                                         }
+                                     }
+                                 }
+                                 if (keys(%{$allgroups{$cid}}) == 0) {
+                                     if (grep/^none$/,@groups) {
+                                         return 'ok';
+                                     }
+                                 } else {
+                                     if (grep/^all$/,@groups) {
+                                         return 'ok';
+                                     }
+                                     foreach my $group (keys(%{$allgroups{$cid}})) {
+                                         if (grep/^$group$/,@groups) {
+                                             return 'ok';
+                                         }
+                                     }
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+             if ($guest) {
+                 return $guest;
+             }
+         }
+     }
+     return;
+ }
+ sub course_group_datechecker {
+     my ($dates,$now,$status) = @_;
+     my ($start,$end) = split(/\./,$dates);
+     if (!$start && !$end) {
+         return 'ok';
+     }
+     if (grep/^active$/,@{$status}) {
+         if (((!$start) || ($start && $start <= $now)) && ((!$end) || ($end && $end >= $now))) {
+             return 'ok';
+         }
+     }
+     if (grep/^previous$/,@{$status}) {
+         if ($end > $now ) {
+             return 'ok';
+         }
+     }
+     if (grep/^future$/,@{$status}) {
+         if ($start > $now) {
+             return 'ok';
+         }
+     }
+     return;
+ }
+ sub parse_portfolio_url {
+     my ($url) = @_;
+     my ($type,$udom,$unum,$group,$file_name);
+     if ($url =~  m-^/*uploaded/([^/]+)/([^/]+)/portfolio(/.+)$-) {
+ 	$type = 1;
+         $udom = $1;
+         $unum = $2;
+         $file_name = $3;
+     } elsif ($url =~ m-^/*uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$-) {
+ 	$type = 2;
+         $udom = $1;
+         $unum = $2;
+         $group = $3;
+         $file_name = $3.'/'.$4;
+     }
+     if (wantarray) {
+ 	return ($type,$udom,$unum,$file_name,$group);
+     }
+     return $type;
+ }
+ sub is_portfolio_url {
+     my ($url) = @_;
+     return scalar(&parse_portfolio_url($url));
+ }
  # ---------------------------------------------- Custom access rule evaluation
  sub customaccess {
- Line 3131  sub allowed {
+ Line 3483  sub allowed {
      if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }
  # Free bre access to adm and meta resources
-     if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|))
+     if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$}))
- 	 || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
+ 	 || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) ))
+ 	&& ($priv eq 'bre')) {
  	return 'F';
      }
- Line 3143  sub allowed {
+ Line 3496  sub allowed {
          return 'F';
      }
- # bre access to group if user has rgf priv for this group and course.
+ # bre access to group portfolio for rgf priv in group, or mdg or vcg in course.
      if (($space=~/^(uploaded|editupload)$/) && ($dir[0] eq 'groups')
           && ($dir[2] eq 'portfolio') && ($priv eq 'bre')) {
          if (exists($env{'request.course.id'})) {
- Line 3155  sub allowed {
+ Line 3508  sub allowed {
                  if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid
                      .'/'.$dir[1]} =~/rgf\&([^\:]*)/) {
                      return $1;
+                 } else {
+                     if ($env{'request.course.sec'}) {
+                         $courseprivid.='/'.$env{'request.course.sec'};
+                     }
+                     if ($env{'user.priv.'.$env{'request.role'}.'./'.
+                         $courseprivid} =~/(mdg|vcg)\&([^\:]*)/) {
+                         return $2;
+                     }
                  }
              }
          }
- Line 3223  sub allowed {
+ Line 3584  sub allowed {
         $thisallowed.=$1;
      }
- # Group: uri itself is a group
-     my $groupuri=$uri;
-     $groupuri=~s/^([^\/])/\/$1/;
-     if ($env{'user.priv.'.$env{'request.role'}.'.'.$groupuri}
-        =~/\Q$priv\E\&([^\:]*)/) {
-        $thisallowed.=$1;
-     }
  # URI is an uploaded document for this course, default permissions don't matter
  # not allowing 'edit' access (editupload) to uploaded course docs
      if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) {
- Line 3257  sub allowed {
+ Line 3610  sub allowed {
          }
      }
+     if ($priv eq 'bre'
+ 	&& $thisallowed ne 'F'
+ 	&& $thisallowed ne '2'
+ 	&& &is_portfolio_url($uri)) {
+ 	$thisallowed = &portfolio_access($uri);
+     }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
- Line 3374  sub allowed {
+ Line 3734  sub allowed {
  	       my ($cdom,$cnum,$csec)=split(/\//,$courseid);
                 my $prefix='course.'.$cdom.'_'.$cnum.'.';
                 if ((time-$env{$prefix.'last_cache'})>$expiretime) {
- 		   &coursedescription($courseid);
+ 		   &coursedescription($courseid,{'freshen_cache' => 1});
                 }
                 if (($env{$prefix.'res.'.$uri.'.lock.sections'}=~/\,\Q$csec\E\,/)
                  || ($env{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
- Line 3407  sub allowed {
+ Line 3767  sub allowed {
  #
      unless ($env{'request.course.id'}) {
-        return '1';
+ 	if ($thisallowed eq 'A') {
+ 	    return 'A';
+ 	} else {
+ 	    return '1';
+ 	}
      }
  #
- Line 3470  sub allowed {
+ Line 3834  sub allowed {
        }
     }
+     if ($thisallowed eq 'A') {
+ 	return 'A';
+     }
     return 'F';
  }
- Line 3716  sub auto_run {
+ Line 4083  sub auto_run {
      my $response = &reply('autorun:'.$cdom,$homeserver);
      return $response;
  }
  sub auto_get_sections {
      my ($cnum,$cdom,$inst_coursecode) = @_;
      my $homeserver = &homeserver($cnum,$cdom);
- Line 3727  sub auto_get_sections {
+ Line 4094  sub auto_get_sections {
      }
      return @secs;
  }
  sub auto_new_course {
      my ($cnum,$cdom,$inst_course_id,$owner) = @_;
      my $homeserver = &homeserver($cnum,$cdom);
      my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver));
      return $response;
  }
  sub auto_validate_courseID {
      my ($cnum,$cdom,$inst_course_id) = @_;
      my $homeserver = &homeserver($cnum,$cdom);
      my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver));
      return $response;
  }
  sub auto_create_password {
      my ($cnum,$cdom,$authparam) = @_;
      my $homeserver = &homeserver($cnum,$cdom);
- Line 3835  sub auto_photoupdate {
+ Line 4202  sub auto_photoupdate {
  sub auto_instcode_format {
      my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_;
      my $courses = '';
-     my $homeserver;
+     my @homeservers;
      if ($caller eq 'global') {
          foreach my $tryserver (keys %libserv) {
              if ($hostdom{$tryserver} eq $codedom) {
-                 $homeserver = $tryserver;
+                 if (!grep/^\Q$tryserver\E$/,@homeservers) {
-                 last;
+                     push(@homeservers,$tryserver);
+                 }
              }
          }
-         if (($env{'user.name'}) && ($env{'user.domain'} eq $codedom)) {
-             $homeserver = &homeserver($env{'user.name'},$codedom);
-         }
      } else {
-         $homeserver = &homeserver($caller,$codedom);
+         push(@homeservers,&homeserver($caller,$codedom));
      }
      foreach (keys %{$instcodes}) {
          $courses .= &escape($_).'='.&escape($$instcodes{$_}).'&';
      }
      chop($courses);
-     my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver);
+     my $ok_response = 0;
-     unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+     my $response;
-         my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response;
+     while (@homeservers > 0 && $ok_response == 0) {
-         %{$codes} = &str2hash($codes_str);
+         my $server = shift(@homeservers);
-         @{$codetitles} = &str2array($codetitles_str);
+         $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server);
-         %{$cat_titles} = &str2hash($cat_titles_str);
+         if ($response !~ /(con_lost|error|no_such_host|refused)/) {
-         %{$cat_order} = &str2hash($cat_order_str);
+             my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) =
+                                                             split/:/,$response;
+             %{$codes} = (%{$codes},&str2hash($codes_str));
+             push(@{$codetitles},&str2array($codetitles_str));
+             %{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str));
+             %{$cat_order} = (%{$cat_order},&str2hash($cat_order_str));
+             $ok_response = 1;
+         }
+     }
+     if ($ok_response) {
          return 'ok';
+     } else {
+         return $response;
      }
+ }
+ sub auto_validate_class_sec {
+     my ($cdom,$cnum,$owner,$inst_class) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response=&reply('autovalidateclass_sec:'.$inst_class.':'.
+                         &escape($owner).':'.$cdom,$homeserver);
      return $response;
  }
- Line 3886  sub modify_group_roles {
+ Line 4269  sub modify_group_roles {
      if ($result eq 'ok') {
          &devalidate_getgroups_cache($udom,$uname,$cdom,$cnum);
      }
      return $result;
  }
- Line 3920  sub get_group_membership {
+ Line 4302  sub get_group_membership {
  sub get_users_groups {
      my ($udom,$uname,$courseid) = @_;
+     my @usersgroups;
      my $cachetime=1800;
      $courseid=~s/\_/\//g;
      $courseid=~s/^(\w)/\/$1/;
      my $hashid="$udom:$uname:$courseid";
-     my ($result,$cached)=&is_cached_new('getgroups',$hashid);
+     my ($grouplist,$cached)=&is_cached_new('getgroups',$hashid);
-     if (defined($cached)) { return $result; }
+     if (defined($cached)) {
+         @usersgroups = split(/:/,$grouplist);
-     my %roleshash = &dump('roles',$udom,$uname,$courseid);
+     } else {
-     my ($tmp) = keys(%roleshash);
+         $grouplist = '';
-     if ($tmp=~/^error:/) {
+         my %roleshash = &dump('roles',$udom,$uname,$courseid);
-         &logthis('Error retrieving roles: '.$tmp.' for '.$uname.':'.$udom);
+         my ($tmp) = keys(%roleshash);
-         return '';
+         if ($tmp=~/^error:/) {
-     } else {
+             &logthis('Error retrieving roles: '.$tmp.' for '.$uname.':'.$udom);
-         my $grouplist;
+         } else {
-         foreach my $key (keys %roleshash) {
+             my $access_end = $env{'course.'.$courseid.
-             if ($key =~ /^\Q$courseid\E\/(\w+)\_gr$/) {
+                                   '.default_enrollment_end_date'};
-                 unless ($roleshash{$key} =~ /_1_1$/) {   # deleted membership
+             my $now = time;
-                     $grouplist .= $1.':';
+             foreach my $key (keys(%roleshash)) {
+                 if ($key =~ /^\Q$courseid\E\/(\w+)\_gr$/) {
+                     my $group = $1;
+                     if ($roleshash{$key} =~ /_(\d+)_(\d+)$/) {
+                         my $start = $2;
+                         my $end = $1;
+                         if ($start == -1) { next; } # deleted from group
+                         if (($start!=0) && ($start>$now)) { next; }
+                         if (($end!=0) && ($end<$now)) {
+                             if ($access_end && $access_end < $now) {
+                                 if ($access_end - $end < 86400) {
+                                     push(@usersgroups,$group);
+                                 }
+                             }
+                             next;
+                         }
+                         push(@usersgroups,$group);
+                     }
                  }
              }
+             @usersgroups = &sort_course_groups($courseid,@usersgroups);
+             $grouplist = join(':',@usersgroups);
+             &do_cache_new('getgroups',$hashid,$grouplist,$cachetime);
          }
-         $grouplist =~ s/:$//;
-         return &do_cache_new('getgroups',$hashid,$grouplist,$cachetime);
      }
+     return @usersgroups;
  }
  sub devalidate_getgroups_cache {
- Line 3959  sub devalidate_getgroups_cache {
+ Line 4361  sub devalidate_getgroups_cache {
  # ------------------------------------------------------------------ Plain Text
  sub plaintext {
-     my $short=shift;
+     my ($short,$type,$cid) = @_;
-     return &Apache::lonlocal::mt($prp{$short});
+     if ($short =~ /^cr/) {
+ 	return (split('/',$short))[-1];
+     }
+     if (!defined($cid)) {
+         $cid = $env{'request.course.id'};
+     }
+     if (defined($cid) && defined($env{'course.'.$cid.'.'.$short.'.plaintext'})) {
+         return &Apache::lonlocal::mt($env{'course.'.$cid.'.'.$short.
+                                           '.plaintext'});
+     }
+     my %rolenames = (
+                       Course => 'std',
+                       Group => 'alt1',
+                     );
+     if (defined($type) &&
+          defined($rolenames{$type}) &&
+          defined($prp{$short}{$rolenames{$type}})) {
+         return &Apache::lonlocal::mt($prp{$short}{$rolenames{$type}});
+     } else {
+         return &Apache::lonlocal::mt($prp{$short}{'std'});
+     }
  }
  # ----------------------------------------------------------------- Assign Role
- Line 4009  sub assignrole {
+ Line 4431  sub assignrole {
             $command.='_0_'.$start;
          }
      }
+     my $origstart = $start;
+     my $origend = $end;
  # actually delete
      if ($deleteflag) {
  	if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) {
- Line 4026  sub assignrole {
+ Line 4450  sub assignrole {
  # log new user role if status is ok
      if ($answer eq 'ok') {
  	&userrolelog($role,$uname,$udom,$url,$start,$end);
+ # for course roles, perform group memberships changes triggered by role change.
+         unless ($role =~ /^gr/) {
+             &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
+                                              $origstart);
+         }
      }
      return $answer;
  }
- Line 4282  sub writecoursepref {
+ Line 4711  sub writecoursepref {
  # ---------------------------------------------------------- Make/modify course
  sub createcourse {
-     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner)=@_;
+     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,
+         $course_owner,$crstype)=@_;
      $url=&declutter($url);
      my $cid='';
      unless (&allowed('ccc',$udom)) {
- Line 4319  sub createcourse {
+ Line 4749  sub createcourse {
  # ----------------------------------------------------------------- Course made
  # log existence
      &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
-                  ':'.&escape($inst_code).':'.&escape($course_owner),$uhome);
+                  ':'.&escape($inst_code).':'.&escape($course_owner).':'.
+                   &escape($crstype),$uhome);
      &flushcourselogs();
  # set toplevel url
      my $topurl=$url;
- Line 4389  sub is_locked {
+ Line 4820  sub is_locked {
  		      $env{'user.domain'},$env{'user.name'});
      my ($tmp)=keys(%locked);
      if ($tmp=~/^error:/) { undef(%locked); }
      if (ref($locked{$file_name}) eq 'ARRAY') {
-         $is_locked = 'true';
+         $is_locked = 'false';
+         foreach my $entry (@{$locked{$file_name}}) {
+            if (ref($entry) eq 'ARRAY') {
+                $is_locked = 'true';
+                last;
+            }
+        }
      } else {
          $is_locked = 'false';
      }
  }
+ sub declutter_portfile {
+     my ($file) = @_;
+     &logthis("got $file");
+     $file =~ s-^(/portfolio/|portfolio/)-/-;
+     &logthis("ret $file");
+     return $file;
+ }
  # ------------------------------------------------------------- Mark as Read Only
  sub mark_as_readonly {
- Line 4405  sub mark_as_readonly {
+ Line 4850  sub mark_as_readonly {
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
      foreach my $file (@{$files}) {
+ 	$file = &declutter_portfile($file);
          push(@{$current_permissions{$file}},$what);
      }
      &put('file_permissions',\%current_permissions,$domain,$user);
- Line 4480  sub files_not_in_path {
+ Line 4926  sub files_not_in_path {
      return (@return_files);
  }
- #--------------------------------------------------------------Get Marked as Read Only
+ #----------------------------------------------Get portfolio file permissions
- sub get_marked_as_readonly {
+ sub get_portfile_permissions {
-     my ($domain,$user,$what) = @_;
+     my ($domain,$user) = @_;
      my %current_permissions = &dump('file_permissions',$domain,$user);
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
+     return \%current_permissions;
+ }
+ #---------------------------------------------Get portfolio file access controls
+ sub get_access_controls {
+     my ($current_permissions,$group,$file) = @_;
+     my %access;
+     my $real_file = $file;
+     $file =~ s/\.meta$//;
+     if (defined($file)) {
+         if (ref($$current_permissions{$file."\0".'accesscontrol'}) eq 'HASH') {
+             foreach my $control (keys(%{$$current_permissions{$file."\0".'accesscontrol'}})) {
+                 $access{$real_file}{$control} = $$current_permissions{$file."\0".$control};
+             }
+         }
+     } else {
+         foreach my $key (keys(%{$current_permissions})) {
+             if ($key =~ /\0accesscontrol$/) {
+                 if (defined($group)) {
+                     if ($key !~ m-^\Q$group\E/-) {
+                         next;
+                     }
+                 }
+                 my ($fullpath) = split(/\0/,$key);
+                 if (ref($$current_permissions{$key}) eq 'HASH') {
+                     foreach my $control (keys(%{$$current_permissions{$key}})) {
+                         $access{$fullpath}{$control}=$$current_permissions{$fullpath."\0".$control};
+                     }
+                 }
+             }
+         }
+     }
+     return %access;
+ }
+ sub modify_access_controls {
+     my ($file_name,$changes,$domain,$user)=@_;
+     my ($outcome,$deloutcome);
+     my %store_permissions;
+     my %new_values;
+     my %new_control;
+     my %translation;
+     my @deletions = ();
+     my $now = time;
+     if (exists($$changes{'activate'})) {
+         if (ref($$changes{'activate'}) eq 'HASH') {
+             my @newitems = sort(keys(%{$$changes{'activate'}}));
+             my $numnew = scalar(@newitems);
+             for (my $i=0; $i<$numnew; $i++) {
+                 my $newkey = $newitems[$i];
+                 my $newid = &Apache::loncommon::get_cgi_id();
+                 $newkey =~ s/^(\d+)/$newid/;
+                 $translation{$1} = $newid;
+                 $new_values{$file_name."\0".$newkey} =
+                                           $$changes{'activate'}{$newitems[$i]};
+                 $new_control{$newkey} = $now;
+             }
+         }
+     }
+     my %todelete;
+     my %changed_items;
+     foreach my $action ('delete','update') {
+         if (exists($$changes{$action})) {
+             if (ref($$changes{$action}) eq 'HASH') {
+                 foreach my $key (keys(%{$$changes{$action}})) {
+                     my ($itemnum) = ($key =~ /^([^:]+):/);
+                     if ($action eq 'delete') {
+                         $todelete{$itemnum} = 1;
+                     } else {
+                         $changed_items{$itemnum} = $key;
+                     }
+                 }
+             }
+         }
+     }
+     # get lock on access controls for file.
+     my $lockhash = {
+                   $file_name."\0".'locked_access_records' => $env{'user.name'}.
+                                                        ':'.$env{'user.domain'},
+                    };
+     my $tries = 0;
+     my $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
+     while (($gotlock ne 'ok') && $tries <3) {
+         $tries ++;
+         sleep 1;
+         $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
+     }
+     if ($gotlock eq 'ok') {
+         my %curr_permissions = &dump('file_permissions',$domain,$user,$file_name);
+         my ($tmp)=keys(%curr_permissions);
+         if ($tmp=~/^error:/) { undef(%curr_permissions); }
+         if (exists($curr_permissions{$file_name."\0".'accesscontrol'})) {
+             my $curr_controls = $curr_permissions{$file_name."\0".'accesscontrol'};
+             if (ref($curr_controls) eq 'HASH') {
+                 foreach my $control_item (keys(%{$curr_controls})) {
+                     my ($itemnum) = ($control_item =~ /^([^:]+):/);
+                     if (defined($todelete{$itemnum})) {
+                         push(@deletions,$file_name."\0".$control_item);
+                     } else {
+                         if (defined($changed_items{$itemnum})) {
+                             $new_control{$changed_items{$itemnum}} = $now;
+                             push(@deletions,$file_name."\0".$control_item);
+                             $new_values{$file_name."\0".$changed_items{$itemnum}} = $$changes{'update'}{$changed_items{$itemnum}};
+                         } else {
+                             $new_control{$control_item} = $$curr_controls{$control_item};
+                         }
+                     }
+                 }
+             }
+         }
+         $deloutcome = &del('file_permissions',\@deletions,$domain,$user);
+         $new_values{$file_name."\0".'accesscontrol'} = \%new_control;
+         $outcome = &put('file_permissions',\%new_values,$domain,$user);
+         #  remove lock
+         my @del_lock = ($file_name."\0".'locked_access_records');
+         my $dellockoutcome = &del('file_permissions',\@del_lock,$domain,$user);
+     } else {
+         $outcome = "error: could not obtain lockfile\n";
+     }
+     return ($outcome,$deloutcome,\%new_values,\%translation);
+ }
+ #------------------------------------------------------Get Marked as Read Only
+ sub get_marked_as_readonly {
+     my ($domain,$user,$what,$group) = @_;
+     my $current_permissions = &get_portfile_permissions($domain,$user);
      my @readonly_files;
      my $cmp1=$what;
      if (ref($what)) { $cmp1=join('',@{$what}) };
-     while (my ($file_name,$value) = each(%current_permissions)) {
+     while (my ($file_name,$value) = each(%{$current_permissions})) {
+         if (defined($group)) {
+             if ($file_name !~ m-^\Q$group\E/-) {
+                 next;
+             }
+         }
          if (ref($value) eq "ARRAY"){
              foreach my $stored_what (@{$value}) {
                  my $cmp2=$stored_what;
-                 if (ref($stored_what)) { $cmp2=join('',@{$stored_what}) };
+                 if (ref($stored_what) eq 'ARRAY') {
+                     $cmp2=join('',@{$stored_what});
+                 }
                  if ($cmp1 eq $cmp2) {
                      push(@readonly_files, $file_name);
+                     last;
                  } elsif (!defined($what)) {
                      push(@readonly_files, $file_name);
+                     last;
                  }
              }
          }
      }
      return @readonly_files;
  }
  #-----------------------------------------------------------Get Marked as Read Only Hash
  sub get_marked_as_readonly_hash {
-     my ($domain,$user,$what) = @_;
+     my ($current_permissions,$group,$what) = @_;
-     my %current_permissions = &dump('file_permissions',$domain,$user);
-     my ($tmp)=keys(%current_permissions);
-     if ($tmp=~/^error:/) { undef(%current_permissions); }
      my %readonly_files;
-     while (my ($file_name,$value) = each(%current_permissions)) {
+     while (my ($file_name,$value) = each(%{$current_permissions})) {
+         if (defined($group)) {
+             if ($file_name !~ m-^\Q$group\E/-) {
+                 next;
+             }
+         }
          if (ref($value) eq "ARRAY"){
              foreach my $stored_what (@{$value}) {
-                 if ($stored_what eq $what) {
+                 if (ref($stored_what) eq 'ARRAY') {
-                     $readonly_files{$file_name} = 'locked';
+                     foreach my $lock_descriptor(@{$stored_what}) {
-                 } elsif (!defined($what)) {
+                         if ($lock_descriptor eq 'graded') {
-                     $readonly_files{$file_name} = 'locked';
+                             $readonly_files{$file_name} = 'graded';
-                 }
+                         } elsif ($lock_descriptor eq 'handback') {
+                             $readonly_files{$file_name} = 'handback';
+                         } else {
+                             if (!exists($readonly_files{$file_name})) {
+                                 $readonly_files{$file_name} = 'locked';
+                             }
+                         }
+                     }
+                 }
              }
          }
      }
- Line 4533  sub get_marked_as_readonly_hash {
+ Line 5125  sub get_marked_as_readonly_hash {
  sub unmark_as_readonly {
      # unmarks $file_name (if $file_name is defined), or all files locked by $what
      # for portfolio submissions, $what contains [$symb,$crsid]
-     my ($domain,$user,$what,$file_name) = @_;
+     my ($domain,$user,$what,$file_name,$group) = @_;
+     $file_name = &declutter_portfile($file_name);
      my $symb_crs = $what;
      if (ref($what)) { $symb_crs=join('',@$what); }
-     my %current_permissions = &dump('file_permissions',$domain,$user);
+     my %current_permissions = &dump('file_permissions',$domain,$user,$group);
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
-     my @readonly_files = &get_marked_as_readonly($domain,$user,$what);
+     my @readonly_files = &get_marked_as_readonly($domain,$user,$what,$group);
      foreach my $file (@readonly_files) {
- 	if (defined($file_name) && ($file_name ne $file)) { next; }
+ 	my $clean_file = &declutter_portfile($file);
+ 	if (defined($file_name) && ($file_name ne $clean_file)) { next; }
  	my $current_locks = $current_permissions{$file};
          my @new_locks;
          my @del_keys;
          if (ref($current_locks) eq "ARRAY"){
              foreach my $locker (@{$current_locks}) {
                  my $compare=$locker;
-                 if (ref($locker)) { $compare=join('',@{$locker}) };
+                 if (ref($locker) eq 'ARRAY') {
-                 if ($compare ne $symb_crs) {
+                     $compare=join('',@{$locker});
-                     push(@new_locks, $locker);
+                     if ($compare ne $symb_crs) {
+                         push(@new_locks, $locker);
+                     }
                  }
              }
              if (scalar(@new_locks) > 0) {
- Line 4690  sub GetFileTimestamp {
+ Line 5286  sub GetFileTimestamp {
  sub stat_file {
      my ($uri) = @_;
-     $uri = &clutter($uri);
+     $uri = &clutter_with_no_wrapper($uri);
      my ($udom,$uname,$file,$dir);
      if ($uri =~ m-^/(uploaded|editupload)/-) {
  	($udom,$uname,$file) =
  	    ($uri =~ m-/(?:uploaded|editupload)/?([^/]*)/?([^/]*)/?(.*)-);
  	$file = 'userfiles/'.$file;
- 	$dir = &Apache::loncommon::propath($udom,$uname);
+ 	$dir = &propath($udom,$uname);
      }
      if ($uri =~ m-^/res/-) {
  	($udom,$uname) =
- Line 4711  sub stat_file {
+ Line 5308  sub stat_file {
      my ($result) = &dirlist($file,$udom,$uname,$dir);
      my @stats = split('&', $result);
      if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
  	shift(@stats); #filename is first
  	return @stats;
- Line 4806  sub devalidatecourseresdata {
+ Line 5404  sub devalidatecourseresdata {
      &devalidate_cache_new('courseres',$hashid);
  }
  # --------------------------------------------------- Course Resourcedata Query
  sub get_courseresdata {
- Line 4910  sub EXT_cache_set {
+ Line 5509  sub EXT_cache_set {
  # --------------------------------------------------------- Value of a Variable
  sub EXT {
-     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
+     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
      unless ($varname) { return ''; }
      #get real user name/domain, courseid and symb
      my $courseid;
- Line 4944  sub EXT {
+ Line 5543  sub EXT {
  	    if ( (defined($Apache::lonhomework::parsing_a_problem)
  		  || defined($Apache::lonhomework::parsing_a_task))
  		 &&
  		 ($symbparm eq &symbread()) ) {
- 		return $Apache::lonhomework::history{$qualifierrest};
+ 		# if we are in the middle of processing the resource the
+ 		# get the value we are planning on committing
+                 if (defined($Apache::lonhomework::results{$qualifierrest})) {
+                     return $Apache::lonhomework::results{$qualifierrest};
+                 } else {
+                     return $Apache::lonhomework::history{$qualifierrest};
+                 }
  	    } else {
  		my %restored;
  		if ($publicuser || $env{'request.state'} eq 'construct') {
- Line 5048  sub EXT {
+ Line 5653  sub EXT {
  # ----------------------------------------------------- Cascading lookup scheme
  	    my $symbp=$symbparm;
- 	    my $mapp=(&decode_symb($symbp))[0];
+ 	    my $mapp=&deversion((&decode_symb($symbp))[0]);
  	    my $symbparm=$symbp.'.'.$spacequalifierrest;
  	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
- Line 5056  sub EXT {
+ Line 5661  sub EXT {
  	    if (($env{'user.name'} eq $uname) &&
  		($env{'user.domain'} eq $udom)) {
  		$section=$env{'request.course.sec'};
-                 @groups=&sort_course_groups($env{'request.course.groups'},$courseid);
+                 @groups = split(/:/,$env{'request.course.groups'});
-                 if (@groups > 0) {
+                 @groups=&sort_course_groups($courseid,@groups);
-                     @groups = sort(@groups);
-                 }
  	    } else {
  		if (! defined($usection)) {
  		    $section=&getsection($udom,$uname,$courseid);
  		} else {
  		    $section = $usection;
  		}
-                 my $grouplist = &get_users_groups($udom,$uname,$courseid);
+                 @groups = &get_users_groups($udom,$uname,$courseid);
-                 if ($grouplist) {
-                     @groups=&sort_course_groups($grouplist,$courseid);
-                 }
  	    }
  	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
- Line 5157  sub EXT {
+ Line 5757  sub EXT {
  	if (($uname eq $env{'user.name'})&&($udom eq $env{'user.domain'})) {
  	    return $env{'environment.'.$spacequalifierrest};
  	} else {
+ 	    if ($uname eq 'anonymous' && $udom eq '') {
+ 		return '';
+ 	    }
  	    my %returnhash=&userenvironment($udom,$uname,
  					    $spacequalifierrest);
  	    return $returnhash{$spacequalifierrest};
- Line 5193  sub check_group_parms {
+ Line 5796  sub check_group_parms {
  }
  sub sort_course_groups { # Sort groups based on defined rankings. Default is sort().
-     my ($grouplist,$courseid) = @_;
+     my ($courseid,@groups) = @_;
-     my @groups = split/:/,$grouplist;
+     @groups = sort(@groups);
-     if (@groups > 1) {
-         @groups = sort(@groups);
-     }
      return @groups;
  }
  sub packages_tab_default {
      my ($uri,$varname)=@_;
      my (undef,$part,$name)=split(/\./,$varname);
-     my $packages=&metadata($uri,'packages');
-     foreach my $package (split(/,/,$packages)) {
+     my (@extension,@specifics,$do_default);
+     foreach my $package (split(/,/,&metadata($uri,'packages'))) {
  	my ($pack_type,$pack_part)=split(/_/,$package,2);
+ 	if ($pack_type eq 'default') {
+ 	    $do_default=1;
+ 	} elsif ($pack_type eq 'extension') {
+ 	    push(@extension,[$package,$pack_type,$pack_part]);
+ 	} else {
+ 	    push(@specifics,[$package,$pack_type,$pack_part]);
+ 	}
+     }
+     # first look for a package that matches the requested part id
+     foreach my $package (@specifics) {
+ 	my (undef,$pack_type,$pack_part)=@{$package};
+ 	next if ($pack_part ne $part);
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
+ 	    return $packagetab{"$pack_type&$name&default"};
+ 	}
+     }
+     # look for any possible matching non extension_ package
+     foreach my $package (@specifics) {
+ 	my (undef,$pack_type,$pack_part)=@{$package};
  	if (defined($packagetab{"$pack_type&$name&default"})) {
  	    return $packagetab{"$pack_type&$name&default"};
  	}
- Line 5215  sub packages_tab_default {
+ Line 5835  sub packages_tab_default {
  	    return $packagetab{$pack_type."_".$pack_part."&$name&default"};
  	}
      }
+     # look for any posible extension_ match
+     foreach my $package (@extension) {
+ 	my ($package,$pack_type)=@{$package};
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
+ 	    return $packagetab{"$pack_type&$name&default"};
+ 	}
+ 	if (defined($packagetab{$package."&$name&default"})) {
+ 	    return $packagetab{$package."&$name&default"};
+ 	}
+     }
+     # look for a global default setting
+     if ($do_default && defined($packagetab{"default&$name&default"})) {
+ 	return $packagetab{"default&$name&default"};
+     }
      return undef;
  }
- Line 5276  sub metadata {
+ Line 5910  sub metadata {
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
  	my $metastring;
- 	if ($uri !~ m -^(uploaded|editupload)/-) {
+ 	if ($uri !~ m -^(editupload)/-) {
  	    my $file=&filelocation('',&clutter($filename));
  	    #push(@{$metaentry{$uri.'.file'}},$file);
  	    $metastring=&getfile($file);
- Line 5300  sub metadata {
+ Line 5934  sub metadata {
  		    } else {
  			$metaentry{':packages'}=$package.$keyroot;
  		    }
- 		    foreach (sort keys %packagetab) {
+ 		    foreach my $pack_entry (keys(%packagetab)) {
  			my $part=$keyroot;
  			$part=~s/^\_//;
- 			if ($_=~/^\Q$package\E\&/ ||
+ 			if ($pack_entry=~/^\Q$package\E\&/ ||
- 			    $_=~/^\Q$package\E_0\&/) {
+ 			    $pack_entry=~/^\Q$package\E_0\&/) {
- 			    my ($pack,$name,$subp)=split(/\&/,$_);
+ 			    my ($pack,$name,$subp)=split(/\&/,$pack_entry);
  			    # ignore package.tab specified default values
                              # here &package_tab_default() will fetch those
  			    if ($subp eq 'default') { next; }
- 			    my $value=$packagetab{$_};
+ 			    my $value=$packagetab{$pack_entry};
  			    my $unikey;
  			    if ($pack =~ /_0$/) {
  				$unikey='parameter_0_'.$name;
- Line 5357  sub metadata {
+ Line 5991  sub metadata {
  			    my $dir=$filename;
  			    $dir=~s|[^/]*$||;
  			    $location=&filelocation($dir,$location);
- 			    foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 			    my $metadata =
- 							       $location,$unikey,
+ 				&metadata($uri,'keys', $location,$unikey,
- 							       $depthcount+1)))) {
+ 					  $depthcount+1);
- 				$metaentry{':'.$_}=$metaentry{':'.$_};
+ 			    foreach my $meta (split(',',$metadata)) {
- 				$metathesekeys{$_}=1;
+ 				$metaentry{':'.$meta}=$metaentry{':'.$meta};
+ 				$metathesekeys{$meta}=1;
  			    }
  			}
  		    } else {
- Line 5370  sub metadata {
+ Line 6005  sub metadata {
  			    $unikey.='_'.$token->[2]->{'name'};
  			}
  			$metathesekeys{$unikey}=1;
- 			foreach (@{$token->[3]}) {
+ 			foreach my $param (@{$token->[3]}) {
- 			    $metaentry{':'.$unikey.'.'.$_}=$token->[2]->{$_};
+ 			    $metaentry{':'.$unikey.'.'.$param} =
+ 				$token->[2]->{$param};
  			}
  			my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
  			my $default=$metaentry{':'.$unikey.'.default'};
- Line 5392  sub metadata {
+ Line 6028  sub metadata {
  	    }
  	}
  	my ($extension) = ($uri =~ /\.(\w+)$/);
- 	foreach my $key (sort(keys(%packagetab))) {
+ 	foreach my $key (keys(%packagetab)) {
  	    #no specific packages #how's our extension
  	    if ($key!~/^extension_\Q$extension\E&/) { next; }
  	    &metadata_create_package_def($uri,$key,'extension_'.$extension,
  					 \%metathesekeys);
  	}
  	if (!exists($metaentry{':packages'})) {
- 	    foreach my $key (sort(keys(%packagetab))) {
+ 	    foreach my $key (keys(%packagetab)) {
  		#no specific packages well let's get default then
  		if ($key!~/^default&/) { next; }
  		&metadata_create_package_def($uri,$key,'default',
- Line 5417  sub metadata {
+ Line 6053  sub metadata {
  		my $dir=$filename;
  		$dir=~s|[^/]*$||;
  		$location=&filelocation($dir,$location);
- 		foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 		my $rights_metadata =
- 						   $location,'_rights',
+ 		    &metadata($uri,'keys',$location,'_rights',
- 						   $depthcount+1)))) {
+ 			      $depthcount+1);
- 		    #$metaentry{':'.$_}=$metacache{$uri}->{':'.$_};
+ 		foreach my $rights (split(',',$rights_metadata)) {
- 		    $metathesekeys{$_}=1;
+ 		    #$metaentry{':'.$rights}=$metacache{$uri}->{':'.$rights};
+ 		    $metathesekeys{$rights}=1;
  		}
  	    }
  	}
- 	$metaentry{':keys'}=join(',',keys %metathesekeys);
+ 	# uniqifiy package listing
+ 	my %seen;
+ 	my @uniq_packages =
+ 	    grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'}));
+ 	$metaentry{':packages'} = join(',',@uniq_packages);
+ 	$metaentry{':keys'} = join(',',keys(%metathesekeys));
  	&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
  	$metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
  	&do_cache_new('meta',$uri,\%metaentry,60*60);
- Line 5461  sub metadata_create_package_def {
+ Line 6104  sub metadata_create_package_def {
  sub metadata_generate_part0 {
      my ($metadata,$metacache,$uri) = @_;
      my %allnames;
-     foreach my $metakey (sort keys %$metadata) {
+     foreach my $metakey (keys(%$metadata)) {
  	if ($metakey=~/^parameter\_(.*)/) {
  	  my $part=$$metacache{':'.$metakey.'.part'};
  	  my $name=$$metacache{':'.$metakey.'.name'};
- Line 5486  sub metadata_generate_part0 {
+ Line 6129  sub metadata_generate_part0 {
      }
  }
+ # ------------------------------------------------------ Devalidate title cache
+ sub devalidate_title_cache {
+     my ($url)=@_;
+     if (!$env{'request.course.id'}) { return; }
+     my $symb=&symbread($url);
+     if (!$symb) { return; }
+     my $key=$env{'request.course.id'}."\0".$symb;
+     &devalidate_cache_new('title',$key);
+ }
  # ------------------------------------------------- Get the title of a resource
  sub gettitle {
- Line 5569  sub symblist {
+ Line 6223  sub symblist {
  sub symbverify {
      my ($symb,$thisurl)=@_;
      my $thisfn=$thisurl;
- # wrapper not part of symbs
-     $thisfn=~s/^\/adm\/wrapper//;
-     $thisfn=~s/^\/adm\/coursedocs\/showdoc\///;
      $thisfn=&declutter($thisfn);
  # direct jump to resource in page or to a sequence - will construct own symbs
      if ($thisfn=~/\.(page|sequence)$/) { return 1; }
- Line 6296  sub filelocation {
+ Line 6947  sub filelocation {
          my @ids=&current_machine_ids();
          foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } }
          if ($is_me) {
-   	    $location=&Apache::loncommon::propath($udom,$uname).
+   	    $location=&propath($udom,$uname).
    	      '/userfiles/'.$filename;
          } else {
    	  $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.
- Line 6401  sub clutter {
+ Line 7052  sub clutter {
  		     && $thisfn!~/\.(sequence|page)$/) {
  		$thisfn='/adm/coursedocs/showdoc'.$thisfn;
  	    } else {
- 		&logthis("Got a blank emb style");
+ #		&logthis("Got a blank emb style");
  	    }
  	}
      }
      return $thisfn;
  }
+ sub clutter_with_no_wrapper {
+     my $uri = &clutter(shift);
+     if ($uri =~ m-^/adm/-) {
+ 	$uri =~ s-^/adm/wrapper/-/-;
+ 	$uri =~ s-^/adm/coursedocs/showdoc/-/-;
+     }
+     return $uri;
+ }
  sub freeze_escape {
      my ($value)=@_;
      if (ref($value)) {
- Line 6417  sub freeze_escape {
+ Line 7077  sub freeze_escape {
      return &escape($value);
  }
- # -------------------------------------------------------- Escape Special Chars
- sub escape {
-     my $str=shift;
-     $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
-     return $str;
- }
- # ----------------------------------------------------- Un-Escape Special Chars
- sub unescape {
-     my $str=shift;
-     $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-     return $str;
- }
  sub thaw_unescape {
      my ($value)=@_;
- Line 6469  sub goodbye {
+ Line 7114  sub goodbye {
     &logthis(sprintf("%-20s is %s",'hits',$hits));
     &flushcourselogs();
     &logthis("Shutting down");
-    return DONE;
  }
  BEGIN {
  # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
      unless ($readit) {
  {
-     # FIXME: Use LONCAPA::Configuration::read_conf here and omit next block
+     my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf');
-     open(my $config,"</etc/httpd/conf/loncapa.conf");
+     %perlvar = (%perlvar,%{$configvars});
-     while (my $configline=<$config>) {
-         if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
- 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-            chomp($varvalue);
-            $perlvar{$varname}=$varvalue;
-         }
-     }
-     close($config);
- }
- {
-     open(my $config,"</etc/httpd/conf/loncapa_apache.conf");
-     while (my $configline=<$config>) {
-         if ($configline =~ /^[^\#]*PerlSetVar/) {
- 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-            chomp($varvalue);
-            $perlvar{$varname}=$varvalue;
-         }
-     }
-     close($config);
  }
  # ------------------------------------------------------------ Read domain file
- Line 6580  sub get_iphost {
+ Line 7203  sub get_iphost {
      while (my $configline=<$config>) {
         chomp($configline);
         if ($configline) {
-           $spareid{$configline}=1;
+ 	   my ($host,$type) = split(':',$configline,2);
+ 	   if (!defined($type) || $type eq '') { $type = 'default' };
+ 	   push(@{ $spareid{$type} }, $host);
         }
      }
      close($config);
- Line 6606  sub get_iphost {
+ Line 7231  sub get_iphost {
      while (my $configline=<$config>) {
  	chomp($configline);
  	if ($configline) {
- 	    my ($short,$plain)=split(/:/,$configline);
+ 	    my ($short,@plain)=split(/:/,$configline);
- 	    if ($plain ne '') { $prp{$short}=$plain; }
+             %{$prp{$short}} = ();
+ 	    if (@plain > 0) {
+                 $prp{$short}{'std'} = $plain[0];
+                 for (my $i=1; $i<@plain; $i++) {
+                     $prp{$short}{'alt'.$i} = $plain[$i];
+                 }
+             }
  	}
      }
      close($config);
- Line 6902  actions
+ Line 7533  actions
   '': forbidden
 : user needs to choose course
 : browse allowed
+  A: passphrase authentication needed
  =item *
- Line 7222  all args are optional
+ Line 7854  all args are optional
  =item *
+ dumpstore($namespace,$udom,$uname,$regexp,$range) :
+ dumps the complete (or key matching regexp) namespace into a hash
+ ($udom, $uname, $regexp, $range are optional) for a namespace that is
+ normally &store()ed into
+ $range should be either an integer '100' (give me the first 100
+                                            matching records)
+               or be  two integers sperated by a - with no spaces
+                  '30-50' (give me the 30th through the 50th matching
+                           records)
+ =item *
+ putstore($namespace,$symb,$version,$storehash,$udomain,$uname) :
+ replaces a &store() version of data with a replacement set of data
+ for a particular resource in a namespace passed in the $storehash hash
+ reference
+ =item *
  tmpstore($storehash,$symb,$namespace,$udom,$uname) : storage that
  works very similar to store/cstore, but all data is stored in a
  temporary location and can be reset using tmpreset, $storehash should
- Line 7275  put($namespace,$storehash,$udom,$uname)
+ Line 7928  put($namespace,$storehash,$udom,$uname)
  =item *
- putstore($namespace,$storehash,$udomain,$uname) : stores hash in namesp
+ cput($namespace,$storehash,$udom,$uname) : critical put
- keys used in storehash include version information (e.g., 1:$symb:message etc.) as
+ ($udom and $uname are optional)
- used in records written by &store and retrieved by &restore.  This function
- was created for use in editing discussion posts, without incrementing the
- version number included in the key for a particular post. The colon
- separated list of attribute names (e.g., the value associated with the key
-:keys:$symb) is also generated and passed in the ampersand separated
- items sent to lonnet::reply().
  =item *
- cput($namespace,$storehash,$udom,$uname) : critical put
+ newput($namespace,$storehash,$udom,$uname) :
- ($udom and $uname are optional)
+ Attempts to store the items in the $storehash, but only if they don't
+ currently exist, if this succeeds you can be certain that you have
+ successfully created a new key value pair in the $namespace db.
+ Args:
+  $namespace: name of database to store values to
+  $storehash: hashref to store to the db
+  $udom: (optional) domain of user containing the db
+  $uname: (optional) name of user caontaining the db
+ Returns:
+  'ok' -> succeeded in storing all keys of $storehash
+  'key_exists: <key>' -> failed to anything out of $storehash, as at
+                         least <key> already existed in the db (other
+                         requested keys may also already exist)
+  'error: <msg>' -> unable to tie the DB or other erorr occured
+  'con_lost' -> unable to contact request server
+  'refused' -> action was not allowed by remote machine
  =item *
- Line 7525  removeuploadedurl(): convience function
+ Line 8192  removeuploadedurl(): convience function
    Args:
     url:  a full /uploaded/... url to delete
+ =item *
+ get_portfile_permissions():
+   Args:
+     domain: domain of user or course contain the portfolio files
+     user: name of user or num of course contain the portfolio files
+   Returns:
+     hashref of a dump of the proper file_permissions.db
+ =item *
+ get_access_controls():
+ Args:
+   current_permissions: the hash ref returned from get_portfile_permissions()
+   group: (optional) the group you want the files associated with
+   file: (optional) the file you want access info on
+ Returns:
+     a hash (keys are file names) of hashes containing
+         keys are: path to file/file_name\0uniqueID:scope_end_start (see below)
+         values are XML containing access control settings (see below)
+ Internal notes:
+  access controls are stored in file_permissions.db as key=value pairs.
+     key -> path to file/file_name\0uniqueID:scope_end_start
+         where scope -> public,guest,course,group,domains or users.
+               end -> UNIX time for end of access (0 -> no end date)
+               start -> UNIX time for start of access
+     value -> XML description of access control
+            <scope type=""> (type =1 of: public,guest,course,group,domains,users">
+             <start></start>
+             <end></end>
+             <password></password>  for scope type = guest
+             <domain></domain>     for scope type = course or group
+             <number></number>
+             <roles id="">
+              <role></role>
+              <access></access>
+              <section></section>
+              <group></group>
+             </roles>
+             <dom></dom>         for scope type = domains
+             <users>             for scope type = users
+              <user>
+               <uname></uname>
+               <udom></udom>
+              </user>
+             </users>
+            </scope>
+  Access data is also aggregated for each file in an additional key=value pair:
+  key -> path to file/file_name\0accesscontrol
+  value -> reference to hash
+           hash contains key = value pairs
+           where key = uniqueID:scope_end_start
+                 value = UNIX time record was last updated
+           Used to improve speed of look-ups of access controls for each file.
+  Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays.
+ modify_access_controls():
+ Modifies access controls for a portfolio file
+ Args
+. file name
+. reference to hash of required changes,
+. domain
+. username
+   where domain,username are the domain of the portfolio owner
+   (either a user or a course)
+ Returns:
+. result of additions or updates ('ok' or 'error', with error message).
+. result of deletions ('ok' or 'error', with error message).
+. reference to hash of any new or updated access controls.
+. reference to hash used to map incoming IDs to uniqueIDs assigned to control.
+    key = integer (inbound ID)
+    value = uniqueID
  =back
  =head2 HTTP Helper Routines

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

Removed from v.1.714
changed lines
	Added in v.1.787