--- loncom/lonnet/perl/lonnet.pm	2013/05/23 14:36:44	1.1172.2.25
+++ loncom/lonnet/perl/lonnet.pm	2012/05/28 12:28:14	1.1174
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.25 2013/05/23 14:36:44 raeburn Exp $
+# $Id: lonnet.pm,v 1.1174 2012/05/28 12:28:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,7 +75,9 @@ use LWP::UserAgent();
 use HTTP::Date;
 use Image::Magick;
 
-use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $apache
+use Encode;
+
+use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
             %managerstab);
 
@@ -109,33 +111,31 @@ require Exporter;
 our @ISA = qw (Exporter);
 our @EXPORT = qw(%env);
 
-# ------------------------------------ Logging (parameters, docs, slots, roles)
+
+# --------------------------------------------------------------------- Logging
 {
     my $logid;
-    sub write_log {
-	my ($context,$hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
-        if ($context eq 'course') {
-            if (($cnum eq '') || ($cdom eq '')) {
-                $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            }
+    sub instructor_log {
+	my ($hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
+        if (($cnum eq '') || ($cdom eq '')) {
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         }
-	$logid ++;
+	$logid++;
         my $now = time();
 	my $id=$now.'00000'.$$.'00000'.$logid;
-        my $logentry = {
-                         $id => {
-                                  'exe_uname' => $env{'user.name'},
-                                  'exe_udom'  => $env{'user.domain'},
-                                  'exe_time'  => $now,
-                                  'exe_ip'    => $ENV{'REMOTE_ADDR'},
-                                  'delflag'   => $delflag,
-                                  'logentry'  => $storehash,
-                                  'uname'     => $uname,
-                                  'udom'      => $udom,
-                                }
-                       };
-        return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
+	return &Apache::lonnet::put('nohist_'.$hash_name,
+				    { $id => {
+					'exe_uname' => $env{'user.name'},
+					'exe_udom'  => $env{'user.domain'},
+					'exe_time'  => $now,
+					'exe_ip'    => $ENV{'REMOTE_ADDR'},
+					'delflag'   => $delflag,
+					'logentry'  => $storehash,
+					'uname'     => $uname,
+					'udom'      => $udom,
+				    }
+				  },$cdom,$cnum);
     }
 }
 
@@ -630,15 +630,6 @@ sub check_for_valid_session {
 	|| !defined($disk_env{'user.domain'})) {
 	return undef;
     }
-
-    if (($r->user() eq '') && ($apache >= 2.4)) {
-        if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {
-            $r->user($disk_env{'user.name'});
-        } else {
-            $r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'});
-        }
-    }
-
     return $handle;
 }
 
@@ -1245,10 +1236,9 @@ sub get_lonbalancer_config {
 
 sub check_loadbalancing {
     my ($uname,$udom) = @_;
-    my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom,
-        $rule_in_effect,$offloadto,$otherserver);
+    my ($is_balancer,$dom_in_use,$homeintdom,$rule_in_effect,
+        $offloadto,$otherserver);
     my $lonhost = $perlvar{'lonHostID'};
-    my @hosts = &current_machine_ids();
     my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
     my $uintdom = &Apache::lonnet::internet_dom($uprimary_id);
     my $intdom = &Apache::lonnet::internet_dom($lonhost);
@@ -1271,8 +1261,15 @@ sub check_loadbalancing {
         }
     }
     if (ref($result) eq 'HASH') {
-        ($is_balancer,$currtargets,$currrules) =
-            &check_balancer_result($result,@hosts);
+        my $currbalancer = $result->{'lonhost'};
+        my $currtargets = $result->{'targets'};
+        my $currrules = $result->{'rules'};
+        if ($currbalancer ne '') {
+            my @hosts = &current_machine_ids();
+            if (grep(/^\Q$currbalancer\E$/,@hosts)) {
+                $is_balancer = 1;
+            }
+        }
         if ($is_balancer) {
             if (ref($currrules) eq 'HASH') {
                 if ($homeintdom) {
@@ -1330,9 +1327,12 @@ sub check_loadbalancing {
             }
         }
         if (ref($result) eq 'HASH') {
-            ($is_balancer,$currtargets,$currrules) =
-                &check_balancer_result($result,@hosts);
-            if ($is_balancer) {
+            my $currbalancer = $result->{'lonhost'};
+            my $currtargets = $result->{'targets'};
+            my $currrules = $result->{'rules'};
+
+            if ($currbalancer eq $lonhost) {
+                $is_balancer = 1;
                 if (ref($currrules) eq 'HASH') {
                     if ($currrules->{'_LC_internetdom'} ne '') {
                         $rule_in_effect = $currrules->{'_LC_internetdom'};
@@ -1353,81 +1353,41 @@ sub check_loadbalancing {
             $offloadto = &this_host_spares($dom_in_use);
         }
     }
-    if ($is_balancer) {
-        my $lowest_load = 30000;
-        if (ref($offloadto) eq 'HASH') {
-            if (ref($offloadto->{'primary'}) eq 'ARRAY') {
-                foreach my $try_server (@{$offloadto->{'primary'}}) {
-                    ($otherserver,$lowest_load) =
-                        &compare_server_load($try_server,$otherserver,$lowest_load);
-                }
+    my $lowest_load = 30000;
+    if (ref($offloadto) eq 'HASH') {
+        if (ref($offloadto->{'primary'}) eq 'ARRAY') {
+            foreach my $try_server (@{$offloadto->{'primary'}}) {
+                ($otherserver,$lowest_load) =
+                    &compare_server_load($try_server,$otherserver,$lowest_load);
             }
-            my $found_server = ($otherserver ne '' && $lowest_load < 100);
+        }
+        my $found_server = ($otherserver ne '' && $lowest_load < 100);
 
-            if (!$found_server) {
-                if (ref($offloadto->{'default'}) eq 'ARRAY') {
-                    foreach my $try_server (@{$offloadto->{'default'}}) {
-                        ($otherserver,$lowest_load) =
-                            &compare_server_load($try_server,$otherserver,$lowest_load);
-                    }
-                }
-            }
-        } elsif (ref($offloadto) eq 'ARRAY') {
-            if (@{$offloadto} == 1) {
-                $otherserver = $offloadto->[0];
-            } elsif (@{$offloadto} > 1) {
-                foreach my $try_server (@{$offloadto}) {
+        if (!$found_server) {
+            if (ref($offloadto->{'default'}) eq 'ARRAY') {
+                foreach my $try_server (@{$offloadto->{'default'}}) {
                     ($otherserver,$lowest_load) =
                         &compare_server_load($try_server,$otherserver,$lowest_load);
                 }
             }
         }
-        if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) {
-            $is_balancer = 0;
-            if ($uname ne '' && $udom ne '') {
-                if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
-
-                    &appenv({'user.loadbalexempt'     => $lonhost,
-                             'user.loadbalcheck.time' => time});
-                }
+    } elsif (ref($offloadto) eq 'ARRAY') {
+        if (@{$offloadto} == 1) {
+            $otherserver = $offloadto->[0];
+        } elsif (@{$offloadto} > 1) {
+            foreach my $try_server (@{$offloadto}) {
+                ($otherserver,$lowest_load) =
+                    &compare_server_load($try_server,$otherserver,$lowest_load);
             }
         }
     }
     return ($is_balancer,$otherserver);
 }
 
-sub check_balancer_result {
-    my ($result,@hosts) = @_;
-    my ($is_balancer,$currtargets,$currrules);
-    if (ref($result) eq 'HASH') {
-        if ($result->{'lonhost'} ne '') {
-            my $currbalancer = $result->{'lonhost'};
-            if (grep(/^\Q$currbalancer\E$/,@hosts)) {
-                $is_balancer = 1;
-                $currtargets = $result->{'targets'};
-                $currrules = $result->{'rules'};
-            }
-        } else {
-            foreach my $key (keys(%{$result})) {
-                if (($key ne '') && (grep(/^\Q$key\E$/,@hosts)) &&
-                    (ref($result->{$key}) eq 'HASH')) {
-                    $is_balancer = 1;
-                    $currrules = $result->{$key}{'rules'};
-                    $currtargets = $result->{$key}{'targets'};
-                    last;
-                }
-            }
-        }
-    }
-    return ($is_balancer,$currtargets,$currrules);
-}
-
 sub get_loadbalancer_targets {
     my ($rule_in_effect,$currtargets,$uname,$udom) = @_;
     my $offloadto;
-    if ($rule_in_effect eq 'none') {
-        return [$perlvar{'lonHostID'}];
-    } elsif ($rule_in_effect eq '') {
+    if ($rule_in_effect eq '') {
         $offloadto = $currtargets;
     } else {
         if ($rule_in_effect eq 'homeserver') {
@@ -1445,7 +1405,7 @@ sub get_loadbalancer_targets {
                     }
                 }
             } else {
-                my %servers = &internet_dom_servers($udom);
+                my %servers = &dom_servers($udom);
                 my ($remotebalancer,$remotetargets) = &get_lonbalancer_config(\%servers);
                 if (&hostname($remotebalancer) ne '') {
                     $offloadto = [$remotebalancer];
@@ -1964,8 +1924,7 @@ sub get_domain_defaults {
     my %domconfig =
          &Apache::lonnet::get_dom('configuration',['defaults','quotas',
                                   'requestcourses','inststatus',
-                                  'coursedefaults','usersessions',
-                                  'requestauthor'],$domain);
+                                  'coursedefaults','usersessions'],$domain);
     if (ref($domconfig{'defaults'}) eq 'HASH') {
         $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; 
         $domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
@@ -1984,7 +1943,7 @@ sub get_domain_defaults {
         } else {
             $domdefaults{'defaultquota'} = $domconfig{'quotas'};
         } 
-        my @usertools = ('aboutme','blog','webdav','portfolio');
+        my @usertools = ('aboutme','blog','portfolio');
         foreach my $item (@usertools) {
             if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
                 $domdefaults{$item} = $domconfig{'quotas'}{$item};
@@ -1996,18 +1955,14 @@ sub get_domain_defaults {
             $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
         }
     }
-    if (ref($domconfig{'requestauthor'}) eq 'HASH') {
-        $domdefaults{'requestauthor'} = $domconfig{'requestauthor'};
-    }
     if (ref($domconfig{'inststatus'}) eq 'HASH') {
         foreach my $item ('inststatustypes','inststatusorder') {
             $domdefaults{$item} = $domconfig{'inststatus'}{$item};
         }
     }
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
-        if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
-            $domdefaults{'officialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'official'};
-            $domdefaults{'unofficialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'};
+        foreach my $item ('canuse_pdfforms') {
+            $domdefaults{$item} = $domconfig{'coursedefaults'}{$item};
         }
     }
     if (ref($domconfig{'usersessions'}) eq 'HASH') {
@@ -2018,7 +1973,8 @@ sub get_domain_defaults {
             $domdefaults{'hostedsessions'} = $domconfig{'usersessions'}{'hosted'};
         }
     }
-    &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
+    &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults,
+                                  $cachetime);
     return %domdefaults;
 }
 
@@ -2428,7 +2384,7 @@ sub chatsend {
 
 sub getversion {
     my $fname=&clutter(shift);
-    unless ($fname=~m{^(/adm/wrapper|)/res/}) { return -1; }
+    unless ($fname=~/^\/res\//) { return -1; }
     return &currentversion(&filelocation('',$fname));
 }
 
@@ -2615,10 +2571,11 @@ sub ssi {
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
     my $response= $ua->request($request);
+    my $content = Encode::decode_utf8($response->content);
     if (wantarray) {
-	return ($response->content, $response);
+	return ($content, $response);
     } else {
-	return $response->content;
+	return $content;
     }
 }
 
@@ -2647,257 +2604,6 @@ 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;
-                }
-            }
-        }
-        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,
@@ -3188,9 +2894,7 @@ sub userfileupload {
 					 $codebase,$thumbwidth,$thumbheight,
                                          $resizewidth,$resizeheight,$context,$mimetype);
         } else {
-            if ($env{'form.folder'}) {
-                $fname=$env{'form.folder'}.'/'.$fname;
-            }
+            $fname=$env{'form.folder'}.'/'.$fname;
             return &process_coursefile('uploaddoc',$docuname,$docudom,
 				       $fname,$formname,$parser,
 				       $allfiles,$codebase,$mimetype);
@@ -3205,7 +2909,7 @@ sub userfileupload {
     } else {
         my $docuname=$env{'user.name'};
         my $docudom=$env{'user.domain'};
-        if ((exists($env{'form.group'})) || ($context eq 'syllabus')) {
+        if (exists($env{'form.group'})) {
             $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
             $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
         }
@@ -3355,9 +3059,7 @@ sub extract_embedded_items {
 		&add_filetype($allfiles,$attr->{'src'},'src');
 	    }
 	    if (lc($tagname) eq 'a') {
-                unless (($attr->{'href'} =~ /^#/) || ($attr->{'href'} eq '')) {
-		    &add_filetype($allfiles,$attr->{'href'},'href');
-                }
+		&add_filetype($allfiles,$attr->{'href'},'href');
 	    }
             if (lc($tagname) eq 'script') {
                 my $src;
@@ -3811,70 +3513,38 @@ sub userrolelog {
 
 sub courserolelog {
     my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_;
-    if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) {
-        my $cdom = $1;
-        my $cnum = $2;
-        my $sec = $3;
-        my $namespace = 'rolelog';
-        my %storehash = (
-                           role    => $trole,
-                           start   => $tstart,
-                           end     => $tend,
-                           selfenroll => $selfenroll,
-                           context    => $context,
-                        );
-        if ($trole eq 'gr') {
-            $namespace = 'groupslog';
-            $storehash{'group'} = $sec;
-        } else {
-            $storehash{'section'} = $sec;
-        }
-        &write_log('course',$namespace,\%storehash,$delflag,$username,
-                   $domain,$cnum,$cdom);
-        if (($trole ne 'st') || ($sec ne '')) {
-            &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
+    if (($trole eq 'cc') || ($trole eq 'in') ||
+        ($trole eq 'ep') || ($trole eq 'ad') ||
+        ($trole eq 'ta') || ($trole eq 'st') ||
+        ($trole=~/^cr/) || ($trole eq 'gr') ||
+        ($trole eq 'co')) {
+        if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) {
+            my $cdom = $1;
+            my $cnum = $2;
+            my $sec = $3;
+            my $namespace = 'rolelog';
+            my %storehash = (
+                               role    => $trole,
+                               start   => $tstart,
+                               end     => $tend,
+                               selfenroll => $selfenroll,
+                               context    => $context,
+                            );
+            if ($trole eq 'gr') {
+                $namespace = 'groupslog';
+                $storehash{'group'} = $sec;
+            } else {
+                $storehash{'section'} = $sec;
+            }
+            &instructor_log($namespace,\%storehash,$delflag,$username,$domain,$cnum,$cdom);
+            if (($trole ne 'st') || ($sec ne '')) {
+                &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
+            }
         }
     }
     return;
 }
 
-sub domainrolelog {
-    my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_;
-    if ($area =~ m{^/($match_domain)/$}) {
-        my $cdom = $1;
-        my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
-        my $namespace = 'rolelog';
-        my %storehash = (
-                           role    => $trole,
-                           start   => $tstart,
-                           end     => $tend,
-                           context => $context,
-                        );
-        &write_log('domain',$namespace,\%storehash,$delflag,$username,
-                   $domain,$domconfiguser,$cdom);
-    }
-    return;
-
-}
-
-sub coauthorrolelog {
-    my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_;
-    if ($area =~ m{^/($match_domain)/($match_username)$}) {
-        my $audom = $1;
-        my $auname = $2;
-        my $namespace = 'rolelog';
-        my %storehash = (
-                           role    => $trole,
-                           start   => $tstart,
-                           end     => $tend,
-                           context => $context,
-                        );
-        &write_log('author',$namespace,\%storehash,$delflag,$username,
-                   $domain,$auname,$audom);
-    }
-    return;
-}
-
 sub get_course_adv_roles {
     my ($cid,$codes) = @_;
     $cid=$env{'request.course.id'} unless (defined($cid));
@@ -3888,10 +3558,6 @@ 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'});
@@ -3904,7 +3570,20 @@ sub get_course_adv_roles {
         if (($tstart) && ($now<$tstart)) { next; }
         my ($role,$username,$domain,$section)=split(/\:/,$entry);
 	if ($username eq '' || $domain eq '') { next; }
-        if ((&privileged($username,$domain,\@possdoms)) &&
+        unless (ref($privileged{$domain}) eq 'HASH') {
+            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) {
@@ -3935,7 +3614,8 @@ sub get_my_roles {
     if ($context eq 'userroles') {
         %dumphash = &dump('roles',$udom,$uname);
     } else {
-        %dumphash = &dump('nohist_userroles',$udom,$uname);
+        %dumphash=
+            &dump('nohist_userroles',$udom,$uname);
         if ($hidepriv) {
             my %coursehash=&coursedescription($udom.'_'.$uname);
             foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
@@ -3977,7 +3657,7 @@ sub get_my_roles {
         }
         my ($rolecode,$username,$domain,$section,$area);
         if ($context eq 'userroles') {
-            ($area,$rolecode) = ($entry =~ /^(.+)_([^_]+)$/);
+            ($area,$rolecode) = split(/_/,$entry);
             (undef,$domain,$username,$section) = split(/\//,$area);
         } else {
             ($role,$username,$domain,$section) = split(/\:/,$entry);
@@ -4003,15 +3683,28 @@ sub get_my_roles {
             }
         }
         if ($hidepriv) {
-            my @privroles = ('dc','su');
             if ($context eq 'userroles') {
-                next if (grep(/^\Q$role\E$/,@privroles));
+                if ((&privileged($username,$domain)) &&
+                    (!$nothide{$username.':'.$domain})) {
+                    next;
+                }
             } else {
-                my $possdoms = [$domain];
-                if (ref($roledoms) eq 'ARRAY') {
-                   push(@{$possdoms},@{$roledoms});
+                unless (ref($privileged{$domain}) eq 'HASH') {
+                    my %dompersonnel =
+                        &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+                    $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 (&privileged($username,$domain,$possdoms,\@privroles)) {
+                if (exists($privileged{$domain}{$username})) {
                     if (!$nothide{$username.':'.$domain}) {
                         next;
                     }
@@ -4115,32 +3808,18 @@ sub courseiddump {
 
 	    if (($domfilter eq '') ||
 		(&host_domain($tryserver) eq $domfilter)) {
-                my $rep;
-                if (grep { $_ eq $tryserver } &current_machine_ids()) {
-                    $rep = &LONCAPA::Lond::dump_course_id_handler(
-                        join(":", (&host_domain($tryserver), $sincefilter,
-                                &escape($descfilter), &escape($instcodefilter),
-                                &escape($ownerfilter), &escape($coursefilter),
-                                &escape($typefilter), &escape($regexp_ok),
-                                $as_hash, &escape($selfenrollonly),
-                                &escape($catfilter), $showhidden, $caller,
-                                &escape($cloner), &escape($cc_clone), $cloneonly,
-                                &escape($createdbefore), &escape($createdafter),
-                                &escape($creationcontext), $domcloner)));
-                } else {
-                    $rep = &reply('courseiddump:'.&host_domain($tryserver).':'.
-                             $sincefilter.':'.&escape($descfilter).':'.
-                             &escape($instcodefilter).':'.&escape($ownerfilter).
-                             ':'.&escape($coursefilter).':'.&escape($typefilter).
-                             ':'.&escape($regexp_ok).':'.$as_hash.':'.
-                             &escape($selfenrollonly).':'.&escape($catfilter).':'.
-                             $showhidden.':'.$caller.':'.&escape($cloner).':'.
-                             &escape($cc_clone).':'.$cloneonly.':'.
-                             &escape($createdbefore).':'.&escape($createdafter).':'.
-                             &escape($creationcontext).':'.$domcloner,
-                             $tryserver);
-                }
-
+                my $rep = 
+                  &reply('courseiddump:'.&host_domain($tryserver).':'.
+                         $sincefilter.':'.&escape($descfilter).':'.
+                         &escape($instcodefilter).':'.&escape($ownerfilter).
+                         ':'.&escape($coursefilter).':'.&escape($typefilter).
+                         ':'.&escape($regexp_ok).':'.$as_hash.':'.
+                         &escape($selfenrollonly).':'.&escape($catfilter).':'.
+                         $showhidden.':'.$caller.':'.&escape($cloner).':'.
+                         &escape($cc_clone).':'.$cloneonly.':'.
+                         &escape($createdbefore).':'.&escape($createdafter).':'.
+                         &escape($creationcontext).':'.$domcloner,
+                         $tryserver);
                 my @pairs=split(/\&/,$rep);
                 foreach my $item (@pairs) {
                     my ($key,$value)=split(/\=/,$item,2);
@@ -4246,7 +3925,7 @@ sub get_domain_roles {
     }
     my $rolelist;
     if (ref($roles) eq 'ARRAY') {
-        $rolelist = join('&',@{$roles});
+        $rolelist = join(':',@{$roles});
     }
     my %personnel = ();
 
@@ -4925,93 +4604,20 @@ sub update_released_required {
 # -------------------------------------------------See if a user is privileged
 
 sub privileged {
-    my ($username,$domain,$possdomains,$possroles)=@_;
+    my ($username,$domain)=@_;
+
+    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 (grep(/^\Q$trole\E$/,@{$roles})) {
-                return 1 unless ($tend && $tend < $now)
-                        or ($tstart && $tstart > $now);
+            if (($trole eq 'dc') || ($trole eq 'su')) {
+                return 1 unless ($tend && $tend < $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;
+    return 0;
 }
 
 # -------------------------------------------------------- Get user privileges
@@ -5123,11 +4729,9 @@ sub rolesinit {
 }
 
 sub set_arearole {
-    my ($trole,$area,$tstart,$tend,$domain,$username,$nolog) = @_;
-    unless ($nolog) {
+    my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
 # 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);
 }
 
@@ -5375,19 +4979,15 @@ sub delete_env_groupprivs {
 sub check_adhoc_privs {
     my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller) = @_;
     my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum;
-    my $setprivs;
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
         &role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
             &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
-            $setprivs = 1;
         }
     } else {
         &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
-        $setprivs = 1;
     }
-    return $setprivs;
 }
 
 sub set_adhoc_privileges {
@@ -5396,7 +4996,7 @@ sub set_adhoc_privileges {
     my $area = '/'.$dcdom.'/'.$pickedcourse;
     my $spec = $role.'.'.$area;
     my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
-                                  $env{'user.name'},1);
+                                  $env{'user.name'});
     my %ccrole = ();
     &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
     my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
@@ -5459,36 +5059,12 @@ sub del {
 
 # -------------------------------------------------------------- dump interface
 
-sub unserialize {
-    my ($rep, $escapedkeys) = @_;
-
-    return {} if $rep =~ /^error/;
-
-    my %returnhash=();
-    foreach my $item (split(/\&/,$rep)) {
-        my ($key, $value) = split(/=/, $item, 2);
-        $key = unescape($key) unless $escapedkeys;
-        next if $key =~ /^error: 2 /;
-        $returnhash{$key} = &thaw_unescape($value);
-    }
-    return \%returnhash;
-}
-
-# see Lond::dump_with_regexp
-# if $escapedkeys hash keys won't get unescaped.
 sub dump {
-    my ($namespace,$udomain,$uname,$regexp,$range,$escapedkeys)=@_;
+    my ($namespace,$udomain,$uname,$regexp,$range)=@_;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
 
-    my $reply;
-    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});
-        return %{&unserialize($reply, $escapedkeys)};
-    }
     if ($regexp) {
 	$regexp=&escape($regexp);
     } else {
@@ -5500,7 +5076,7 @@ sub dump {
     if (!($rep =~ /^error/ )) {
 	foreach my $item (@pairs) {
 	    my ($key,$value)=split(/=/,$item,2);
-            $key = &unescape($key) unless ($escapedkeys);
+	    $key = &unescape($key);
 	    next if ($key =~ /^error: 2 /);
 	    $returnhash{$key}=&thaw_unescape($value);
 	}
@@ -5513,9 +5089,23 @@ sub dump {
 
 sub dumpstore {
    my ($namespace,$udomain,$uname,$regexp,$range)=@_;
-   # same as dump but keys must be escaped. They may contain colon separated
-   # lists of values that may themself contain colons (e.g. symbs).
-   return &dump($namespace, $udomain, $uname, $regexp, $range, 1);
+   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);
+       next if ($key =~ /^error: 2 /);
+       $returnhash{$key}=&thaw_unescape($value);
+   }
+   return %returnhash;
 }
 
 # -------------------------------------------------------------- keys interface
@@ -5784,88 +5374,6 @@ 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 {
@@ -6121,15 +5629,10 @@ sub usertools_access {
                       unofficial => 1,
                       community  => 1,
                  );
-    } elsif ($context eq 'requestauthor') {
-        %tools = (
-                      requestauthor => 1,
-                 );
     } else {
         %tools = (
                       aboutme   => 1,
                       blog      => 1,
-                      webdav    => 1,
                       portfolio => 1,
                  );
     }
@@ -6144,32 +5647,25 @@ sub usertools_access {
         if ($action ne 'reload') {
             if ($context eq 'requestcourses') {
                 return $env{'environment.canrequest.'.$tool};
-            } elsif ($context eq 'requestauthor') {
-                return $env{'environment.canrequest.author'};
             } else {
                 return $env{'environment.availabletools.'.$tool};
             }
         }
     }
 
-    my ($toolstatus,$inststatus,$envkey);
-    if ($context eq 'requestauthor') {
-        $envkey = $context;
-    } else {
-        $envkey = $context.'.'.$tool;
-    }
+    my ($toolstatus,$inststatus);
 
     if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
          ($action ne 'reload')) {
-        $toolstatus = $env{'environment.'.$envkey};
+        $toolstatus = $env{'environment.'.$context.'.'.$tool};
         $inststatus = $env{'environment.inststatus'};
     } else {
         if (ref($userenvref) eq 'HASH') {
-            $toolstatus = $userenvref->{$envkey};
+            $toolstatus = $userenvref->{$context.'.'.$tool};
             $inststatus = $userenvref->{'inststatus'};
         } else {
-            my %userenv = &userenvironment($udom,$uname,$envkey,'inststatus');
-            $toolstatus = $userenv{$envkey};
+            my %userenv = &userenvironment($udom,$uname,$context.'.'.$tool,'inststatus');
+            $toolstatus = $userenv{$context.'.'.$tool};
             $inststatus = $userenv{'inststatus'};
         }
     }
@@ -6235,7 +5731,7 @@ sub usertools_access {
             }
         }
     } else {
-        if (($context eq 'tools') && ($tool ne 'webdav')) {
+        if ($context eq 'tools') {
             $access = 1;
         } else {
             $access = 0;
@@ -6892,73 +6388,6 @@ 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 '') {
@@ -7484,8 +6913,8 @@ sub auto_validate_instcode {
     }
     $response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'.
                         &escape($instcode).':'.&escape($owner),$homeserver));
-    my ($outcome,$description,$defaultcredits) = map { &unescape($_); } split('&',$response,3);
-    return ($outcome,$description,$defaultcredits);
+    my ($outcome,$description) = map { &unescape($_); } split('&',$response,2);
+    return ($outcome,$description);
 }
 
 sub auto_create_password {
@@ -8023,41 +7452,6 @@ sub assignrole {
                             }
                         }
                     }
-                } elsif ($context eq 'requestauthor') {
-                    if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
-                        ($url eq '/'.$udom.'/') && ($role eq 'au')) {
-                        if ($env{'environment.requestauthor'} eq 'automatic') {
-                            $refused = '';
-                        } else {
-                            my %domdefaults = &get_domain_defaults($udom);
-                            if (ref($domdefaults{'requestauthor'}) eq 'HASH') {
-                                my $checkbystatus;
-                                if ($env{'user.adv'}) {
-                                    my $disposition = $domdefaults{'requestauthor'}{'_LC_adv'};
-                                    if ($disposition eq 'automatic') {
-                                        $refused = '';
-                                    } elsif ($disposition eq '') {
-                                        $checkbystatus = 1;
-                                    }
-                                } else {
-                                    $checkbystatus = 1;
-                                }
-                                if ($checkbystatus) {
-                                    if ($env{'environment.inststatus'}) {
-                                        my @inststatuses = split(/,/,$env{'environment.inststatus'});
-                                        foreach my $type (@inststatuses) {
-                                            if (($type ne '') &&
-                                                ($domdefaults{'requestauthor'}{$type} eq 'automatic')) {
-                                                $refused = '';
-                                            }
-                                        }
-                                    } elsif ($domdefaults{'requestauthor'}{'default'} eq 'automatic') {
-                                        $refused = '';
-                                    }
-                                }
-                            }
-                        }
-                    }
                 }
                 if ($refused) {
                     &logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url.
@@ -8107,25 +7501,11 @@ sub assignrole {
 # log new user role if status is ok
     if ($answer eq 'ok') {
 	&userrolelog($role,$uname,$udom,$url,$start,$end);
-        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') ||
-                 ($role eq 'au') || ($role eq 'dc')) {
-            &domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
-                           $context);
-        } elsif (($role eq 'ca') || ($role eq 'aa')) {
-            &coauthorrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
-                             $context);
+        &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,$selfenroll,$context);
+        unless ($role =~ /^gr/) {
+            &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
+                                             $origstart,$selfenroll,$context);
         }
         if ($role eq 'cc') {
             &autoupdate_coowners($url,$end,$start,$uname,$udom);
@@ -8425,7 +7805,7 @@ 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,$credits)=@_;
+        $selfenroll,$context,$inststatus)=@_;
     if (!$cid) {
 	unless ($cid=$env{'request.course.id'}) {
 	    return 'not_in_class';
@@ -8440,14 +7820,12 @@ sub modifystudent {
     # students environment
     $uid = undef if (!$forceid);
     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
-					$gene,$usec,$end,$start,$type,$locktype,
-                                        $cid,$selfenroll,$context,$credits);
+					$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context);
     return $reply;
 }
 
 sub modify_student_enrollment {
-    my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
-        $locktype,$cid,$selfenroll,$context,$credits) = @_;
+    my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_;
     my ($cdom,$cnum,$chome);
     if (!$cid) {
 	unless ($cid=$env{'request.course.id'}) {
@@ -8494,7 +7872,7 @@ 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,$credits) },
+			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
 		   $cdom,$cnum);
     if (($reply eq 'ok') || ($reply eq 'delayed')) {
         &devalidate_getsection_cache($udom,$uname,$cid);
@@ -8723,7 +8101,7 @@ 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;
 }
 
@@ -9979,7 +9357,7 @@ sub metadata {
     # if it is a non metadata possible uri return quickly
     if (($uri eq '') || 
 	(($uri =~ m|^/*adm/|) && 
-	     ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) ||
+	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
 	return undef;
     }
@@ -10410,7 +9788,7 @@ 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) {
-            &do_cache_new('allslots',$hashid,\%slots,600);
+            &Apache::lonnet::do_cache_new('allslots',$hashid,\%slots,600);
             return %slots;
         }
     }
@@ -10423,41 +9801,6 @@ sub devalidate_slots_cache {
     &devalidate_cache_new('allslots',$hashid);
 }
 
-sub get_coursechange {
-    my ($cdom,$cnum) = @_;
-    if ($cdom eq '' || $cnum eq '') {
-        return unless ($env{'request.course.id'});
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    }
-    my $hashid=$cdom.'_'.$cnum;
-    my ($change,$cached)=&is_cached_new('crschange',$hashid);
-    if ((defined($cached)) && ($change ne '')) {
-        return $change;
-    } else {
-        my %crshash;
-        %crshash = &get('environment',['internal.contentchange'],$cdom,$cnum);
-        if ($crshash{'internal.contentchange'} eq '') {
-            $change = $env{'course.'.$cdom.'_'.$cnum.'.internal.created'};
-            if ($change eq '') {
-                %crshash = &get('environment',['internal.created'],$cdom,$cnum);
-                $change = $crshash{'internal.created'};
-            }
-        } else {
-            $change = $crshash{'internal.contentchange'};
-        }
-        my $cachetime = 600;
-        &do_cache_new('crschange',$hashid,$change,$cachetime);
-    }
-    return $change;
-}
-
-sub devalidate_coursechange_cache {
-    my ($cnum,$cdom)=@_;
-    my $hashid=$cnum.':'.$cdom;
-    &devalidate_cache_new('crschange',$hashid);
-}
-
 # ------------------------------------------------- Update symbolic store links
 
 sub symblist {
@@ -10485,7 +9828,7 @@ sub symblist {
 # --------------------------------------------------------------- Verify a symb
 
 sub symbverify {
-    my ($symb,$thisurl,$encstate)=@_;
+    my ($symb,$thisurl)=@_;
     my $thisfn=$thisurl;
     $thisfn=&declutter($thisfn);
 # direct jump to resource in page or to a sequence - will construct own symbs
@@ -10504,46 +9847,31 @@ 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;
+            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) {
-                   if (ref($encstate)) {
-                       $$encstate = $bighash{'encrypted_'.$id};
-                   }
-                   if (($env{'request.role.adv'}) ||
-                       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+   eq $symb) { 
+		   if (($env{'request.role.adv'}) ||
+		       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
                        ($thisurl eq '/adm/navmaps')) {
-                       $okay=1;
-                       last;
-                   }
-               }
-           }
+		       $okay=1; 
+		   }
+	       }
+	   }
         }
 	untie(%bighash);
     }
@@ -10616,18 +9944,14 @@ sub deversion {
 
 sub symbread {
     my ($thisfn,$donotrecurse)=@_;
-    my $cache_str;
-    if ($thisfn ne '') {
-        $cache_str='request.symbread.cached.'.$thisfn;
-        if ($env{$cache_str} ne '') {
-            return $env{$cache_str};
-        }
-   } else {
+    my $cache_str='request.symbread.cached.'.$thisfn;
+    if (defined($env{$cache_str})) { return $env{$cache_str}; }
 # no filename provided? try from environment
+    unless ($thisfn) {
         if ($env{'request.symb'}) {
-            return $env{$cache_str}=&symbclean($env{'request.symb'});
-        }
-        $thisfn=$env{'request.filename'};
+	    return $env{$cache_str}=&symbclean($env{'request.symb'});
+	}
+	$thisfn=$env{'request.filename'};
     }
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
 # is that filename actually a symb? Verify, clean, and return
@@ -10855,6 +10179,7 @@ sub rndseed {
 	$which =&get_rand_alg($courseid);
     }
     if (defined(&getCODE())) {
+
 	if ($which eq '64bit5') {
 	    return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
 	} elsif ($which eq '64bit4') {
@@ -11537,12 +10862,12 @@ sub goodbye {
 }
 
 sub get_dns {
-    my ($url,$func,$ignore_cache,$nocache,$hashref) = @_;
+    my ($url,$func,$ignore_cache) = @_;
     if (!$ignore_cache) {
 	my ($content,$cached)=
 	    &Apache::lonnet::is_cached_new('dns',$url);
 	if ($cached) {
-	    &$func($content,$hashref);
+	    &$func($content);
 	    return;
 	}
     }
@@ -11567,10 +10892,8 @@ sub get_dns {
         delete($alldns{$dns});
 	next if ($response->is_error());
 	my @content = split("\n",$response->content);
-        unless ($nocache) {
-	    &do_cache_new('dns',$url,\@content,30*24*60*60);
-        }
-	&$func(\@content,$hashref);
+	&Apache::lonnet::do_cache_new('dns',$url,\@content,30*24*60*60);
+	&$func(\@content);
 	return;
     }
     close($config);
@@ -11578,62 +10901,9 @@ 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,$hashref);
+    &$func(\@content);
     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 $versions = shift(@{$lines});
-        my %supported;
-        if ($versions =~ /^VERSIONS\:([\w\.\,]+)$/) {
-            my $releaseslist = $1;
-            if ($releaseslist =~ /,/) {
-                map { $supported{$_} = 1; } split(/,/,$releaseslist);
-            } elsif ($releaseslist) {
-                $supported{$releaseslist} = 1;
-            }
-        }
-        if ($supported{$release}) {
-            my $matchthis = 0;
-            foreach my $line (@{$lines}) {
-                if ($line =~ /^(\d[\w\.]+)$/) {
-                    if ($matchthis) {
-                        last;
-                    } elsif ($1 eq $release) {
-                        $matchthis = 1;
-                    }
-                } elsif ($matchthis) {
-                    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;
-    &get_dns('/adm/dns/checksums',\&parse_dns_checksums_tab,1,1,
-             \%checksums);
-    return \%checksums;
-}
-
 # ------------------------------------------------------------ Read domain file
 {
     my $loaded;
@@ -11943,9 +11213,9 @@ sub fetch_dns_checksums {
 	    }
 	    push(@{$iphost{$ip}},@{$name_to_host{$name}});
 	}
-	&do_cache_new('iphost','iphost',
-		      [\%iphost,\%name_to_ip,\%lonid_to_ip],
-		      48*60*60);
+	&Apache::lonnet::do_cache_new('iphost','iphost',
+				      [\%iphost,\%name_to_ip,\%lonid_to_ip],
+				      48*60*60);
 
 	return %iphost;
     }
@@ -12001,7 +11271,7 @@ sub fetch_dns_checksums {
             }
             $seen{$prim_ip} = 1;
         }
-        return &do_cache_new('internetnames',$lonid,\@idns,12*60*60);
+        return &Apache::lonnet::do_cache_new('internetnames',$lonid,\@idns,12*60*60);
     }
 
 }
@@ -12171,17 +11441,6 @@ $readit=1;
 	if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
 	&logthis(" Detected 64bit platform ($_64bit)");
     }
-
-    {
-        eval {
-            ($apache) =
-                (Apache2::ServerUtil::get_server_version() =~ m{Apache/(\d+\.\d+)});
-        };
-        if ($@) {
-           $apache = 1.3;
-        }
-    }
-
 }
 }
 
@@ -12469,21 +11728,6 @@ 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
@@ -12500,7 +11744,7 @@ environment).  If no custom name is defi
    
 =item *
 
-get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv) :
+get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) :
 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,
@@ -12514,41 +11758,6 @@ 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
@@ -12641,9 +11850,7 @@ 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.
+=item B<$inststatus> institutional status of user - : separated string of escaped status types  
 
 =back
 
@@ -12688,8 +11895,6 @@ Inputs:
 
 =item $context
 
-=item $credits, number of credits student will earn from this class
-
 =back
 
 
@@ -12755,6 +11960,7 @@ data base, returning a hash that is keye
 values that are the resource value.  I believe that the timestamps and
 versions are also returned.
 
+
 =back
 
 =head2 Course Modification
@@ -12855,14 +12061,12 @@ returns the data handle
 
 =item *
 
-symbverify($symb,$thisfn,$encstate) : verifies that $symb actually exists
-and is a possible symb for the URL in $thisfn, and if is an encrypted
+symbverify($symb,$thisfn) : verifies that $symb actually exists and is
+a possible symb for the URL in $thisfn, and if is an encryypted
 resource that the user accessed using /enc/ returns a 1 on success, 0
-on failure, user must be in a course, as it assumes the existence of
-the course initial hash, and uses $env('request.course.id'}.  The third
-arg is an optional reference to a scalar.  If this arg is passed in the
-call to symbverify, it will be set to 1 if the symb has been set to be 
-encrypted; otherwise it will be null.
+on failure, user must be in a course, as it assumes the existance of
+the course initial hash, and uses $env('request.course.id'}
+
 
 =item *
 
@@ -12915,34 +12119,6 @@ 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
@@ -13498,8 +12674,6 @@ 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
@@ -13517,51 +12691,7 @@ Returns:
 3. reference to hash of any new or updated access controls.
 4. 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)
-
-1. prefix (alphanumeric): of keys in hash, e.g., suppsequence, docspage,
-   docssequence, or name of group
-
-2. keyid (alphanumeric): name of temporary locking key in hash,
-   e.g., num, boardids
-
-3. namespace: name of gdbm file used to store suffixes already assigned;
-   file will be named nohist_namespace.db
-
-4. cdom: domain of course; default is current course domain from %env
-
-5. cnum: course number; default is current course number from %env
-
-6. 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.
-
-7. who: holder of locking key; defaults to user:domain for user.
-
-8. locktries: number of attempts to obtain a lock (sleep of 1s before
-   retrying); default is 3.
-
-9. maxtries: number of attempts to obtain a unique suffix; default is 20.
-
-Returns:
-
-1. suffix obtained (numeric)
-
-2. result of deleting locking key (ok if deleted, or lock never obtained)
-
-3. error: contains (localized) error message if an error occurred.
-
+   value = uniqueID  
 
 =back