--- loncom/interface/loncommon.pm	2023/01/23 22:50:32	1.1075.2.161.2.15
+++ loncom/interface/loncommon.pm	2022/01/19 00:39:01	1.1075.2.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.161.2.15 2023/01/23 22:50:32 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.163 2022/01/19 00:39:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@ use POSIX qw(strftime mktime);
 use Apache::lonmenu();
 use Apache::lonenc();
 use Apache::lonlocal;
-use Apache::lonnavmaps();
+use Apache::lonnet();
 use HTML::Entities;
 use Apache::lonhtmlcommon();
 use Apache::loncoursedata();
@@ -71,7 +71,6 @@ use Apache::lonuserutils();
 use Apache::lonuserstate();
 use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
-use LONCAPA::map();
 use HTTP::Request;
 use DateTime::TimeZone;
 use DateTime::Locale;
@@ -84,8 +83,6 @@ use Crypt::DES;
 use DynaLoader; # for Crypt::DES version
 use File::Copy();
 use File::Path();
-use String::CRC32();
-use Short::URL();
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -951,8 +948,8 @@ ENDSCRT
 }
 
 sub select_timezone {
-   my ($name,$selected,$onchange,$includeempty,$id,$disabled)=@_;
-   my $output='<select name="'.$name.'" '.$id.$onchange.$disabled.'>'."\n";
+   my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
+   my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
    if ($includeempty) {
        $output .= '<option value=""';
        if (($selected eq '') || ($selected eq 'local')) {
@@ -1222,7 +1219,7 @@ END
 
 =pod
 
-=item * &help_open_topic($topic,$text,$stayOnPage,$width,$height,$imgid,$links_target)
+=item * &help_open_topic($topic,$text,$stayOnPage,$width,$height,$imgid)
 
 Returns a string corresponding to an HTML link to the given help
 $topic, where $topic corresponds to the name of a .tex file in
@@ -1246,12 +1243,10 @@ $imgid is the id of the img tag used for
 used in a javascript call to switch the image src.  See 
 lonhtmlcommon::htmlareaselectactive() for an example.
 
-$links_target will optionally be set to a target (_top, _parent or _self).
-
 =cut
 
 sub help_open_topic {
-    my ($topic, $text, $stayOnPage, $width, $height, $imgid, $links_target) = @_;
+    my ($topic, $text, $stayOnPage, $width, $height, $imgid) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
     $width = 500 if (not defined $width);
@@ -1277,15 +1272,9 @@ sub help_open_topic {
     }
 
     # Add the text
-    my $target = ' target="_top"';
-    if ($links_target) {
-        $target = ' target="'.$links_target.'"';
-    } elsif (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-        $target = '';
-    }
     if ($text ne "") {	
 	$template.='<span class="LC_help_open_topic">'
-                  .'<a'.$target.' href="'.$link.'">'
+                  .'<a target="_top" href="'.$link.'">'
                   .$text.'</a>';
     }
 
@@ -1295,7 +1284,7 @@ sub help_open_topic {
     if ($imgid ne '') {
         $imgid = ' id="'.$imgid.'"';
     }
-    $template.=' <a'.$target.' href="'.$link.'" title="'.$title.'">'
+    $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
               .'<img src="'.$helpicon.'" border="0"'
               .' alt="'.&mt('Help: [_1]',$topic).'"'
               .' title="'.$title.'" style="vertical-align:middle;"'.$imgid 
@@ -1368,20 +1357,20 @@ ENDOUTPUT
 
 # now just updates the help link and generates a blue icon
 sub help_open_menu {
-    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text,$links_target) 
+    my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
 	= @_;    
     $stayOnPage = 1;
     my $output;
     if ($component_help) {
 	if (!$text) {
 	    $output=&help_open_topic($component_help,undef,$stayOnPage,
-				       $width,$height,'',$links_target);
+				       $width,$height);
 	} else {
 	    my $help_text;
 	    $help_text=&unescape($topic);
 	    $output='<table><tr><td>'.
 		&help_open_topic($component_help,$help_text,$stayOnPage,
-				 $width,$height,'',$links_target).'</td></tr></table>';
+				 $width,$height).'</td></tr></table>';
 	}
     }
     my $banner_link = &update_help_link($topic,$component_help,$faq,$bug,$stayOnPage);
@@ -1490,26 +1479,19 @@ sub help_open_bug {
     {
 	$link = $url;
     }
-
-    my $target = '_top';
-    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
-        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
-        $target = '_blank';
-    }
-
     # Add the text
     if ($text ne "")
     {
 	$template .= 
   "<table bgcolor='#AA3333' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#FF5555'><a target=\"$target\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
+  "<td bgcolor='#FF5555'><a target=\"_top\" href=\"$link\"><span style=\"color:#FFFFFF;font-size:10pt;\">$text</span></a>";
     }
 
     # Add the graphic
     my $title = &mt('Report a Bug');
     my $bugicon=&lonhttpdurl("/adm/lonMisc/smallBug.gif");
     $template .= <<"ENDTEMPLATE";
- <a target="$target" href="$link" title="$title"><img src="$bugicon" border="0" alt="(Bug: $topic)" /></a>
+ <a target="_top" href="$link" title="$title"><img src="$bugicon" border="0" alt="(Bug: $topic)" /></a>
 ENDTEMPLATE
     if ($text ne '') { $template.='</td></tr></table>' };
     return $template;
@@ -3268,155 +3250,6 @@ sub check_passwd_rules {
     return $warning;
 }
 
-sub passwd_validation_js {
-    my ($currpasswdval,$domain,$context,$id) = @_;
-    my (%passwdconf,$alertmsg);
-    if ($context eq 'linkprot') {
-        my %domconfig = &Apache::lonnet::get_dom('configuration',['ltisec'],$domain);
-        if (ref($domconfig{'ltisec'}) eq 'HASH') {
-            if (ref($domconfig{'ltisec'}{'rules'}) eq 'HASH') {
-                %passwdconf = %{$domconfig{'ltisec'}{'rules'}};
-            }
-        }
-        if ($id eq 'add') {
-            $alertmsg = &mt('Secret for added launcher did not satisfy requirement(s):').'\n\n';
-        } elsif ($id =~ /^\d+$/) {
-            my $pos = $id+1;
-            $alertmsg = &mt('Secret for launcher [_1] did not satisfy requirement(s):','#'.$pos).'\n\n';
-        } else {
-            $alertmsg = &mt('A secret did not satisfy requirement(s):').'\n\n';
-        }
-    } else {
-        %passwdconf = &Apache::lonnet::get_passwdconf($domain);
-        $alertmsg = &mt('Initial password did not satisfy requirement(s):').'\n\n';
-    }
-    my ($min,$max,@chars,$numrules,$intargjs,%alert);
-    $numrules = 0;
-    $min = $Apache::lonnet::passwdmin;
-    if (ref($passwdconf{'chars'}) eq 'ARRAY') {
-        if ($passwdconf{'min'} =~ /^\d+$/) {
-            if ($passwdconf{'min'} > $min) {
-                $min = $passwdconf{'min'};
-            }
-        }
-        if ($passwdconf{'max'} =~ /^\d+$/) {
-            $max = $passwdconf{'max'};
-            $numrules ++;
-        }
-        @chars = @{$passwdconf{'chars'}};
-        if (@chars) {
-            $numrules ++;
-        }
-    }
-    if ($min > 0) {
-        $numrules ++;
-    }
-    if (($min > 0) || ($max ne '') || (@chars > 0)) {
-        if ($min) {
-            $alert{'min'} = &mt('minimum [quant,_1,character]',$min).'\n';
-        }
-        if ($max) {
-            $alert{'max'} = &mt('maximum [quant,_1,character]',$max).'\n';
-        }
-        my (@charalerts,@charrules);
-        if (@chars) {
-            if (grep(/^uc$/,@chars)) {
-                push(@charalerts,&mt('contain at least one upper case letter'));
-                push(@charrules,'uc');
-            }
-            if (grep(/^lc$/,@chars)) {
-                push(@charalerts,&mt('contain at least one lower case letter'));
-                push(@charrules,'lc');
-            }
-            if (grep(/^num$/,@chars)) {
-                push(@charalerts,&mt('contain at least one number'));
-                push(@charrules,'num');
-            }
-            if (grep(/^spec$/,@chars)) {
-                push(@charalerts,&mt('contain at least one non-alphanumeric'));
-                push(@charrules,'spec');
-            }
-        }
-        $intargjs = qq|            var rulesmsg = '';\n|.
-                    qq|            var currpwval = $currpasswdval;\n|;
-            if ($min) {
-                $intargjs .= qq|
-            if (currpwval.length < $min) {
-                rulesmsg += ' - $alert{min}';
-            }
-|;
-            }
-            if ($max) {
-                $intargjs .= qq|
-            if (currpwval.length > $max) {
-                rulesmsg += ' - $alert{max}';
-            }
-|;
-            }
-            if (@chars > 0) {
-                my $charrulestr = '"'.join('","',@charrules).'"';
-                my $charalertstr = '"'.join('","',@charalerts).'"';
-                $intargjs .= qq|            var brokerules = new Array();\n|.
-                             qq|            var charrules = new Array($charrulestr);\n|.
-                             qq|            var charalerts = new Array($charalertstr);\n|;
-                my %rules;
-                map { $rules{$_} = 1; } @chars;
-                if ($rules{'uc'}) {
-                    $intargjs .= qq|
-            var ucRegExp = /[A-Z]/;
-            if (!ucRegExp.test(currpwval)) {
-                brokerules.push('uc');
-            }
-|;
-                }
-                if ($rules{'lc'}) {
-                    $intargjs .= qq|
-            var lcRegExp = /[a-z]/;
-            if (!lcRegExp.test(currpwval)) {
-                brokerules.push('lc');
-            }
-|;
-                }
-                if ($rules{'num'}) {
-                     $intargjs .= qq|
-            var numRegExp = /[0-9]/;
-            if (!numRegExp.test(currpwval)) {
-                brokerules.push('num');
-            }
-|;
-                }
-                if ($rules{'spec'}) {
-                     $intargjs .= q|
-            var specRegExp = /[!"#$%&'()*+,\-.\/:;<=>?@[\\^\]_`{\|}~]/;
-            if (!specRegExp.test(currpwval)) {
-                brokerules.push('spec');
-            }
-|;
-                }
-                $intargjs .= qq|
-            if (brokerules.length > 0) {
-                for (var i=0; i<brokerules.length; i++) {
-                    for (var j=0; j<charrules.length; j++) {
-                        if (brokerules[i] == charrules[j]) {
-                            rulesmsg += ' - '+charalerts[j]+'\\n';
-                            break;
-                        }
-                    }
-                }
-            }
-|;
-            }
-            $intargjs .= qq|
-            if (rulesmsg != '') {
-                rulesmsg = '$alertmsg'+rulesmsg;
-                alert(rulesmsg);
-                return false;
-            }
-|;
-    }
-    return ($numrules,$intargjs);
-}
-
 ###############################################################
 ##    Get Kerberos Defaults for Domain                 ##
 ###############################################################
@@ -3835,30 +3668,6 @@ sub syllabuswrapper {
     return qq{<a href="/public/$domain/$coursedir/syllabus">$linktext</a>};
 }
 
-sub aboutme_on {
-    my ($uname,$udom)=@_;
-    unless ($uname) { $uname=$env{'user.name'}; }
-    unless ($udom)  { $udom=$env{'user.domain'}; }
-    return if ($udom eq 'public' && $uname eq 'public');
-    my $hashkey=$uname.':'.$udom;
-    my ($aboutme,$cached)=&Apache::lonnet::is_cached_new('aboutme',$hashkey);
-    if ($cached) {
-        return $aboutme;
-    }
-    $aboutme = &Apache::lonnet::usertools_access($uname,$udom,'aboutme');
-    &Apache::lonnet::do_cache_new('aboutme',$hashkey,$aboutme,3600);
-    return $aboutme;
-}
-
-sub devalidate_aboutme_cache {
-    my ($uname,$udom)=@_;
-    if (!$udom)  { $udom =$env{'user.domain'}; }
-    if (!$uname) { $uname=$env{'user.name'};   }
-    return if ($udom eq 'public' && $uname eq 'public');
-    my $id=$uname.':'.$udom;
-    &Apache::lonnet::devalidate_cache_new('aboutme',$id);
-}
-
 # -----------------------------------------------------------------------------
 
 sub track_student_link {
@@ -4921,7 +4730,7 @@ sub findallcourses {
 sub blockcheck {
     my ($setters,$activity,$clientip,$uname,$udom,$url,$is_course,$symb,$caller) = @_;
 
-    unless (($activity eq 'docs') || ($activity eq 'reinit') || ($activity eq 'alert')) {
+    unless ($activity eq 'docs') {
         my ($has_evb,$check_ipaccess);
         my $dom = $env{'user.domain'};
         if ($env{'request.course.id'}) {
@@ -5000,9 +4809,6 @@ sub blockcheck {
                 }
             }
         }
-        if (($activity eq 'wishlist') || ($activity eq 'annotate')) {
-            return ();
-        }
     }
     if (defined($udom) && defined($uname)) {
         # If uname and udom are for a course, check for blocks in the course.
@@ -5028,9 +4834,8 @@ sub blockcheck {
     # boards, chat or groups, check for blocking in current course only.
 
     if (($activity eq 'boards' || $activity eq 'chat' ||
-         $activity eq 'groups' || $activity eq 'printout' ||
-         $activity eq 'search' || $activity eq 'reinit' ||
-         $activity eq 'alert') && ($env{'request.course.id'})) {
+         $activity eq 'groups' || $activity eq 'printout') &&
+        ($env{'request.course.id'})) {
         foreach my $key (keys(%live_courses)) {
             if ($key ne $env{'request.course.id'}) {
                 delete($live_courses{$key});
@@ -5364,10 +5169,6 @@ END_MYBLOCK
         $text = &mt('Gradebook Blocked');
     } elsif ($activity eq 'search') {
         $text = &mt('Search Blocked');
-    } elsif ($activity eq 'alert') {
-        $text = &mt('Checking Critical Messages Blocked');
-    } elsif ($activity eq 'reinit') {
-        $text = &mt('Checking Course Update Blocked');
     } elsif ($activity eq 'about') {
         $text = &mt('Access to User Information Pages Blocked');
     } elsif ($activity eq 'wishlist') {
@@ -5408,34 +5209,13 @@ sub check_ip_acc {
     }
 
     my $name;
-    my %access = (
-                     allowfrom => 1,
-                     denyfrom  => 0,
-                 );
-    my @allows;
-    my @denies;
-    foreach my $item (split(',',$acc)) {
-        $item =~ s/^\s*//;
-        $item =~ s/\s*$//;
-        if ($item =~ /^\!(.+)$/) {
-            push(@denies,$1);
-        } else {
-            push(@allows,$item);
-        }
-    }
-    my $numdenies = scalar(@denies);
-    my $numallows = scalar(@allows);
-    my $count = 0;
-    foreach my $pattern (@denies,@allows) {
-        $count ++;
-        my $acctype = 'allowfrom';
-        if ($count <= $numdenies) {
-            $acctype = 'denyfrom';
-        }
+    foreach my $pattern (split(',',$acc)) {
+        $pattern =~ s/^\s*//;
+        $pattern =~ s/\s*$//;
         if ($pattern =~ /\*$/) {
             #35.8.*
             $pattern=~s/\*//;
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
         } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
             #35.8.3.[34-56]
             my $low=$2;
@@ -5443,7 +5223,7 @@ sub check_ip_acc {
             $pattern=$1;
             if ($ip =~ /^\Q$pattern\E/) {
                 my $last=(split(/\./,$ip))[3];
-                if ($last <=$high && $last >=$low) { $allowed=$access{$acctype}; }
+                if ($last <=$high && $last >=$low) { $allowed=1; }
             }
         } elsif ($pattern =~ /^\*/) {
             #*.msu.edu
@@ -5453,10 +5233,10 @@ sub check_ip_acc {
                 my $netaddr=inet_aton($ip);
                 ($name)=gethostbyaddr($netaddr,AF_INET);
             }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
         } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
             #127.0.0.1
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
+            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
         } else {
             #some.name.com
             if (!defined($name)) {
@@ -5464,16 +5244,9 @@ sub check_ip_acc {
                 my $netaddr=inet_aton($ip);
                 ($name)=gethostbyaddr($netaddr,AF_INET);
             }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
-        }
-        if ($allowed =~ /^(0|1)$/) { last; }
-    }
-    if ($allowed eq '') {
-        if ($numdenies && !$numallows) {
-            $allowed = 1;
-        } else {
-            $allowed = 0;
+            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
         }
+        if ($allowed) { last; }
     }
     return $allowed;
 }
@@ -5559,7 +5332,7 @@ sub get_domainconf {
                                 foreach my $host (keys(%{$domconfig{'login'}{$key}})) {
                                     if (ref($domconfig{'login'}{$key}{$host}) eq 'HASH') {
                                         $designhash{$udom.'.login.'.$key.'_'.$host} = 1;
-                                        foreach my $item ('text','img','alt','url','title','window','notsso') {
+                                        foreach my $item ('text','img','alt','url','title','notsso') {
                                             $designhash{$udom.'.login.'.$key.'_'.$item.'_'.$host} = $domconfig{'login'}{$key}{$host}{$item};
                                         }
                                     }
@@ -5792,10 +5565,6 @@ sub head_subbox {
 Input: (optional) filename from which breadcrumb trail is built.
        In most cases no input as needed, as $env{'request.filename'}
        is appropriate for use in building the breadcrumb trail.
-       frameset flag
-       If page header is being requested for use in a frameset, then
-       the second (option) argument -- frameset will be true, and
-       the target attribute set for links should be target="_parent".
 
 Returns: HTML div with CSTR path and recent box
          To be included on Authoring Space pages
@@ -5803,7 +5572,7 @@ Returns: HTML div with CSTR path and rec
 =cut
 
 sub CSTR_pageheader {
-    my ($trailfile,$frameset) = @_;
+    my ($trailfile) = @_;
     if ($trailfile eq '') {
         $trailfile = $env{'request.filename'};
     }
@@ -5826,21 +5595,13 @@ sub CSTR_pageheader {
         $lastitem = $thisdisfn;
     }
 
-    my ($target,$crumbtarget) = (' target="_top"','_top');
-    if ($frameset) {
-        $target = ' target="_parent"';
-        $crumbtarget = '_parent';
-    } elsif (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
-        $target = ' target="'.$env{'request.deeplink.target'}.'"';
-        $crumbtarget = $env{'request.deeplink.target'};
-    }
-
     my $output =
          '<div>'
         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
         .'<b>'.&mt('Authoring Space:').'</b> '
-        .'<form name="dirs" method="post" action="'.$formaction.'"'.$target.'>'
-        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,$crumbtarget,'/priv/'.$udom,undef,undef);
+        .'<form name="dirs" method="post" action="'.$formaction
+        .'" target="_top">' #FIXME lonpubdir: target="_parent"
+        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);
 
     if ($lastitem) {
         $output .=
@@ -5850,10 +5611,10 @@ sub CSTR_pageheader {
     }
     $output .=
          '<br />'
-        #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/',$crumbtarget,'/priv','','+1',1)."</b></tt><br />"
+        #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />"
         .&Apache::lonhtmlcommon::select_recent('construct','recent','this.form.action=this.form.recent.value;this.form.submit()')
         .'</form>'
-        .&Apache::lonmenu::constspaceform($frameset)
+        .&Apache::lonmenu::constspaceform()
         .'</div>';
 
     return $output;
@@ -5910,34 +5671,6 @@ Inputs:
             inlineremote items to be added in "Functions" menu below
             breadcrumbs.
 
-=item * $ltiscope, optional argument, will be one of: resource, map or
-            course, if LON-CAPA is in LTI Provider context. Value is
-            the scope of use, i.e., launch was for access to a single, a map
-            or the entire course.
-
-=item * $ltiuri, optional argument, if LON-CAPA is in LTI Provider
-            context, this will contain the URL for the landing item in
-            the course, after launch from an LTI Consumer
-
-=item * $ltimenu, optional argument, if LON-CAPA is in LTI Provider
-            context, this will contain a reference to hash of items
-            to be included in the page header and/or inline menu.
-
-=item * $menucoll, optional argument, if specific menu collection is in
-            effect, either set as the default for the course, or set for
-            the deeplink paramater for $env{'request.deeplink.login'}
-            then $menucoll will be the number of that collection.
-
-=item * $menuref, optional argument, reference to a hash, containing the
-            menu options included for the menu in effect, based on the
-            configuration for the numbered menu collection in use.
-
-=item * $showncrumbsref, reference to a scalar. Calls to lonmenu::innerregister
-            within &bodytag() can result in calls to lonhtmlcommon::breadcrumbs(),
-            if so, $showncrumbsref is set there to 1, and will propagate back
-            via &bodytag() to &start_page(), to prevent lonhtmlcommon::breadcrumbs()
-            being called a second time.
-
 =back
 
 Returns: A uniform header for LON-CAPA web pages.  
@@ -5949,8 +5682,7 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
-        $no_nav_bar,$bgcolor,$no_inline_link,$args,$advtoolsref,
-        $ltiscope,$ltiuri,$ltimenu,$menucoll,$menuref,$showncrumbsref)=@_;
+        $no_nav_bar,$bgcolor,$no_inline_link,$args,$advtoolsref)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -6034,46 +5766,16 @@ sub bodytag {
 	undef($role);
     }
 
-    my $showcrstitle = 1;
-    if (($cid) && ($env{'request.lti.login'})) {
-        if (ref($ltimenu) eq 'HASH') {
-            unless ($ltimenu->{'role'}) {
-                undef($role);
-            }
-            unless ($ltimenu->{'coursetitle'}) {
-                $realm='&nbsp;';
-                $showcrstitle = 0;
-            }
-        }
-    } elsif (($cid) && ($menucoll)) {
-        if (ref($menuref) eq 'HASH') {
-            unless ($menuref->{'role'}) {
-                undef($role);
-            }
-            unless ($menuref->{'crs'}) {
-                $realm='&nbsp;';
-                $showcrstitle = 0;
-            }
-        }
-    }
-
     my $titleinfo = '<h1>'.$title.'</h1>';
     #
     # Extra info if you are the DC
     my $dc_info = '';
-    if (($env{'user.adv'}) && ($env{'request.course.id'}) && $showcrstitle &&
+    if (($env{'user.adv'}) && ($env{'request.course.id'}) &&
         (exists($env{'user.role.dc./'.$env{'course.'.$cid.'.domain'}.'/'}))) {
         $dc_info = $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
         $dc_info =~ s/\s+$//;
     }
 
-    my $crstype;
-    if ($cid) {
-        $crstype = $env{'course.'.$cid.'.type'};
-    } elsif ($args->{'crstype'}) {
-        $crstype = $args->{'crstype'};
-    }
-
     $role = '<span class="LC_nobreak">('.$role.')</span>' if ($role && !$env{'browser.mobile'});
 
     if ($env{'request.state'} eq 'construct') { $forcereg=1; }
@@ -6101,30 +5803,27 @@ sub bodytag {
         $bodytag .= Apache::lonhtmlcommon::scripttag(
             Apache::lonmenu::utilityfunctions($httphost), 'start');
 
-        unless ($args->{'no_primary_menu'}) {
-            my ($left,$right) = Apache::lonmenu::primary_menu($crstype,$ltimenu,$menucoll,$menuref,
-                                                              $args->{'links_disabled'},
-                                                              $args->{'links_target'});
-            if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-                if ($dc_info) {
-                    $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
-                }
-                $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
-                               <em>$realm</em> $dc_info</div>|;
-                return $bodytag;
-            }
+        my ($left,$right) = Apache::lonmenu::primary_menu($args->{'links_disabled'});
 
-            unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
-                $bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|;
+        if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
+            if ($dc_info) {
+                $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
             }
+            $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
+                           <em>$realm</em> $dc_info</div>|;
+            return $bodytag;
+        }
 
-            $bodytag .= $right;
+        unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
+            $bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|;
+        }
 
-            if ($dc_info) {
-                $dc_info = &dc_courseid_toggle($dc_info);
-            }
-            $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
+        $bodytag .= $right;
+
+        if ($dc_info) {
+            $dc_info = &dc_courseid_toggle($dc_info);
         }
+        $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
 
         #if directed to not display the secondary menu, don't.
         if ($args->{'no_secondary_menu'}) {
@@ -6132,23 +5831,17 @@ sub bodytag {
         }
         #don't show menus for public users
         if (!$public){
-            unless ($args->{'no_inline_menu'}) {
-                $bodytag .= Apache::lonmenu::secondary_menu($httphost,$ltiscope,$ltimenu,
-                                                            $args->{'no_primary_menu'},
-                                                            $menucoll,$menuref,
-                                                            $args->{'links_disabled'},
-                                                            $args->{'links_target'});
-            }
+            $bodytag .= Apache::lonmenu::secondary_menu($httphost,$args->{'links_disabled'});
             $bodytag .= Apache::lonmenu::serverform();
             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
             if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,
-                                $args->{'bread_crumbs'},'','',$hostname,
-                                $ltiscope,$ltiuri,$showncrumbsref);
+                                $args->{'bread_crumbs'},'','',$hostname);
             } elsif ($forcereg) {
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
-                                $args->{'group'},$args->{'hide_buttons'},
-                                $hostname,$ltiscope,$ltiuri,$showncrumbsref);
+                                                            $args->{'group'},
+                                                            $args->{'hide_buttons'},
+                                                            $hostname);
             } else {
                 my $forbodytag;
                 &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
@@ -6291,38 +5984,8 @@ sub endbodytag {
     }
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
-            my ($endbodyjs,$idattr);
-            if ($env{'internal.head.to_opener'}) {
-                my $linkid = 'LC_continue_link';
-                $idattr = ' id="'.$linkid.'"';
-                my $redirect_for_js = &js_escape($env{'internal.head.redirect'});
-                $endbodyjs=<<ENDJS;
-<script type="text/javascript">
-// <![CDATA[
-function ebFunction(evt) {
-    evt.preventDefault();
-    var dest = '$redirect_for_js';
-    if (window.opener != null && !window.opener.closed) {
-        window.opener.location.href=dest;
-        window.close();
-    } else {
-        window.location.href=dest;
-    }
-    return false;
-}
-
-\$(document).ready(function () {
-  if (document.getElementById('$linkid')) {
-    var clickelem = document.getElementById('$linkid');
-    clickelem.addEventListener('click',ebFunction,false);
-  }
-});
-// ]]>
-</script>
-ENDJS
-            }
 	    $endbodytag=
-	        "$endbodyjs<br /><a href=\"$env{'internal.head.redirect'}\"$idattr>".
+	        "<br /><a href=\"$env{'internal.head.redirect'}\">".
 	        &mt('Continue').'</a>'.
 	        $endbodytag;
         }
@@ -8169,10 +7832,6 @@ a#LC_content_toolbar_edittoplevel {
   background-image:url(/res/adm/pages/edittoplevel.gif);
 }
 
-a#LC_content_toolbar_printout {
-  background-image:url(/res/adm/pages/printout.gif);
-}
-
 ul#LC_toolbar li a:hover {
   background-position: bottom center;
 }
@@ -8384,13 +8043,7 @@ Inputs: $title - optional title for the
                                    3- whether the side effect should occur
                            (side effect of setting 
                                $env{'internal.head.redirect'} to the url 
-                               redirected to)
-                                   4- whether the redirect target should be
-                                      the opener of the current (pop-up)
-                                      window (side effect of setting
-                                      $env{'internal.head.to_opener'} to
-                                      1, if true.
-                                   5- whether encrypt check should be skipped
+                               redirected too)
             domain         -> force to color decorate a page for a specific
                                domain
             function       -> force usage of a specific rolish color scheme
@@ -8453,45 +8106,15 @@ sub headtag {
         }
     }
     if (ref($args->{'redirect'})) {
-	my ($time,$url,$inhibit_continue,$to_opener,$skip_enc_check) = @{$args->{'redirect'}};
-        if (!$skip_enc_check) {
-	    $url = &Apache::lonenc::check_encrypt($url);
-        }
+	my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
+	$url = &Apache::lonenc::check_encrypt($url);
 	if (!$inhibit_continue) {
 	    $env{'internal.head.redirect'} = $url;
 	}
-        $result.=<<"ADDMETA";
+	$result.=<<ADDMETA
 <meta http-equiv="pragma" content="no-cache" />
-ADDMETA
-        if ($to_opener) {
-            $env{'internal.head.to_opener'} = 1;
-            my $dest = &js_escape($url);
-            my $timeout = int($time * 1000);
-            $result .=<<"ENDJS";
-<script type="text/javascript">
-// <![CDATA[
-function LC_To_Opener() {
-    var dest = '$dest';
-    if (dest != '') {
-        if (window.opener != null && !window.opener.closed) {
-            window.opener.location.href=dest;
-            window.close();
-        } else {
-            window.location.href=dest;
-        }
-    }
-}
-\$(document).ready(function () {
-    setTimeout('LC_To_Opener()',$timeout);
-});
-// ]]>
-</script>
-ENDJS
-        } else {
-            $result.=<<"ADDMETA";
 <meta http-equiv="Refresh" content="$time; url=$url" />
 ADDMETA
-        }
     } else {
         unless (($args->{'frameset'}) || ($args->{'js_ready'}) || ($args->{'only_body'}) || ($args->{'no_nav_bar'})) {
             my $requrl = $env{'request.uri'};
@@ -8537,7 +8160,7 @@ ADDMETA
                         my $newserver = &Apache::lonnet::spareserver(undef,30000,undef,1,$dom_in_use);
                         if (($newserver eq '') && ($offloadoth)) {
                             my @domains = &Apache::lonnet::current_machine_domains();
-                            if (($dom_in_use ne '') && (!grep(/^\Q$dom_in_use\E$/,@domains))) {
+                            if (($dom_in_use ne '') && (!grep(/^\Q$dom_in_use\E$/,@domains))) { 
                                 ($newserver) = &Apache::lonnet::choose_server($dom_in_use);
                             }
                         }
@@ -8841,7 +8464,6 @@ $args - additional optional args support
              links_disabled -> Links in primary and secondary menus are disabled
                                (Can enable them once page has loaded - see lonroles.pm
                                for an example).
-             links_target   -> Target for links, e.g., _parent (optional).
 
 =back
 
@@ -8854,83 +8476,12 @@ sub start_page {
     #&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
 
     $env{'internal.start_page'}++;
-    my ($result,@advtools,$ltiscope,$ltiuri,%ltimenu,$menucoll,%menu);
+    my ($result,@advtools);
 
     if (! exists($args->{'skip_phases'}{'head'}) ) {
         $result .= &xml_begin($args->{'frameset'}) . &headtag($title, $head_extra, $args);
     }
-
-    if (($env{'request.course.id'}) && ($env{'request.lti.login'})) {
-        if ($env{'course.'.$env{'request.course.id'}.'.lti.override'}) {
-            unless ($env{'course.'.$env{'request.course.id'}.'.lti.topmenu'}) {
-                $args->{'no_primary_menu'} = 1;
-            }
-            unless ($env{'course.'.$env{'request.course.id'}.'.lti.inlinemenu'}) {
-                $args->{'no_inline_menu'} = 1;
-            }
-            if ($env{'course.'.$env{'request.course.id'}.'.lti.lcmenu'}) {
-                map { $ltimenu{$_} = 1; } split(/,/,$env{'course.'.$env{'request.course.id'}.'.lti.lcmenu'});
-            }
-        } else {
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
-            if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
-                unless ($lti{$env{'request.lti.login'}}{'topmenu'}) {
-                    $args->{'no_primary_menu'} = 1;
-                }
-                unless ($lti{$env{'request.lti.login'}}{'inlinemenu'}) {
-                    $args->{'no_inline_menu'} = 1;
-                }
-                if (ref($lti{$env{'request.lti.login'}}{'lcmenu'}) eq 'ARRAY') {
-                    map { $ltimenu{$_} = 1; } @{$lti{$env{'request.lti.login'}}{'lcmenu'}};
-                }
-            }
-        }
-        ($ltiscope,$ltiuri) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},
-                                  $env{'course.'.$env{'request.course.id'}.'.domain'},
-                                  $env{'course.'.$env{'request.course.id'}.'.num'});
-    } elsif ($env{'request.course.id'}) {
-        my $expiretime=600;
-        if ((time-$env{'course.'.$env{'request.course.id'}.'.last_cache'}) > $expiretime) {
-            &Apache::lonnet::coursedescription($env{'request.course.id'},{'freshen_cache' => 1});
-        }
-        my ($deeplinkmenu,$menuref);
-        ($menucoll,$deeplinkmenu,$menuref) = &menucoll_in_effect();
-        if ($menucoll) {
-            if (ref($menuref) eq 'HASH') {
-                %menu = %{$menuref};
-            }
-            if ($menu{'top'} eq 'n') {
-                $args->{'no_primary_menu'} = 1;
-            }
-            if ($menu{'inline'} eq 'n') {
-                unless (&Apache::lonnet::allowed('opa')) {
-                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                    my $crstype = &course_type();
-                    my $now = time;
-                    my $ccrole;
-                    if ($crstype eq 'Community') {
-                        $ccrole = 'co';
-                    } else {
-                        $ccrole = 'cc';
-                    }
-                    if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
-                        my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
-                        if ((($start) && ($start<0)) ||
-                            (($end) && ($end<$now))  ||
-                            (($start) && ($now<$start))) {
-                            $args->{'no_inline_menu'} = 1;
-                        }
-                    } else {
-                        $args->{'no_inline_menu'} = 1;
-                    }
-                }
-            }
-        }
-    }
-
-    my $showncrumbs;
+    
     if (! exists($args->{'skip_phases'}{'body'}) ) {
 	if ($args->{'frameset'}) {
 	    my $attr_string = &make_attr_string($args->{'force_register'},
@@ -8943,8 +8494,7 @@ sub start_page {
                          $args->{'only_body'},      $args->{'domain'},
                          $args->{'force_register'}, $args->{'no_nav_bar'},
                          $args->{'bgcolor'},        $args->{'no_inline_link'},
-                         $args,                     \@advtools,
-                         $ltiscope,$ltiuri,\%ltimenu,$menucoll,\%menu,\$showncrumbs);
+                         $args,                     \@advtools);
         }
     }
 
@@ -8966,7 +8516,6 @@ sub start_page {
 
     #Breadcrumbs
     if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
-        unless ($showncrumbs) {
 		&Apache::lonhtmlcommon::clear_breadcrumbs();
 		#if any br links exists, add them to the breadcrumbs
 		if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {         
@@ -8980,26 +8529,17 @@ sub start_page {
                 }
                 my $menulink;
                 # if arg: bread_crumbs_nomenu is true pass 0 as $menulink item.
-                if ((exists($args->{'bread_crumbs_nomenu'})) ||
-                    ($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
+                if (exists($args->{'bread_crumbs_nomenu'})) {
                     $menulink = 0;
                 } else {
                     undef($menulink);
                 }
-                my $linkprotout;
-                if ($env{'request.deeplink.login'}) {
-                    my $linkprotout = &Apache::lonmenu::linkprot_exit();
-                    if ($linkprotout) {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                    }
-                }
 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
 		if(exists($args->{'bread_crumbs_component'})){
 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'},'',$menulink);
-		} else {
+		}else{
 			$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink);
 		}
-        }
     } elsif (($env{'environment.remote'} eq 'on') &&
              ($env{'form.inhibitmenu'} ne 'yes') &&
              ($env{'request.noversionuri'} =~ m{^/res/}) &&
@@ -9041,103 +8581,6 @@ sub end_page {
     return $result;
 }
 
-sub menucoll_in_effect {
-    my ($menucoll,$deeplinkmenu,%menu);
-    if ($env{'request.course.id'}) {
-        $menucoll = $env{'course.'.$env{'request.course.id'}.'.menudefault'};
-        if ($env{'request.deeplink.login'}) {
-            my ($deeplink_symb,$deeplink,$check_login_symb);
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            if ($env{'request.noversionuri'} =~ m{^/(res|uploaded)/}) {
-                if ($env{'request.noversionuri'} =~ /\.(page|sequence)$/) {
-                    my $navmap = Apache::lonnavmaps::navmap->new();
-                    if (ref($navmap)) {
-                        $deeplink = $navmap->get_mapparam(undef,
-                                                          &Apache::lonnet::declutter($env{'request.noversionuri'}),
-                                                          '0.deeplink');
-                    } else {
-                        $check_login_symb = 1;
-                    }
-                } else {
-                    my $symb=&Apache::lonnet::symbread();
-                    if ($symb) {
-                        $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb);
-                    } else {
-                        $check_login_symb = 1;
-                    }
-                }
-            } else {
-                $check_login_symb = 1;
-            }
-            if ($check_login_symb) {
-                $deeplink_symb = &deeplink_login_symb($cnum,$cdom);
-                if ($deeplink_symb =~ /\.(page|sequence)$/) {
-                    my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
-                    my $navmap = Apache::lonnavmaps::navmap->new();
-                    if (ref($navmap)) {
-                        $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink');
-                    }
-                } else {
-                    $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb);
-                }
-            }
-            if ($deeplink ne '') {
-                my ($state,$others,$listed,$scope,$protect,$display,$target) = split(/,/,$deeplink);
-                if ($display =~ /^\d+$/) {
-                    $deeplinkmenu = 1;
-                    $menucoll = $display;
-                }
-            }
-        }
-        if ($menucoll) {
-            %menu = &page_menu($env{'course.'.$env{'request.course.id'}.'.menucollections'},$menucoll);
-        }
-    }
-    return ($menucoll,$deeplinkmenu,\%menu);
-}
-
-sub deeplink_login_symb {
-    my ($cnum,$cdom) = @_;
-    my $login_symb;
-    if ($env{'request.deeplink.login'}) {
-        $login_symb = &symb_from_tinyurl($env{'request.deeplink.login'},$cnum,$cdom);
-    }
-    return $login_symb;
-}
-
-sub symb_from_tinyurl {
-    my ($url,$cnum,$cdom) = @_;
-    if ($url =~ m{^\Q/tiny/$cdom/\E(\w+)$}) {
-        my $key = $1;
-        my ($tinyurl,$login);
-        my ($result,$cached)=&Apache::lonnet::is_cached_new('tiny',$cdom."\0".$key);
-        if (defined($cached)) {
-            $tinyurl = $result;
-        } else {
-            my $configuname = &Apache::lonnet::get_domainconfiguser($cdom);
-            my %currtiny = &Apache::lonnet::get('tiny',[$key],$cdom,$configuname);
-            if ($currtiny{$key} ne '') {
-                $tinyurl = $currtiny{$key};
-                &Apache::lonnet::do_cache_new('tiny',$cdom."\0".$key,$currtiny{$key},600);
-            }
-        }
-        if ($tinyurl ne '') {
-            my ($cnumreq,$symb) = split(/\&/,$tinyurl);
-            if (wantarray) {
-                return ($cnumreq,$symb);
-            } elsif ($cnumreq eq $cnum) {
-                return $symb;
-            }
-        }
-    }
-    if (wantarray) {
-        return ();
-    } else {
-        return;
-    }
-}
-
 sub wishlist_window {
     return(<<'ENDWISHLIST');
 <script type="text/javascript">
@@ -9629,21 +9072,14 @@ function expand_div(caller) {
 
 sub simple_error_page {
     my ($r,$title,$msg,$args) = @_;
-    my %displayargs;
     if (ref($args) eq 'HASH') {
         if (!$args->{'no_auto_mt_msg'}) { $msg = &mt($msg); }
-        if ($args->{'only_body'}) {
-            $displayargs{'only_body'} = 1;
-        }
-        if ($args->{'no_nav_bar'}) {
-            $displayargs{'no_nav_bar'} = 1;
-        }
     } else {
         $msg = &mt($msg);
     }
 
     my $page =
-	&Apache::loncommon::start_page($title,'',\%displayargs).
+	&Apache::loncommon::start_page($title).
 	'<p class="LC_error">'.$msg.'</p>'.
 	&Apache::loncommon::end_page();
     if (ref($r)) {
@@ -13711,9 +13147,7 @@ sub process_extracted_files {
                             my $url = '/uploaded/'.$docudom.'/'.$docuname.'/'.
                                       $docstype.'/'.$mapinner{$outer}.'/'.$newidx.'/'.
                                       $title;
-                            if (($outer !~ /\D/) &&
-                                (($mapinner{$outer} eq 'default') || ($mapinner{$outer} !~ /\D/)) &&
-                                ($newidx !~ /\D/)) {
+                            if (($outer !~ /\D/) && ($mapinner{$outer} !~ /\D/) && ($newidx !~ /\D/)) {
                                 if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") {
                                     mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755);
                                 }
@@ -15474,7 +14908,7 @@ sub recurse_categories {
         for (my $k=0; $k<@{$cats->[$depth]{$category}}; $k++) {
             my $name = $cats->[$depth]{$category}[$k];
             my $item = &escape($category).':'.&escape($parents->[-1]).':'.$shallower;
-            my $trailstr = join(' &raquo; ',(@{$parents},$category));
+            my $trailstr = join(' -&gt; ',(@{$parents},$category));
             if ($allitems->{$item} eq '') {
                 push(@{$trails},$trailstr);
                 $allitems->{$item} = scalar(@{$trails})-1;
@@ -15752,7 +15186,7 @@ sub commit_studentrole {
                 }
                 $oldsecurl = $uurl;
                 $expire_role_result = 
-                    &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,'','','',$context);
+                    &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',$now,'','',$context);
                 if ($env{'request.course.sec'} ne '') { 
                     if ($expire_role_result eq 'refused') {
                         my @roles = ('st');
@@ -15864,8 +15298,7 @@ sub check_clone {
     my $cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'};
     my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid);
     my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom);
-    my $clonetitle;
-    my @clonemsg;
+    my $clonemsg;
     my $can_clone = 0;
     my $lctype = lc($args->{'crstype'});
     if ($lctype ne 'community') {
@@ -15873,38 +15306,16 @@ sub check_clone {
     }
     if ($clonehome eq 'no_host') {
         if ($args->{'crstype'} eq 'Community') {
-            push(@clonemsg,({
-                              mt => 'No new community created.',
-                              args => [],
-                            },
-                            {
-                              mt => 'A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',
-                              args => [$args->{'clonedomain'}.':'.$args->{'clonedomain'}],
-                            }));
+            $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a non-existent community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
         } else {
-            push(@clonemsg,({
-                              mt => 'No new course created.',
-                              args => [],
-                            },
-                            {
-                              mt => 'A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',
-                              args => [$args->{'clonecourse'}.':'.$args->{'clonedomain'}],
-                            }));
-        }
+            $clonemsg = &mt('No new course created.').$linefeed.&mt('A new course could not be cloned from the specified original - [_1] - because it is a non-existent course.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+        }     
     } else {
 	my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});
-        $clonetitle = $clonedesc{'description'};
         if ($args->{'crstype'} eq 'Community') {
             if ($clonedesc{'type'} ne 'Community') {
-                push(@clonemsg,({
-                                  mt => 'No new community created.',
-                                  args => [],
-                                },
-                                {
-                                  mt => 'A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',
-                                  args => [$args->{'clonecourse'}.':'.$args->{'clonedomain'}],
-                                }));
-                return ($can_clone,\@clonemsg,$cloneid,$clonehome);
+                 $clonemsg = &mt('No new community created.').$linefeed.&mt('A new community could not be cloned from the specified original - [_1] - because it is a course not a community.',$args->{'clonecourse'}.':'.$args->{'clonedomain'});
+                return ($can_clone, $clonemsg, $cloneid, $clonehome);
             }
         }
 	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
@@ -15993,34 +15404,20 @@ sub check_clone {
             }
             unless ($can_clone) {
                 if ($args->{'crstype'} eq 'Community') {
-                    push(@clonemsg,({
-                                      mt => 'No new community created.',
-                                      args => [],
-                                    },
-                                    {
-                                      mt => 'The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',
-                                      args => [$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}],
-                                    }));
+                    $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
                 } else {
-                    push(@clonemsg,({
-                                      mt => 'No new course created.',
-                                      args => [],
-                                    },
-                                    {
-                                      mt => 'The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',
-                                      args => [$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'}],
-                                    }));
+                    $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
 	        }
 	    }
         }
     }
-    return ($can_clone,\@clonemsg,$cloneid,$clonehome,$clonetitle);
+    return ($can_clone, $clonemsg, $cloneid, $clonehome);
 }
 
 sub construct_course {
     my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,
-        $cnum,$category,$coderef,$callercontext,$user_lh) = @_;
-    my ($outcome,$msgref,$clonemsgref);
+        $cnum,$category,$coderef) = @_;
+    my $outcome;
     my $linefeed =  '<br />'."\n";
     if ($context eq 'auto') {
         $linefeed = "\n";
@@ -16029,11 +15426,18 @@ sub construct_course {
 #
 # Are we cloning?
 #
-    my ($can_clone,$cloneid,$clonehome,$clonetitle);
+    my ($can_clone, $clonemsg, $cloneid, $clonehome);
     if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) {
-	($can_clone,$clonemsgref,$cloneid,$clonehome,$clonetitle) = &check_clone($args,$linefeed);
+	($can_clone, $clonemsg, $cloneid, $clonehome) = &check_clone($args,$linefeed);
+	if ($context ne 'auto') {
+            if ($clonemsg ne '') {
+	        $clonemsg = '<span class="LC_error">'.$clonemsg.'</span>';
+            }
+	}
+	$outcome .= $clonemsg.$linefeed;
+
         if (!$can_clone) {
-	    return (0,$outcome,$clonemsgref);
+	    return (0,$outcome);
 	}
     }
 
@@ -16051,20 +15455,15 @@ sub construct_course {
                                              $args->{'ccuname'}.':'.
                                              $args->{'ccdomain'},
                                              $args->{'crstype'},
-                                             $cnum,$context,$category,
-                                             $callercontext);
+                                             $cnum,$context,$category);
 
     # Note: The testing routines depend on this being output; see 
     # Utils::Course. This needs to at least be output as a comment
     # if anyone ever decides to not show this, and Utils::Course::new
     # will need to be suitably modified.
-    if (($callercontext eq 'auto') && ($user_lh ne '')) {
-        $outcome .= &mt_user($user_lh,'New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
-    } else {
-        $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
-    }
+    $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
     if ($$courseid =~ /^error:/) {
-        return (0,$outcome,$clonemsgref);
+        return (0,$outcome);
     }
 
 #
@@ -16073,37 +15472,23 @@ sub construct_course {
     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
     my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
     if ($crsuhome eq 'no_host') {
-        if (($callercontext eq 'auto') && ($user_lh ne '')) {
-            $outcome .= &mt_user($user_lh,
-                            'Course creation failed, unrecognized course home server.');
-        } else {
-            $outcome .= &mt('Course creation failed, unrecognized course home server.');
-        }
-        $outcome .= $linefeed;
-        return (0,$outcome,$clonemsgref);
+        $outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed;
+        return (0,$outcome);
     }
     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
 
 #
 # Do the cloning
-#
-    my @clonemsg;
+#   
     if ($can_clone && $cloneid) {
-        push(@clonemsg,
-                      {
-                          mt => 'Created [_1] by cloning from [_2]',
-                          args => [$crstype,$clonetitle],
-                      });
+	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
+	if ($context ne 'auto') {
+	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
+	}
+	$outcome .= $clonemsg.$linefeed;
 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
-        my @info =
-            &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},
-                                                     $args->{'dateshift'},$args->{'crscode'},
-                                                     $args->{'ccuname'}.':'.$args->{'ccdomain'},
-                                                     $args->{'tinyurls'});
-        if (@info) {
-            push(@clonemsg,@info);
-        }
+	&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},$args->{'dateshift'});
 # Restore URL
 	$cenv{'url'}=$oldcenv{'url'};
 # Restore title
@@ -16386,6 +15771,7 @@ sub construct_course {
 #
     unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank')
 	    || ($cloneid)) {
+	use LONCAPA::map;
 	$outcome .= &mt('Setting first resource').': ';
 
 	my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence';
@@ -16408,7 +15794,7 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
     }
 
-    return (1,$outcome,\@clonemsg);
+    return (1,$outcome);
 }
 
 sub make_unique_code {
@@ -16748,7 +16134,7 @@ sub init_user_environment {
             my %is_adv = ( is_adv => $env{'user.adv'} );
             my %domdef = &Apache::lonnet::get_domain_defaults($domain);
 
-            foreach my $tool ('aboutme','blog','webdav','portfolio','timezone') {
+            foreach my $tool ('aboutme','blog','webdav','portfolio') {
                 $userenv{'availabletools.'.$tool} = 
                     &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
                                                       undef,\%userenv,\%domdef,\%is_adv);
@@ -17576,52 +16962,24 @@ sub needs_coursereinit {
         $interval = 600;
     }
     if (($now-$env{'request.course.timechecked'})>$interval) {
+        my $lastchange = &Apache::lonnet::get_coursechange($cdom,$cnum);
         &Apache::lonnet::appenv({'request.course.timechecked'=>$now});
-        my $blocked = &blocking_status('reinit',undef,$cnum,$cdom,undef,1);
-        if ($blocked) {
-            return ();
-        }
-        my $update;
-        my $lastmainchange = &Apache::lonnet::get_coursechange($cdom,$cnum);
-        my $lastsuppchange = &Apache::lonnet::get_suppchange($cdom,$cnum);
-        if ($lastmainchange > $env{'request.course.tied'}) {
-            my ($needswitch,$switchwarning,$switchserver) = &switch_for_update($loncaparev,$cdom,$cnum);
-            if ($needswitch) {
-                return ('switch',$switchwarning,$switchserver);
-            }
-            $update = 'main';
-        }
-        if ($lastsuppchange > $env{'request.course.suppupdated'}) {
-            if ($update) {
-                $update = 'both';
-            } else {
-                my ($needswitch,$switchwarning,$switchserver) = &switch_for_update($loncaparev,$cdom,$cnum);
-                if ($needswitch) {
-                    return ('switch',$switchwarning,$switchserver);
-                } else {
-                    $update = 'supp';
+        if ($lastchange > $env{'request.course.tied'}) {
+            my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+            if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
+                my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'};
+                if ($curr_reqd_hash{'internal.releaserequired'} ne $required) {
+                    &Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' =>
+                                             $curr_reqd_hash{'internal.releaserequired'}});
+                    my ($switchserver,$switchwarning) =
+                        &check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'},
+                                                $curr_reqd_hash{'internal.releaserequired'});
+                    if ($switchwarning ne '' || $switchserver ne '') {
+                        return ('switch',$switchwarning,$switchserver);
+                    }
                 }
             }
-            return ($update);
-        }
-    }
-    return ();
-}
-
-sub switch_for_update {
-    my ($loncaparev,$cdom,$cnum) = @_;
-    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
-    if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
-        my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'};
-        if ($curr_reqd_hash{'internal.releaserequired'} ne $required) {
-            &Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' =>
-                                    $curr_reqd_hash{'internal.releaserequired'}});
-            my ($switchserver,$switchwarning) =
-                &check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'},
-                                        $curr_reqd_hash{'internal.releaserequired'});
-            if ($switchwarning ne '' || $switchserver ne '') {
-                return ('switch',$switchwarning,$switchserver);
-            }
+            return ('update');
         }
     }
     return ();
@@ -17713,147 +17071,28 @@ sub parse_supplemental_title {
     return $title;
 }
 
-sub get_supplemental {
-    my ($cnum,$cdom,$ignorecache,$possdel)=@_;
-    my $hashid=$cnum.':'.$cdom;
-    my ($supplemental,$cached,$set_httprefs);
-    unless ($ignorecache) {
-        ($supplemental,$cached) = &Apache::lonnet::is_cached_new('supplemental',$hashid);
-    }
-    unless (defined($cached)) {
-        my $chome=&Apache::lonnet::homeserver($cnum,$cdom);
-        unless ($chome eq 'no_host') {
-            my @order = @LONCAPA::map::order;
-            my @resources = @LONCAPA::map::resources;
-            my @resparms = @LONCAPA::map::resparms;
-            my @zombies = @LONCAPA::map::zombies;
-            my ($errors,%ids,%hidden);
-            $errors =
-                &recurse_supplemental($cnum,$cdom,'supplemental.sequence',
-                                      $errors,$possdel,\%ids,\%hidden);
-            @LONCAPA::map::order = @order;
-            @LONCAPA::map::resources = @resources;
-            @LONCAPA::map::resparms = @resparms;
-            @LONCAPA::map::zombies = @zombies;
-            $set_httprefs = 1;
-            if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-                &Apache::lonnet::appenv({'request.course.suppupdated' => time});
-            }
-            $supplemental = {
-                               ids => \%ids,
-                               hidden => \%hidden,
-                            };
-            &Apache::lonnet::do_cache_new('supplemental',$hashid,$supplemental,600);
-        }
-    }
-    return ($supplemental,$set_httprefs);
-}
-
 sub recurse_supplemental {
-    my ($cnum,$cdom,$suppmap,$errors,$possdel,$suppids,$hiddensupp,$hidden) = @_;
-    if (($suppmap) && (ref($suppids) eq 'HASH') && (ref($hiddensupp) eq 'HASH')) {
-        my $mapnum;
-        if ($suppmap eq 'supplemental.sequence') {
-            $mapnum = 0;
-        } else {
-            ($mapnum) = ($suppmap =~ /^supplemental_(\d+)\.sequence$/);
-        }
+    my ($cnum,$cdom,$suppmap,$numfiles,$errors) = @_;
+    if ($suppmap) {
         my ($errtext,$fatal) = &LONCAPA::map::mapread('/uploaded/'.$cdom.'/'.$cnum.'/'.$suppmap);
         if ($fatal) {
             $errors ++;
         } else {
-            my @order = @LONCAPA::map::order;
-            if (@order > 0) {
-                my @resources = @LONCAPA::map::resources;
-                my @resparms = @LONCAPA::map::resparms;
-                foreach my $idx (@order) {
-                    my ($title,$src,$ext,$type,$status)=split(/\:/,$resources[$idx]);
+            if ($#LONCAPA::map::resources > 0) {
+                foreach my $res (@LONCAPA::map::resources) {
+                    my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
                     if (($src ne '') && ($status eq 'res')) {
-                        my $id = $mapnum.':'.$idx;
-                        push(@{$suppids->{$src}},$id);
-                        if (($hidden) || (&get_supp_parameter($resparms[$idx],'parameter_hiddenresource') =~ /^yes/i)) {
-                            $hiddensupp->{$id} = 1;
-                        }
                         if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
-                            $errors = &recurse_supplemental($cnum,$cdom,$1,$errors,$possdel,$suppids,
-                                                            $hiddensupp,$hiddensupp->{$id});
+                            ($numfiles,$errors) = &recurse_supplemental($cnum,$cdom,$1,$numfiles,$errors);
                         } else {
-                            my $allowed;
-                            if (($env{'request.role.adv'}) || (!$hiddensupp->{$id})) {
-                                $allowed = 1;
-                            } elsif ($possdel) {
-                                foreach my $item (@{$suppids->{$src}}) {
-                                    next if ($item eq $id);
-                                    unless ($hiddensupp->{$item}) {
-                                       $allowed = 1;
-                                       last;
-                                    }
-                                }
-                                if ((!$allowed) && (exists($env{'httpref.'.$src}))) {
-                                    &Apache::lonnet::delenv('httpref.'.$src);
-                                }
-                            }
-                            if ($allowed && (!exists($env{'httpref.'.$src}))) {
-                                &Apache::lonnet::allowuploaded('/adm/coursedoc',$src);
-                            }
+                            $numfiles ++;
                         }
                     }
                 }
             }
         }
     }
-    return $errors;
-}
-
-sub set_supp_httprefs {
-    my ($cnum,$cdom,$supplemental,$possdel) = @_;
-    if (ref($supplemental) eq 'HASH') {
-        if ((ref($supplemental->{'ids'}) eq 'HASH') && (ref($supplemental->{'hidden'}) eq 'HASH')) {
-            foreach my $src (keys(%{$supplemental->{'ids'}})) {
-                next if ($src =~ /\.sequence$/);
-                if (ref($supplemental->{'ids'}->{$src}) eq 'ARRAY') {
-                    my $allowed;
-                    if ($env{'request.role.adv'}) {
-                        $allowed = 1;
-                    } else {
-                        foreach my $id (@{$supplemental->{'ids'}->{$src}}) {
-                            unless ($supplemental->{'hidden'}->{$id}) {
-                                $allowed = 1;
-                                last;
-                            }
-                        }
-                    }
-                    if (exists($env{'httpref.'.$src})) {
-                        if ($possdel) {
-                            unless ($allowed) {
-                                &Apache::lonnet::delenv('httpref.'.$src);
-                            }
-                        }
-                    } elsif ($allowed) {
-                        &Apache::lonnet::allowuploaded('/adm/coursedoc',$src);
-                    }
-                }
-            }
-            if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-                &Apache::lonnet::appenv({'request.course.suppupdated' => time});
-            }
-        }
-    }
-}
-
-sub get_supp_parameter {
-    my ($resparm,$name)=@_;
-    return if ($resparm eq '');
-    my $value=undef;
-    my $ptype=undef;
-    foreach (split('&&&',$resparm)) {
-        my ($thistype,$thisname,$thisvalue)=split('___',$_);
-        if ($thisname eq $name) {
-            $value=$thisvalue;
-            $ptype=$thistype;
-        }
-    }
-    return $value;
+    return ($numfiles,$errors);
 }
 
 sub symb_to_docspath {
@@ -17926,67 +17165,6 @@ sub symb_to_docspath {
     return $path;
 }
 
-sub validate_folderpath {
-    my ($supplementalflag,$allowed,$coursenum,$coursedom) = @_;
-    if ($env{'form.folderpath'} ne '') {
-        my @items = split(/\&/,$env{'form.folderpath'});
-        my ($badpath,$changed,$got_supp,$supppath,%supphidden,%suppids);
-        for (my $i=0; $i<@items; $i++) {
-            my $odd = $i%2;
-            if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) {
-                $badpath = 1;
-            } elsif ($odd && $supplementalflag) {
-                my $idx = $i-1;
-                if ($items[$i] =~ /^([^:]*)::(|1):::$/) {
-                    my $esc_name = $1;
-                    if ((!$allowed) || ($items[$idx] eq 'supplemental')) {
-                        $supppath .= '&'.$esc_name;
-                        $changed = 1;
-                    } else {
-                        $supppath .= '&'.$items[$i];
-                    }
-                } elsif (($allowed) && ($items[$idx] ne 'supplemental')) {
-                    $changed = 1;
-                    my $is_hidden;
-                    unless ($got_supp) {
-                        my ($supplemental) = &get_supplemental($coursenum,$coursedom);
-                        if (ref($supplemental) eq 'HASH') {
-                            if (ref($supplemental->{'hidden'}) eq 'HASH') {
-                                %supphidden = %{$supplemental->{'hidden'}};
-                            }
-                            if (ref($supplemental->{'ids'}) eq 'HASH') {
-                                %suppids = %{$supplemental->{'ids'}};
-                            }
-                        }
-                        $got_supp = 1;
-                    }
-                    if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') {
-                        my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0];
-                        if ($supphidden{$mapid}) {
-                            $is_hidden = 1;
-                        }
-                    }
-                    $supppath .= '&'.$items[$i].'::'.$is_hidden.':::';
-                } else {
-                    $supppath .= '&'.$items[$i];
-                }
-            } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) {
-                $badpath = 1;
-            } elsif ($supplementalflag) {
-                $supppath .= '&'.$items[$i];
-            }
-            last if ($badpath);
-        }
-        if ($badpath) {
-            delete($env{'form.folderpath'});
-        } elsif ($changed && $supplementalflag) {
-            $supppath =~ s/^\&//;
-            $env{'form.folderpath'} = $supppath;
-        }
-    }
-    return;
-}
-
 sub captcha_display {
     my ($context,$lonhost,$defdom) = @_;
     my ($output,$error);
@@ -18109,7 +17287,7 @@ sub create_captcha {
             $output = '<input type="hidden" name="crypt" value="'.$md5sum.'" />'."\n".
                       '<span class="LC_nobreak">'.
                       &mt('Type in the letters/numbers shown below').'&nbsp;'.
-                      '<input type="text" size="5" name="code" value="" autocomplete="new-password" />'.
+                      '<input type="text" size="5" name="code" value="" autocomplete="off" />'.
                       '</span><br />'.
                       '<img src="'.$captcha_params{'www_output_dir'}.'/'.$md5sum.'.png" alt="captcha" />';
             last;
@@ -18247,28 +17425,12 @@ sub cleanup_html {
 
 # Checks for critical messages and returns a redirect url if one exists.
 # $interval indicates how often to check for messages.
-# $context is the calling context -- roles, grades, contents, menu or flip.
 sub critical_redirect {
-    my ($interval,$context) = @_;
+    my ($interval) = @_;
     unless (($env{'user.domain'} ne '') && ($env{'user.name'} ne '')) {
         return ();
     }
     if ((time-$env{'user.criticalcheck.time'})>$interval) {
-        if (($env{'request.course.id'}) && (($context eq 'flip') || ($context eq 'contents'))) {
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $blocked = &blocking_status('alert',undef,$cnum,$cdom,undef,1);
-            if ($blocked) {
-                my $checkrole = "cm./$cdom/$cnum";
-                if ($env{'request.course.sec'} ne '') {
-                    $checkrole .= "/$env{'request.course.sec'}";
-                }
-                unless ((&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) &&
-                        ($env{'request.role'} !~ m{^st\./$cdom/$cnum})) {
-                    return;
-                }
-            }
-        }
         my @what=&Apache::lonnet::dump('critical', $env{'user.domain'},
                                         $env{'user.name'});
         &Apache::lonnet::appenv({'user.criticalcheck.time'=>time});
@@ -18334,158 +17496,6 @@ sub des_decrypt {
     return $plaintext;
 }
 
-sub get_requested_shorturls {
-    my ($cdom,$cnum,$navmap) = @_;
-    return unless (ref($navmap));
-    my ($numnew,$errors);
-    my @toshorten = &Apache::loncommon::get_env_multiple('form.addtiny');
-    if (@toshorten) {
-        my (%maps,%resources,%titles);
-        &Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles,
-                                                               'shorturls',$cdom,$cnum);
-        if (keys(%resources)) {
-            my %tocreate;
-            foreach my $item (sort {$a <=> $b} (@toshorten)) {
-                my $symb = $resources{$item};
-                if ($symb) {
-                    $tocreate{$cnum.'&'.$symb} = 1;
-                }
-            }
-            if (keys(%tocreate)) {
-                ($numnew,$errors) = &make_short_symbs($cdom,$cnum,
-                                                      \%tocreate);
-            }
-        }
-    }
-    return ($numnew,$errors);
-}
-
-sub make_short_symbs {
-    my ($cdom,$cnum,$tocreateref,$lockuser) = @_;
-    my ($numnew,@errors);
-    if (ref($tocreateref) eq 'HASH') {
-        my %tocreate = %{$tocreateref};
-        if (keys(%tocreate)) {
-            my %coursetiny = &Apache::lonnet::dump('tiny',$cdom,$cnum);
-            my $su = Short::URL->new(no_vowels => 1);
-            my $init = '';
-            my (%newunique,%addcourse,%courseonly,%failed);
-            # get lock on tiny db
-            my $now = time;
-            if ($lockuser eq '') {
-                $lockuser = $env{'user.name'}.':'.$env{'user.domain'};
-            }
-            my $lockhash = {
-                                "lock\0$now" => $lockuser,
-                            };
-            my $tries = 0;
-            my $gotlock = &Apache::lonnet::newput_dom('tiny',$lockhash,$cdom);
-            my ($code,$error);
-            while (($gotlock ne 'ok') && ($tries<3)) {
-                $tries ++;
-                sleep 1;
-                $gotlock = &Apache::lonnet::newput_dom('tiny',$lockhash,$cdom);
-            }
-            if ($gotlock eq 'ok') {
-                $init = &shorten_symbs($cdom,$init,$su,\%coursetiny,\%tocreate,\%newunique,
-                                       \%addcourse,\%courseonly,\%failed);
-                if (keys(%failed)) {
-                    my $numfailed = scalar(keys(%failed));
-                    push(@errors,&mt('error: could not obtain unique six character URL for [quant,_1,resource]',$numfailed));
-                }
-                if (keys(%newunique)) {
-                    my $putres = &Apache::lonnet::newput_dom('tiny',\%newunique,$cdom);
-                    if ($putres eq 'ok') {
-                        $numnew = scalar(keys(%newunique));
-                        my $newputres = &Apache::lonnet::newput('tiny',\%addcourse,$cdom,$cnum);
-                        unless ($newputres eq 'ok') {
-                            push(@errors,&mt('error: could not store course look-up of short URLs'));
-                        }
-                    } else {
-                        push(@errors,&mt('error: could not store unique six character URLs'));
-                    }
-                }
-                my $dellockres = &Apache::lonnet::del_dom('tiny',["lock\0$now"],$cdom);
-                unless ($dellockres eq 'ok') {
-                    push(@errors,&mt('error: could not release lockfile'));
-                }
-            } else {
-                push(@errors,&mt('error: could not obtain lockfile'));
-            }
-            if (keys(%courseonly)) {
-                my $result = &Apache::lonnet::newput('tiny',\%courseonly,$cdom,$cnum);
-                if ($result ne 'ok') {
-                    push(@errors,&mt('error: could not update course look-up of short URLs'));
-                }
-            }
-        }
-    }
-    return ($numnew,\@errors);
-}
-
-sub shorten_symbs {
-    my ($cdom,$init,$su,$coursetiny,$tocreate,$newunique,$addcourse,$courseonly,$failed) = @_;
-    return unless ((ref($su)) && (ref($coursetiny) eq 'HASH') && (ref($tocreate) eq 'HASH') &&
-                   (ref($newunique) eq 'HASH') && (ref($addcourse) eq 'HASH') &&
-                   (ref($courseonly) eq 'HASH') && (ref($failed) eq 'HASH'));
-    my (%possibles,%collisions);
-    foreach my $key (keys(%{$tocreate})) {
-        my $num = String::CRC32::crc32($key);
-        my $tiny = $su->encode($num,$init);
-        if ($tiny) {
-            $possibles{$tiny} = $key;
-        }
-    }
-    if (!$init) {
-        $init = 1;
-    } else {
-        $init ++;
-    }
-    if (keys(%possibles)) {
-        my @posstiny = keys(%possibles);
-        my $configuname = &Apache::lonnet::get_domainconfiguser($cdom);
-        my %currtiny = &Apache::lonnet::get('tiny',\@posstiny,$cdom,$configuname);
-        if (keys(%currtiny)) {
-            foreach my $key (keys(%currtiny)) {
-                next if ($currtiny{$key} eq '');
-                if ($currtiny{$key} eq $possibles{$key}) {
-                    my ($tcnum,$tsymb) = split(/\&/,$currtiny{$key});
-                    unless (($coursetiny->{$tsymb} eq $key) || ($addcourse->{$tsymb} eq $key) || ($courseonly->{$tsymb} eq $key)) {
-                        $courseonly->{$tsymb} = $key;
-                    }
-                } else {
-                    $collisions{$possibles{$key}} = 1;
-                }
-                delete($possibles{$key});
-            }
-        }
-        foreach my $key (keys(%possibles)) {
-            $newunique->{$key} = $possibles{$key};
-            my ($tcnum,$tsymb) = split(/\&/,$possibles{$key});
-            unless (($coursetiny->{$tsymb} eq $key) || ($addcourse->{$tsymb} eq $key) || ($courseonly->{$tsymb} eq $key)) {
-                $addcourse->{$tsymb} = $key;
-            }
-        }
-    }
-    if (keys(%collisions)) {
-        if ($init <5) {
-            if (!$init) {
-                $init = 1;
-            } else {
-                $init ++;
-            }
-            $init = &shorten_symbs($cdom,$init,$su,$coursetiny,\%collisions,
-                                   $newunique,$addcourse,$courseonly,$failed);
-        } else {
-            foreach my $key (keys(%collisions)) {
-                $failed->{$key} = 1;
-                $failed->{$key} = 1;
-            }
-        }
-    }
-    return $init;
-}
-
 sub is_nonframeable {
     my ($url,$absolute,$hostname,$ip,$nocache) = @_;
     my ($remprotocol,$remhost) = ($url =~ m{^(https?)\://(([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,})}i);
@@ -18639,37 +17649,6 @@ sub is_nonframeable {
     return $uselink;
 }
 
-sub page_menu {
-    my ($menucolls,$menunum) = @_;
-    my %menu;
-    foreach my $item (split(/;/,$menucolls)) {
-        my ($num,$value) = split(/\%/,$item);
-        if ($num eq $menunum) {
-            my @entries = split(/\&/,$value);
-            foreach my $entry (@entries) {
-                my ($name,$fields) = split(/=/,$entry);
-                if (($name eq 'top') || ($name eq 'inline') || ($name eq 'foot') || ($name eq 'main')) {
-                    $menu{$name} = $fields;
-                } else {
-                    my @shown;
-                    if ($fields =~ /,/) {
-                        @shown = split(/,/,$fields);
-                    } else {
-                        @shown = ($fields);
-                    }
-                    if (@shown) {
-                        foreach my $field (@shown) {
-                            next if ($field eq '');
-                            $menu{$field} = 1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return %menu;
-}
-
 1;
 __END__;