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.1191 and 1.1256

-version 1.1191, 2012/09/25 19:54:38
+version 1.1256, 2014/04/23 10:11:34
  Line 356  sub get_remote_globals {
  }
  sub remote_devalidate_cache {
-     my ($lonhost,$name,$id) = @_;
+     my ($lonhost,$cachekeys) = @_;
-     my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost);
+     my $items;
+     return unless (ref($cachekeys) eq 'ARRAY');
+     my $cachestr = join('&',@{$cachekeys});
+     my $response = &reply('devalidatecache:'.&escape($cachestr),$lonhost);
      return $response;
  }
- Line 603  sub transfer_profile_to_env {
+ Line 606  sub transfer_profile_to_env {
  # ---------------------------------------------------- Check for valid session
  sub check_for_valid_session {
-     my ($r,$name) = @_;
+     my ($r,$name,$userhashref) = @_;
      my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
      if ($name eq '') {
          $name = 'lonID';
- Line 634  sub check_for_valid_session {
+ Line 637  sub check_for_valid_session {
  	|| !defined($disk_env{'user.domain'})) {
  	return undef;
      }
+     if (ref($userhashref) eq 'HASH') {
+         $userhashref->{'name'} = $disk_env{'user.name'};
+         $userhashref->{'domain'} = $disk_env{'user.domain'};
+     }
      return $handle;
  }
- Line 667  sub appenv {
+ Line 676  sub appenv {
  	    if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) {
                  $refused = 1;
                  if (ref($roles) eq 'ARRAY') {
-                     my ($type,$role) = ($key =~ /^user\.(role|priv)\.([^.]+)\./);
+                     my ($type,$role) = ($key =~ m{^user\.(role|priv)\.(.+?)\./});
                      if (grep(/^\Q$role\E$/,@{$roles})) {
                          $refused = 0;
                      }
- Line 881  sub spareserver {
+ Line 890  sub spareserver {
  }
  sub compare_server_load {
-     my ($try_server, $spare_server, $lowest_load) = @_;
+     my ($try_server, $spare_server, $lowest_load, $required) = @_;
+     if ($required) {
+         my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
+         my $remoterev = &get_server_loncaparev(undef,$try_server);
+         my ($major,$minor) = ($remoterev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
+         if (($major eq '' && $minor eq '') ||
+             (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
+             return ($spare_server,$lowest_load);
+         }
+     }
      my $loadans     = &reply('load',    $try_server);
      my $userloadans = &reply('userload',$try_server);
- Line 942  sub has_user_session {
+ Line 961  sub has_user_session {
  # --------- determine least loaded server in a user's domain which allows login
  sub choose_server {
-     my ($udom,$checkloginvia) = @_;
+     my ($udom,$checkloginvia,$required) = @_;
      my %domconfhash = &Apache::loncommon::get_domainconf($udom);
      my %servers = &get_servers($udom);
      my $lowest_load = 30000;
- Line 954  sub choose_server {
+ Line 973  sub choose_server {
              if ($loginvia) {
                  my ($server,$path) = split(/:/,$loginvia);
                  ($login_host, $lowest_load) =
-                     &compare_server_load($server, $login_host, $lowest_load);
+                     &compare_server_load($server, $login_host, $lowest_load, $required);
                  if ($login_host eq $server) {
                      $portal_path = $path;
                      $isredirect = 1;
                  }
              } else {
                  ($login_host, $lowest_load) =
-                     &compare_server_load($lonhost, $login_host, $lowest_load);
+                     &compare_server_load($lonhost, $login_host, $lowest_load, $required);
                  if ($login_host eq $lonhost) {
                      $portal_path = '';
                      $isredirect = '';
- Line 969  sub choose_server {
+ Line 988  sub choose_server {
              }
          } else {
              ($login_host, $lowest_load) =
-                 &compare_server_load($lonhost, $login_host, $lowest_load);
+                 &compare_server_load($lonhost, $login_host, $lowest_load, $required);
          }
      }
      if ($login_host ne '') {
- Line 1316  sub check_loadbalancing {
+ Line 1335  sub check_loadbalancing {
              }
          }
      } elsif (($homeintdom) && ($udom ne $serverhomedom)) {
-         my ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
+         ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
          unless (defined($cached)) {
              my %domconfig =
                  &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
- Line 1571  sub idput {
+ Line 1590  sub idput {
      }
  }
+ # ---------------------------------------- Delete unwanted IDs from ids.db file
+ sub iddel {
+     my ($udom,$idshashref,$uhome)=@_;
+     my %result=();
+     unless (ref($idshashref) eq 'HASH') {
+         return %result;
+     }
+     my %servers=();
+     while (my ($id,$uname) = each(%{$idshashref})) {
+         my $uhom;
+         if ($uhome) {
+             $uhom = $uhome;
+         } else {
+             $uhom=&homeserver($uname,$udom);
+         }
+         if ($uhom ne 'no_host') {
+             if ($servers{$uhom}) {
+                 $servers{$uhom}.='&'.&escape($id);
+             } else {
+                 $servers{$uhom}=&escape($id);
+             }
+         }
+     }
+     foreach my $server (keys(%servers)) {
+         $result{$server} = &critical('iddel:'.$udom.':'.$servers{$server},$uhome);
+     }
+     return %result;
+ }
  # ------------------------------dump from db file owned by domainconfig user
  sub dump_dom {
      my ($namespace, $udom, $regexp) = @_;
- Line 1696  sub retrieve_inst_usertypes {
+ Line 1745  sub retrieve_inst_usertypes {
      my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
      if ((ref($domdefs{'inststatustypes'}) eq 'HASH') &&
          (ref($domdefs{'inststatusorder'}) eq 'ARRAY')) {
-         %returnhash = %{$domdefs{'inststatustypes'}};
+         return ($domdefs{'inststatustypes'},$domdefs{'inststatusorder'});
-         @order = @{$domdefs{'inststatusorder'}};
      } else {
          if (defined(&domain($udom,'primary'))) {
              my $uhome=&domain($udom,'primary');
              my $rep=&reply("inst_usertypes:$udom",$uhome);
              if ($rep =~ /^(con_lost|error|no_such_host|refused)/) {
-                 &logthis("get_dom failed - $rep returned from $uhome in domain: $udom");
+                 &logthis("retrieve_inst_usertypes failed - $rep returned from $uhome in domain: $udom");
                  return (\%returnhash,\@order);
              }
              my ($hashitems,$orderitems) = split(/:/,$rep);
- Line 1719  sub retrieve_inst_usertypes {
+ Line 1767  sub retrieve_inst_usertypes {
                  push(@order,&unescape($item));
              }
          } else {
-             &logthis("get_dom failed - no primary domain server for $udom");
+             &logthis("retrieve_inst_usertypes failed - no primary domain server for $udom");
          }
+         return (\%returnhash,\@order);
      }
-     return (\%returnhash,\@order);
  }
  sub is_domainimage {
- Line 1947  sub inst_userrules {
+ Line 1995  sub inst_userrules {
  # ------------- Get Authentication, Language and User Tools Defaults for Domain
  sub get_domain_defaults {
-     my ($domain) = @_;
+     my ($domain,$ignore_cache) = @_;
+     return if (($domain eq '') || ($domain eq 'public'));
      my $cachetime = 60*60*24;
-     my ($result,$cached)=&is_cached_new('domdefaults',$domain);
+     unless ($ignore_cache) {
-     if (defined($cached)) {
+         my ($result,$cached)=&is_cached_new('domdefaults',$domain);
-         if (ref($result) eq 'HASH') {
+         if (defined($cached)) {
-             return %{$result};
+             if (ref($result) eq 'HASH') {
+                 return %{$result};
+             }
          }
      }
      my %domdefaults;
- Line 1960  sub get_domain_defaults {
+ Line 2011  sub get_domain_defaults {
           &Apache::lonnet::get_dom('configuration',['defaults','quotas',
                                    'requestcourses','inststatus',
                                    'coursedefaults','usersessions',
-                                   'requestauthor'],$domain);
+                                   'requestauthor','selfenrollment'],$domain);
+     my @coursetypes = ('official','unofficial','community','textbook');
      if (ref($domconfig{'defaults'}) eq 'HASH') {
          $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'};
          $domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
- Line 1978  sub get_domain_defaults {
+ Line 2030  sub get_domain_defaults {
              $domdefaults{'defaultquota'} = $domconfig{'quotas'}{'defaultquota'};
          } else {
              $domdefaults{'defaultquota'} = $domconfig{'quotas'};
          }
          my @usertools = ('aboutme','blog','webdav','portfolio');
          foreach my $item (@usertools) {
              if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
                  $domdefaults{$item} = $domconfig{'quotas'}{$item};
              }
          }
+         if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') {
+             $domdefaults{'authorquota'} = $domconfig{'quotas'}{'authorquota'};
+         }
      }
      if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-         foreach my $item ('official','unofficial','community') {
+         foreach my $item ('official','unofficial','community','textbook') {
              $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
          }
      }
- Line 1995  sub get_domain_defaults {
+ Line 2050  sub get_domain_defaults {
          $domdefaults{'requestauthor'} = $domconfig{'requestauthor'};
      }
      if (ref($domconfig{'inststatus'}) eq 'HASH') {
-         foreach my $item ('inststatustypes','inststatusorder') {
+         foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
              $domdefaults{$item} = $domconfig{'inststatus'}{$item};
          }
      }
      if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
-         foreach my $item ('canuse_pdfforms') {
+         $domdefaults{'canuse_pdfforms'} = $domconfig{'coursedefaults'}{'canuse_pdfforms'};
-             $domdefaults{$item} = $domconfig{'coursedefaults'}{$item};
+         foreach my $type (@coursetypes) {
+             if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
+                 unless ($type eq 'community') {
+                     $domdefaults{$type.'credits'} = $domconfig{'coursedefaults'}{'coursecredits'}{$type};
+                 }
+             }
+             if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
+                 $domdefaults{$type.'quota'} = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
+             }
          }
      }
      if (ref($domconfig{'usersessions'}) eq 'HASH') {
- Line 2012  sub get_domain_defaults {
+ Line 2075  sub get_domain_defaults {
              $domdefaults{'hostedsessions'} = $domconfig{'usersessions'}{'hosted'};
          }
      }
-     &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults,
+     if (ref($domconfig{'selfenrollment'}) eq 'HASH') {
-                                   $cachetime);
+         if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') {
+             my @settings = ('types','registered','enroll_dates','access_dates','section',
+                             'approval','limit');
+             foreach my $type (@coursetypes) {
+                 if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') {
+                     my @mgrdc = ();
+                     foreach my $item (@settings) {
+                         if ($domconfig{'selfenrollment'}{'admin'}{$type}{$item} eq '0') {
+                             push(@mgrdc,$item);
+                         }
+                     }
+                     if (@mgrdc) {
+                         $domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc);
+                     }
+                 }
+             }
+         }
+         if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') {
+             foreach my $type (@coursetypes) {
+                 if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
+                     foreach my $item (keys(%{$domconfig{'selfenrollment'}{'default'}{$type}})) {
+                         $domdefaults{$type.'selfenroll'.$item} = $domconfig{'selfenrollment'}{'default'}{$type}{$item};
+                     }
+                 }
+             }
+         }
+     }
+     &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
      return %domdefaults;
  }
- Line 2645  sub allowuploaded {
+ Line 2735  sub allowuploaded {
      &Apache::lonnet::appenv(\%httpref);
  }
+ #
+ # Determine if the current user should be able to edit a particular resource,
+ # when viewing in course context.
+ # (a) When viewing resource used to determine if "Edit" item is included in
+ #     Functions.
+ # (b) When displaying folder contents in course editor, used to determine if
+ #     "Edit" link will be displayed alongside resource.
+ #
+ #  input: six args -- filename (decluttered), course number, course domain,
+ #                   url, symb (if registered) and group (if this is a group
+ #                   item -- e.g., bulletin board, group page etc.).
+ #  output: array of five scalars --
+ #          $cfile -- url for file editing if editable on current server
+ #          $home -- homeserver of resource (i.e., for author if published,
+ #                                           or course if uploaded.).
+ #          $switchserver --  1 if server switch will be needed.
+ #          $forceedit -- 1 if icon/link should be to go to edit mode
+ #          $forceview -- 1 if icon/link should be to go to view mode
+ #
+ sub can_edit_resource {
+     my ($file,$cnum,$cdom,$resurl,$symb,$group) = @_;
+     my ($cfile,$home,$switchserver,$forceedit,$forceview,$uploaded,$incourse);
+ #
+ # For aboutme pages user can only edit his/her own.
+ #
+     if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
+         my ($sdom,$sname) = ($1,$2);
+         if (($sdom eq $env{'user.domain'}) && ($sname eq $env{'user.name'})) {
+             $home = $env{'user.home'};
+             $cfile = $resurl;
+             if ($env{'form.forceedit'}) {
+                 $forceview = 1;
+             } else {
+                 $forceedit = 1;
+             }
+             return ($cfile,$home,$switchserver,$forceedit,$forceview);
+         } else {
+             return;
+         }
+     }
+     if ($env{'request.course.id'}) {
+         my $crsedit = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+         if ($group ne '') {
+ # if this is a group homepage or group bulletin board, check group privs
+             my $allowed = 0;
+             if ($resurl =~ m{^/?adm/$cdom/$cnum/$group/smppg$}) {
+                 if ((&allowed('mdg',$env{'request.course.id'}.
+                               ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) ||
+                         (&allowed('mgh',$env{'request.course.id'}.'/'.$group)) || $crsedit) {
+                     $allowed = 1;
+                 }
+             } elsif ($resurl =~ m{^/?adm/$cdom/$cnum/\d+/bulletinboard$}) {
+                 if ((&allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) ||
+                         (&allowed('cgb',$env{'request.course.id'}.'/'.$group)) || $crsedit) {
+                     $allowed = 1;
+                 }
+             }
+             if ($allowed) {
+                 $home=&homeserver($cnum,$cdom);
+                 if ($env{'form.forceedit'}) {
+                     $forceview = 1;
+                 } else {
+                     $forceedit = 1;
+                 }
+                 $cfile = $resurl;
+             } else {
+                 return;
+             }
+         } else {
+             if ($resurl =~ m{^/?adm/viewclasslist$}) {
+                 unless (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+                     return;
+                 }
+             } elsif (!$crsedit) {
+ #
+ # No edit allowed where CC has switched to student role.
+ #
+                 return;
+             }
+         }
+     }
+     if ($file ne '') {
+         if (($cnum =~ /$match_courseid/) && ($cdom =~ /$match_domain/)) {
+             if (&is_course_upload($file,$cnum,$cdom)) {
+                 $uploaded = 1;
+                 $incourse = 1;
+                 if ($file =~/\.(htm|html|css|js|txt)$/) {
+                     $cfile = &hreflocation('',$file);
+                     if ($env{'form.forceedit'}) {
+                         $forceview = 1;
+                     } else {
+                         $forceedit = 1;
+                     }
+                 }
+             } elsif ($resurl =~ m{^/public/$cdom/$cnum/syllabus}) {
+                 $incourse = 1;
+                 if ($env{'form.forceedit'}) {
+                     $forceview = 1;
+                 } else {
+                     $forceedit = 1;
+                 }
+                 $cfile = $resurl;
+             } elsif (($resurl ne '') && (&is_on_map($resurl))) {
+                 if ($resurl =~ m{^/adm/$match_domain/$match_username/\d+/smppg|bulletinboard$}) {
+                     $incourse = 1;
+                     if ($env{'form.forceedit'}) {
+                         $forceview = 1;
+                     } else {
+                         $forceedit = 1;
+                     }
+                     $cfile = $resurl;
+                 } elsif ($resurl eq '/res/lib/templates/simpleproblem.problem') {
+                     $incourse = 1;
+                     $cfile = $resurl.'/smpedit';
+                 } elsif ($resurl =~ m{^/adm/wrapper/ext/}) {
+                     $incourse = 1;
+                     if ($env{'form.forceedit'}) {
+                         $forceview = 1;
+                     } else {
+                         $forceedit = 1;
+                     }
+                     $cfile = $resurl;
+                 } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
+                     $incourse = 1;
+                     if ($env{'form.forceedit'}) {
+                         $forceview = 1;
+                     } else {
+                         $forceedit = 1;
+                     }
+                     $cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl");
+                 }
+             } elsif ($resurl eq '/res/lib/templates/simpleproblem.problem/smpedit') {
+                 my $template = '/res/lib/templates/simpleproblem.problem';
+                 if (&is_on_map($template)) {
+                     $incourse = 1;
+                     $forceview = 1;
+                     $cfile = $template;
+                 }
+             } elsif (($resurl =~ m{^/adm/wrapper/ext/}) && ($env{'form.folderpath'} =~ /^supplemental/)) {
+                     $incourse = 1;
+                     if ($env{'form.forceedit'}) {
+                         $forceview = 1;
+                     } else {
+                         $forceedit = 1;
+                     }
+                     $cfile = $resurl;
+             } elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) {
+                 $incourse = 1;
+                 $forceview = 1;
+                 if ($symb) {
+                     my ($map,$id,$res)=&decode_symb($symb);
+                     $env{'request.symb'} = $symb;
+                     $cfile = &clutter($res);
+                 } else {
+                     $cfile = $env{'form.suppurl'};
+                     $cfile =~ s{^http://}{};
+                     $cfile = '/adm/wrapper/ext/'.$cfile;
+                 }
+             } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
+                 if ($env{'form.forceedit'}) {
+                     $forceview = 1;
+                 } else {
+                     $forceedit = 1;
+                 }
+                 $cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl");
+             }
+         }
+         if ($uploaded || $incourse) {
+             $home=&homeserver($cnum,$cdom);
+         } elsif ($file !~ m{/$}) {
+             $file=~s{^(priv/$match_domain/$match_username)}{/$1};
+             $file=~s{^($match_domain/$match_username)}{/priv/$1};
+             # Check that the user has permission to edit this resource
+             my $setpriv = 1;
+             my ($cfuname,$cfudom)=&constructaccess($file,$setpriv);
+             if (defined($cfudom)) {
+                 $home=&homeserver($cfuname,$cfudom);
+                 $cfile=$file;
+             }
+         }
+         if (($cfile ne '') && (!$incourse || $uploaded) &&
+             (($home ne '') && ($home ne 'no_host'))) {
+             my @ids=&current_machine_ids();
+             unless (grep(/^\Q$home\E$/,@ids)) {
+                 $switchserver=1;
+             }
+         }
+     }
+     return ($cfile,$home,$switchserver,$forceedit,$forceview);
+ }
+ sub is_course_upload {
+     my ($file,$cnum,$cdom) = @_;
+     my $uploadpath = &LONCAPA::propath($cdom,$cnum);
+     $uploadpath =~ s{^\/}{};
+     if (($file =~ m{^\Q$uploadpath\E/userfiles/(docs|supplemental)/}) ||
+         ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/(docs|supplemental)/})) {
+         return 1;
+     }
+     return;
+ }
+ sub in_course {
+     my ($udom,$uname,$cdom,$cnum,$type,$hideprivileged) = @_;
+     if ($hideprivileged) {
+         my $skipuser;
+         my %coursehash = &coursedescription($cdom.'_'.$cnum);
+         my @possdoms = ($cdom);
+         if ($coursehash{'checkforpriv'}) {
+             push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
+         }
+         if (&privileged($uname,$udom,\@possdoms)) {
+             $skipuser = 1;
+             if ($coursehash{'nothideprivileged'}) {
+                 foreach my $item (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+                     my $user;
+                     if ($item =~ /:/) {
+                         $user = $item;
+                     } else {
+                         $user = join(':',split(/[\@]/,$item));
+                     }
+                     if ($user eq $uname.':'.$udom) {
+                         undef($skipuser);
+                         last;
+                     }
+                 }
+             }
+             if ($skipuser) {
+                 return 0;
+             }
+         }
+     }
+     $type ||= 'any';
+     if (!defined($cdom) || !defined($cnum)) {
+         my $cid  = $env{'request.course.id'};
+         $cdom = $env{'course.'.$cid.'.domain'};
+         $cnum = $env{'course.'.$cid.'.num'};
+     }
+     my $typesref;
+     if (($type eq 'any') || ($type eq 'all')) {
+         $typesref = ['active','previous','future'];
+     } elsif ($type eq 'previous' || $type eq 'future') {
+         $typesref = [$type];
+     }
+     my %roles = &get_my_roles($uname,$udom,'userroles',
+                               $typesref,undef,[$cdom]);
+     my ($tmp) = keys(%roles);
+     return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+     my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles));
+     if (@course_roles > 0) {
+         return 1;
+     }
+     return 0;
+ }
  # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
  # input: action, courseID, current domain, intended
  #        path to file, source of file, instruction to parse file for objects,
- Line 2935  sub userfileupload {
+ Line 3283  sub userfileupload {
  					 $codebase,$thumbwidth,$thumbheight,
                                           $resizewidth,$resizeheight,$context,$mimetype);
          } else {
-             $fname=$env{'form.folder'}.'/'.$fname;
+             if ($env{'form.folder'}) {
+                 $fname=$env{'form.folder'}.'/'.$fname;
+             }
              return &process_coursefile('uploaddoc',$docuname,$docudom,
  				       $fname,$formname,$parser,
  				       $allfiles,$codebase,$mimetype);
- Line 2950  sub userfileupload {
+ Line 3300  sub userfileupload {
      } else {
          my $docuname=$env{'user.name'};
          my $docudom=$env{'user.domain'};
-         if (exists($env{'form.group'})) {
+         if ((exists($env{'form.group'})) || ($context eq 'syllabus')) {
              $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
              $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
          }
- Line 3100  sub extract_embedded_items {
+ Line 3450  sub extract_embedded_items {
  		&add_filetype($allfiles,$attr->{'src'},'src');
  	    }
  	    if (lc($tagname) eq 'a') {
- 		&add_filetype($allfiles,$attr->{'href'},'href');
+                 unless (($attr->{'href'} =~ /^#/) || ($attr->{'href'} eq '')) {
+                     &add_filetype($allfiles,$attr->{'href'},'href');
+                 }
  	    }
              if (lc($tagname) eq 'script') {
                  my $src;
- Line 3188  sub extract_embedded_items {
+ Line 3540  sub extract_embedded_items {
                      }
                  }
  	    }
+             if (lc($tagname) eq 'iframe') {
+                 my $src = $attr->{'src'} ;
+                 if (($src ne '') && ($src !~ m{^(/|https?://)})) {
+                     &add_filetype($allfiles,$src,'src');
+                 } elsif ($src =~ m{^/}) {
+                     if ($env{'request.course.id'}) {
+                         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                         my $url = &hreflocation('',$fullpath);
+                         if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) {
+                             my $relpath = $1;
+                             if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) {
+                                 &add_filetype($allfiles,$1,'src');
+                             }
+                         }
+                     }
+                 }
+             }
              if ($t->[4] =~ m{/>$}) {
                  pop(@state);
              }
  	} elsif ($t->[0] eq 'E') {
  	    my ($tagname) = ($t->[1]);
- Line 3631  sub get_course_adv_roles {
+ Line 4001  sub get_course_adv_roles {
              $nothide{$user}=1;
          }
      }
+     my @possdoms = ($coursehash{'domain'});
+     if ($coursehash{'checkforpriv'}) {
+         push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
+     }
      my %returnhash=();
      my %dumphash=
              &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
- Line 3643  sub get_course_adv_roles {
+ Line 4017  sub get_course_adv_roles {
          if (($tstart) && ($now<$tstart)) { next; }
          my ($role,$username,$domain,$section)=split(/\:/,$entry);
  	if ($username eq '' || $domain eq '') { next; }
-         unless (ref($privileged{$domain}) eq 'HASH') {
+         if ((&privileged($username,$domain,\@possdoms)) &&
-             my %dompersonnel =
-                 &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
-             $privileged{$domain} = {};
-             foreach my $server (keys(%dompersonnel)) {
-                 if (ref($dompersonnel{$server}) eq 'HASH') {
-                     foreach my $user (keys(%{$dompersonnel{$server}})) {
-                         my ($trole,$uname,$udom) = split(/:/,$user);
-                         $privileged{$udom}{$uname} = 1;
-                     }
-                 }
-             }
-         }
-         if ((exists($privileged{$domain}{$username})) &&
              (!$nothide{$username.':'.$domain})) { next; }
  	if ($role eq 'cr') { next; }
          if ($codes) {
- Line 3687  sub get_my_roles {
+ Line 4048  sub get_my_roles {
      if ($context eq 'userroles') {
          %dumphash = &dump('roles',$udom,$uname);
      } else {
-         %dumphash=
+         %dumphash = &dump('nohist_userroles',$udom,$uname);
-             &dump('nohist_userroles',$udom,$uname);
          if ($hidepriv) {
              my %coursehash=&coursedescription($udom.'_'.$uname);
              foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
- Line 3756  sub get_my_roles {
+ Line 4116  sub get_my_roles {
              }
          }
          if ($hidepriv) {
+             my @privroles = ('dc','su');
              if ($context eq 'userroles') {
-                 if ((&privileged($username,$domain)) &&
+                 next if (grep(/^\Q$role\E$/,@privroles));
-                     (!$nothide{$username.':'.$domain})) {
-                     next;
-                 }
              } else {
-                 unless (ref($privileged{$domain}) eq 'HASH') {
+                 my $possdoms = [$domain];
-                     my %dompersonnel =
+                 if (ref($roledoms) eq 'ARRAY') {
-                         &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+                    push(@{$possdoms},@{$roledoms});
-                     $privileged{$domain} = {};
-                     if (keys(%dompersonnel)) {
-                         foreach my $server (keys(%dompersonnel)) {
-                             if (ref($dompersonnel{$server}) eq 'HASH') {
-                                 foreach my $user (keys(%{$dompersonnel{$server}})) {
-                                     my ($trole,$uname,$udom) = split(/:/,$user);
-                                     $privileged{$udom}{$uname} = $trole;
-                                 }
-                             }
-                         }
-                     }
                  }
-                 if (exists($privileged{$domain}{$username})) {
+                 if (&privileged($username,$domain,$possdoms,\@privroles)) {
                      if (!$nothide{$username.':'.$domain}) {
                          next;
                      }
- Line 3869  sub courseiddump {
+ Line 4216  sub courseiddump {
      my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,
          $coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok,
          $selfenrollonly,$catfilter,$showhidden,$caller,$cloner,$cc_clone,
-         $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner)=@_;
+         $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner,
+         $hasuniquecode)=@_;
      my $as_hash = 1;
      my %returnhash;
      if (!$domfilter) { $domfilter=''; }
- Line 3892  sub courseiddump {
+ Line 4240  sub courseiddump {
                                  &escape($catfilter), $showhidden, $caller,
                                  &escape($cloner), &escape($cc_clone), $cloneonly,
                                  &escape($createdbefore), &escape($createdafter),
-                                 &escape($creationcontext), $domcloner)));
+                                 &escape($creationcontext), $domcloner, $hasuniquecode)));
                  } else {
                      $rep = &reply('courseiddump:'.&host_domain($tryserver).':'.
                               $sincefilter.':'.&escape($descfilter).':'.
- Line 3903  sub courseiddump {
+ Line 4251  sub courseiddump {
                               $showhidden.':'.$caller.':'.&escape($cloner).':'.
                               &escape($cc_clone).':'.$cloneonly.':'.
                               &escape($createdbefore).':'.&escape($createdafter).':'.
-                              &escape($creationcontext).':'.$domcloner,
+                              &escape($creationcontext).':'.$domcloner.':'.$hasuniquecode,
                               $tryserver);
                  }
- Line 4012  sub get_domain_roles {
+ Line 4360  sub get_domain_roles {
      }
      my $rolelist;
      if (ref($roles) eq 'ARRAY') {
-         $rolelist = join(':',@{$roles});
+         $rolelist = join('&',@{$roles});
      }
      my %personnel = ();
- Line 4554  sub restore {
+ Line 4902  sub restore {
      if ($stuname) { $home=&homeserver($stuname,$domain); }
      if (!$symb) {
-       unless ($symb=escape(&symbread())) { return ''; }
+         return if ($namespace eq 'courserequests');
+         unless ($symb=escape(&symbread())) { return ''; }
      } else {
-       $symb=&escape(&symbclean($symb));
+         unless ($namespace eq 'courserequests') {
+             $symb=&escape(&symbclean($symb));
+         }
      }
      if (!$namespace) {
         unless ($namespace=$env{'request.course.id'}) {
- Line 4691  sub update_released_required {
+ Line 5042  sub update_released_required {
  # -------------------------------------------------See if a user is privileged
  sub privileged {
-     my ($username,$domain)=@_;
+     my ($username,$domain,$possdomains,$possroles)=@_;
-     my %rolesdump = &dump("roles", $domain, $username) or return 0;
      my $now = time;
+     my $roles;
+     if (ref($possroles) eq 'ARRAY') {
+         $roles = $possroles;
+     } else {
+         $roles = ['dc','su'];
+     }
+     if (ref($possdomains) eq 'ARRAY') {
+         my %privileged = &privileged_by_domain($possdomains,$roles);
+         foreach my $dom (@{$possdomains}) {
+             if (($username =~ /^$match_username$/) && ($domain =~ /^$match_domain$/) &&
+                 (ref($privileged{$dom}) eq 'HASH')) {
+                 foreach my $role (@{$roles}) {
+                     if (ref($privileged{$dom}{$role}) eq 'HASH') {
+                         if (exists($privileged{$dom}{$role}{$username.':'.$domain})) {
+                             my ($end,$start) = split(/:/,$privileged{$dom}{$role}{$username.':'.$domain});
+                             return 1 unless (($end && $end < $now) ||
+                                              ($start && $start > $now));
+                         }
+                     }
+                 }
+             }
+         }
+     } else {
+         my %rolesdump = &dump("roles", $domain, $username) or return 0;
+         my $now = time;
-     for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys %rolesdump}) {
+         for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys %rolesdump}) {
              my ($trole, $tend, $tstart) = split(/_/, $role);
-             if (($trole eq 'dc') || ($trole eq 'su')) {
+             if (grep(/^\Q$trole\E$/,@{$roles})) {
                  return 1 unless ($tend && $tend < $now)
-                     or ($tstart && $tstart > $now);
+                         or ($tstart && $tstart > $now);
              }
- 	}
+         }
+     }
      return 0;
  }
+ sub privileged_by_domain {
+     my ($domains,$roles) = @_;
+     my %privileged = ();
+     my $cachetime = 60*60*24;
+     my $now = time;
+     unless ((ref($domains) eq 'ARRAY') && (ref($roles) eq 'ARRAY')) {
+         return %privileged;
+     }
+     foreach my $dom (@{$domains}) {
+         next if (ref($privileged{$dom}) eq 'HASH');
+         my $needroles;
+         foreach my $role (@{$roles}) {
+             my ($result,$cached)=&is_cached_new('priv_'.$role,$dom);
+             if (defined($cached)) {
+                 if (ref($result) eq 'HASH') {
+                     $privileged{$dom}{$role} = $result;
+                 }
+             } else {
+                 $needroles = 1;
+             }
+         }
+         if ($needroles) {
+             my %dompersonnel = &get_domain_roles($dom,$roles);
+             $privileged{$dom} = {};
+             foreach my $server (keys(%dompersonnel)) {
+                 if (ref($dompersonnel{$server}) eq 'HASH') {
+                     foreach my $item (keys(%{$dompersonnel{$server}})) {
+                         my ($trole,$uname,$udom,$rest) = split(/:/,$item,4);
+                         my ($end,$start) = split(/:/,$dompersonnel{$server}{$item});
+                         next if ($end && $end < $now);
+                         $privileged{$dom}{$trole}{$uname.':'.$udom} =
+                             $dompersonnel{$server}{$item};
+                     }
+                 }
+             }
+             if (ref($privileged{$dom}) eq 'HASH') {
+                 foreach my $role (@{$roles}) {
+                     if (ref($privileged{$dom}{$role}) eq 'HASH') {
+                         &do_cache_new('priv_'.$role,$dom,$privileged{$dom}{$role},$cachetime);
+                     } else {
+                         my %hash = ();
+                         &do_cache_new('priv_'.$role,$dom,\%hash,$cachetime);
+                     }
+                 }
+             }
+         }
+     }
+     return %privileged;
+ }
  # -------------------------------------------------------- Get user privileges
  sub rolesinit {
- Line 4816  sub rolesinit {
+ Line 5240  sub rolesinit {
  }
  sub set_arearole {
-     my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
+     my ($trole,$area,$tstart,$tend,$domain,$username,$nolog) = @_;
+     unless ($nolog) {
  # log the associated role with the area
-     &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+         &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+     }
      return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend);
  }
  sub custom_roleprivs {
      my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_;
      my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
-     my $homsvr=homeserver($rauthor,$rdomain);
+     my $homsvr = &homeserver($rauthor,$rdomain);
      if (&hostname($homsvr) ne '') {
          my ($rdummy,$roledef)=
              &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
- Line 4946  sub set_userprivs {
+ Line 5372  sub set_userprivs {
  sub role_status {
      my ($rolekey,$update,$refresh,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_;
-     my @pwhere = ();
      if (exists($env{$rolekey}) && $env{$rolekey} ne '') {
-         (undef,undef,$$role,@pwhere)=split(/\./,$rolekey);
+         my ($one,$two) = split(m{\./},$rolekey,2);
+         (undef,undef,$$role) = split(/\./,$one,3);
          unless (!defined($$role) || $$role eq '') {
-             $$where=join('.',@pwhere);
+             $$where = '/'.$two;
              $$trolecode=$$role.'.'.$$where;
              ($$tstart,$$tend)=split(/\./,$env{$rolekey});
              $$tstatus='is';
- Line 5087  sub set_adhoc_privileges {
+ Line 5513  sub set_adhoc_privileges {
      my $area = '/'.$dcdom.'/'.$pickedcourse;
      my $spec = $role.'.'.$area;
      my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
-                                   $env{'user.name'});
+                                   $env{'user.name'},1);
      my %ccrole = ();
      &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
      my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
- Line 5156  sub unserialize {
+ Line 5582  sub unserialize {
      return {} if $rep =~ /^error/;
      my %returnhash=();
- 	foreach my $item (split /\&/, $rep) {
+ 	foreach my $item (split(/\&/,$rep)) {
  	    my ($key, $value) = split(/=/, $item, 2);
  	    $key = unescape($key) unless $escapedkeys;
  	    next if $key =~ /^error: 2 /;
- 	    $returnhash{$key} = Apache::lonnet::thaw_unescape($value);
+ 	    $returnhash{$key} = &thaw_unescape($value);
  	}
      #return %returnhash;
      return \%returnhash;
- Line 5178  sub dump {
+ Line 5604  sub dump {
      if (grep { $_ eq $uhome } current_machine_ids()) {
          # user is hosted on this machine
          $reply = LONCAPA::Lond::dump_with_regexp(join(":", ($udomain,
-                     $uname, $namespace, $regexp, $range)), $loncaparevs{$uhome});
+                     $uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'});
          return %{unserialize($reply, $escapedkeys)};
      }
      if ($regexp) {
- Line 5485  sub tmpdel {
+ Line 5911  sub tmpdel {
      return &reply("tmpdel:$token",$server);
  }
+ # ------------------------------------------------------------ get_timebased_id
+ sub get_timebased_id {
+     my ($prefix,$keyid,$namespace,$cdom,$cnum,$idtype,$who,$locktries,
+         $maxtries) = @_;
+     my ($newid,$error,$dellock);
+     unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) {
+         return ('','ok','invalid call to get suffix');
+     }
+ # set defaults for any optional args for which values were not supplied
+     if ($who eq '') {
+         $who = $env{'user.name'}.':'.$env{'user.domain'};
+     }
+     if (!$locktries) {
+         $locktries = 3;
+     }
+     if (!$maxtries) {
+         $maxtries = 10;
+     }
+     if (($cdom eq '') || ($cnum eq '')) {
+         if ($env{'request.course.id'}) {
+             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+         }
+         if (($cdom eq '') || ($cnum eq '')) {
+             return ('','ok','call to get suffix not in course context');
+         }
+     }
+ # construct locking item
+     my $lockhash = {
+                       $prefix."\0".'locked_'.$keyid => $who,
+                    };
+     my $tries = 0;
+ # attempt to get lock on nohist_$namespace file
+     my $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
+     while (($gotlock ne 'ok') && $tries <$locktries) {
+         $tries ++;
+         sleep 1;
+         $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
+     }
+ # attempt to get unique identifier, based on current timestamp
+     if ($gotlock eq 'ok') {
+         my %inuse = &Apache::lonnet::dump('nohist_'.$namespace,$cdom,$cnum,$prefix);
+         my $id = time;
+         $newid = $id;
+         my $idtries = 0;
+         while (exists($inuse{$prefix."\0".$newid}) && $idtries < $maxtries) {
+             if ($idtype eq 'concat') {
+                 $newid = $id.$idtries;
+             } else {
+                 $newid ++;
+             }
+             $idtries ++;
+         }
+         if (!exists($inuse{$prefix."\0".$newid})) {
+             my %new_item =  (
+                               $prefix."\0".$newid => $who,
+                             );
+             my $putresult = &Apache::lonnet::put('nohist_'.$namespace,\%new_item,
+                                                  $cdom,$cnum);
+             if ($putresult ne 'ok') {
+                 undef($newid);
+                 $error = 'error saving new item: '.$putresult;
+             }
+         } else {
+              $error = ('error: no unique suffix available for the new item ');
+         }
+ #  remove lock
+         my @del_lock = ($prefix."\0".'locked_'.$keyid);
+         $dellock = &Apache::lonnet::del('nohist_'.$namespace,\@del_lock,$cdom,$cnum);
+     } else {
+         $error = "error: could not obtain lockfile\n";
+         $dellock = 'ok';
+     }
+     return ($newid,$dellock,$error);
+ }
  # -------------------------------------------------- portfolio access checking
  sub portfolio_access {
- Line 5739  sub usertools_access {
+ Line 6247  sub usertools_access {
                        official   => 1,
                        unofficial => 1,
                        community  => 1,
+                       textbook   => 1,
                   );
      } elsif ($context eq 'requestauthor') {
          %tools = (
- Line 5754  sub usertools_access {
+ Line 6263  sub usertools_access {
      }
      return if (!defined($tools{$tool}));
-     if ((!defined($udom)) || (!defined($uname))) {
+     if (($udom eq '') || ($uname eq '')) {
          $udom = $env{'user.domain'};
          $uname = $env{'user.name'};
      }
- Line 6264  sub allowed {
+ Line 6773  sub allowed {
  	&& &is_portfolio_url($uri)) {
  	$thisallowed = &portfolio_access($uri);
      }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
  	return 'F';
- Line 6511  sub allowed {
+ Line 7020  sub allowed {
     return 'F';
  }
+ # ------------------------------------------- Check construction space access
+ sub constructaccess {
+     my ($url,$setpriv)=@_;
+ # We do not allow editing of previous versions of files
+     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
+ # Get username and domain from URL
+     my ($ownername,$ownerdomain,$ownerhome);
+     ($ownerdomain,$ownername) =
+         ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)/});
+ # The URL does not really point to any authorspace, forget it
+     unless (($ownername) && ($ownerdomain)) { return ''; }
+ # Now we need to see if the user has access to the authorspace of
+ # $ownername at $ownerdomain
+     if (($ownername eq $env{'user.name'}) && ($ownerdomain eq $env{'user.domain'})) {
+ # Real author for this?
+        $ownerhome = $env{'user.home'};
+        if (exists($env{'user.priv.au./'.$ownerdomain.'/./'})) {
+           return ($ownername,$ownerdomain,$ownerhome);
+        }
+     } else {
+ # Co-author for this?
+         if (exists($env{'user.priv.ca./'.$ownerdomain.'/'.$ownername.'./'}) ||
+             exists($env{'user.priv.aa./'.$ownerdomain.'/'.$ownername.'./'}) ) {
+             $ownerhome = &homeserver($ownername,$ownerdomain);
+             return ($ownername,$ownerdomain,$ownerhome);
+         }
+     }
+ # We don't have any access right now. If we are not possibly going to do anything about this,
+ # we might as well leave
+    unless ($setpriv) { return ''; }
+ # Backdoor access?
+     my $allowed=&allowed('eco',$ownerdomain);
+ # Nope
+     unless ($allowed) { return ''; }
+ # Looks like we may have access, but could be locked by the owner of the construction space
+     if ($allowed eq 'U') {
+         my %blocked=&get('environment',['domcoord.author'],
+                          $ownerdomain,$ownername);
+ # Is blocked by owner
+         if ($blocked{'domcoord.author'} eq 'blocked') { return ''; }
+     }
+     if (($allowed eq 'F') || ($allowed eq 'U')) {
+ # Grant temporary access
+         my $then=$env{'user.login.time'};
+         my $update=$env{'user.update.time'};
+         if (!$update) { $update = $then; }
+         my $refresh=$env{'user.refresh.time'};
+         if (!$refresh) { $refresh = $update; }
+         my $now = time;
+         &check_adhoc_privs($ownerdomain,$ownername,$update,$refresh,
+                            $now,'ca','constructaccess');
+         $ownerhome = &homeserver($ownername,$ownerdomain);
+         return($ownername,$ownerdomain,$ownerhome);
+     }
+ # No business here
+     return '';
+ }
  sub get_comm_blocks {
      my ($cdom,$cnum) = @_;
      if ($cdom eq '' || $cnum eq '') {
- Line 6778  sub definerole {
+ Line 7354  sub definerole {
  # ---------------- Make a metadata query against the network of library servers
  sub metadata_query {
-     my ($query,$custom,$customshow,$server_array)=@_;
+     my ($query,$custom,$customshow,$server_array,$domains_hash)=@_;
      my %rhash;
      my %libserv = &all_library();
      my @server_list = (defined($server_array) ? @$server_array
                                                : keys(%libserv) );
      for my $server (@server_list) {
+         my $domains = '';
+         if (ref($domains_hash) eq 'HASH') {
+             $domains = $domains_hash->{$server};
+         }
  	unless ($custom or $customshow) {
- 	    my $reply=&reply("querysend:".&escape($query),$server);
+ 	    my $reply=&reply("querysend:".&escape($query).':::'.&escape($domains),$server);
  	    $rhash{$server}=$reply;
  	}
  	else {
  	    my $reply=&reply("querysend:".&escape($query).':'.
- 			     &escape($custom).':'.&escape($customshow),
+ 			     &escape($custom).':'.&escape($customshow).':'.&escape($domains),
  			     $server);
  	    $rhash{$server}=$reply;
  	}
- Line 7036  sub auto_validate_instcode {
+ Line 7616  sub auto_validate_instcode {
      }
      $response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'.
                          &escape($instcode).':'.&escape($owner),$homeserver));
-     my ($outcome,$description) = map { &unescape($_); } split('&',$response,2);
+     my ($outcome,$description,$defaultcredits) = map { &unescape($_); } split('&',$response,3);
-     return ($outcome,$description);
+     return ($outcome,$description,$defaultcredits);
  }
  sub auto_create_password {
- Line 7279  sub auto_courserequest_checks {
+ Line 7859  sub auto_courserequest_checks {
  }
  sub auto_courserequest_validation {
-     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = @_;
+     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$custominfo) = @_;
      my ($homeserver,$response);
      if ($dom =~ /^$match_domain$/) {
          $homeserver = &domain($dom,'primary');
      }
      unless ($homeserver eq 'no_host') {
+         my $customdata;
+         if (ref($custominfo) eq 'HASH') {
+             $customdata = &freeze_escape($custominfo);
+         }
          $response=&unescape(&reply('autocrsreqvalidation:'.$dom.':'.&escape($owner).
                                      ':'.&escape($crstype).':'.&escape($inststatuslist).
-                                     ':'.&escape($instcode).':'.&escape($instseclist),
+                                     ':'.&escape($instcode).':'.&escape($instseclist).':'.
-                                     $homeserver));
+                                     $customdata,$homeserver));
      }
      return $response;
  }
- Line 7308  sub auto_validate_class_sec {
+ Line 7891  sub auto_validate_class_sec {
      return $response;
  }
+ sub auto_crsreq_update {
+     my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,
+         $code,$inbound) = @_;
+     my ($homeserver,%crsreqresponse);
+     if ($cdom =~ /^$match_domain$/) {
+         $homeserver = &domain($cdom,'primary');
+     }
+     unless (($homeserver eq 'no_host') || ($homeserver eq '')) {
+         my $info;
+         if (ref($inbound) eq 'HASH') {
+             $info = &freeze_escape($inbound);
+         }
+         my $response=&reply('autocrsrequpdate:'.$cdom.':'.$cnum.':'.&escape($crstype).
+                             ':'.&escape($action).':'.&escape($ownername).':'.
+                             &escape($ownerdomain).':'.&escape($fullname).':'.
+                             &escape($title).':'.&escape($code).':'.$info,$homeserver);
+         unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+             my @items = split(/&/,$response);
+             foreach my $item (@items) {
+                 my ($key,$value) = split('=',$item);
+                 $crsreqresponse{&unescape($key)} = &thaw_unescape($value);
+             }
+         }
+     }
+     return \%crsreqresponse;
+ }
  # ------------------------------------------------------- Course Group routines
  sub get_coursegroups {
- Line 7659  sub assignrole {
+ Line 8269  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,$selfenroll,$context);
-         }
          if (($role eq 'cc') || ($role eq 'in') ||
              ($role eq 'ep') || ($role eq 'ad') ||
              ($role eq 'ta') || ($role eq 'st') ||
              ($role=~/^cr/) || ($role eq 'gr') ||
              ($role eq 'co')) {
+ # for course roles, perform group memberships changes triggered by role change.
+             unless ($role =~ /^gr/) {
+                 &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
+                                                  $origstart,$selfenroll,$context);
+             }
              &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
                             $selfenroll,$context);
          } elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') ||
- Line 7977  sub modifyuser {
+ Line 8587  sub modifyuser {
  sub modifystudent {
      my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
          $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid,
-         $selfenroll,$context,$inststatus)=@_;
+         $selfenroll,$context,$inststatus,$credits)=@_;
      if (!$cid) {
  	unless ($cid=$env{'request.course.id'}) {
  	    return 'not_in_class';
- Line 7989  sub modifystudent {
+ Line 8599  sub modifystudent {
           $desiredhome,$email,$inststatus);
      unless ($reply eq 'ok') { return $reply; }
      # This will cause &modify_student_enrollment to get the uid from the
-     # students environment
+     # student's environment
      $uid = undef if (!$forceid);
      $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
- 					$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context);
+                                         $gene,$usec,$end,$start,$type,$locktype,
+                                         $cid,$selfenroll,$context,$credits);
      return $reply;
  }
  sub modify_student_enrollment {
-     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_;
+     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
+         $locktype,$cid,$selfenroll,$context,$credits) = @_;
      my ($cdom,$cnum,$chome);
      if (!$cid) {
  	unless ($cid=$env{'request.course.id'}) {
- Line 8044  sub modify_student_enrollment {
+ Line 8656  sub modify_student_enrollment {
      my %old_entry = &Apache::lonnet::get('classlist',[$user],$cdom,$cnum);
      my $reply=cput('classlist',
  		   {$user =>
- 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
+ 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits) },
  		   $cdom,$cnum);
      if (($reply eq 'ok') || ($reply eq 'delayed')) {
          &devalidate_getsection_cache($udom,$uname,$cid);
- Line 8273  sub is_course {
+ Line 8885  sub is_course {
      my %courses = &courseiddump($cdom, '.', 1, '.', '.', $cnum, undef, undef,
          '.');
-     return unless exists($courses{$cdom.'_'.$cnum});
+     return unless(exists($courses{$cdom.'_'.$cnum}));
      return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum;
  }
- Line 8298  sub store_userdata {
+ Line 8910  sub store_userdata {
                      $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
                  }
                  $namevalue=~s/\&$//;
+                 unless ($namespace eq 'courserequests') {
+                     $datakey = &escape($datakey);
+                 }
                  $result =  &reply("store:$udom:$uname:$namespace:$datakey:".
                                    $namevalue,$uhome);
              }
- Line 9120  sub resdata {
+ Line 9735  sub resdata {
      return undef;
  }
+ sub get_numsuppfiles {
+     my ($cnum,$cdom,$ignorecache)=@_;
+     my $hashid=$cnum.':'.$cdom;
+     my ($suppcount,$cached);
+     unless ($ignorecache) {
+         ($suppcount,$cached) = &is_cached_new('suppcount',$hashid);
+     }
+     unless (defined($cached)) {
+         my $chome=&homeserver($cnum,$cdom);
+         unless ($chome eq 'no_host') {
+             ($suppcount,my $errors) = (0,0);
+             my $suppmap = 'supplemental.sequence';
+             ($suppcount,$errors) =
+                 &Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,$errors);
+         }
+         &do_cache_new('suppcount',$hashid,$suppcount,600);
+     }
+     return $suppcount;
+ }
  #
  # EXT resource caching routines
  #
- Line 9148  sub EXT_cache_set {
+ Line 9783  sub EXT_cache_set {
  # --------------------------------------------------------- Value of a Variable
  sub EXT {
-     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
+     my ($varname,$symbparm,$udom,$uname,$usection,$recurse,$cid)=@_;
      unless ($varname) { return ''; }
      #get real user name/domain, courseid and symb
      my $courseid;
- Line 9263  sub EXT {
+ Line 9898  sub EXT {
  	    if (!$symbparm) { $symbparm=&symbread(); }
  	}
- 	if ($space eq 'title') {
+         if ($qualifier eq '') {
- 	    if (!$symbparm) { $symbparm = $env{'request.filename'}; }
+ 	    if ($space eq 'title') {
- 	    return &gettitle($symbparm);
+ 	        if (!$symbparm) { $symbparm = $env{'request.filename'}; }
- 	}
+ 	        return &gettitle($symbparm);
+ 	    }
- 	if ($space eq 'map') {
+ 	    if ($space eq 'map') {
- 	    my ($map) = &decode_symb($symbparm);
+ 	        my ($map) = &decode_symb($symbparm);
- 	    return &symbread($map);
+ 	        return &symbread($map);
- 	}
+ 	    }
- 	if ($space eq 'filename') {
+             if ($space eq 'maptitle') {
- 	    if ($symbparm) {
+                 my ($map) = &decode_symb($symbparm);
- 		return &clutter((&decode_symb($symbparm))[2]);
+                 return &gettitle($map);
+             }
+ 	    if ($space eq 'filename') {
+ 	        if ($symbparm) {
+ 		    return &clutter((&decode_symb($symbparm))[2]);
+ 	        }
+ 	        return &hreflocation('',$env{'request.filename'});
  	    }
- 	    return &hreflocation('',$env{'request.filename'});
- 	}
+             if ((defined($courseid)) && ($courseid eq $env{'request.course.id'}) && $symbparm) {
+                 if ($space eq 'visibleparts') {
+                     my $navmap = Apache::lonnavmaps::navmap->new();
+                     my $item;
+                     if (ref($navmap)) {
+                         my $res = $navmap->getBySymb($symbparm);
+                         my $parts = $res->parts();
+                         if (ref($parts) eq 'ARRAY') {
+                             $item = join(',',@{$parts});
+                         }
+                         undef($navmap);
+                     }
+                     return $item;
+                 }
+             }
+         }
  	my ($section, $group, @groups);
  	my ($courselevelm,$courselevel);
- 	if ($symbparm && defined($courseid) &&
+         if (($courseid eq '') && ($cid)) {
- 	    $courseid eq $env{'request.course.id'}) {
+             $courseid = $cid;
+         }
+ 	if (($symbparm && $courseid) &&
+ 	    (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid)))  {
  	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
- Line 9529  sub metadata {
+ Line 10189  sub metadata {
      # if it is a non metadata possible uri return quickly
      if (($uri eq '') ||
  	(($uri =~ m|^/*adm/|) &&
- 	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
+ 	     ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) ||
          ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
  	return undef;
      }
- Line 9960  sub get_course_slots {
+ Line 10620  sub get_course_slots {
          my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
          my ($tmp) = keys(%slots);
          if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-             &Apache::lonnet::do_cache_new('allslots',$hashid,\%slots,600);
+             &do_cache_new('allslots',$hashid,\%slots,600);
              return %slots;
          }
      }
- Line 10054  sub symbverify {
+ Line 10714  sub symbverify {
      if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
                              &GDBM_READER(),0640)) {
+         my $noclutter;
          if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) {
              $thisurl =~ s/\?.+$//;
+             if ($map =~ m{^uploaded/.+\.page$}) {
+                 $thisurl =~ s{^(/adm/wrapper|)/ext/}{http://};
+                 $thisurl =~ s{^\Qhttp://https://\E}{https://};
+                 $noclutter = 1;
+             }
+         }
+         my $ids;
+         if ($noclutter) {
+             $ids=$bighash{'ids_'.$thisurl};
+         } else {
+             $ids=$bighash{'ids_'.&clutter($thisurl)};
          }
-         my $ids=$bighash{'ids_'.&clutter($thisurl)};
          unless ($ids) {
              my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
              $ids=$bighash{$idkey};
          }
          if ($ids) {
  # ------------------------------------------------------------------- Has ID(s)
+             if ($thisfn =~ m{^/adm/wrapper/ext/}) {
+                 $symb =~ s/\?.+$//;
+             }
  	    foreach my $id (split(/\,/,$ids)) {
  	       my ($mapid,$resid)=split(/\./,$id);
-                if ($thisfn =~ m{^/adm/wrapper/ext/}) {
-                    $symb =~ s/\?.+$//;
-                }
                 if (
    &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn)
     eq $symb) {
- Line 10079  sub symbverify {
+ Line 10750  sub symbverify {
  		       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
                         ($thisurl eq '/adm/navmaps')) {
  		       $okay=1;
+                        last;
  		   }
  	       }
  	   }
- Line 10154  sub deversion {
+ Line 10826  sub deversion {
  sub symbread {
      my ($thisfn,$donotrecurse)=@_;
-     my $cache_str='request.symbread.cached.'.$thisfn;
+     my $cache_str;
-     if (defined($env{$cache_str})) {
+     if ($thisfn ne '') {
-         if (($thisfn) || ($env{$cache_str} ne '')) {
+         $cache_str='request.symbread.cached.'.$thisfn;
+         if ($env{$cache_str} ne '') {
              return $env{$cache_str};
          }
-     }
+     } else {
  # no filename provided? try from environment
-     unless ($thisfn) {
          if ($env{'request.symb'}) {
  	    return $env{$cache_str}=&symbclean($env{'request.symb'});
  	}
- Line 11076  sub goodbye {
+ Line 11748  sub goodbye {
  }
  sub get_dns {
-     my ($url,$func,$ignore_cache) = @_;
+     my ($url,$func,$ignore_cache,$nocache,$hashref) = @_;
      if (!$ignore_cache) {
  	my ($content,$cached)=
  	    &Apache::lonnet::is_cached_new('dns',$url);
  	if ($cached) {
- 	    &$func($content);
+ 	    &$func($content,$hashref);
  	    return;
  	}
      }
- Line 11106  sub get_dns {
+ Line 11778  sub get_dns {
          delete($alldns{$dns});
  	next if ($response->is_error());
  	my @content = split("\n",$response->content);
- 	&Apache::lonnet::do_cache_new('dns',$url,\@content,30*24*60*60);
+ 	unless ($nocache) {
- 	&$func(\@content);
+ 	    &do_cache_new('dns',$url,\@content,30*24*60*60);
+ 	}
+ 	&$func(\@content,$hashref);
  	return;
      }
      close($config);
- Line 11115  sub get_dns {
+ Line 11789  sub get_dns {
      &logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
      open($config,"<$perlvar{'lonTabDir'}/dns_$which.tab");
      my @content = <$config>;
-     &$func(\@content);
+     &$func(\@content,$hashref);
+     return;
+ }
+ # ------------------------------------------------------Get DNS checksums file
+ sub parse_dns_checksums_tab {
+     my ($lines,$hashref) = @_;
+     my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+     my $loncaparev = &get_server_loncaparev($machine_dom);
+     my ($release,$timestamp) = split(/\-/,$loncaparev);
+     my (%chksum,%revnum);
+     if (ref($lines) eq 'ARRAY') {
+         chomp(@{$lines});
+         my $version = shift(@{$lines});
+         if ($version eq $release) {
+             foreach my $line (@{$lines}) {
+                 my ($file,$version,$shasum) = split(/,/,$line);
+                 $chksum{$file} = $shasum;
+                 $revnum{$file} = $version;
+             }
+             if (ref($hashref) eq 'HASH') {
+                 %{$hashref} = (
+                                 sums     => \%chksum,
+                                 versions => \%revnum,
+                               );
+             }
+         }
+     }
      return;
  }
+ sub fetch_dns_checksums {
+     my %checksums;
+     my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+     my $loncaparev = &get_server_loncaparev($machine_dom);
+     my ($release,$timestamp) = split(/\-/,$loncaparev);
+     &get_dns("/adm/dns/checksums/$release",\&parse_dns_checksums_tab,1,1,
+              \%checksums);
+     return \%checksums;
+ }
  # ------------------------------------------------------------ Read domain file
  {
      my $loaded;
- Line 11427  sub get_dns {
+ Line 12139  sub get_dns {
  	    }
  	    push(@{$iphost{$ip}},@{$name_to_host{$name}});
  	}
- 	&Apache::lonnet::do_cache_new('iphost','iphost',
+ 	&do_cache_new('iphost','iphost',
- 				      [\%iphost,\%name_to_ip,\%lonid_to_ip],
+ 		      [\%iphost,\%name_to_ip,\%lonid_to_ip],
 *60*60);
  	return %iphost;
      }
- Line 11485  sub get_dns {
+ Line 12197  sub get_dns {
              }
              $seen{$prim_ip} = 1;
          }
-         return &Apache::lonnet::do_cache_new('internetnames',$lonid,\@idns,12*60*60);
+         return &do_cache_new('internetnames',$lonid,\@idns,12*60*60);
      }
  }
  sub all_loncaparevs {
-     return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10);
+     return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11);
  }
+ # ---------------------------------------------------------- Read loncaparev table
+ {
+     sub load_loncaparevs {
+         if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
+             if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
+                 while (my $configline=<$config>) {
+                     chomp($configline);
+                     my ($hostid,$loncaparev)=split(/:/,$configline);
+                     $loncaparevs{$hostid}=$loncaparev;
+                 }
+                 close($config);
+             }
+         }
+     }
+ }
+ # ---------------------------------------------------------- Read serverhostID table
+ {
+     sub load_serverhomeIDs {
+         if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
+             if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
+                 while (my $configline=<$config>) {
+                     chomp($configline);
+                     my ($name,$id)=split(/:/,$configline);
+                     $serverhomeIDs{$name}=$id;
+                 }
+                 close($config);
+             }
+         }
+     }
+ }
  BEGIN {
  # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
- Line 11570  BEGIN {
+ Line 12315  BEGIN {
  }
  # ---------------------------------------------------------- Read loncaparev table
- {
-     if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
+ &load_loncaparevs();
-         if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
-             while (my $configline=<$config>) {
-                 chomp($configline);
-                 my ($hostid,$loncaparev)=split(/:/,$configline);
-                 $loncaparevs{$hostid}=$loncaparev;
-             }
-             close($config);
-         }
-     }
- }
  # ---------------------------------------------------------- Read serverhostID table
- {
-     if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
-         if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
-             while (my $configline=<$config>) {
-                 chomp($configline);
-                 my ($name,$id)=split(/:/,$configline);
-                 $serverhomeIDs{$name}=$id;
-             }
-             close($config);
-         }
-     }
- }
+ &load_serverhomeIDs();
+ # ---------------------------------------------------------- Read releaseslist XML
  {
      my $file = $Apache::lonnet::perlvar{'lonTabDir'}.'/releaseslist.xml';
      if (-e $file) {
- Line 11795  were new keys. I.E. 1:foo will become 1:
+ Line 12521  were new keys. I.E. 1:foo will become 1:
  Calling convention:
-  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home);
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname);
-  &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home);
+  &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname);
  For more detailed information, see lonnet specific documentation.
- Line 11942  allowed($priv,$uri,$symb,$role) : check
+ Line 12668  allowed($priv,$uri,$symb,$role) : check
  =item *
+ constructaccess($url,$setpriv) : check for access to construction space URL
+ See if the owner domain and name in the URL match those in the
+ expected environment.  If so, return three element list
+ ($ownername,$ownerdomain,$ownerhome).
+ Otherwise return the null string.
+ If second argument 'setpriv' is true, it assigns the privileges,
+ and returns the same three element list, unless the owner has
+ blocked "ad hoc" Domain Coordinator access to the Author Space,
+ in which case the null string is returned.
+ =item *
  definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
  role rolename set privileges in format of lonTabs/roles.tab for system, domain,
  and course level
- Line 11958  environment).  If no custom name is defi
+ Line 12699  environment).  If no custom name is defi
  =item *
- get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) :
+ get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv) :
  All arguments are optional. Returns a hash of a roles, either for
  co-author/assistant author roles for a user's Construction Space
  (default), or if $context is 'userroles', roles for the user himself,
- Line 11972  of role statuses (active, future or prev
+ Line 12713  of role statuses (active, future or prev
  to restrict the list of roles reported. If no array ref is
  provided for types, will default to return only active roles.
+ =item *
+ in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if
+ user: $uname:$udom has a role in the course: $cdom_$cnum.
+ Additional optional arguments are: $type (if role checking is to be restricted
+ to certain user status types -- previous (expired roles), active (currently
+ available roles) or future (roles available in the future), and
+ $hideprivileged -- if true will not report course roles for users who
+ have active Domain Coordinator role in course's domain or in additional
+ domains (specified in 'Domains to check for privileged users' in course
+ environment -- set via:  Course Settings -> Classlists and staff listing).
+ =item *
+ privileged($username,$domain,$possdomains,$possroles) : returns 1 if user
+ $username:$domain is a privileged user (e.g., Domain Coordinator or Super User)
+ $possdomains and $possroles are optional array refs -- to domains to check and
+ roles to check.  If $possdomains is not specified, a dump will be done of the
+ users' roles.db to check for a dc or su role in any domain. This can be
+ time consuming if &privileged is called repeatedly (e.g., when displaying a
+ classlist), so in such cases, supplying a $possdomains array is preferred, as
+ this then allows &privileged_by_domain() to be used, which caches the identity
+ of privileged users, eliminating the need for repeated calls to &dump().
+ =item *
+ privileged_by_domain($possdomains,$roles) : returns a hash of a hash of a hash,
+ where the outer hash keys are domains specified in the $possdomains array ref,
+ next inner hash keys are privileged roles specified in the $roles array ref,
+ and the innermost hash contains key = value pairs for username:domain = end:start
+ for active or future "privileged" users with that role in that domain. To avoid
+ repeated dumps of domain roles -- via &get_domain_roles() -- contents of the
+ innerhash are cached using priv_$role and $dom as the identifiers.
  =back
  =head2 User Modification
- Line 12013  or when Autoupdate.pl is run by cron in
+ Line 12789  or when Autoupdate.pl is run by cron in
  modifystudent
  modify a student's enrollment and identification information.
- The course id is resolved based on the current users environment.
+ The course id is resolved based on the current user's environment.
- This means the envoking user must be a course coordinator or otherwise
+ This means the invoking user must be a course coordinator or otherwise
  associated with a course.
  This call is essentially a wrapper for lonnet::modifyuser and
- Line 12064  Inputs:
+ Line 12840  Inputs:
  =item B<$context> role change context (shown in User Management Logs display in a course)
  =item B<$inststatus> institutional status of user - : separated string of escaped status types
+ =item B<$credits> Number of credits student will earn from this class - only needs to be supplied if value needs to be different from default credits for class.
  =back
- Line 12072  Inputs:
+ Line 12850  Inputs:
  modify_student_enrollment
- Change a students enrollment status in a class.  The environment variable
+ Change a student's enrollment status in a class.  The environment variable
  'role.request.course' must be defined for this function to proceed.
  Inputs:
  =over 4
- =item $udom, students domain
+ =item $udom, student's domain
- =item $uname, students name
+ =item $uname, student's name
- =item $uid, students user id
+ =item $uid, student's user id
- =item $first, students first name
+ =item $first, student's first name
  =item $middle
- Line 12109  Inputs:
+ Line 12887  Inputs:
  =item $context
+ =item $credits, number of credits student will earn from this class
  =back
- Line 12165  If defined, the supplied username is use
+ Line 12945  If defined, the supplied username is use
  resdata($name,$domain,$type,@which) : request for current parameter
  setting for a specific $type, where $type is either 'course' or 'user',
  @what should be a list of parameters to ask about. This routine caches
- answers for 5 minutes.
+ answers for 10 minutes.
  =item *
- Line 12174  data base, returning a hash that is keye
+ Line 12954  data base, returning a hash that is keye
  values that are the resource value.  I believe that the timestamps and
  versions are also returned.
+ get_numsuppfiles($cnum,$cdom) : retrieve number of files in a course's
+ supplemental content area. This routine caches the number of files for
+minutes.
  =back
- Line 12234  resource. Expects the local filesystem p
+ Line 13017  resource. Expects the local filesystem p
  =item *
- EXT($varname,$symb,$udom,$uname) : evaluates and returns the value of
+ EXT($varname,$symb,$udom,$uname,$usection,$recurse,$cid) : evaluates
- a vairety of different possible values, $varname should be a request
+ and returns the value of a variety of different possible values,
- string, and the other parameters can be used to specify who and what
+ $varname should be a request string, and the other parameters can be
- one is asking about.
+ used to specify who and what one is asking about. Ordinarily, $cid
+ does not need to be specified, as it is retrived from
+ $env{'request.course.id'}, but &Apache::lonnet::EXT() is called
+ within lonuserstate::loadmap() when initializing a course, before
+ $env{'request.course.id'} has been set, so it needs to be provided
+ in that one case.
  Possible values for $varname are environment.lastname (or other item
  from the envirnment hash), user.name (or someother aspect about the
- Line 12335  expirespread($uname,$udom,$stype,$usymb)
+ Line 13123  expirespread($uname,$udom,$stype,$usymb)
  devalidate($symb) : devalidate temporary spreadsheet calculations,
  forcing spreadsheet to reevaluate the resource scores next time.
+ =item *
+ can_edit_resource($file,$cnum,$cdom,$resurl,$symb,$group) : determine if current user can edit a particular resource,
+ when viewing in course context.
+  input: six args -- filename (decluttered), course number, course domain,
+                     url, symb (if registered) and group (if this is a
+                     group item -- e.g., bulletin board, group page etc.).
+  output: array of five scalars --
+          $cfile -- url for file editing if editable on current server
+          $home -- homeserver of resource (i.e., for author if published,
+                                           or course if uploaded.).
+          $switchserver --  1 if server switch will be needed.
+          $forceedit -- 1 if icon/link should be to go to edit mode
+          $forceview -- 1 if icon/link should be to go to view mode
+ =item *
+ is_course_upload($file,$cnum,$cdom)
+ Used in course context to determine if current file was uploaded to
+ the course (i.e., would be found in /userfiles/docs on the course's
+ homeserver.
+   input: 3 args -- filename (decluttered), course number and course domain.
+   output: boolean -- 1 if file was uploaded.
  =back
  =head2 Storing/Retreiving Data
- Line 12487  server ($udom and $uhome are optional)
+ Line 13303  server ($udom and $uhome are optional)
  =item *
- get_domain_defaults($target_domain) : returns hash with defaults for
+ get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
- authentication and language in the domain. Keys are: auth_def, auth_arg_def,
+ for: authentication, language, quotas, timezone, date locale, and portal URL in
- lang_def; corresponsing values are authentication type (internal, krb4, krb5,
+ the target domain.
- or localauth), initial password or a kerberos realm, language (e.g., en-us).
- Values are retrieved from cache (if current), or from domain's configuration.db
+ May also include additional key => value pairs for the following groups:
- (if available), or lastly from values in lonTabs/dns_domain,tab,
- or lonTabs/domain.tab.
+ =over
+ =item
+ disk quotas (MB allocated by default to portfolios and authoring spaces).
+ =over
+ =item defaultquota, authorquota
+ =back
+ =item
+ tools (availability of aboutme page, blog, webDAV access for authoring spaces,
+ portfolio for users).
+ =over
+ =item
+ aboutme, blog, webdav, portfolio
+ =back
+ =item
+ requestcourses: ability to request courses, and how requests are processed.
+ =over
+ =item
+ official, unofficial, community, textbook
+ =back
+ =item
+ inststatus: types of institutional affiliation, and order in which they are displayed.
+ =over
+ =item
+ inststatustypes, inststatusorder, inststatusguest
+ =back
+ =item
+ coursedefaults: can PDF forms can be created, default credits for courses, default quotas (MB)
+ for course's uploaded content.
+ =over
- %domdefaults = &get_auth_defaults($target_domain);
+ =item
+ canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota,
+ communityquota, textbookquota
+ =back
+ =item
+ usersessions: set options for hosting of your users in other domains, and hosting of users from other domains
+ on your servers.
+ =over
+ =item
+ remotesessions, hostedsessions
+ =back
+ =back
+ In cases where a domain coordinator has never used the "Set Domain Configuration"
+ utility to create a configuration.db file on a domain's primary library server
+ only the following domain defaults: auth_def, auth_arg_def, lang_def
+ -- corresponding values are authentication type (internal, krb4, krb5,
+ or localauth), initial password or a kerberos realm, language (e.g., en-us) --
+ will be available. Values are retrieved from cache (if current), unless the
+ optional $ignore_cache arg is true, or from domain's configuration.db (if available),
+ or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
+ Typical usage:
+ %domdefaults = &get_domain_defaults($target_domain);
  =back
- Line 12890  Internal notes:
+ Line 13782  Internal notes:
   Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays.
+ =item *
  modify_access_controls():
  Modifies access controls for a portfolio file
- Line 12907  Returns:
+ Line 13801  Returns:
 . 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
+ =item *
+ get_timebased_id():
+ Attempts to get a unique timestamp-based suffix for use with items added to a
+ course via the Course Editor (e.g., folders, composite pages,
+ group bulletin boards).
+ Args: (first three required; six others optional)
+. prefix (alphanumeric): of keys in hash, e.g., suppsequence, docspage,
+    docssequence, or name of group
+. keyid (alphanumeric): name of temporary locking key in hash,
+    e.g., num, boardids
+. namespace: name of gdbm file used to store suffixes already assigned;
+    file will be named nohist_namespace.db
+. cdom: domain of course; default is current course domain from %env
+. cnum: course number; default is current course number from %env
+. idtype: set to concat if an additional digit is to be appended to the
+    unix timestamp to form the suffix, if the plain timestamp is already
+    in use.  Default is to not do this, but simply increment the unix
+    timestamp by 1 until a unique key is obtained.
+. who: holder of locking key; defaults to user:domain for user.
+. locktries: number of attempts to obtain a lock (sleep of 1s before
+    retrying); default is 3.
+. maxtries: number of attempts to obtain a unique suffix; default is 20.
+ Returns:
+. suffix obtained (numeric)
+. result of deleting locking key (ok if deleted, or lock never obtained)
+. error: contains (localized) error message if an error occurred.
  =back

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

Removed from v.1.1191
changed lines
	Added in v.1.1256