--- loncom/interface/loncommon.pm	2023/09/06 16:09:14	1.1075.2.161.2.18
+++ loncom/interface/loncommon.pm	2022/10/27 20:30:11	1.1393
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.161.2.18 2023/09/06 16:09:14 raeburn Exp $
+# $Id: loncommon.pm,v 1.1393 2022/10/27 20:30:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,17 +71,19 @@ use Apache::lonuserutils();
 use Apache::lonuserstate();
 use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
-use LONCAPA::map();
+use LONCAPA::LWPReq;
 use HTTP::Request;
 use DateTime::TimeZone;
 use DateTime::Locale;
 use Encode();
+use Text::Aspell;
 use Authen::Captcha;
 use Captcha::reCAPTCHA;
 use JSON::DWIW;
-use LWP::UserAgent;
 use Crypt::DES;
 use DynaLoader; # for Crypt::DES version
+use MIME::Lite;
+use MIME::Types;
 use File::Copy();
 use File::Path();
 use String::CRC32();
@@ -170,6 +172,7 @@ sub ssi_with_retries {
 # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;
 my %supported_language;
+my %supported_codes;
 my %latex_language;		# For choosing hyphenation in <transl..>
 my %latex_language_bykey;	# for choosing hyphenation from metadata
 my %cprtag;
@@ -204,14 +207,15 @@ BEGIN {
             while (my $line = <$fh>) {
                 next if ($line=~/^\#/);
                 chomp($line);
-                my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
+                my ($key,$code,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
                 $language{$key}=$val.' - '.$enc;
                 if ($sup) {
                     $supported_language{$key}=$sup;
+		    $supported_codes{$key}   = $code;
                 }
 		if ($latex) {
 		    $latex_language_bykey{$key} = $latex;
-		    $latex_language{$two} = $latex;
+		    $latex_language{$code} = $latex;
 		}
             }
             close($fh);
@@ -690,7 +694,7 @@ if (!Array.prototype.indexOf) {
         var n = 0;
         if (arguments.length > 0) {
             n = Number(arguments[1]);
-            if (n !== n) { // shortcut for verifying if it's NaN
+            if (n !== n) { // shortcut for verifying if it is NaN
                 n = 0;
             } else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
                 n = (n > 0 || -1) * Math.floor(Math.abs(n));
@@ -891,6 +895,8 @@ sub selectcourse_link {
    my $linktext = &mt('Select Course');
    if ($selecttype eq 'Community') {
        $linktext = &mt('Select Community');
+   } elsif ($selecttype eq 'Placement') {
+       $linktext = &mt('Select Placement Test'); 
    } elsif ($selecttype eq 'Course/Community') {
        $linktext = &mt('Select Course/Community');
        $type = '';
@@ -926,12 +932,12 @@ sub check_uncheck_jscript {
 function checkAll(field) {
     if (field.length > 0) {
         for (i = 0; i < field.length; i++) {
-            if (!field[i].disabled) {
+            if (!field[i].disabled) { 
                 field[i].checked = true;
             }
         }
     } else {
-        if (!field.disabled) {
+        if (!field.disabled) { 
             field.checked = true;
         }
     }
@@ -1007,7 +1013,7 @@ sub select_datelocale {
                 }
                 $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
                 push(@possibles,$id);
-            }
+            } 
         }
     }
     foreach my $item (sort(@possibles)) {
@@ -1043,6 +1049,33 @@ sub select_language {
 
 =pod
 
+
+=item * &list_languages()
+
+Returns an array reference that is suitable for use in language prompters.
+Each array element is itself a two element array.  The first element
+is the language code.  The second element a descsriptiuon of the 
+language itself.  This is suitable for use in e.g.
+&Apache::edit::select_arg (once dereferenced that is).
+
+=cut 
+
+sub list_languages {
+    my @lang_choices;
+
+    foreach my $id (&languageids()) {
+	my $code = &supportedlanguagecode($id);
+	if ($code) {
+	    my $selector    = $supported_codes{$id};
+	    my $description = &plainlanguagedescription($id);
+	    push(@lang_choices, [$selector, $description]);
+	}
+    }
+    return \@lang_choices;
+}
+
+=pod
+
 =item * &linked_select_forms(...)
 
 linked_select_forms returns a string containing a <script></script> block
@@ -1075,6 +1108,9 @@ linked_select_forms takes the following
 =item * $onchangesecond, additional javascript call to execute for an onchange
         event for the second <select> tag
 
+=item * $suffix, to differentiate separate uses of select2data javascript
+        objects in a page.
+
 =back 
 
 Below is an example of such a hash.  Only the 'text', 'default', and 
@@ -1129,7 +1165,8 @@ sub linked_select_forms {
         $hashref,
         $menuorder,
         $onchangefirst,
-        $onchangesecond
+        $onchangesecond,
+        $suffix
         ) = @_;
     my $second = "document.$formname.$secondselectname";
     my $first = "document.$formname.$firstselectname";
@@ -1137,20 +1174,20 @@ sub linked_select_forms {
     my $result = '';
     $result.='<script type="text/javascript" language="JavaScript">'."\n";
     $result.="// <![CDATA[\n";
-    $result.="var select2data = new Object();\n";
+    $result.="var select2data${suffix} = new Object();\n";
     $" = '","';
     my $debug = '';
     foreach my $s1 (sort(keys(%$hashref))) {
-        $result.="select2data.d_$s1 = new Object();\n";        
-        $result.="select2data.d_$s1.def = new String('".
+        $result.="select2data${suffix}['d_$s1'] = new Object();\n";        
+        $result.="select2data${suffix}['d_$s1'].def = new String('".
             $hashref->{$s1}->{'default'}."');\n";
-        $result.="select2data.d_$s1.values = new Array(";
+        $result.="select2data${suffix}['d_$s1'].values = new Array(";
         my @s2values = sort(keys( %{ $hashref->{$s1}->{'select2'} } ));
         if (ref($hashref->{$s1}->{'order'}) eq 'ARRAY') {
             @s2values = @{$hashref->{$s1}->{'order'}};
         }
         $result.="\"@s2values\");\n";
-        $result.="select2data.d_$s1.texts = new Array(";        
+        $result.="select2data${suffix}['d_$s1'].texts = new Array(";        
         my @s2texts;
         foreach my $value (@s2values) {
             push(@s2texts, $hashref->{$s1}->{'select2'}->{$value});
@@ -1160,19 +1197,17 @@ sub linked_select_forms {
     $"=' ';
     $result.= <<"END";
 
-function select1_changed() {
+function select1${suffix}_changed() {
     // Determine new choice
-    var newvalue = "d_" + $first.value;
+    var newvalue = "d_" + $first.options[$first.selectedIndex].value;
     // update select2
-    var values     = select2data[newvalue].values;
-    var texts      = select2data[newvalue].texts;
-    var select2def = select2data[newvalue].def;
+    var values     = select2data${suffix}[newvalue].values;
+    var texts      = select2data${suffix}[newvalue].texts;
+    var select2def = select2data${suffix}[newvalue].def;
     var i;
     // out with the old
-    for (i = 0; i < $second.options.length; i++) {
-        $second.options[i] = null;
-    }
-    // in with the nuclear
+    $second.options.length = 0;
+    // in with the new
     for (i=0;i<values.length; i++) {
         $second.options[i] = new Option(values[i]);
         $second.options[i].value = values[i];
@@ -1186,7 +1221,7 @@ function select1_changed() {
 </script>
 END
     # output the initial values for the selection lists
-    $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed();$onchangefirst\">\n";
+    $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1${suffix}_changed();$onchangefirst\">\n";
     my @order = sort(keys(%{$hashref}));
     if (ref($menuorder) eq 'ARRAY') {
         @order = @{$menuorder};
@@ -1265,11 +1300,7 @@ sub help_open_topic {
     $topic=~s/\W/\_/g;
 
     if (!$stayOnPage) {
-        if ($env{'browser.mobile'}) {
-	    $link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";
-        } else {
-            $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-        }
+	$link = "javascript:openMyModal('/adm/help/${filename}.hlp',$width,$height,'yes');";
     } elsif ($stayOnPage eq 'popup') {
         $link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
     } else {
@@ -1284,7 +1315,7 @@ sub help_open_topic {
              (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
         $target = '';
     }
-    if ($text ne "") {	
+    if ($text ne "") {
 	$template.='<span class="LC_help_open_topic">'
                   .'<a'.$target.' href="'.$link.'">'
                   .$text.'</a>';
@@ -1325,11 +1356,11 @@ sub helpLatexCheatsheet {
 	  .&help_open_topic('Other_Symbols',&mt('Other Symbols'),$stayOnPage,undef,600)
 	  .'</span>';
     unless ($not_author) {
-        $out .= ' <span>'
-	       .&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600)
-	       .'</span> <span>'
-               .&help_open_topic('Authoring_Multilingual_Problems',&mt('Languages'),$stayOnPage,undef,600)
-               .'</span>';
+        $out .= '<span>'
+               .&help_open_topic('Authoring_Output_Tags',&mt('Output Tags'),$stayOnPage,undef,600)
+               .'</span> <span>'
+               .&help_open_topic('Authoring_Multilingual_Problems',&mt('How to create problems in different languages'),$stayOnPage,undef,600)
+	       .'</span>';
     }
     $out .= '</span>'; # End cheatsheet
     return $out;
@@ -1392,10 +1423,8 @@ sub help_open_menu {
 sub top_nav_help {
     my ($text,$linkattr) = @_;
     $text = &mt($text);
-    my $stay_on_page;
-    unless ($env{'environment.remote'} eq 'on') {
-        $stay_on_page = 1;
-    }
+    my $stay_on_page = 1;
+
     my ($link,$banner_link);
     unless ($env{'request.noversionuri'} =~ m{^/adm/helpmenu}) {
         $link = ($stay_on_page) ? "javascript:helpMenu('display')"
@@ -1427,7 +1456,7 @@ sub help_menu_js {
 					'js_ready'    => 1,
                                         'use_absolute' => $httphost,
 					'add_entries' => {
-					    'border' => '0',
+					    'border' => '0', 
 					    'rows'   => "110,*",},});
     my $end_page =
         &Apache::loncommon::end_page({'frameset' => 1,
@@ -1776,6 +1805,162 @@ RESIZE
 }
 
 sub colorfuleditor_js {
+    my $browse_or_search;
+    my $respath;
+    my ($cnum,$cdom) = &crsauthor_url();
+    if ($cnum) {
+        $respath = "/res/$cdom/$cnum/";
+        my %js_lt = &Apache::lonlocal::texthash(
+            sunm => 'Sub-directory name',
+            save => 'Save page to make this permanent',
+        );
+        &js_escape(\%js_lt);
+        $browse_or_search = <<"END";
+
+    function toggleChooser(form,element,titleid,only,search) {
+        var disp = 'none';
+        if (document.getElementById('chooser_'+element)) {
+            var curr = document.getElementById('chooser_'+element).style.display;
+            if (curr == 'none') {
+                disp='inline';
+                if (form.elements['chooser_'+element].length) {
+                    for (var i=0; i<form.elements['chooser_'+element].length; i++) {
+                        form.elements['chooser_'+element][i].checked = false;
+                    }
+                }
+                toggleResImport(form,element);
+            }
+            document.getElementById('chooser_'+element).style.display = disp;
+        }
+    }
+
+    function toggleCrsFile(form,element,numdirs) {
+        if (document.getElementById('chooser_'+element+'_crsres')) {
+            var curr = document.getElementById('chooser_'+element+'_crsres').style.display;
+            if (curr == 'none') {
+                if (numdirs) {
+                    form.elements['coursepath_'+element].selectedIndex = 0;
+                    if (numdirs > 1) {
+                        window['select1'+element+'_changed']();
+                    }
+                }
+            } 
+            document.getElementById('chooser_'+element+'_crsres').style.display = 'block';
+            
+        }
+        if (document.getElementById('chooser_'+element+'_upload')) {
+            document.getElementById('chooser_'+element+'_upload').style.display = 'none';
+            if (document.getElementById('uploadcrsres_'+element)) {
+                document.getElementById('uploadcrsres_'+element).value = '';
+            }
+        }
+        return;
+    }
+
+    function toggleCrsUpload(form,element,numcrsdirs) {
+        if (document.getElementById('chooser_'+element+'_crsres')) {
+            document.getElementById('chooser_'+element+'_crsres').style.display = 'none';
+        }
+        if (document.getElementById('chooser_'+element+'_upload')) {
+            var curr = document.getElementById('chooser_'+element+'_upload').style.display;
+            if (curr == 'none') {
+                if (numcrsdirs) {
+                   form.elements['crsauthorpath_'+element].selectedIndex = 0;
+                   form.elements['newsubdir_'+element][0].checked = true;
+                   toggleNewsubdir(form,element);
+                }
+            }
+            document.getElementById('chooser_'+element+'_upload').style.display = 'block';
+        }
+        return;
+    }
+
+    function toggleResImport(form,element) {
+        var choices = new Array('crsres','upload');
+        for (var i=0; i<choices.length; i++) {
+            if (document.getElementById('chooser_'+element+'_'+choices[i])) {
+                document.getElementById('chooser_'+element+'_'+choices[i]).style.display = 'none';
+            }
+        }
+    }
+
+    function toggleNewsubdir(form,element) {
+        var newsub = form.elements['newsubdir_'+element];
+        if (newsub) {
+            if (newsub.length) {
+                for (var j=0; j<newsub.length; j++) {
+                    if (newsub[j].checked) {
+                        if (document.getElementById('newsubdirname_'+element)) {
+                            if (newsub[j].value == '1') {
+                                document.getElementById('newsubdirname_'+element).type = "text";
+                                if (document.getElementById('newsubdir_'+element)) {
+                                    document.getElementById('newsubdir_'+element).innerHTML = '<br />$js_lt{sunm}';
+                                }
+                            } else {
+                                document.getElementById('newsubdirname_'+element).type = "hidden";
+                                document.getElementById('newsubdirname_'+element).value = "";
+                                document.getElementById('newsubdir_'+element).innerHTML = "";
+                            }
+                        }
+                        break; 
+                    }
+                }
+            }
+        }
+    }
+
+    function updateCrsFile(form,element) {
+        var directory = form.elements['coursepath_'+element];
+        var filename = form.elements['coursefile_'+element];
+        var path = directory.options[directory.selectedIndex].value;
+        var file = filename.options[filename.selectedIndex].value;
+        form.elements[element].value = '$respath';
+        if (path == '/') {
+            form.elements[element].value += file;
+        } else {
+            form.elements[element].value += path+'/'+file;
+        }
+        unClean();
+        if (document.getElementById('previewimg_'+element)) {
+            document.getElementById('previewimg_'+element).src = form.elements[element].value;
+            var newsrc = document.getElementById('previewimg_'+element).src; 
+        }
+        if (document.getElementById('showimg_'+element)) {
+            document.getElementById('showimg_'+element).innerHTML = '($js_lt{save})';
+        }
+        toggleChooser(form,element);
+        return;
+    }
+
+    function uploadDone(suffix,name) {
+        if (name) {
+	    document.forms["lonhomework"].elements[suffix].value = name;
+            unClean();
+            toggleChooser(document.forms["lonhomework"],suffix);
+        }
+    }
+
+\$(document).ready(function(){
+
+    \$(document).delegate('form :submit', 'click', function( event ) {
+        if ( \$( this ).hasClass( "LC_uploadcrsres" ) ) {
+            var buttonId = this.id;
+            var suffix = buttonId.toString();
+            suffix = suffix.replace(/^crsupload_/,'');
+            event.preventDefault();
+            document.lonhomework.target = 'crsupload_target_'+suffix;
+            document.lonhomework.action = '/adm/coursepub?LC_uploadcrsres='+suffix;
+            \$(this.form).submit();
+            document.lonhomework.target = '';
+            if (document.getElementById('crsuploadto_'+suffix)) {
+                document.lonhomework.action = document.getElementById('crsuploadto_'+suffix).value;
+            }
+            return false;
+        }
+    });
+});
+END
+    }
     return <<"COLORFULEDIT"
 <script type="text/javascript">
 // <![CDATA[>
@@ -1821,14 +2006,14 @@ sub colorfuleditor_js {
             }
 
             // only iterate whole storage if nothing to override
-            if(localStorage.getItem(key) == null){
+            if(localStorage.getItem(key) == null){        
 
                 // prevent storage from growing large
                 if(localStorage.length > 50){
                     var regex_getTimestamp = /^(?:\d)+;/;
                     var oldest_timestamp = regex_getTimestamp.exec(localStorage.key(0));
                     var oldest_key;
-
+                    
                     for(var i = 1; i < localStorage.length; i++){
                         if (regex_getTimestamp.exec(localStorage.key(i)) < oldest_timestamp) {
                             oldest_key = localStorage.key(i);
@@ -1858,7 +2043,7 @@ sub colorfuleditor_js {
                 pairs = valueArr[i].split(',');
                 elements = document.getElementsByName(pairs[0]);
 
-                for (var j = 0; j < elements.length; j++){
+                for (var j = 0; j < elements.length; j++){  
                     elements[j].style.display = pairs[1];
                     if (pairs[1] == "none"){
                         var regex_id = /([_\\d]+)\$/;
@@ -1871,7 +2056,7 @@ sub colorfuleditor_js {
     }
 
     function getTagList () {
-
+        
         var stringToSearch = document.lonhomework.innerHTML;
 
         var ret = new Array();
@@ -1879,7 +2064,7 @@ sub colorfuleditor_js {
         var tag_list = stringToSearch.match(regex_findBlock);
 
         if(tag_list != null){
-            for(var i = 0; i < tag_list.length; i++){
+            for(var i = 0; i < tag_list.length; i++){            
                 ret.push(tag_list[i].replace(/"/, ''));
             }
         }
@@ -1916,7 +2101,7 @@ sub colorfuleditor_js {
 
             for(var i = 0; i < tag_list.length; i++){
                 elem_list = document.getElementsByName(tag_list[i]);
-
+                
                 if(elem_list.length > 0){
                     elem = elem_list[0];
                     break;
@@ -1939,7 +2124,7 @@ sub colorfuleditor_js {
             rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
         );
     }
-
+    
     function autosize(depth){
         var cmInst = window['cm'+depth];
         var fitsizeButton = document.getElementById('fitsize'+depth);
@@ -1958,7 +2143,7 @@ sub colorfuleditor_js {
         }
     }
 
-
+$browse_or_search
 
 // ]]>
 </script>
@@ -2006,10 +2191,136 @@ sub insert_folding_button {
     my $curDepth = $Apache::lonxml::curdepth;
     my $lastresource = $env{'request.ambiguous'};
 
-    return "<input type=\"button\" id=\"folding_btn_$curDepth\"
+    return "<input type=\"button\" id=\"folding_btn_$curDepth\" 
             value=\"".&mt('Hide')."\" onclick=\"fold_box('$curDepth','$lastresource')\">";
 }
 
+sub crsauthor_url {
+    my ($url) = @_;
+    if ($url eq '') {
+        $url = $ENV{'REQUEST_URI'};
+    }
+    my ($cnum,$cdom);
+    if ($env{'request.course.id'}) {
+        my ($audom,$auname) = ($url =~ m{^/priv/($match_domain)/($match_name)/});
+        if ($audom ne '' && $auname ne '') {
+            if (($env{'course.'.$env{'request.course.id'}.'.num'} eq $auname) &&
+                ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $audom)) {
+                $cnum = $auname;
+                $cdom = $audom;
+            }
+        }
+    }
+    return ($cnum,$cdom);
+}
+
+sub import_crsauthor_form {
+    my ($form,$firstselectname,$secondselectname,$onchangefirst,$only,$suffix,$disabled) = @_;
+    return (0) unless ($env{'request.course.id'});
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'};
+    return (0) unless (($cnum ne '') && ($cdom ne ''));
+    my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+    my @ids=&Apache::lonnet::current_machine_ids();
+    my ($output,$is_home,$relpath,%subdirs,%files,%selimport_menus);
+    
+    if (grep(/^\Q$crshome\E$/,@ids)) {
+        $is_home = 1;
+    }
+    $relpath = "/priv/$cdom/$cnum";
+    &Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$relpath,'',\%subdirs,\%files);
+    my %lt = &Apache::lonlocal::texthash (
+        fnam => 'Filename',
+        dire => 'Directory',
+    );
+    my $numdirs = scalar(keys(%files));
+    my (%possexts,$singledir,@singledirfiles);
+    if ($only) {
+        map { $possexts{$_} = 1; } split(/\s*,\s*/,$only);
+    }
+    my (%nonemptydirs,$possdirs);
+    if ($numdirs > 1) {
+        my @order;
+        foreach my $key (sort { lc($a) cmp lc($b) } (keys(%files))) {
+            if (ref($files{$key}) eq 'HASH') {
+                my $shown = $key;
+                if ($key eq '') {
+                    $shown = '/';
+                }
+                my @ordered = ();
+                foreach my $file (sort { lc($a) cmp lc($b) } (keys(%{$files{$key}}))) {
+                    next if ($file =~ /\.rights$/);
+                    if ($only) {
+                        my ($ext) = ($file =~ /\.([^.]+)$/);
+                        unless ($possexts{lc($ext)}) {
+                            next;
+                        }
+                    }
+                    $selimport_menus{$key}->{'select2'}->{$file} = $file;
+                    push(@ordered,$file);
+                }
+                if (@ordered) {
+                    push(@order,$key);
+                    $nonemptydirs{$key} = 1;
+                    $selimport_menus{$key}->{'text'} = $shown;
+                    $selimport_menus{$key}->{'default'} = '';
+                    $selimport_menus{$key}->{'select2'}->{''} = '';
+                    $selimport_menus{$key}->{'order'} = \@ordered;
+                }
+            }
+        }
+        $possdirs = scalar(keys(%nonemptydirs));
+        if ($possdirs > 1) {
+            my @order = sort { lc($a) cmp lc($b) } (keys(%nonemptydirs));
+            $output = $lt{'dire'}.
+                      &linked_select_forms($form,'<br />'.
+                                           $lt{'fnam'},'',
+                                           $firstselectname,$secondselectname,
+                                           \%selimport_menus,\@order,
+                                           $onchangefirst,'',$suffix).'<br />';
+        } elsif ($possdirs == 1) {
+            $singledir = (keys(%nonemptydirs))[0];
+            if (ref($selimport_menus{$singledir}->{'order'}) eq 'ARRAY') {
+                @singledirfiles = @{$selimport_menus{$singledir}->{'order'}};
+            }
+            delete($selimport_menus{$singledir});
+        }
+    } elsif ($numdirs == 1) {
+        $singledir = (keys(%files))[0];
+        foreach my $file (sort { lc($a) cmp lc($b) } (keys(%{$files{$singledir}}))) {
+            if ($only) {
+                my ($ext) = ($file =~ /\.([^.]+)$/);
+                unless ($possexts{lc($ext)}) {
+                    next;
+                }
+            } else {
+                next if ($file =~ /\.rights$/);
+            }
+            push(@singledirfiles,$file);
+        }
+        if (@singledirfiles) {
+            $possdirs = 1;
+        }
+    }
+    if (($possdirs == 1) && (@singledirfiles)) {
+        my $showdir = $singledir;
+        if ($singledir eq '') {
+            $showdir = '/';
+        }
+        $output = $lt{'dire'}.
+                  '<select name="'.$firstselectname.'">'.
+                  '<option value="'.$singledir.'">'.$showdir.'</option>'."\n".
+                  '</select><br />'.
+                  $lt{'fnam'}.'<select name="'.$secondselectname.'">'."\n".
+                  '<option value="" selected="selected">'.$lt{'se'}.'</option>'."\n";
+        foreach my $file (@singledirfiles) {
+            $output .= '<option value="'.$file.'">'.$file.'</option>'."\n";
+        }
+        $output .= '</select><br />'."\n";
+    }
+    return ($possdirs,$output);
+}
 
 =pod
 
@@ -2198,10 +2509,24 @@ sub create_text_file {
 # ------------------------------------------
 
 sub domain_select {
-    my ($name,$value,$multiple)=@_;
+    my ($name,$value,$multiple,$incdoms,$excdoms)=@_;
+    my @possdoms;
+    if (ref($incdoms) eq 'ARRAY') {
+        @possdoms = @{$incdoms};
+    } else {
+        @possdoms = &Apache::lonnet::all_domains();
+    }
+
     my %domains=map { 
 	$_ => $_.' '. &Apache::lonnet::domain($_,'description') 
-    } &Apache::lonnet::all_domains();
+    } @possdoms;
+
+    if ((ref($excdoms) eq 'ARRAY') && (@{$excdoms} > 0)) {
+        foreach my $dom (@{$excdoms}) {
+            delete($domains{$dom});
+        }
+    }
+
     if ($multiple) {
 	$domains{''}=&mt('Any domain');
 	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
@@ -2278,7 +2603,7 @@ option_name => displayed text. An option
 a javascript onchange item, e.g., onchange="this.form.submit();".
 An optional arg -- $readonly -- if true will cause the select form
 to be disabled, e.g., for the case where an instructor has a section-
-specific role, and is viewing/modifying parameters.  
+specific role, and is viewing/modifying parameters. 
 
 See lonrights.pm for an example invocation and use.
 
@@ -2481,7 +2806,7 @@ The optional $incdoms is a reference to
 
 The optional $excdoms is a reference to an array of domains which will be excluded from the available options.
 
-The optional $disabled argument, if true, adds the disabled attribute to the select tag. 
+The optional $disabled argument, if true, adds the disabled attribute to the select tag.
 
 =cut
 
@@ -2502,7 +2827,7 @@ sub select_dom_form {
     }
     if ($includeempty) { @domains=('',@domains); }
     if (ref($excdoms) eq 'ARRAY') {
-        map { $exclude{$_} = 1; } @{$excdoms};
+        map { $exclude{$_} = 1; } @{$excdoms}; 
     }
     my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange$disabled>\n";
     foreach my $dom (@domains) {
@@ -2860,7 +3185,7 @@ sub authform_nochange {
               kerb_def_dom => 'MSU.EDU',
               @_,
           );
-    my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'}); 
+    my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
     my $result;
     if (!$authnum) {
         $result = &mt('Under your current role you are not permitted to change login settings for this user');
@@ -3054,7 +3379,7 @@ sub authform_local {
     my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
     if ($in{'readonly'}) {
         $disabled = ' disabled="disabled"';
-    }
+    } 
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'loc') {
             if ($can_assign{'loc'}) {
@@ -3124,7 +3449,7 @@ sub authform_filesystem {
             } else {
                 $result = &mt('Currently Filesystem Authenticated.');
                 return $result;
-            }           
+            }
         }
     } else {
         if ($authnum == 1) {
@@ -3224,6 +3549,7 @@ sub get_assignable_auth {
                           krb5 => 1,
                           int  => 1,
                           loc  => 1,
+                          lti  => 1,
                      );
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     if (ref($domconfig{'usercreation'}) eq 'HASH') {
@@ -3645,13 +3971,73 @@ sub get_related_words {
     untie %thesaurus_db;
     return @Words;
 }
+###############################################################
+#
+#  Spell checking
+#
 
 =pod
 
 =back
 
+=head1 Spell checking
+
+=over 4
+
+=item * &check_spelling($wordlist $language)
+
+Takes a string containing words and feeds it to an external
+spellcheck program via a pipeline. Returns a string containing
+them mis-spelled words.
+
+Parameters:
+
+=over 4
+
+=item - $wordlist
+
+String that will be fed into the spellcheck program.
+
+=item - $language
+
+Language string that specifies the language for which the spell
+check will be performed.
+
+=back
+
+=back
+
+Note: This sub assumes that aspell is installed.
+
+
 =cut
 
+
+sub check_spelling {
+    my ($wordlist, $language) = @_;
+    my @misspellings;
+    
+    # Generate the speller and set the langauge.
+    # if explicitly selected:
+
+    my $speller = Text::Aspell->new;
+    if ($language) {
+	$speller->set_option('lang', $language);
+    }
+
+    # Turn the word list into an array of words by splittingon whitespace
+
+    my @words = split(/\s+/, $wordlist);
+
+    foreach my $word (@words) {
+	if(! $speller->check($word)) {
+	    push(@misspellings, $word);
+	}
+    }
+    return join(' ', @misspellings);
+    
+}
+
 # -------------------------------------------------------------- Plaintext name
 =pod
 
@@ -3896,30 +4282,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 {
@@ -4139,7 +4501,11 @@ category
 
 sub filecategorytypes {
     my ($cat) = @_;
-    return @{$category_extensions{lc($cat)}};
+    if (ref($category_extensions{lc($cat)}) eq 'ARRAY') { 
+        return @{$category_extensions{lc($cat)}};
+    } else {
+        return ();
+    }
 }
 
 =pod
@@ -4306,7 +4672,7 @@ Return string with previous attempt on p
 
 =item * $usec: section of the desired student
 
-=item * $identifier: counter for student (multiple students one problem) or
+=item * $identifier: counter for student (multiple students one problem) or 
     problem (one student; whole sequence).
 
 =back
@@ -4393,7 +4759,7 @@ sub get_previous_attempt {
             my (@hidden,@unsolved);
             if (%typeparts) {
                 foreach my $id (keys(%typeparts)) {
-                    if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') ||
+                    if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || 
                         ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
                         push(@hidden,$id);
                     } elsif ($identifier ne '') {
@@ -4454,7 +4820,7 @@ sub get_previous_attempt {
                         if ($key =~ /\./) {
                             my $value = $returnhash{$version.':'.$key};
                             if ($key =~ /\.rndseed$/) {
-                                my ($id) = ($key =~ /^(.+)\.rndseed$/);
+                                my ($id) = ($key =~ /^(.+)\.[^.]+$/);
                                 if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
                                     $value = $returnhash{$version.':'.$id.'.rawrndseed'};
                                 }
@@ -4471,7 +4837,7 @@ sub get_previous_attempt {
                     next if ($key =~ /\.foilorder$/);
                     my $value = $returnhash{$version.':'.$key};
                     if ($key =~ /\.rndseed$/) {
-                        my ($id) = ($key =~ /^(.+)\.rndseed$/);
+                        my ($id) = ($key =~ /^(.+)\.[^.]+$/);
                         if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
                             $value = $returnhash{$version.':'.$id.'.rawrndseed'};
                         }
@@ -4502,7 +4868,7 @@ sub get_previous_attempt {
                       if ($key =~/$regexp$/ && (defined &$gradesub)) {
                           $value = &$gradesub($value);
                       }
-                      $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                      $prevattempts.='<td>'. $value.'&nbsp;</td>';
                   } else {
                       $prevattempts.='<td>&nbsp;</td>';
                   }
@@ -4518,7 +4884,7 @@ sub get_previous_attempt {
 	      if ($key =~/$regexp$/ && (defined &$gradesub)) {
                   $value = &$gradesub($value);
               }
-	      $prevattempts.='<td>'.$value.'&nbsp;</td>';
+	     $prevattempts.='<td>'.$value.'&nbsp;</td>';
           }
       }
       $prevattempts.= &end_data_table_row().&end_data_table();
@@ -4545,11 +4911,13 @@ sub get_previous_attempt {
 sub format_previous_attempt_value {
     my ($key,$value) = @_;
     if (($key =~ /timestamp/) || ($key=~/duedate/)) {
-	$value = &Apache::lonlocal::locallocaltime($value);
+        $value = &Apache::lonlocal::locallocaltime($value);
     } elsif (ref($value) eq 'ARRAY') {
-	$value = '('.join(', ', @{ $value }).')';
+        $value = &HTML::Entities::encode('('.join(', ', @{ $value }).')','"<>&');
     } elsif ($key =~ /answerstring$/) {
         my %answers = &Apache::lonnet::str2hash($value);
+        my @answer = %answers;
+        %answers = map {&HTML::Entities::encode($_, '"<>&')} @answer;
         my @anskeys = sort(keys(%answers));
         if (@anskeys == 1) {
             my $answer = $answers{$anskeys[0]};
@@ -4572,7 +4940,7 @@ sub format_previous_attempt_value {
             } 
         }
     } else {
-	$value = &unescape($value);
+        $value = &HTML::Entities::encode(&unescape($value), '"<>&');
     }
     return $value;
 }
@@ -4634,6 +5002,9 @@ sub get_student_view {
   }
   if (defined($target)) { $form{'grade_target'} = $target; }
   $feedurl=&Apache::lonnet::clutter($feedurl);
+  if (($feedurl =~ /ext\.tool$/) && ($target eq 'tex')) {
+      $feedurl =~ s{^/adm/wrapper}{};
+  }
   my ($userview,$response)=&Apache::lonnet::ssi_body($feedurl,%form);
   $userview=~s/\<body[^\>]*\>//gi;
   $userview=~s/\<\/body\>//gi;
@@ -4987,7 +5358,6 @@ 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')) {
         my ($has_evb,$check_ipaccess);
         my $dom = $env{'user.domain'};
@@ -5097,7 +5467,8 @@ sub blockcheck {
     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 'alert') &&
+        ($env{'request.course.id'})) {
         foreach my $key (keys(%live_courses)) {
             if ($key ne $env{'request.course.id'}) {
                 delete($live_courses{$key});
@@ -5204,7 +5575,7 @@ sub blockcheck {
 
         # Retrieve blocking times and identity of blocker for course
         # of specified user, unless user has 'evb' privilege.
-        
+
         my ($start,$end,$trigger) = 
             &get_blocks($setters,$activity,$cdom,$cnum,$url,$symb,$caller);
         if (($start != 0) && 
@@ -5394,7 +5765,7 @@ sub blocking_status {
     my $querystring  = "?activity=$activity";
 # $uname and $udom decide whose portfolio (or information page) the user is trying to look at
     if (($activity eq 'port') || ($activity eq 'about') || ($activity eq 'passwd')) {
-        $querystring .= "&amp;udom=$udom"      if ($udom =~ /^$match_domain$/);
+        $querystring .= "&amp;udom=$udom"      if ($udom =~ /^$match_domain$/); 
         $querystring .= "&amp;uname=$uname"    if ($uname =~ /^$match_username$/);
     } elsif ($activity eq 'docs') {
         my $showurl = &Apache::lonenc::check_encrypt($url);
@@ -5464,8 +5835,7 @@ sub check_ip_acc {
     if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
         return 1;
     }
-    my $allowed=0;
-    my $ip;
+    my ($ip,$allowed);
     if (($ENV{'REMOTE_ADDR'} eq '127.0.0.1') ||
         ($ENV{'REMOTE_ADDR'} eq &Apache::lonnet::get_host_ip($Apache::lonnet::perlvar{'lonHostID'}))) {
         $ip = $env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
@@ -5484,17 +5854,18 @@ sub check_ip_acc {
     foreach my $item (split(',',$acc)) {
         $item =~ s/^\s*//;
         $item =~ s/\s*$//;
+        my $pattern;
         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 $numdenies = scalar(@denies);
+   my $numallows = scalar(@allows);
+   my $count = 0;
+   foreach my $pattern (@denies,@allows) {
+        $count ++; 
         my $acctype = 'allowfrom';
         if ($count <= $numdenies) {
             $acctype = 'denyfrom';
@@ -5605,6 +5976,7 @@ sub get_domainconf {
                                                 my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
                                                 $designhash{$udom.'.login.loginvia'} = $server;
                                                 if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
+
                                                     $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
                                                 } else {
                                                     $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
@@ -5893,6 +6265,16 @@ sub CSTR_pageheader {
         $lastitem = $thisdisfn;
     }
 
+    my ($crsauthor,$title);
+    if (($env{'request.course.id'}) &&
+        ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
+        ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) {
+        $crsauthor = 1;
+        $title = &mt('Course Authoring Space');
+    } else {
+        $title = &mt('Authoring Space');
+    }
+
     my ($target,$crumbtarget) = (' target="_top"','_top');
     if ($frameset) {
         $target = ' target="_parent"';
@@ -5908,7 +6290,7 @@ sub CSTR_pageheader {
     my $output =
          '<div>'
         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
-        .'<b>'.&mt('Authoring Space:').'</b> '
+        .'<b>'.$title.'</b> '
         .'<form name="dirs" method="post" action="'.$formaction.'"'.$target.'>'
         .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,$crumbtarget,'/priv/'.$udom,undef,undef);
 
@@ -5918,13 +6300,18 @@ sub CSTR_pageheader {
             .$lastitem
             .'</span>';
     }
-    $output .=
-         '<br />'
-        #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/',$crumbtarget,'/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)
-        .'</div>';
+
+    if ($crsauthor) {
+        $output .= '</form>'.&Apache::lonmenu::constspaceform($frameset);
+    } else {
+        $output .=
+             '<br />'
+            #FIXME lonpubdir: &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/',$crumbtarget,'/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);
+    }
+    $output .= '</div>';
 
     return $output;
 }
@@ -5966,9 +6353,6 @@ Inputs:
 
 =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
 
-=item * $no_inline_link, if true and in remote mode, don't show the
-         'Switch To Inline Menu' link
-
 =item * $args, optional argument valid values are
             no_auto_mt_title -> prevents &mt()ing the title arg
             use_absolute     -> for external resource or syllabus, this will
@@ -5996,11 +6380,11 @@ Inputs:
 =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.
+            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.
+            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(),
@@ -6019,8 +6403,8 @@ 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,$args,$advtoolsref,$ltiscope,$ltiuri,
+        $ltimenu,$menucoll,$menuref,$showncrumbsref)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -6076,7 +6460,7 @@ sub bodytag {
                 $role = &mt('Helpdesk[_1]','&nbsp;'.$2);
             }
         } else {
-            $role = (split(/\//,$role,4))[-1];
+            $role = (split(/\//,$role,4))[-1]; 
         }
         if ($sec) {
             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$sec;
@@ -6143,26 +6527,13 @@ sub bodytag {
     } 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; }
-
-
-
-    my $funclist;
-    if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
-        $bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions($httphost), 'start')."\n".
-                    Apache::lonmenu::serverform();
-        my $forbodytag;
-        &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
-                                            $forcereg,$args->{'group'},
-                                            $args->{'bread_crumbs'},
-                                            $advtoolsref,'','',\$forbodytag);
-        unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
-            $funclist = $forbodytag;
-        }
+    if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+        undef($role);
     } else {
+        $role = '<span class="LC_nobreak">('.$role.')</span>' if ($role && !$env{'browser.mobile'});
+    }
+
+        if ($env{'request.state'} eq 'construct') { $forcereg=1; }
 
         #    if ($env{'request.state'} eq 'construct') {
         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
@@ -6175,6 +6546,7 @@ sub bodytag {
             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>|;
@@ -6196,7 +6568,7 @@ sub bodytag {
             $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
         }
 
-        #if directed to not display the secondary menu, don't.
+        #if directed to not display the secondary menu, don't.  
         if ($args->{'no_secondary_menu'}) {
             return $bodytag;
         }
@@ -6220,15 +6592,11 @@ sub bodytag {
                                 $args->{'group'},$args->{'hide_buttons'},
                                 $hostname,$ltiscope,$ltiuri,$showncrumbsref);
             } else {
-                my $forbodytag;
-                &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
-                                                    $forcereg,$args->{'group'},
-                                                    $args->{'bread_crumbs'},
-                                                    $advtoolsref,'',$hostname,
-                                                    \$forbodytag);
-                unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
-                    $bodytag .= $forbodytag;
-                }
+                $bodytag .= 
+                    &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
+                                                        $forcereg,$args->{'group'},
+                                                        $args->{'bread_crumbs'},
+                                                        $advtoolsref,'',$hostname);
             }
         }else{
             # this is to seperate menu from content when there's no secondary
@@ -6238,54 +6606,6 @@ sub bodytag {
         }
 
         return $bodytag;
-    }
-
-#
-# Top frame rendering, Remote is up
-#
-
-    my $imgsrc = $img;
-    if ($img =~ /^\/adm/) {
-        $imgsrc = &lonhttpdurl($img);
-    }
-    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
-
-    my $help=($no_inline_link?''
-              :&Apache::loncommon::top_nav_help('Help'));
-
-    # Explicit link to get inline menu
-    my $menu= ($no_inline_link?''
-               :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
-
-    if ($dc_info) {
-        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
-    }
-
-    my $name = &plainname($env{'user.name'},$env{'user.domain'});
-    unless ($public) {
-        $name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'},
-                                undef,'LC_menubuttons_link');
-    }
-
-    unless ($env{'form.inhibitmenu'}) {
-        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
-                       <ol class="LC_primary_menu LC_floatright LC_right">
-                       <li>$help</li>
-                       <li>$menu</li>
-                       </ol><div id="LC_realm"> $realm $dc_info</div>|;
-    }
-    if ($env{'request.state'} eq 'construct') {
-        if (!$public){
-            if ($env{'request.state'} eq 'construct') {
-                $funclist = &Apache::lonhtmlcommon::scripttag(
-                                &Apache::lonmenu::utilityfunctions($httphost), 'start').
-                            &Apache::lonhtmlcommon::scripttag('','end').
-                            &Apache::lonmenu::innerregister($forcereg,
-                                                            $args->{'bread_crumbs'});
-            }
-        }
-    }
-    return $bodytag."\n".$funclist;
 }
 
 sub dc_courseid_toggle {
@@ -6317,15 +6637,8 @@ sub make_attr_string {
 		delete($attr_ref->{$key});
 	    }
 	}
-        if ($env{'environment.remote'} eq 'on') {
-            $attr_ref->{'onload'}  =
-                &Apache::lonmenu::loadevents().  $on_load;
-            $attr_ref->{'onunload'}=
-                &Apache::lonmenu::unloadevents().$on_unload;
-        } else {  
-	    $attr_ref->{'onload'}  = $on_load;
-	    $attr_ref->{'onunload'}= $on_unload;
-        }
+	$attr_ref->{'onload'}  = $on_load;
+	$attr_ref->{'onunload'}= $on_unload;
     }
 
     my $attr_string;
@@ -6679,6 +6992,12 @@ ul.LC_breadcrumb_tools_outerlist li {
     float: right;
 }
 
+.LC_placement_prog {
+    padding-right: 20px;
+    font-weight: bold;
+    font-size: 90%;
+}
+
 table#LC_title_bar td {
   background: $tabbg;
 }
@@ -6770,7 +7089,7 @@ td.LC_menubuttons_text {
 }
 
 td.LC_zero_height {
-  line-height: 0;
+  line-height: 0; 
   cellpadding: 0;
 }
 
@@ -7095,6 +7414,12 @@ td.LC_parm_overview_restrictions  {
   border-collapse: collapse;
 }
 
+span.LC_parm_recursive,
+td.LC_parm_recursive {
+  font-weight: bold;
+  font-size: smaller;
+}
+
 table.LC_parm_overview_restrictions td {
   border-width: 1px 4px 1px 4px;
   border-style: solid;
@@ -7447,7 +7772,12 @@ table.LC_data_table tr > td.LC_docs_entr
   color: #990000;
 }
 
+.LC_docs_alias {
+  color: #440055;  
+}
+
 .LC_domprefs_email,
+.LC_docs_alias_name,
 .LC_docs_reinit_warn,
 .LC_docs_ext_edit {
   font-size: x-small;
@@ -7696,11 +8026,6 @@ fieldset {
   /* overflow: hidden; */
 }
 
-fieldset#LC_selectuser {
-    margin: 0;
-    padding: 0;
-}
-
 article.geogebraweb div {
     margin: 0;
 }
@@ -7749,7 +8074,7 @@ ol.LC_primary_menu li {
   line-height: 1.5em;
 }
 
-ol.LC_primary_menu li a, 
+ol.LC_primary_menu li a,
 ol.LC_primary_menu li p {
   display: block;
   margin: 0;
@@ -7764,7 +8089,7 @@ ol.LC_primary_menu li p span.LC_primary_
 }
 
 ol.LC_primary_menu li p span.LC_primary_menu_innerarrow {
-  display: inline-block;
+  display: inline-block;	
   width: 5%;
   float: right;
   text-align: right;
@@ -7799,9 +8124,9 @@ ol.LC_primary_menu li:hover li, ol.LC_pr
   float: none;
   border-left: 1px solid black;
   border-right: 1px solid black;
-/* A dark bottom border to visualize different menu options;
+/* A dark bottom border to visualize different menu options; 
 overwritten in the create_submenu routine for the last border-bottom of the menu */
-  border-bottom: 1px solid $data_table_dark;
+  border-bottom: 1px solid $data_table_dark; 
 }
 
 ol.LC_primary_menu li li p:hover {
@@ -8386,6 +8711,16 @@ pre.LC_wordwrap {
 }
 
 /*
+  styles used for response display
+*/
+div.LC_radiofoil, div.LC_rankfoil {
+  margin: .5em 0em .5em 0em;
+}
+table.LC_itemgroup {
+  margin-top: 1em;
+}
+
+/*
   styles used by TTH when "Default set of options to pass to tth/m
   when converting TeX" in course settings has been set
 
@@ -8406,6 +8741,87 @@ span.roman {font-family: serif; font-sty
 span.overacc2 {position: relative;  left: .8em; top: -1.2ex;}
 span.overacc1 {position: relative;  left: .6em; top: -1.2ex;}
 
+/*
+  sections with roles, for content only
+*/
+section[class^="role-"] {
+  padding-left: 10px;
+  padding-right: 5px;
+  margin-top: 8px;
+  margin-bottom: 8px;
+  border: 1px solid #2A4;
+  border-radius: 5px;
+  box-shadow: 0px 1px 1px #BBB;
+}
+section[class^="role-"]>h1 {
+  position: relative;
+  margin: 0px;
+  padding-top: 10px;
+  padding-left: 40px;
+}
+section[class^="role-"]>h1:before {
+  position: absolute;
+  left: -5px;
+  top: 5px;
+}
+section.role-activity>h1:before {
+  content:url('/adm/daxe/images/section_icons/activity.png');
+}
+section.role-advice>h1:before {
+  content:url('/adm/daxe/images/section_icons/advice.png');
+}
+section.role-bibliography>h1:before {
+  content:url('/adm/daxe/images/section_icons/bibliography.png');
+}
+section.role-citation>h1:before {
+  content:url('/adm/daxe/images/section_icons/citation.png');
+}
+section.role-conclusion>h1:before {
+  content:url('/adm/daxe/images/section_icons/conclusion.png');
+}
+section.role-definition>h1:before {
+  content:url('/adm/daxe/images/section_icons/definition.png');
+}
+section.role-demonstration>h1:before {
+  content:url('/adm/daxe/images/section_icons/demonstration.png');
+}
+section.role-example>h1:before {
+  content:url('/adm/daxe/images/section_icons/example.png');
+}
+section.role-explanation>h1:before {
+  content:url('/adm/daxe/images/section_icons/explanation.png');
+}
+section.role-introduction>h1:before {
+  content:url('/adm/daxe/images/section_icons/introduction.png');
+}
+section.role-method>h1:before {
+  content:url('/adm/daxe/images/section_icons/method.png');
+}
+section.role-more_information>h1:before {
+  content:url('/adm/daxe/images/section_icons/more_information.png');
+}
+section.role-objectives>h1:before {
+  content:url('/adm/daxe/images/section_icons/objectives.png');
+}
+section.role-prerequisites>h1:before {
+  content:url('/adm/daxe/images/section_icons/prerequisites.png');
+}
+section.role-remark>h1:before {
+  content:url('/adm/daxe/images/section_icons/remark.png');
+}
+section.role-reminder>h1:before {
+  content:url('/adm/daxe/images/section_icons/reminder.png');
+}
+section.role-summary>h1:before {
+  content:url('/adm/daxe/images/section_icons/summary.png');
+}
+section.role-syntax>h1:before {
+  content:url('/adm/daxe/images/section_icons/syntax.png');
+}
+section.role-warning>h1:before {
+  content:url('/adm/daxe/images/section_icons/warning.png');
+}
+
 #LC_minitab_header {
   float:left;
   width:100%;
@@ -8502,8 +8918,8 @@ sub headtag {
     if (!$args->{'frameset'}) {
 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
     }
-    if ($args->{'force_register'}) {
-        $result .= &Apache::lonmenu::registerurl(1);
+    if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
+        $result .= Apache::lonxml::display_title();
     }
     if (!$args->{'no_nav_bar'} 
 	&& !$args->{'only_body'}
@@ -8530,12 +8946,12 @@ 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);
+            $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) {
@@ -8612,7 +9028,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);
                             }
                         }
@@ -8708,7 +9124,7 @@ OFFLOAD
     if (!$args->{'frameset'}) {
         $result .= ' /';
     }
-    $result .= '>'
+    $result .= '>' 
         .$inhibitprint
 	.$head_extra;
     my $clientmobile;
@@ -8741,12 +9157,12 @@ sub font_settings {
     my $headerstring='';
     if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) ||
         ((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) {
-	$headerstring.=
-	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"';
+        $headerstring.=
+            '<meta http-equiv="Content-Type" content="text/html; charset=utf-8"';
         if (!$args->{'frameset'}) {
-            $headerstring.= ' /';
+	    $headerstring.= ' /';
         }
-        $headerstring .= '>'."\n";
+	$headerstring .= '>'."\n";
     }
     return $headerstring;
 }
@@ -8900,14 +9316,12 @@ $args - additional optional args support
              skip_phases    -> hash ref of 
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
-             no_inline_link -> if true and in remote mode, don't show the
-                                    'Switch To Inline Menu' link
              no_auto_mt_title -> prevent &mt()ing the title arg
              bread_crumbs ->             Array containing breadcrumbs
              bread_crumbs_component ->  if exists show it as headline else show only the breadcrumbs
              bread_crumbs_nomenu -> if true will pass false as the value of $menulink
                                     to lonhtmlcommon::breadcrumbs
-             group          -> includes the current group, if page is for a
+             group          -> includes the current group, if page is for a 
                                specific group
              use_absolute   -> for request for external resource or syllabus, this
                                will contain https://<hostname> if server uses
@@ -9017,9 +9431,9 @@ sub start_page {
                          $args->{'function'},       $args->{'add_entries'},
                          $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->{'bgcolor'},        $args,
+                         \@advtools,$ltiscope,$ltiuri,\%ltimenu,$menucoll,
+                         \%menu,\$showncrumbs);
         }
     }
 
@@ -9056,7 +9470,10 @@ 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')) {
+                     ($ltiscope eq 'map') || ($ltiscope eq 'resource') ||
+                     ((($args->{'crstype'} eq 'Placement') || (($env{'request.course.id'}) &&
+                     ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement'))) &&
+                     (!$env{'request.role.adv'}))) {
                     $menulink = 0;
                 } else {
                     undef($menulink);
@@ -9071,15 +9488,10 @@ sub start_page {
 		#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/}) &&
-             ($env{'request.noversionuri'} !~ m{^/res/adm/pages/})) {
-        $result .= '<div style="padding:0;margin:0;clear:both"><hr /></div>';
     }
     return $result;
 }
@@ -9135,7 +9547,7 @@ sub menucoll_in_effect {
                         $check_login_symb = 1;
                     }
                 } else {
-                    my $symb=&Apache::lonnet::symbread();
+                    my $symb = &Apache::lonnet::symbread();
                     if ($symb) {
                         $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$symb);
                     } else {
@@ -9213,50 +9625,6 @@ sub symb_from_tinyurl {
     }
 }
 
-sub usable_exttools {
-    my %tooltypes;
-    if ($env{'request.course.id'}) {
-        if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'}) {
-           if ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'both') {
-               %tooltypes = (
-                             crs => 1,
-                             dom => 1,
-                            );
-           } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'crs') {
-               $tooltypes{'crs'} = 1;
-           } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.exttool'} eq 'dom') {
-               $tooltypes{'dom'} = 1;
-           }
-        } else {
-            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            my $crstype = lc($env{'course.'.$env{'request.course.id'}.'.type'});
-            if ($crstype eq '') {
-                $crstype = 'course';
-            }
-            if ($crstype eq 'course') {
-                if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'}) {
-                    $crstype = 'official';
-                } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
-                    $crstype = 'textbook';
-                } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.lti'}) {
-                    $crstype = 'lti';
-                } else {
-                    $crstype = 'unofficial';
-                }
-            }
-            my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
-            if ($domdefaults{$crstype.'domexttool'}) {
-                $tooltypes{'dom'} = 1;
-            }
-            if ($domdefaults{$crstype.'exttool'}) {
-                $tooltypes{'crs'} = 1;
-            }
-        }
-    }
-    return %tooltypes;
-}
-
 sub wishlist_window {
     return(<<'ENDWISHLIST');
 <script type="text/javascript">
@@ -9376,7 +9744,7 @@ sub modal_adhoc_inner {
     my ($funcname,$width,$height,$content,$possmathjax)=@_;
     my $innerwidth=$width-20;
     $content=&js_ready(
-               &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
+                 &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
                  &start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1).
                  $content.
                  &end_scrollbox().
@@ -10068,7 +10436,7 @@ sub get_sections {
         }
     }
 
-    if ($check_students) {
+    if ($check_students) { 
 	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
 	my $sec_index = &Apache::loncoursedata::CL_SECTION();
 	my $status_index = &Apache::loncoursedata::CL_STATUS();
@@ -10390,8 +10758,8 @@ Incoming parameters:
 2. user's domain
 3. quota name - portfolio, author, or course
    (if no quota name provided, defaults to portfolio).
-4. crstype - official, unofficial, textbook or community, if quota name is
-   course
+4. crstype - official, unofficial, textbook, placement or community, 
+   if quota name is course
 
 Returns:
 1. Disk quota (in MB) assigned to student.
@@ -10464,8 +10832,9 @@ sub get_user_quota {
         if ($quota eq '' || wantarray) {
             if ($quotaname eq 'course') {
                 my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
-                if (($crstype eq 'official') || ($crstype eq 'unofficial') ||
-                    ($crstype eq 'community') || ($crstype eq 'textbook')) {
+                if (($crstype eq 'official') || ($crstype eq 'unofficial') || 
+                    ($crstype eq 'community') || ($crstype eq 'textbook') ||
+                    ($crstype eq 'placement')) { 
                     $defquota = $domdefs{$crstype.'quota'};
                 }
                 if ($defquota eq '') {
@@ -10613,7 +10982,7 @@ Inputs: 7
 4. filename of file for which action is being requested
 5. filesize (kB) of file
 6. action being taken: copy or upload.
-7. quotatype (in course context -- official, unofficial, community or textbook).
+7. quotatype (in course context -- official, unofficial, textbook, placement or community).
 
 Returns: 1 scalar: HTML to display containing warning if quota would be exceeded,
          otherwise return null.
@@ -10649,6 +11018,8 @@ sub excess_filesize_warning {
 ###############################################
 
 
+
+
 sub get_secgrprole_info {
     my ($cdom,$cnum,$needroles,$type)  = @_;
     my %sections_count = &get_sections($cdom,$cnum);
@@ -10757,7 +11128,16 @@ sub user_picker {
         $allow_blank = 0;
         $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1,undef,[$currdom]);
     } else {
-        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1);
+        my $defdom = $env{'request.role.domain'};
+        my ($trusted,$untrusted);
+        if (($context eq 'requestcrs') || ($context eq 'course')) {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+        } elsif ($context eq 'author') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+        } elsif ($context eq 'domain') {
+            ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom);
+        }
+        $domform = &select_dom_form($currdom,'srchdomain',$allow_blank,1,undef,$trusted,$untrusted);
     }
     my $srchinsel = ' <select name="srchin">';
 
@@ -10962,7 +11342,7 @@ sub user_rule_check {
     if (ref($usershash) eq 'HASH') {
         if (keys(%{$usershash}) > 1) {
             my (%by_username,%by_id,%userdoms);
-            my $checkid;
+            my $checkid; 
             if (ref($checks) eq 'HASH') {
                 if ((!defined($checks->{'username'})) && (defined($checks->{'id'}))) {
                     $checkid = 1;
@@ -10973,7 +11353,7 @@ sub user_rule_check {
                 if ($checkid) {
                     if (ref($usershash->{$user}) eq 'HASH') {
                         if ($usershash->{$user}->{'id'} ne '') {
-                            $by_id{$udom}{$usershash->{$user}->{'id'}} = $uname;
+                            $by_id{$udom}{$usershash->{$user}->{'id'}} = $uname; 
                             $userdoms{$udom} = 1;
                             if (ref($inst_results) eq 'HASH') {
                                 $inst_results->{$uname.':'.$udom} = {};
@@ -11043,7 +11423,7 @@ sub user_rule_check {
                 if (ref($usershash->{$user}) eq 'HASH') {
                     if (ref($checks) eq 'HASH') {
                         if (defined($checks->{'username'})) {
-                            ($inst_response{$user},%{$inst_results->{$user}}) =
+                            ($inst_response{$user},%{$inst_results->{$user}}) = 
                                 &Apache::lonnet::get_instuser($udom,$uname);
                         } elsif (defined($checks->{'id'})) {
                             if ($usershash->{$user}->{'id'} ne '') {
@@ -11066,7 +11446,7 @@ sub user_rule_check {
                         if (ref($domconfig{'usercreation'}) eq 'HASH') {
                             foreach my $item ('username','id') {
                                 if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
-                                   $$curr_rules{$udom}{$item} =
+                                   $$curr_rules{$udom}{$item} = 
                                        $domconfig{'usercreation'}{$item.'_rule'};
                                 }
                             }
@@ -11089,7 +11469,7 @@ sub user_rule_check {
                     $id = $inst_results->{$user}->{'id'};
                 }
             }
-            if ($id eq '') {
+            if ($id eq '') { 
                 if (ref($usershash->{$user})) {
                     $id = $usershash->{$user}->{'id'};
                 }
@@ -11408,7 +11788,7 @@ future_reservable - ref to hash of stude
 
     Keys in inner hash are:
     (a) symb: either blank or symb to which slot use is restricted.
-    (b) startreserve:  start date of reservation period.
+    (b) startreserve: start date of reservation period.
     (c) uniqueperiod: start,end dates when slot is to be uniquely
         selected.
 
@@ -11418,13 +11798,35 @@ future_reservable - ref to hash of stude
 
 sub get_future_slots {
     my ($cnum,$cdom,$now,$symb) = @_;
+    my $map;
+    if ($symb) {
+        ($map) = &Apache::lonnet::decode_symb($symb);
+    }
     my (%reservable_now,%future_reservable,@sorted_reservable,@sorted_future);
     my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
     foreach my $slot (keys(%slots)) {
         next unless($slots{$slot}->{'type'} eq 'schedulable_student');
         if ($symb) {
-            next if (($slots{$slot}->{'symb'} ne '') && 
-                     ($slots{$slot}->{'symb'} ne $symb));
+            if ($slots{$slot}->{'symb'} ne '') {
+                my $canuse;
+                my %oksymbs;
+                my @slotsymbs = split(/\s*,\s*/,$slots{$slot}->{'symb'});
+                map { $oksymbs{$_} = 1; } @slotsymbs;
+                if ($oksymbs{$symb}) {
+                    $canuse = 1;
+                } else {
+                    foreach my $item (@slotsymbs) {
+                        if ($item =~ /\.(page|sequence)$/) {
+                            (undef,undef,my $sloturl) = &Apache::lonnet::decode_symb($item);
+                            if (($map ne '') && ($map eq $sloturl)) {
+                                $canuse = 1;
+                                last;
+                            }
+                        }
+                    }
+                }
+                next unless ($canuse);
+            }
         }
         if (($slots{$slot}->{'starttime'} > $now) &&
             ($slots{$slot}->{'endtime'} > $now)) {
@@ -11477,7 +11879,7 @@ sub get_future_slots {
                 $reservable_now{$slot} = {
                                            symb       => $symb,
                                            endreserve => $lastres,
-                                           uniqueperiod => $uniqueperiod,   
+                                           uniqueperiod => $uniqueperiod,
                                          };
             } elsif (($startreserve > $now) &&
                      (!$endreserve || $endreserve > $startreserve)) {
@@ -11642,7 +12044,23 @@ sub get_env_multiple {
     return(@values);
 }
 
+# Looks at given dependencies, and returns something depending on the context.
+# For coursedocs paste, returns (undef, $counter, $numpathchg, \%existing).
+# For syllabus rewrites, returns (undef, $counter, $numpathchg, \%existing, \%mapping).
+# For all other contexts, returns ($output, $counter, $numpathchg).
+# $output: string with the HTML output. Can contain missing dependencies with an upload form, existing dependencies, and dependencies no longer in use.
+# $counter: integer with the number of existing dependencies when no HTML output is returned, and the number of missing dependencies when an HTML output is returned.
+# $numpathchg: integer with the number of cleaned up dependency paths.
+# \%existing: hash reference clean path -> 1 only for existing dependencies.
+# \%mapping: hash reference clean path -> original path for all dependencies.
+# @param {string} actionurl - The path to the handler, indicative of the context.
+# @param {string} state - Can contain HTML with hidden inputs that will be added to the output form.
+# @param {hash reference} allfiles - List of file info from lonnet::extract_embedded_items
+# @param {hash reference} codebase - undef, not modified by lonnet::extract_embedded_items ?
+# @param {hash reference} args - More parameters ! Possible keys: error_on_invalid_names (boolean), ignore_remote_references (boolean), current_path (string), docs_url (string), docs_title (string), context (string)
+# @return {Array} - array depending on the context (not a reference)
 sub ask_for_embedded_content {
+    # NOTE: documentation was added afterwards, it could be wrong
     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
     my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges,
         %currsubfile,%unused,$rem);
@@ -11658,6 +12076,9 @@ sub ask_for_embedded_content {
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
+    # fills these variables based on the context:
+    # $navmap, $cdom, $cnum, $udom, $uname, $url, $toplevel, $getpropath,
+    # $path, $fileloc, $title, $rem, $filename
     if ($env{'request.course.id'}) {
         if ($actionurl eq '/adm/dependencies') {
             $navmap = Apache::lonnavmaps::navmap->new();
@@ -11665,7 +12086,7 @@ sub ask_for_embedded_content {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     }
-    if (($actionurl eq '/adm/portfolio') ||
+    if (($actionurl eq '/adm/portfolio') || 
         ($actionurl eq '/adm/coursegrp_portfolio')) {
         my $current_path='/';
         if ($env{'form.currentpath'}) {
@@ -11697,18 +12118,18 @@ sub ask_for_embedded_content {
             $toplevel = $url;
             if ($args->{'context'} eq 'paste') {
                 ($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});
-                ($path) =
+                ($path) = 
                     ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
                 $fileloc = &Apache::lonnet::filelocation('',$toplevel);
                 $fileloc =~ s{^/}{};
             }
         }
-    } elsif ($actionurl eq '/adm/dependencies') {
+    } elsif ($actionurl eq '/adm/dependencies')  {
         if ($env{'request.course.id'} ne '') {
             if (ref($args) eq 'HASH') {
                 $url = $args->{'docs_url'};
                 $title = $args->{'docs_title'};
-                $toplevel = $url;
+                $toplevel = $url; 
                 unless ($toplevel =~ m{^/}) {
                     $toplevel = "/$url";
                 }
@@ -11742,6 +12163,16 @@ sub ask_for_embedded_content {
         $fileloc = &Apache::lonnet::filelocation('',$toplevel).'/';
         $fileloc =~ s{^/}{};
     }
+    
+    # parses the dependency paths to get some info
+    # fills $newfiles, $mapping, $subdependencies, $dependencies
+    # $newfiles: hash URL -> 1 for new files or external URLs
+    # (will be completed later)
+    # $mapping:
+    #   for external URLs: external URL -> external URL
+    #   for relative paths: clean path -> original path
+    # $subdependencies: hash clean path -> clean file name -> 1 for relative paths in subdirectories
+    # $dependencies: hash clean or not file name -> 1 for relative paths not in subdirectories
     foreach my $file (keys(%{$allfiles})) {
         my $embed_file;
         if (($path eq "/uploaded/$cdom/$cnum/portfolio/syllabus") && ($file =~ m{^\Q$path/\E(.+)$})) {
@@ -11784,11 +12215,24 @@ sub ask_for_embedded_content {
             }
         }
     }
+    
+    # looks for all existing files in dependency subdirectories (from $subdependencies filled above)
+    # and lists
+    # fills $currsubfile, $pathchanges, $existing, $numexisting, $newfiles, $unused
+    # $currsubfile: hash clean path -> file name -> 1 for all existing files in the path
+    # $pathchanges: hash clean path -> 1 if the file in subdirectory exists and
+    #                                    the path had to be cleaned up
+    # $existing: hash clean path -> 1 if the file exists
+    # $numexisting: number of keys in $existing
+    # $newfiles: updated with clean path -> 1 for files in subdirectories that do not exist
+    # $unused: only for /adm/dependencies, hash clean path -> 1 for existing files in
+    #                                      dependency subdirectories that are
+    #                                      not listed as dependencies, with some exceptions using $rem
     my $dirptr = 16384;
     foreach my $path (keys(%subdependencies)) {
         $currsubfile{$path} = {};
-        if (($actionurl eq '/adm/portfolio') ||
-            ($actionurl eq '/adm/coursegrp_portfolio')) { 
+        if (($actionurl eq '/adm/portfolio') || 
+            ($actionurl eq '/adm/coursegrp_portfolio')) {
             my ($sublistref,$listerror) =
                 &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
             if (ref($sublistref) eq 'ARRAY') {
@@ -11859,6 +12303,9 @@ sub ask_for_embedded_content {
             }
         }
     }
+    
+    # fills $currfile, hash file name -> 1 or [$size,$mtime]
+    # for files in $url or $fileloc (target directory) in some contexts
     my %currfile;
     if (($actionurl eq '/adm/portfolio') ||
         ($actionurl eq '/adm/coursegrp_portfolio')) {
@@ -11897,6 +12344,8 @@ sub ask_for_embedded_content {
             }
         }
     }
+    # updates $pathchanges, $existing, $numexisting, $newfiles and $unused for files that
+    # are not in subdirectories, using $currfile
     foreach my $file (keys(%dependencies)) {
         if (exists($currfile{$file})) {
             unless ($mapping{$file} eq $file) {
@@ -11925,17 +12374,25 @@ sub ask_for_embedded_content {
             $unused{$file} = 1;
         }
     }
+    
+    # returns some results for coursedocs paste and syllabus rewrites ($output is undef)
     if (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
         ($args->{'context'} eq 'paste')) {
         $counter = scalar(keys(%existing));
         $numpathchg = scalar(keys(%pathchanges));
         return ($output,$counter,$numpathchg,\%existing);
-    } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&
+    } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") && 
              (ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {
         $counter = scalar(keys(%existing));
         $numpathchg = scalar(keys(%pathchanges));
         return ($output,$counter,$numpathchg,\%existing,\%mapping);
     }
+    
+    # returns HTML otherwise, with dependency results and to ask for more uploads
+    
+    # $upload_output: missing dependencies (with upload form)
+    # $modify_output: uploaded dependencies (in use)
+    # $delete_output: files no longer in use (unused files are not listed for londocs, bug?)
     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
         if ($actionurl eq '/adm/dependencies') {
             next if ($embed_file =~ m{^\w+://});
@@ -12159,7 +12616,7 @@ sub ask_for_embedded_content {
 
 Performs clean-up of directories, subdirectories and filename in an
 embedded object, referenced in an HTML file which is being uploaded
-to a course or portfolio, where
+to a course or portfolio, where 
 "Upload embedded images/multimedia files if HTML file" checkbox was
 checked.
 
@@ -12178,7 +12635,7 @@ sub clean_path {
         @contents = ($embed_file);
     }
     my $lastidx = scalar(@contents)-1;
-    for (my $i=0; $i<=$lastidx; $i++) {
+    for (my $i=0; $i<=$lastidx; $i++) { 
         $contents[$i]=~s{\\}{/}g;
         $contents[$i]=~s/\s+/\_/g;
         $contents[$i]=~s{[^/\w\.\-]}{}g;
@@ -12517,7 +12974,7 @@ sub modify_html_refs {
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');
-    unless ((@changes > 0)  || ($context eq 'syllabus')) {
+    unless ((@changes > 0) || ($context eq 'syllabus')) {
         if (wantarray) {
             return ('',0,0); 
         } else {
@@ -12652,7 +13109,7 @@ sub modify_html_refs {
                         }
                     }
                     if ($rewrites) {
-                        my $saveresult;
+                        my $saveresult; 
                         my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
                         if ($url eq $container) {
                             my ($fname) = ($container =~ m{/([^/]+)$});
@@ -13178,7 +13635,7 @@ sub process_decompression {
             }
             my $numskip = scalar(@to_skip);
             my $numoverwrite = scalar(@to_overwrite);
-            if (($numskip) && (!$numoverwrite)) {
+            if (($numskip) && (!$numoverwrite)) { 
                 $warning = &mt('All items in the archive file already exist, and no overwriting of existing files has been requested.');         
             } elsif ($dir eq '') {
                 $error = &mt('Directory containing archive file unavailable.');
@@ -13188,11 +13645,11 @@ sub process_decompression {
                     my $tempdir = time.'_'.$$.int(rand(10000));
                     mkdir("$dir/$tempdir",0755);
                     if (&File::Copy::move("$dir/$file","$dir/$tempdir/$file")) {
-                        ($decompressed,$display) =
+                        ($decompressed,$display) = 
                             &decompress_uploaded_file($file,"$dir/$tempdir");
                         foreach my $item (@to_skip) {
                             if (($item ne '') && ($item !~ /\.\./)) {
-                                if (-f "$dir/$tempdir/$item") {
+                                if (-f "$dir/$tempdir/$item") { 
                                     unlink("$dir/$tempdir/$item");
                                 } elsif (-d "$dir/$tempdir/$item") {
                                     &File::Path::remove_tree("$dir/$tempdir/$item",{ safe => 1 });
@@ -13232,7 +13689,7 @@ sub process_decompression {
                     if (ref($newdirlistref) eq 'ARRAY') {
                         foreach my $dir_line (@{$newdirlistref}) {
                             my ($item,undef,undef,$testdir)=split(/\&/,$dir_line,5);
-                            unless (($item =~ /^\.+$/) || ($item eq $file)) { 
+                            unless (($item =~ /^\.+$/) || ($item eq $file)) {
                                 push(@newitems,$item);
                                 if ($dirptr&$testdir) {
                                     $is_dir{$item} = 1;
@@ -13287,7 +13744,7 @@ sub process_decompression {
                                     $env{'form.archive_title_'.$i} = $env{'form.camtasia_foldername'};
                                     $displayed{'folder'} = $i;
                                 } elsif ((($item eq "$contents[0]/index.html") && ($version == 6)) ||
-                                         (($item eq "$contents[0]/$contents[0]".'.html') && ($version == 8))) {
+                                         (($item eq "$contents[0]/$contents[0]".'.html') && ($version == 8))) { 
                                     $env{'form.archive_'.$i} = 'display';
                                     $env{'form.archive_title_'.$i} = $env{'form.camtasia_moviename'};
                                     $displayed{'web'} = $i;
@@ -13739,7 +14196,7 @@ sub process_extracted_files {
         $folders{'0'} = $items[-2];
         if ($env{'form.folderpath'} =~ /\:1$/) {
             $containers{'0'}='page';
-        } else {
+        } else {  
             $containers{'0'}='sequence';
         }
     }
@@ -13820,7 +14277,7 @@ sub process_extracted_files {
                             $newseqid{$i} = $newidx;
                             unless ($errtext) {
                                 $result .=  '<li>'.&mt('Folder: [_1] added to course',
-                                                       &HTML::Entities::encode($docstitle,'<>&"'))..
+                                                       &HTML::Entities::encode($docstitle,'<>&"')).
                                             '</li>'."\n";
                             }
                         }
@@ -13847,7 +14304,7 @@ sub process_extracted_files {
                                             $fetch =~ s/^\Q$prefix$dir\E//;
                                             $prompttofetch{$fetch} = 1;
                                         }
-                                   }
+                                    }
                                 }
                                 $LONCAPA::map::resources[$newidx]=
                                     $docstitle.':'.$url.':false:normal:res';
@@ -13872,7 +14329,7 @@ sub process_extracted_files {
                 }
             } else {
                 $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',
-                                &HTML::Entities::encode($path,'<>&"')).'<br />';
+                                &HTML::Entities::encode($path,'<>&"')).'<br />'; 
             }
         }
         for (my $i=1; $i<=$numitems; $i++) {
@@ -13894,7 +14351,7 @@ sub process_extracted_files {
                         }
                         if ($itemidx eq '') {
                             $itemidx =  0;
-                        }
+                        } 
                         if (grep(/^\Q$referrer{$i}\E$/,@archdirs)) {
                             if ($mapinner{$referrer{$i}}) {
                                 $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
@@ -13943,13 +14400,13 @@ sub process_extracted_files {
                                     $showpath = "$relpath/$title";
                                 } else {
                                     $showpath = "/$title";
-                                }
+                                } 
                                 $result .= '<li>'.&mt('[_1] included as a dependency',
                                                       &HTML::Entities::encode($showpath,'<>&"')).
                                            '</li>'."\n";
                                 unless ($ishome) {
                                     my $fetch = "$fullpath/$title";
-                                    $fetch =~ s/^\Q$prefix$dir\E//;
+                                    $fetch =~ s/^\Q$prefix$dir\E//; 
                                     $prompttofetch{$fetch} = 1;
                                 }
                             }
@@ -15165,13 +15622,13 @@ generated by lonerrorhandler.pm, CHECKRP
 lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl respectively.
 
 Inputs:
-defmail (scalar - email address of default recipient),
+defmail (scalar - email address of default recipient), 
 mailing type (scalar: errormail, packagesmail, helpdeskmail,
 requestsmail, updatesmail, or idconflictsmail).
 
 defdom (domain for which to retrieve configuration settings),
 
-origmail (scalar - email address of recipient from loncapa.conf,
+origmail (scalar - email address of recipient from loncapa.conf, 
 i.e., predates configuration by DC via domainprefs.pm
 
 $requname username of requester (if mailing type is helpdeskmail)
@@ -15180,6 +15637,7 @@ $requdom domain of requester (if mailing
 
 $reqemail e-mail address of requester (if mailing type is helpdeskmail)
 
+
 Returns: comma separated list of addresses to which to send e-mail.
 
 =back
@@ -15423,6 +15881,91 @@ sub build_recipient_list {
 
 =pod
 
+=over 4
+
+=item * &mime_email()
+
+Sends an email with a possible attachment
+
+Inputs:
+
+=over 4
+
+from -              Sender's email address
+
+replyto -           Reply-To email address
+
+to -                Email address of recipient
+
+subject -           Subject of email
+
+body -              Body of email
+
+cc_string -         Carbon copy email address
+
+bcc -               Blind carbon copy email address
+
+attachment_path -   Path of file to be attached
+
+file_name -         Name of file to be attached
+
+attachment_text -   The body of an attachment of type "TEXT"
+
+=back
+
+=back
+
+=cut
+
+############################################################
+############################################################
+
+sub mime_email {
+    my ($from,$replyto,$to,$subject,$body,$cc_string,$bcc,$attachment_path, 
+        $file_name,$attachment_text) = @_;
+ 
+    my $msg = MIME::Lite->new(
+             From    => $from,
+             To      => $to,
+             Subject => $subject,
+             Type    =>'TEXT',
+             Data    => $body,
+             );
+    if ($replyto ne '') {
+        $msg->add("Reply-To" => $replyto);
+    }
+    if ($cc_string ne '') {
+        $msg->add("Cc" => $cc_string);
+    }
+    if ($bcc ne '') {
+        $msg->add("Bcc" => $bcc);
+    }
+    $msg->attr("content-type"         => "text/plain");
+    $msg->attr("content-type.charset" => "UTF-8");
+    # Attach file if given
+    if ($attachment_path) {
+        unless ($file_name) {
+            if ($attachment_path =~ m-/([^/]+)$-) { $file_name = $1; }
+        }
+        my ($type, $encoding) = MIME::Types::by_suffix($attachment_path);
+        $msg->attach(Type     => $type,
+                     Path     => $attachment_path,
+                     Filename => $file_name
+                     );
+    # Otherwise attach text if given
+    } elsif ($attachment_text) {
+        $msg->attach(Type => 'TEXT',
+                     Data => $attachment_text);
+    }
+    # Send it
+    $msg->send('sendmail');
+}
+
+############################################################
+############################################################
+
+=pod
+
 =head1 Course Catalog Routines
 
 =over 4
@@ -15527,6 +16070,8 @@ sub extract_categories {
                     $trailstr = &mt('Official courses (with institutional codes)');
                 } elsif ($name eq 'communities') {
                     $trailstr = &mt('Communities');
+                } elsif ($name eq 'placement') {
+                    $trailstr = &mt('Placement Tests');
                 } else {
                     $trailstr = $name;
                 }
@@ -15676,8 +16221,10 @@ sub assign_categories_table {
                     next if ($parent eq 'instcode');
                     if ($type eq 'Community') {
                         next unless ($parent eq 'communities');
+                    } elsif ($type eq 'Placement') {
+                        next unless ($parent eq 'placement');
                     } else {
-                        next if ($parent eq 'communities');
+                        next if (($parent eq 'communities') || ($parent eq 'placement'));
                     }
                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                     my $item = &escape($parent).'::0';
@@ -15690,6 +16237,8 @@ sub assign_categories_table {
                     my $parent_title = $parent;
                     if ($parent eq 'communities') {
                         $parent_title = &mt('Communities');
+                    } elsif ($parent eq 'placement') {
+                        $parent_title = &mt('Placement Tests');
                     }
                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
                               '<input type="checkbox" name="usecategory" value="'.
@@ -15871,7 +16420,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');
@@ -15920,7 +16469,7 @@ sub commit_studentrole {
                     }
                 }
             } else {
-                if ($secchange) {       
+                if ($secchange) { 
                     $$logmsg .= &mt('Error when attempting section change for [_1] from old section "[_2]" to new section: "[_3]" in course [_4] -error:',$uname,$oldsec,$sec,$cid).' '.$modify_section_result.$linefeed;
                 } else {
                     $$logmsg .= &mt('Error when attempting to modify role for [_1] for section: "[_2]" in course [_3] -error:',$uname,$sec,$cid).' '.$modify_section_result.$linefeed;
@@ -16040,7 +16589,7 @@ sub check_clone {
                             if ($args->{'ccdomain'} eq $args->{'clonedomain'}) {
                                 $can_clone = 1;
                             }
-                        } elsif (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
+                        } elsif (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) && 
                                  ($args->{'clonedomain'} eq  $args->{'course_domain'})) {
                             if (&Apache::lonnet::default_instcode_cloning($args->{'clonedomain'},$domdefs{'canclone'},
                                                                           $clonehash{'internal.coursecode'},$args->{'crscode'})) {
@@ -16059,7 +16608,7 @@ sub check_clone {
                     $can_clone = 1;
                 }
                 unless ($can_clone) {
-                    if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
+                    if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) && 
                         ($args->{'clonedomain'} eq  $args->{'course_domain'})) {
                         my (%gotdomdefaults,%gotcodedefaults);
                         foreach my $cloner (@cloners) {
@@ -16098,12 +16647,12 @@ sub check_clone {
                 if ($args->{'crstype'} eq 'Community') {
                     $ccrole = 'co';
                 }
-                my %roleshash =
-                    &Apache::lonnet::get_my_roles($args->{'ccuname'},
-                                                  $args->{'ccdomain'},
+	        my %roleshash =
+		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+					          $args->{'ccdomain'},
                                                   'userroles',['active'],[$ccrole],
-                                                  [$args->{'clonedomain'}]);
-                if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
+					          [$args->{'clonedomain'}]);
+	        if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
                     $can_clone = 1;
                 } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
                                                           $args->{'ccuname'},$args->{'ccdomain'})) {
@@ -16129,7 +16678,7 @@ sub check_clone {
                                       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'}],
                                     }));
-	        }
+                }
 	    }
         }
     }
@@ -16159,7 +16708,12 @@ sub construct_course {
 #
 # Open course
 #
-    my $crstype = lc($args->{'crstype'});
+    my $showncrstype;
+    if ($args->{'crstype'} eq 'Placement') {
+        $showncrstype = 'placement test'; 
+    } else {  
+        $showncrstype = lc($args->{'crstype'});
+    }
     my %cenv=();
     $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
                                              $args->{'cdescr'},
@@ -16178,9 +16732,9 @@ sub construct_course {
     # 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;
+        $outcome .= &mt_user($user_lh,'New LON-CAPA [_1] ID: [_2]',$showncrstype,$$courseid).$linefeed;
     } else {
-        $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
+        $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$showncrstype,$$courseid).$linefeed;
     }
     if ($$courseid =~ /^error:/) {
         return (0,$outcome,$clonemsgref);
@@ -16205,19 +16759,19 @@ sub construct_course {
 
 #
 # Do the cloning
-#
+#   
     my @clonemsg;
     if ($can_clone && $cloneid) {
         push(@clonemsg,
                       {
                           mt => 'Created [_1] by cloning from [_2]',
-                          args => [$crstype,$clonetitle],
+                          args => [$showncrstype,$clonetitle],
                       });
 	my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum);
 # Copy all files
         my @info =
-            &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},
-                                                     $args->{'dateshift'},$args->{'crscode'},
+	    &Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid,$args->{'datemode'},
+	                                             $args->{'dateshift'},$args->{'crscode'},
                                                      $args->{'ccuname'}.':'.$args->{'ccdomain'},
                                                      $args->{'tinyurls'});
         if (@info) {
@@ -16385,7 +16939,7 @@ sub construct_course {
             $outcome .= $linefeed;
         } else {
             $outcome .= "</ul><br /><br /></div>\n";
-        }
+        } 
     }
     if ($args->{'no_end_date'}) {
         $args->{'endaccess'} = 0;
@@ -16454,7 +17008,7 @@ sub construct_course {
             if (ref($crsinfo{$$crsudom.'_'.$$crsunum}) eq 'HASH') {
                 $crsinfo{$$crsudom.'_'.$$crsunum}{'uniquecode'} = $code;
                 my $putres = &Apache::lonnet::courseidput($$crsudom,\%crsinfo,$crsuhome,'notime');
-            }
+            } 
             if (ref($coderef)) {
                 $$coderef = $code;
             }
@@ -16508,6 +17062,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';
@@ -16530,6 +17085,30 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
     }
 
+# 
+# Set params for Placement Tests
+#
+    if ($args->{'crstype'} eq 'Placement') {
+       my %storecontent; 
+       my $prefix=$$crsudom.'_'.$$crsunum.'.0.';
+       my %defaults = (
+                        buttonshide   => { value => 'yes',
+                                           type => 'string_yesno',},
+                        type          => { value => 'randomizetry',
+                                           type  => 'string_questiontype',},
+                        maxtries      => { value => 1,
+                                           type => 'int_pos',},
+                        problemstatus => { value => 'no',
+                                           type  => 'string_problemstatus',},
+                      );
+       foreach my $key (keys(%defaults)) {
+           $storecontent{$prefix.$key} = $defaults{$key}{'value'};
+           $storecontent{$prefix.$key.'.type'} = $defaults{$key}{'type'};
+       }
+       &Apache::lonnet::cput
+                 ('resourcedata',\%storecontent,$$crsudom,$$crsunum); 
+    }
+
     return (1,$outcome,\@clonemsg);
 }
 
@@ -16543,7 +17122,7 @@ sub make_unique_code {
     my $tries = 0;
     my $gotlock = &Apache::lonnet::newput_dom('uniquecodes',$lockhash,$cdom);
     my ($code,$error);
-
+  
     while (($gotlock ne 'ok') && ($tries<3)) {
         $tries ++;
         sleep 1;
@@ -16590,8 +17169,7 @@ sub generate_code {
 ############################################################
 ############################################################
 
-#SD
-# only Community and Course, or anything else?
+# Community, Course and Placement Test
 sub course_type {
     my ($cid) = @_;
     if (!defined($cid)) {
@@ -16609,17 +17187,19 @@ sub group_term {
     my %names = (
                   'Course' => 'group',
                   'Community' => 'group',
+                  'Placement' => 'group',
                 );
     return $names{$crstype};
 }
 
 sub course_types {
-    my @types = ('official','unofficial','community','textbook','lti');
+    my @types = ('official','unofficial','community','textbook','placement','lti');
     my %typename = (
                          official   => 'Official course',
                          unofficial => 'Unofficial course',
                          community  => 'Community',
                          textbook   => 'Textbook course',
+                         placement  => 'Placement test',
                          lti        => 'LTI provider',
                    );
     return (\@types,\%typename);
@@ -16725,8 +17305,6 @@ sub init_user_environment {
 
     my $public=($username eq 'public' && $domain eq 'public');
 
-# See if old ID present, if so, remove
-
     my ($filename,$cookie,$userroles,$firstaccenv,$timerintenv);
     my $now=time;
 
@@ -16748,7 +17326,8 @@ sub init_user_environment {
 	}
 	if (!$cookie) { $cookie="publicuser_$oldest"; }
     } else {
-	# if this isn't a robot, kill any existing non-robot sessions
+	# See if old ID present, if so, remove if this isn't a robot,
+	# killing any existing non-robot sessions
 	if (!$args->{'robot'}) {
 	    opendir(DIR,$lonids);
 	    while ($filename=readdir(DIR)) {
@@ -16804,8 +17383,7 @@ sub init_user_environment {
 
     my %userenv = &Apache::lonnet::dump('environment',$domain,$username);
     my ($tmp) = keys(%userenv);
-    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-    } else {
+    if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
 	undef(%userenv);
     }
     if (($userenv{'interface'}) && (!$form->{'interface'})) {
@@ -16820,7 +17398,7 @@ sub init_user_environment {
 # --------------------------------------------------------- Write first profile
 
     {
-        my $ip = &Apache::lonnet::get_requestor_ip();
+        my $ip = &Apache::lonnet::get_requestor_ip($r);
 	my %initial_env = 
 	    ("user.name"          => $username,
 	     "user.domain"        => $domain,
@@ -16877,7 +17455,7 @@ sub init_user_environment {
                                                       undef,\%userenv,\%domdef,\%is_adv);
             }
 
-            foreach my $crstype ('official','unofficial','community','textbook','lti') {
+            foreach my $crstype ('official','unofficial','community','textbook','placement','lti') {
                 $userenv{'canrequest.'.$crstype} =
                     &Apache::lonnet::usertools_access($username,$domain,$crstype,
                                                       'reload','requestcourses',
@@ -16891,14 +17469,42 @@ sub init_user_environment {
             my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
                                                  $domain,$username);
             my $reqstatus = $reqauthor{'author_status'};
-            if ($reqstatus eq 'approval' || $reqstatus eq 'approved') {
+            if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { 
                 if (ref($reqauthor{'author'}) eq 'HASH') {
                     $userenv{'requestauthorqueued'} = $reqstatus.':'.
                                                       $reqauthor{'author'}{'timestamp'};
                 }
             }
+            my ($types,$typename) = &course_types();
+            if (ref($types) eq 'ARRAY') {
+                my @options = ('approval','validate','autolimit');
+                my $optregex = join('|',@options);
+                my (%willtrust,%trustchecked);
+                foreach my $type (@{$types}) {
+                    my $dom_str = $env{'environment.reqcrsotherdom.'.$type};
+                    if ($dom_str ne '') {
+                        my $updatedstr = '';
+                        my @possdomains = split(',',$dom_str);
+                        foreach my $entry (@possdomains) {
+                            my ($extdom,$extopt) = split(':',$entry);
+                            unless ($trustchecked{$extdom}) {
+                                $willtrust{$extdom} = &Apache::lonnet::will_trust('reqcrs',$domain,$extdom);
+                                $trustchecked{$extdom} = 1;
+                            }
+                            if ($willtrust{$extdom}) {
+                                $updatedstr .= $entry.',';
+                            }
+                        }
+                        $updatedstr =~ s/,$//;
+                        if ($updatedstr) {
+                            $userenv{'reqcrsotherdom.'.$type} = $updatedstr;
+                        } else {
+                            delete($userenv{'reqcrsotherdom.'.$type});
+                        }
+                    }
+                }
+            }
         }
-
 	$env{'user.environment'} = "$lonids/$cookie.id";
 
 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
@@ -17002,12 +17608,12 @@ and quotacheck.pl
 
 Inputs:
 
-filterlist - anonymous array of fields to include as potential filters
+filterlist - anonymous array of fields to include as potential filters 
 
 crstype - course type
 
 roleelement - fifth arg in selectcourse_link() populates fifth arg in javascript: opencrsbrowser() function, used
-              to pop-open a course selector (will contain "extra element").
+              to pop-open a course selector (will contain "extra element"). 
 
 multelement - if multiple course selections will be allowed, this will be a hidden form element: name: multiple; value: 1
 
@@ -17023,19 +17629,19 @@ cloneruname - username of owner of new c
 
 clonerudom - domain of owner of new course who wants to clone
 
-typeelem - text to use for left column in row containing course type (i.e., Course, Community or Course/Community)
+typeelem - text to use for left column in row containing course type (i.e., Course, Community or Course/Community) 
 
 codetitlesref - reference to array of titles of components in institutional codes (official courses)
 
 codedom - domain
 
-formname - value of form element named "form".
+formname - value of form element named "form". 
 
 fixeddom - domain, if fixed.
 
-prevphase - value to assign to form element named "phase" when going back to the previous screen
+prevphase - value to assign to form element named "phase" when going back to the previous screen  
 
-cnameelement - name of form element in form on opener page which will receive title of selected course
+cnameelement - name of form element in form on opener page which will receive title of selected course 
 
 cnumelement - name of form element in form on opener page which will receive courseID  of selected course
 
@@ -17126,15 +17732,19 @@ sub build_filters {
         $createdfilterform = &timebased_select_form('createdfilter',$filter);
     }
 
+    my $prefix = $crstype;
+    if ($crstype eq 'Placement') {
+        $prefix = 'Placement Test'
+    }
     my %lt = &Apache::lonlocal::texthash(
-                'cac' => "$crstype Activity",
-                'ccr' => "$crstype Created",
-                'cde' => "$crstype Title",
-                'cdo' => "$crstype Domain",
+                'cac' => "$prefix Activity",
+                'ccr' => "$prefix Created",
+                'cde' => "$prefix Title",
+                'cdo' => "$prefix Domain",
                 'ins' => 'Institutional Code',
                 'inc' => 'Institutional Categorization',
-                'cow' => "$crstype Owner/Co-owner",
-                'cop' => "$crstype Personnel Includes",
+                'cow' => "$prefix Owner/Co-owner",
+                'cop' => "$prefix Personnel Includes",
                 'cog' => 'Type',
              );
 
@@ -17142,6 +17752,8 @@ sub build_filters {
         my $typeval = 'Course';
         if ($crstype eq 'Community') {
             $typeval = 'Community';
+        } elsif ($crstype eq 'Placement') {
+            $typeval = 'Placement';
         }
         $typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
     } else {
@@ -17150,9 +17762,15 @@ sub build_filters {
             $typeselectform .= ' onchange="'.$onchange.'"';
         }
         $typeselectform .= '>'."\n";
-        foreach my $posstype ('Course','Community') {
+        foreach my $posstype ('Course','Community','Placement') {
+            my $shown;
+            if ($posstype eq 'Placement') {
+                $shown = &mt('Placement Test');
+            } else {
+                $shown = &mt($posstype);
+            }
             $typeselectform.='<option value="'.$posstype.'"'.
-                ($posstype eq $crstype ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+                ($posstype eq $crstype ? ' selected="selected" ' : ''). ">".$shown."</option>\n";
         }
         $typeselectform.="</select>";
     }
@@ -17177,7 +17795,7 @@ sub build_filters {
         if (exists($filter->{'instcodefilter'})) {
 #            if (($fixeddom) || ($formname eq 'requestcrs') ||
 #                ($formname eq 'modifycourse') || ($formname eq 'filterpicker')) {
-            if ($codedom) {
+            if ($codedom) { 
                 $officialjs = 1;
                 ($instcodeform,$jscript,$$numtitlesref) =
                     &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker',
@@ -17306,7 +17924,7 @@ $typeelement
     return $jscript.$clonewarning.$output;
 }
 
-=pod
+=pod 
 
 =item * &timebased_select_form()
 
@@ -17321,7 +17939,7 @@ item - name of form element (sincefilter
 filter - anonymous hash of criteria and their values
 
 Returns: HTML for a select box contained a blank, then six time selections,
-         with value set in incoming form variables currently selected.
+         with value set in incoming form variables currently selected. 
 
 Side Effects: None
 
@@ -17358,7 +17976,7 @@ page load completion for page showing se
 
 Inputs: None
 
-Returns: markup containing updateFilters() and hideSearching() javascript functions.
+Returns: markup containing updateFilters() and hideSearching() javascript functions. 
 
 Side Effects: None
 
@@ -17397,7 +18015,7 @@ to retrieve a hash for which keys are co
 
 Inputs:
 
-dom - domain being searched
+dom - domain being searched 
 
 type - course type ('Course' or 'Community' or '.' if any).
 
@@ -17409,7 +18027,7 @@ cloneruname - optional username of new c
 
 clonerudom - optional domain of new course owner
 
-domcloner - optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by,
+domcloner - optional "domcloner" flag; has value=1 if user has ccc priv in domain being filtered by, 
             (used when DC is using course creation form)
 
 codetitles - reference to array of titles of components in institutional codes (official courses).
@@ -17419,8 +18037,8 @@ cc_clone - escaped comma separated list
 
 reqcrsdom - domain of new course, where search_courses is used to identify potential courses to clone
 
-reqinstcode - institutional code of new course, where search_courses is used to identify potential
-              courses to clone
+reqinstcode - institutional code of new course, where search_courses is used to identify potential 
+              courses to clone 
 
 Returns: %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -17546,8 +18164,8 @@ $required - LON-CAPA version needed by c
 
 Returns:
 
-$switchserver - query string tp append to /adm/switchserver call (if
-                current server's LON-CAPA version is too old.
+$switchserver - query string tp append to /adm/switchserver call (if 
+                current server's LON-CAPA version is too old. 
 
 $warning - Message is displayed if no suitable server could be found.
 
@@ -17660,7 +18278,7 @@ Inputs:
 $loncaparev - Version on current server (format: Major.Minor.Subrelease-datestamp)
 
 $interval (optional) - Time which may elapse (in s) between last check for content
-                       change in current course. (default: 600 s).
+                       change in current course. (default: 600 s).  
 
 Returns: an array; first element is:
 
@@ -17668,9 +18286,9 @@ Returns: an array; first element is:
 
 'switch' - if content updates mean user's session
            needs to be switched to a server running a newer LON-CAPA version
-
+ 
 'update' - if course session needs to be refreshed (i.e., Big Hash needs to be reloaded)
-           on current server hosting user's session
+           on current server hosting user's session                
 
 ''       - if no action required.
 
@@ -17678,10 +18296,10 @@ Returns: an array; first element is:
 
 If first item element is 'switch':
 
-second item is $switchwarning - Warning message if no suitable server found to host session.
+second item is $switchwarning - Warning message if no suitable server found to host session. 
 
 third item is $switchserver - query string to append to /adm/switchserver containing lonHostID
-                              and current role.
+                              and current role. 
 
 otherwise: no other elements returned.
 
@@ -17751,22 +18369,34 @@ sub switch_for_update {
 }
 
 sub update_content_constraints {
-    my ($cdom,$cnum,$chome,$cid) = @_;
+    my ($cdom,$cnum,$chome,$cid,$keeporder) = @_;
     my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
     my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
-    my %checkresponsetypes;
+    my (%checkresponsetypes,%checkcrsrestypes);
     foreach my $key (keys(%Apache::lonnet::needsrelease)) {
         my ($item,$name,$value) = split(/:/,$key);
         if ($item eq 'resourcetag') {
             if ($name eq 'responsetype') {
                 $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
             }
+        } elsif ($item eq 'course') {
+            if ($name eq 'courserestype') {
+                $checkcrsrestypes{$value} = $Apache::lonnet::needsrelease{$key};
+            }
         }
     }
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (defined($navmap)) {
-        my %allresponses;
-        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+        my (%allresponses,%allcrsrestypes);
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() || $_[0]->is_tool() },1,0)) {
+            if ($res->is_tool()) {
+                if ($allcrsrestypes{'exttool'}) {
+                    $allcrsrestypes{'exttool'} ++;
+                } else {
+                    $allcrsrestypes{'exttool'} = 1;
+                }
+                next;
+            }
             my %responses = $res->responseTypes();
             foreach my $key (keys(%responses)) {
                 next unless(exists($checkresponsetypes{$key}));
@@ -17779,8 +18409,34 @@ sub update_content_constraints {
                 ($reqdmajor,$reqdminor) = ($major,$minor);
             }
         }
+        foreach my $key (keys(%allcrsrestypes)) {
+            my ($major,$minor) = split(/\./,$checkcrsrestypes{$key});
+            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) {
+                ($reqdmajor,$reqdminor) = ($major,$minor);
+            }
+        }
         undef($navmap);
     }
+    my (@resources,@order,@resparms,@zombies);
+    if ($keeporder) {
+        use LONCAPA::map;
+        @resources = @LONCAPA::map::resources;
+        @order = @LONCAPA::map::order;
+        @resparms = @LONCAPA::map::resparms;
+        @zombies = @LONCAPA::map::zombies;
+    }
+    if ($keeporder) {
+        @LONCAPA::map::resources = @resources;
+        @LONCAPA::map::order = @order;
+        @LONCAPA::map::resparms = @resparms;
+        @LONCAPA::map::zombies = @zombies;
+    }
+    if (&Apache::lonnet::count_supptools($cnum,$cdom,1)) {
+        my ($major,$minor) = split(/\./,$checkcrsrestypes{'exttool'});
+        if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) {
+            ($reqdmajor,$reqdminor) = ($major,$minor);
+        }
+    }
     unless (($reqdmajor eq '') && ($reqdminor eq '')) {
         &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
     }
@@ -17801,7 +18457,7 @@ sub allmaps_incourse {
     if ($lastchange > $env{'request.course.tied'}) {
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
         unless ($ferr) {
-            &update_content_constraints($cdom,$cnum,$chome,$cid);
+            &update_content_constraints($cdom,$cnum,$chome,$cid,1);
         }
     }
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -17827,10 +18483,8 @@ sub parse_supplemental_title {
         my $name =  &plainname($uname,$udom);
         $name = &HTML::Entities::encode($name,'"<>&\'');
         $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
-        $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.$name;
-        if ($foldertitle ne '') {
-            $title .= ': <br />'.$foldertitle;
-        }
+        $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+            $name.': <br />'.$foldertitle;
     }
     if (wantarray) {
         return ($title,$foldertitle,$renametitle);
@@ -17838,42 +18492,6 @@ 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')) {
@@ -18055,26 +18673,18 @@ 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);
+        my ($badpath,$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) {
+            } elsif ($odd && $supplementalflag && $allowed) {
+                my $suffix;
                 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;
+                if (($items[$i] !~ /^[^:]*::(|1):::$/) && ($items[$idx] ne 'supplemental')) {
                     my $is_hidden;
                     unless ($got_supp) {
-                        my ($supplemental) = &get_supplemental($coursenum,$coursedom);
+                        my ($supplemental) = &Apache::lonnet::get_supplemental($coursenum,$coursedom);
                         if (ref($supplemental) eq 'HASH') {
                             if (ref($supplemental->{'hidden'}) eq 'HASH') {
                                 %supphidden = %{$supplemental->{'hidden'}};
@@ -18091,20 +18701,19 @@ sub validate_folderpath {
                             $is_hidden = 1;
                         }
                     }
-                    $supppath .= '&'.$items[$i].'::'.$is_hidden.':::';
-                } else {
-                    $supppath .= '&'.$items[$i];
+                    $suffix = '::'.$is_hidden.':::';
                 }
+                $supppath .= '&'.$items[$i].$suffix;
             } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) {
                 $badpath = 1;
-            } elsif ($supplementalflag) {
+            } elsif (!$odd && $supplementalflag && $allowed) {
                 $supppath .= '&'.$items[$i];
             }
             last if ($badpath);
         }
         if ($badpath) {
             delete($env{'form.folderpath'});
-        } elsif ($changed && $supplementalflag) {
+        } elsif ($supplementalflag && $allowed) {
             $supppath =~ s/^\&//;
             $env{'form.folderpath'} = $supppath;
         }
@@ -18115,7 +18724,7 @@ sub validate_folderpath {
 sub captcha_display {
     my ($context,$lonhost,$defdom) = @_;
     my ($output,$error);
-    my ($captcha,$pubkey,$privkey,$version) =
+    my ($captcha,$pubkey,$privkey,$version) = 
         &get_captcha_config($context,$lonhost,$defdom);
     if ($captcha eq 'original') {
         $output = &create_captcha();
@@ -18186,7 +18795,7 @@ sub get_captcha_config {
                 $captcha = 'recaptcha';
                 $version = $domconfhash{$serverhomedom.'.login.recaptchaversion'};
                 if ($version ne '2') {
-                    $version = 1;
+                    $version = 1; 
                 }
             } else {
                 $captcha = 'original';
@@ -18215,7 +18824,7 @@ sub get_captcha_config {
                 $captcha = 'original';
             }
         }
-    }
+    } 
     return ($captcha,$pubkey,$privkey,$version);
 }
 
@@ -18294,22 +18903,27 @@ sub create_recaptcha {
                &mt('If the text is hard to read, [_1] will replace them.',
                    '<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
                '<br /><br />';
-     }
+    }
 }
 
 sub check_recaptcha {
     my ($privkey,$version) = @_;
     my $captcha_chk;
-    my $ip = &Apache::lonnet::get_requestor_ip(); 
+    my $ip = &Apache::lonnet::get_requestor_ip();
     if ($version >= 2) {
-        my $ua = LWP::UserAgent->new;
-        $ua->timeout(10);
         my %info = (
-                     secret   => $privkey,
+                     secret   => $privkey, 
                      response => $env{'form.g-recaptcha-response'},
                      remoteip => $ip,
                    );
-        my $response = $ua->post('https://www.google.com/recaptcha/api/siteverify',\%info);
+        my $request=new HTTP::Request('POST','https://www.google.com/recaptcha/api/siteverify');
+        $request->content(join('&',map {
+                         my $name = escape($_);
+                         "$name=" . ( ref($info{$_}) eq 'ARRAY'
+                         ? join("&$name=", map {escape($_) } @{$info{$_}})
+                         : &escape($info{$_}) );
+        } keys(%info)));
+        my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',10,1);
         if ($response->is_success)  {
             my $data = JSON::DWIW->from_json($response->decoded_content);
             if (ref($data) eq 'HASH') {
@@ -18372,7 +18986,7 @@ 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.
+# $context is the calling context -- roles, grades, contents, menu or flip. 
 sub critical_redirect {
     my ($interval,$context) = @_;
     unless (($env{'user.domain'} ne '') && ($env{'user.name'} ne '')) {
@@ -18394,18 +19008,18 @@ sub critical_redirect {
                 }
             }
         }
-        my @what=&Apache::lonnet::dump('critical', $env{'user.domain'},
+        my @what=&Apache::lonnet::dump('critical', $env{'user.domain'}, 
                                         $env{'user.name'});
         &Apache::lonnet::appenv({'user.criticalcheck.time'=>time});
         my $redirecturl;
         if ($what[0]) {
-            if (($what[0] ne 'con_lost') && ($what[0] ne 'no_such_host') && ($what[0]!~/^error\:/)) {
-                $redirecturl='/adm/email?critical=display';
-                my $url=&Apache::lonnet::absolute_url().$redirecturl;
+	    if (($what[0] ne 'con_lost') && ($what[0] ne 'no_such_host') && ($what[0]!~/^error\:/)) {
+	        $redirecturl='/adm/email?critical=display';
+	        my $url=&Apache::lonnet::absolute_url().$redirecturl;
                 return (1, $url);
             }
         }
-    }
+    } 
     return ();
 }
 
@@ -18604,7 +19218,6 @@ sub shorten_symbs {
         } else {
             foreach my $key (keys(%collisions)) {
                 $failed->{$key} = 1;
-                $failed->{$key} = 1;
             }
         }
     }
@@ -18634,9 +19247,7 @@ sub is_nonframeable {
     }
     my $uselink;
     my $request = new HTTP::Request('HEAD',$url);
-    my $ua = LWP::UserAgent->new;
-    $ua->timeout(5);
-    my $response=$ua->request($request);
+    my $response = &LONCAPA::LWPReq::makerequest('',$request,'','',5);
     if ($response->is_success()) {
         my $secpolicy = lc($response->header('content-security-policy'));
         my $xframeop = lc($response->header('x-frame-options'));