--- loncom/interface/loncommon.pm	2019/02/04 01:32:50	1.1075.2.127.2.6
+++ loncom/interface/loncommon.pm	2015/02/25 19:22:24	1.1206
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.127.2.6 2019/02/04 01:32:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.1206 2015/02/25 19:22:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,16 +72,12 @@ use Apache::lonuserstate();
 use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
 use DateTime::TimeZone;
-use DateTime::Locale;
-use Encode();
+use DateTime::Locale::Catalog;
+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 File::Copy();
-use File::Path();
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -166,6 +162,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;
@@ -196,18 +193,19 @@ BEGIN {
     {
         my $langtabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                                    '/language.tab';
-        if ( open(my $fh,'<',$langtabfile) ) {
+        if ( open(my $fh,"<$langtabfile") ) {
             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);
@@ -217,7 +215,7 @@ BEGIN {
     {
         my $copyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
                                   '/copyright.tab';
-        if ( open (my $fh,'<',$copyrightfile) ) {
+        if ( open (my $fh,"<$copyrightfile") ) {
             while (my $line = <$fh>) {
                 next if ($line=~/^\#/);
                 chomp($line);
@@ -231,7 +229,7 @@ BEGIN {
     {
         my $sourcecopyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
                                   '/source_copyright.tab';
-        if ( open (my $fh,'<',$sourcecopyrightfile) ) {
+        if ( open (my $fh,"<$sourcecopyrightfile") ) {
             while (my $line = <$fh>) {
                 next if ($line =~ /^\#/);
                 chomp($line);
@@ -245,7 +243,7 @@ BEGIN {
 # -------------------------------------------------------------- default domain designs
     my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
     my $designfile = $designdir.'/default.tab';
-    if ( open (my $fh,'<',$designfile) ) {
+    if ( open (my $fh,"<$designfile") ) {
         while (my $line = <$fh>) {
             next if ($line =~ /^\#/);
             chomp($line);
@@ -259,12 +257,12 @@ BEGIN {
     {
         my $categoryfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                                   '/filecategories.tab';
-        if ( open (my $fh,'<',$categoryfile) ) {
+        if ( open (my $fh,"<$categoryfile") ) {
 	    while (my $line = <$fh>) {
 		next if ($line =~ /^\#/);
 		chomp($line);
                 my ($extension,$category)=(split(/\s+/,$line,2));
-                push(@{$category_extensions{lc($category)}},$extension);
+                push @{$category_extensions{lc($category)}},$extension;
             }
             close($fh);
         }
@@ -274,7 +272,7 @@ BEGIN {
     {
         my $typesfile = $Apache::lonnet::perlvar{'lonTabDir'}.
                '/filetypes.tab';
-        if ( open (my $fh,'<',$typesfile) ) {
+        if ( open (my $fh,"<$typesfile") ) {
             while (my $line = <$fh>) {
 		next if ($line =~ /^\#/);
 		chomp($line);
@@ -537,7 +535,7 @@ ENDAUTHORBRW
 
 sub coursebrowser_javascript {
     my ($domainfilter,$sec_element,$formname,$role_element,$crstype,
-        $credits_element,$instcode) = @_;
+        $credits_element) = @_;
     my $wintitle = 'Course_Browser';
     if ($crstype eq 'Community') {
         $wintitle = 'Community_Browser';
@@ -588,12 +586,6 @@ sub coursebrowser_javascript {
             var ownername = document.forms[formid].ccuname.value;
             var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
             url += '&cloner='+ownername+':'+ownerdom;
-            if (type == 'Course') {
-                url += '&crscode='+document.forms[formid].crscode.value;
-            }
-        }
-        if (formname == 'requestcrs') {
-            url += '&crsdom=$domainfilter&crscode=$instcode';
         }
         if (multflag !=null && multflag != '') {
             url += '&multiple='+multflag;
@@ -677,7 +669,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));
@@ -913,12 +905,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;
         }
     }
@@ -938,8 +930,8 @@ ENDSCRT
 }
 
 sub select_timezone {
-   my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
-   my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
+   my ($name,$selected,$onchange,$includeempty)=@_;
+   my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
    if ($includeempty) {
        $output .= '<option value=""';
        if (($selected eq '') || ($selected eq 'local')) {
@@ -960,8 +952,8 @@ sub select_timezone {
 }
 
 sub select_datelocale {
-    my ($name,$selected,$onchange,$includeempty,$disabled)=@_;
-    my $output='<select name="'.$name.'" '.$onchange.$disabled.'>'."\n";
+    my ($name,$selected,$onchange,$includeempty)=@_;
+    my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
     if ($includeempty) {
         $output .= '<option value=""';
         if ($selected eq '') {
@@ -969,16 +961,15 @@ sub select_datelocale {
         }
         $output .= '> </option>';
     }
-    my @languages = &Apache::lonlocal::preferred_languages();
     my (@possibles,%locale_names);
-    my @locales = DateTime::Locale->ids();
-    foreach my $id (@locales) {
-        if ($id ne '') {
-            my ($en_terr,$native_terr);
-            my $loc = DateTime::Locale->load($id);
-            if (ref($loc)) {
-                $en_terr = $loc->name();
-                $native_terr = $loc->native_name();
+    my @locales = DateTime::Locale::Catalog::Locales;
+    foreach my $locale (@locales) {
+        if (ref($locale) eq 'HASH') {
+            my $id = $locale->{'id'};
+            if ($id ne '') {
+                my $en_terr = $locale->{'en_territory'};
+                my $native_terr = $locale->{'native_territory'};
+                my @languages = &Apache::lonlocal::preferred_languages();
                 if (grep(/^en$/,@languages) || !@languages) {
                     if ($en_terr ne '') {
                         $locale_names{$id} = '('.$en_terr.')';
@@ -992,8 +983,7 @@ sub select_datelocale {
                         $locale_names{$id} = '('.$en_terr.')';
                     }
                 }
-                $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
-                push(@possibles,$id);
+                push (@possibles,$id);
             }
         }
     }
@@ -1004,7 +994,7 @@ sub select_datelocale {
         }
         $output.=">$item";
         if ($locale_names{$item} ne '') {
-            $output.='  '.$locale_names{$item};
+            $output.="  $locale_names{$item}</option>\n";
         }
         $output.="</option>\n";
     }
@@ -1013,7 +1003,7 @@ sub select_datelocale {
 }
 
 sub select_language {
-    my ($name,$selected,$includeempty,$noedit) = @_;
+    my ($name,$selected,$includeempty) = @_;
     my %langchoices;
     if ($includeempty) {
         %langchoices = ('' => 'No language preference');
@@ -1025,7 +1015,34 @@ sub select_language {
         }
     }
     %langchoices = &Apache::lonlocal::texthash(%langchoices);
-    return &select_form($selected,$name,\%langchoices,undef,$noedit);
+    return &select_form($selected,$name,\%langchoices);
+}
+
+=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
@@ -1140,7 +1157,7 @@ sub linked_select_forms {
         $result.="select2data.d_$s1.texts = new Array(";        
         my @s2texts;
         foreach my $value (@s2values) {
-            push(@s2texts, $hashref->{$s1}->{'select2'}->{$value});
+            push @s2texts, $hashref->{$s1}->{'select2'}->{$value};
         }
         $result.="\"@s2texts\");\n";
     }
@@ -1250,11 +1267,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 {
@@ -1303,11 +1316,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;
@@ -1370,10 +1383,8 @@ sub help_open_menu {
 sub top_nav_help {
     my ($text) = @_;
     $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')"
@@ -1403,9 +1414,9 @@ sub help_menu_js {
         &Apache::loncommon::start_page('Help Menu', undef,
 				       {'frameset'    => 1,
 					'js_ready'    => 1,
-                                        'use_absolute' => $httphost, 
+                                        'use_absolute' => $httphost,
 					'add_entries' => {
-					    'border' => '0',
+					    'border' => '0', 
 					    'rows'   => "110,*",},});
     my $end_page =
         &Apache::loncommon::end_page({'frameset' => 1,
@@ -1792,14 +1803,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);
@@ -1829,7 +1840,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]+)\$/;
@@ -1842,7 +1853,7 @@ sub colorfuleditor_js {
     }
 
     function getTagList () {
-
+        
         var stringToSearch = document.lonhomework.innerHTML;
 
         var ret = new Array();
@@ -1850,7 +1861,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(/"/, ''));
             }
         }
@@ -1887,7 +1898,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;
@@ -1910,7 +1921,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);
@@ -1977,11 +1988,10 @@ 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')\">";
 }
 
-
 =pod
 
 =head1 Excel and CSV file utility routines
@@ -2241,15 +2251,12 @@ sub multiple_select_form {
 
 =pod
 
-=item * &select_form($defdom,$name,$hashref,$onchange,$readonly)
+=item * &select_form($defdom,$name,$hashref,$onchange)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select options from a ref to a hash containing:
 option_name => displayed text. An optional $onchange can include
-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.  
+a javascript onchange item, e.g., onchange="this.form.submit();"  
 
 See lonrights.pm for an example invocation and use.
 
@@ -2257,7 +2264,7 @@ See lonrights.pm for an example invocati
 
 #-------------------------------------------
 sub select_form {
-    my ($def,$name,$hashref,$onchange,$readonly) = @_;
+    my ($def,$name,$hashref,$onchange) = @_;
     return unless (ref($hashref) eq 'HASH');
     if ($onchange) {
         $onchange = ' onchange="'.$onchange.'"';
@@ -2431,7 +2438,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -2448,19 +2455,14 @@ 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. 
-
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms,$disabled) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_;
     if ($onchange) {
         $onchange = ' onchange="'.$onchange.'"';
     }
-    if ($disabled) {
-        $disabled = ' disabled="disabled"';
-    }
     my (@domains,%exclude);
     if (ref($incdoms) eq 'ARRAY') {
         @domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
@@ -2469,9 +2471,9 @@ 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";
+    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
         next if ($exclude{$dom});
         $selectdomain.="<option value=\"$dom\" ".
@@ -2825,7 +2827,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');
@@ -2847,16 +2849,13 @@ sub authform_kerberos {
               @_,
               );
     my ($check4,$check5,$krbcheck,$krbarg,$krbver,$result,$authtype,
-        $autharg,$jscall,$disabled);
+        $autharg,$jscall);
     my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
     if ($in{'kerb_def_auth'} eq 'krb5') {
        $check5 = ' checked="checked"';
     } else {
        $check4 = ' checked="checked"';
     }
-    if ($in{'readonly'}) {
-        $disabled = ' disabled="disabled"';
-    }
     $krbarg = $in{'kerb_def_dom'};
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'krb') {
@@ -2901,7 +2900,7 @@ sub authform_kerberos {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="radio" name="login" value="krb"'.$disabled.' />';
+                    $authtype = '<input type="radio" name="login" value="krb" />';
                 }
             }
         }
@@ -2910,7 +2909,7 @@ sub authform_kerberos {
     if ($authtype eq '') {
         $authtype = '<input type="radio" name="login" value="krb" '.
                     'onclick="'.$jscall.'" onchange="'.$jscall.'"'.
-                    $krbcheck.$disabled.' />';
+                    $krbcheck.' />';
     }
     if (($can_assign{'krb4'} && $can_assign{'krb5'}) ||
         ($can_assign{'krb4'} && !$can_assign{'krb5'} &&
@@ -2923,9 +2922,9 @@ sub authform_kerberos {
          '<label>'.$authtype,
          '</label><input type="text" size="10" name="krbarg" '.
              'value="'.$krbarg.'" '.
-             'onchange="'.$jscall.'"'.$disabled.' />',
-         '<label><input type="radio" name="krbver" value="4" '.$check4.$disabled.' />',
-         '</label><label><input type="radio" name="krbver" value="5" '.$check5.$disabled.' />',
+             'onchange="'.$jscall.'" />',
+         '<label><input type="radio" name="krbver" value="4" '.$check4.' />',
+         '</label><label><input type="radio" name="krbver" value="5" '.$check5.' />',
 	 '</label>');
     } elsif ($can_assign{'krb4'}) {
         $result .= &mt
@@ -2934,7 +2933,7 @@ sub authform_kerberos {
          '<label>'.$authtype,
          '</label><input type="text" size="10" name="krbarg" '.
              'value="'.$krbarg.'" '.
-             'onchange="'.$jscall.'"'.$disabled.' />',
+             'onchange="'.$jscall.'" />',
          '<label><input type="hidden" name="krbver" value="4" />',
          '</label>');
     } elsif ($can_assign{'krb5'}) {
@@ -2944,7 +2943,7 @@ sub authform_kerberos {
          '<label>'.$authtype,
          '</label><input type="text" size="10" name="krbarg" '.
              'value="'.$krbarg.'" '.
-             'onchange="'.$jscall.'"'.$disabled.' />',
+             'onchange="'.$jscall.'" />',
          '<label><input type="hidden" name="krbver" value="5" />',
          '</label>');
     }
@@ -2957,11 +2956,8 @@ sub authform_internal {
                 kerb_def_dom => 'MSU.EDU',
                 @_,
                 );
-    my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall,$disabled);
+    my ($intcheck,$intarg,$result,$authtype,$autharg,$jscall);
     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 'int') {
             if ($can_assign{'int'}) {
@@ -2990,7 +2986,7 @@ sub authform_internal {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="radio" name="login" value="int"'.$disabled.' />';
+                    $authtype = '<input type="radio" name="login" value="int" />';
                 }
             }
         }
@@ -2998,14 +2994,14 @@ sub authform_internal {
     $jscall = "javascript:changed_radio('int',$in{'formname'});";
     if ($authtype eq '') {
         $authtype = '<input type="radio" name="login" value="int" '.$intcheck.
-                    ' onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />';
+                    ' onchange="'.$jscall.'" onclick="'.$jscall.'" />';
     }
     $autharg = '<input type="password" size="10" name="intarg" value="'.
-               $intarg.'" onchange="'.$jscall.'"'.$disabled.' />';
+               $intarg.'" onchange="'.$jscall.'" />';
     $result = &mt
         ('[_1] Internally authenticated (with initial password [_2])',
          '<label>'.$authtype,'</label>'.$autharg);
-    $result.='<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }"'.$disabled.' />'.&mt('Visible input').'</label>';
+    $result.="<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
     return $result;
 }
 
@@ -3015,11 +3011,8 @@ sub authform_local {
               kerb_def_dom => 'MSU.EDU',
               @_,
               );
-    my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall,$disabled);
+    my ($loccheck,$locarg,$result,$authtype,$autharg,$jscall);
     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'}) {
@@ -3048,7 +3041,7 @@ sub authform_local {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="radio" name="login" value="loc"'.$disabled.' />';
+                    $authtype = '<input type="radio" name="login" value="loc" />';
                 }
             }
         }
@@ -3057,10 +3050,10 @@ sub authform_local {
     if ($authtype eq '') {
         $authtype = '<input type="radio" name="login" value="loc" '.
                     $loccheck.' onchange="'.$jscall.'" onclick="'.
-                    $jscall.'"'.$disabled.' />';
+                    $jscall.'" />';
     }
     $autharg = '<input type="text" size="10" name="locarg" value="'.
-               $locarg.'" onchange="'.$jscall.'"'.$disabled.' />';
+               $locarg.'" onchange="'.$jscall.'" />';
     $result = &mt('[_1] Local Authentication with argument [_2]',
                   '<label>'.$authtype,'</label>'.$autharg);
     return $result;
@@ -3072,11 +3065,8 @@ sub authform_filesystem {
               kerb_def_dom => 'MSU.EDU',
               @_,
               );
-    my ($fsyscheck,$result,$authtype,$autharg,$jscall,$disabled);
+    my ($fsyscheck,$result,$authtype,$autharg,$jscall);
     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 'fsys') {
             if ($can_assign{'fsys'}) {
@@ -3102,7 +3092,7 @@ sub authform_filesystem {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="radio" name="login" value="fsys"'.$disabled.' />';
+                    $authtype = '<input type="radio" name="login" value="fsys" />';
                 }
             }
         }
@@ -3111,16 +3101,16 @@ sub authform_filesystem {
     if ($authtype eq '') {
         $authtype = '<input type="radio" name="login" value="fsys" '.
                     $fsyscheck.' onchange="'.$jscall.'" onclick="'.
-                    $jscall.'"'.$disabled.' />';
+                    $jscall.'" />';
     }
     $autharg = '<input type="text" size="10" name="fsysarg" value=""'.
-               ' onchange="'.$jscall.'"'.$disabled.' />';
+               ' onchange="'.$jscall.'" />';
     $result = &mt
         ('[_1] Filesystem Authenticated (with initial password [_2])',
          '<label><input type="radio" name="login" value="fsys" '.
-         $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'"'.$disabled.' />',
+         $fsyscheck.'onchange="'.$jscall.'" onclick="'.$jscall.'" />',
          '</label><input type="password" size="10" name="fsysarg" value="" '.
-                  'onchange="'.$jscall.'"'.$disabled.' />');
+                  'onchange="'.$jscall.'" />');
     return $result;
 }
 
@@ -3142,7 +3132,7 @@ sub get_assignable_auth {
             my $context;
             if ($env{'request.role'} =~ /^au/) {
                 $context = 'author';
-            } elsif ($env{'request.role'} =~ /^(dc|dh)/) {
+            } elsif ($env{'request.role'} =~ /^dc/) {
                 $context = 'domain';
             } elsif ($env{'request.course.id'}) {
                 $context = 'course';
@@ -3333,13 +3323,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
 
@@ -3970,7 +4020,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
@@ -3990,13 +4040,8 @@ sub get_previous_attempt {
       my %lasthash=();
       my $version;
       for ($version=1;$version<=$returnhash{'version'};$version++) {
-        foreach my $key (reverse(sort(split(/\:/,$returnhash{$version.':keys'})))) {
-            if ($key =~ /\.rawrndseed$/) {
-                my ($id) = ($key =~ /^(.+)\.rawrndseed$/);
-                $lasthash{$id.'.rndseed'} = $returnhash{$version.':'.$key};
-            } else {
-                $lasthash{$key}=$returnhash{$version.':'.$key};
-            }
+        foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+	  $lasthash{$key}=$returnhash{$version.':'.$key};
         }
       }
       $prevattempts=&start_data_table().&start_data_table_header_row();
@@ -4057,7 +4102,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 '') {
@@ -4116,15 +4161,9 @@ sub get_previous_attempt {
                         }
                     } else {
                         if ($key =~ /\./) {
-                            my $value = $returnhash{$version.':'.$key};
-                            if ($key =~ /\.rndseed$/) {
-                                my ($id) = ($key =~ /^(.+)\.rndseed$/);
-                                if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
-                                    $value = $returnhash{$version.':'.$id.'.rawrndseed'};
-                                }
-                            }
-                            $prevattempts.='<td>'.&format_previous_attempt_value($key,$value).
-                                           '&nbsp;</td>';
+                            my $value = &format_previous_attempt_value($key,
+                                              $returnhash{$version.':'.$key});
+                            $prevattempts.='<td>'.$value.'&nbsp;</td>';
                         } else {
                             $prevattempts.='<td>&nbsp;</td>';
                         }
@@ -4133,15 +4172,9 @@ sub get_previous_attempt {
             } else {
 	        foreach my $key (sort(keys(%lasthash))) {
                     next if ($key =~ /\.foilorder$/);
-                    my $value = $returnhash{$version.':'.$key};
-                    if ($key =~ /\.rndseed$/) {
-                        my ($id) = ($key =~ /^(.+)\.rndseed$/);
-                        if (exists($returnhash{$version.':'.$id.'.rawrndseed'})) {
-                            $value = $returnhash{$version.':'.$id.'.rawrndseed'};
-                        }
-                    }
-                    $prevattempts.='<td>'.&format_previous_attempt_value($key,$value).
-                                   '&nbsp;</td>';
+		    my $value = &format_previous_attempt_value($key,
+			            $returnhash{$version.':'.$key});
+		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
 	        }
             }
 	    $prevattempts.=&end_data_table_row();
@@ -4166,7 +4199,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>';
                   }
@@ -4182,7 +4215,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();
@@ -4203,11 +4236,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]};
@@ -4230,7 +4265,7 @@ sub format_previous_attempt_value {
             } 
         }
     } else {
-	$value = &unescape($value);
+        $value = &HTML::Entities::encode(&unescape($value), '"<>&');
     }
     return $value;
 }
@@ -4698,7 +4733,7 @@ sub blockcheck {
                                                                 $tdom,$spec,$trest,$area);
                         }
                     }
-                    my ($author,$adv,$rar) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
+                    my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles);
                     if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) {
                         if ($1) {
                             $no_userblock = 1;
@@ -4896,9 +4931,9 @@ sub blocking_status {
 # build a link to a popup window containing the details
     my $querystring  = "?activity=$activity";
 # $uname and $udom decide whose portfolio the user is trying to look at
-    if (($activity eq 'port') || ($activity eq 'passwd')) {
-        $querystring .= "&amp;udom=$udom"      if ($udom =~ /^$match_domain$/);
-        $querystring .= "&amp;uname=$uname"    if ($uname =~ /^$match_username$/);
+    if ($activity eq 'port') {
+        $querystring .= "&amp;udom=$udom"      if $udom;
+        $querystring .= "&amp;uname=$uname"    if $uname;
     } elsif ($activity eq 'docs') {
         $querystring .= '&amp;url='.&HTML::Entities::encode($url,'&"');
     }
@@ -4917,17 +4952,13 @@ END_MYBLOCK
   
     my $popupUrl = "/adm/blockingstatus/$querystring";
     my $text = &mt('Communication Blocked');
-    my $class = 'LC_comblock';
     if ($activity eq 'docs') {
         $text = &mt('Content Access Blocked');
-        $class = '';
     } elsif ($activity eq 'printout') {
         $text = &mt('Printing Blocked');
-    } elsif ($activity eq 'passwd') {
-        $text = &mt('Password Changing Blocked');
     }
     $output .= <<"END_BLOCK";
-<div class='$class'>
+<div class='LC_comblock'>
   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
   title='$text'>
   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
@@ -4949,7 +4980,7 @@ sub check_ip_acc {
         return 1;
     }
     my $allowed=0;
-    my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'};
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
 
     my $name;
     foreach my $pattern (split(',',$acc)) {
@@ -4994,87 +5025,6 @@ sub check_ip_acc {
     return $allowed;
 }
 
-sub check_slotip_acc {
-    my ($acc,$clientip)=@_;
-    &Apache::lonxml::debug("acc is $acc");
-    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
-        return 1;
-    }
-    my $allowed;
-    my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'};
-
-    my $name;
-    my %access = (
-                     allowfrom => 1,
-                     denyfrom  => 0,
-                 );
-    my @allows;
-    my @denies;
-    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 $acctype = 'allowfrom';
-        if ($count <= $numdenies) {
-            $acctype = 'denyfrom';
-        }
-        if ($pattern =~ /\*$/) {
-            #35.8.*
-            $pattern=~s/\*//;
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
-        } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
-            #35.8.3.[34-56]
-            my $low=$2;
-            my $high=$3;
-            $pattern=$1;
-            if ($ip =~ /^\Q$pattern\E/) {
-                my $last=(split(/\./,$ip))[3];
-                if ($last <=$high && $last >=$low) { $allowed=$access{$acctype}; }
-            }
-        } elsif ($pattern =~ /^\*/) {
-            #*.msu.edu
-            $pattern=~s/\*//;
-            if (!defined($name)) {
-                use Socket;
-                my $netaddr=inet_aton($ip);
-                ($name)=gethostbyaddr($netaddr,AF_INET);
-            }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
-        } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
-            #127.0.0.1
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=$access{$acctype}; }
-        } else {
-            #some.name.com
-            if (!defined($name)) {
-                use Socket;
-                my $netaddr=inet_aton($ip);
-                ($name)=gethostbyaddr($netaddr,AF_INET);
-            }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=$access{$acctype}; }
-        }
-        if ($allowed =~ /^(0|1)$/) { last; }
-    }
-    if ($allowed eq '') {
-        if ($numdenies && !$numallows) {
-            $allowed = 1;
-        } else {
-            $allowed = 0;
-        }
-    }
-    return $allowed;
-}
-
 ###############################################
 
 =pod
@@ -5126,28 +5076,23 @@ sub get_domainconf {
             if (keys(%{$domconfig{'login'}})) {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                        if (($key eq 'loginvia') || ($key eq 'headtag')) {
-                            if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                                foreach my $hostname (keys(%{$domconfig{'login'}{$key}})) {
-                                    if (ref($domconfig{'login'}{$key}{$hostname}) eq 'HASH') {
-                                        if ($key eq 'loginvia') {
-                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
-                                                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'};
-                                                }
+                        if ($key eq 'loginvia') {
+                            if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
+                                foreach my $hostname (keys(%{$domconfig{'login'}{'loginvia'}})) {
+                                    if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
+                                        if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
+                                            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'};
                                             }
-                                        } elsif ($key eq 'headtag') {
-                                            if ($domconfig{'login'}{'headtag'}{$hostname}{'url'}) {
-                                                $designhash{$udom.'.login.headtag_'.$hostname} = $domconfig{'login'}{'headtag'}{$hostname}{'url'};
+                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
+                                                $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
                                             }
                                         }
-                                        if ($domconfig{'login'}{$key}{$hostname}{'exempt'}) {
-                                            $designhash{$udom.'.login.'.$key.'_exempt_'.$hostname} = $domconfig{'login'}{$key}{$hostname}{'exempt'};
-                                        }
                                     }
                                 }
                             }
@@ -5215,7 +5160,7 @@ sub get_legacy_domconf {
     my $designdir=$Apache::lonnet::perlvar{'lonTabDir'}.'/lonDomColors';
     my $designfile =  $designdir.'/'.$udom.'.tab';
     if (-e $designfile) {
-        if ( open (my $fh,'<',$designfile) ) {
+        if ( open (my $fh,"<$designfile") ) {
             while (my $line = <$fh>) {
                 next if ($line =~ /^\#/);
                 chomp($line);
@@ -5466,11 +5411,11 @@ 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
+            inherit_jsmath -> when creating popup window in a page,
+                              should it have jsmath forced on by the
+                              current page
 
 =item * $advtoolsref, optional argument, ref to an array containing
             inlineremote items to be added in "Functions" menu below
@@ -5487,7 +5432,7 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
-        $no_nav_bar,$bgcolor,$no_inline_link,$args,$advtoolsref)=@_;
+        $no_nav_bar,$bgcolor,$args,$advtoolsref)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -5523,14 +5468,6 @@ sub bodytag {
     if ($env{'request.course.id'}) {
         if ($env{'request.role'} !~ /^cr/) {
             $role = &Apache::lonnet::plaintext($role,&course_type());
-        } elsif ($role =~ m{^cr/($match_domain)/\1-domainconfig/(\w+)$}) {
-            if ($env{'request.role.desc'}) {
-                $role = $env{'request.role.desc'};
-            } else {
-                $role = &mt('Helpdesk[_1]','&nbsp;'.$2);
-            }
-        } else {
-            $role = (split(/\//,$role,4))[-1];
         }
         if ($env{'request.course.sec'}) {
             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
@@ -5546,7 +5483,7 @@ sub bodytag {
 
 # construct main body tag
     my $bodytag = "<body $extra_body_attr>".
-	&Apache::lontexconvert::init_math_support();
+	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
 
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
@@ -5570,25 +5507,9 @@ sub bodytag {
         $dc_info =~ s/\s+$//;
     }
 
-    $role = '<span class="LC_nobreak">('.$role.')</span>' if ($role && !$env{'browser.mobile'});
-
-    if ($env{'request.state'} eq 'construct') { $forcereg=1; }
-
-
+    $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
 
-    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;
-        }
-    } else {
+        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
@@ -5600,11 +5521,11 @@ sub bodytag {
         my ($left,$right) = Apache::lonmenu::primary_menu();
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
-            if ($dc_info) {
+             if ($dc_info) {
                  $dc_info = qq|<span class="LC_cusr_subheading">$dc_info</span>|;
-            }
-            $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
-                           <em>$realm</em> $dc_info</div>|;
+             }
+             $bodytag .= qq|<div id="LC_nav_bar">$left $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
@@ -5619,7 +5540,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;
         }
@@ -5633,17 +5554,13 @@ sub bodytag {
                                 $args->{'bread_crumbs'});
             } elsif ($forcereg) {
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
-                                                            $args->{'group'},
-                                                            $args->{'hide_buttons'});
+                                                            $args->{'group'});
             } else {
-                my $forbodytag;
-                &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
-                                                    $forcereg,$args->{'group'},
-                                                    $args->{'bread_crumbs'},
-                                                    $advtoolsref,'',\$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);
             }
         }else{
             # this is to seperate menu from content when there's no secondary
@@ -5653,54 +5570,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 {
@@ -5732,15 +5601,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;
@@ -5774,6 +5636,7 @@ sub endbodytag {
     unless ((ref($args) eq 'HASH') && ($args->{'notbody'})) {
         $endbodytag='</body>';
     }
+    $endbodytag=&Apache::lontexconvert::jsMath_process()."\n".$endbodytag;
     if ( exists( $env{'internal.head.redirect'} ) ) {
         if (!(ref($args) eq 'HASH' && $args->{'noredirectlink'})) {
 	    $endbodytag=
@@ -5948,17 +5811,6 @@ div.LC_confirm_box .LC_success img {
   vertical-align: middle;
 }
 
-.LC_maxwidth {
-  max-width: 100%;
-  height: auto;
-}
-
-.LC_textsize_mobile {
-  \@media only screen and (max-device-width: 480px) {
-      -webkit-text-size-adjust:100%; -moz-text-size-adjust:100%; -ms-text-size-adjust:100%;
-  }
-}
-
 .LC_icon {
   border: none;
   vertical-align: middle;
@@ -6080,10 +5932,6 @@ table#LC_menubuttons img {
   vertical-align: middle;
 }
 
-.LC_breadcrumbs_hoverable {
-  background: $sidebg;
-}
-
 td.LC_table_cell_checkbox {
   text-align: center;
 }
@@ -6793,6 +6641,10 @@ span.LC_cusr_subheading {
   font-size: 85%;
 }
 
+span.LC_math-error {
+  border: solid 1px red; min-width: 1px;
+}
+
 div.LC_docs_entry_move {
   border: 1px solid #BBBBBB;
   background: #DDDDDD;
@@ -6941,6 +6793,7 @@ div.LC_edit_problem_footer,
 div.LC_edit_problem_footer div,
 div.LC_edit_problem_editxml_header,
 div.LC_edit_problem_editxml_header div {
+  margin-top: 5px;
   z-index: 100;
 }
 
@@ -6957,17 +6810,19 @@ table.LC_edit_problem_header_title {
   background: $tabbg;
 }
 
+div.LC_edit_problem_discards {
+  float: left;
+}
+
 div.LC_edit_actionbar {
+    margin: -5px 0px 0px 0px !important;
     background-color: $sidebg;
-    margin: 0;
-    padding: 0;
-    line-height: 200%;
+    height: 31px;
 }
 
-div.LC_edit_actionbar div{
-    padding: 0;
-    margin: 0;
-    display: inline-block;
+div.LC_edit_problem_saves {
+  float: right;
+  padding-bottom: 5px;
 }
 
 .LC_edit_opt {
@@ -7074,10 +6929,6 @@ fieldset {
   /* overflow: hidden; */
 }
 
-article.geogebraweb div {
-    margin: 0;
-}
-
 fieldset > legend {
   font-weight: bold;
   padding: 0 5px 0 5px;
@@ -7122,7 +6973,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;
@@ -7137,7 +6988,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;
@@ -7172,9 +7023,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 {
@@ -7755,39 +7606,6 @@ 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;}
 
-#LC_minitab_header {
-  float:left;
-  width:100%;
-  background:#DAE0D2 url("/res/adm/pages/minitabmenu_bg.gif") repeat-x bottom;
-  font-size:93%;
-  line-height:normal;
-  margin: 0.5em 0 0.5em 0;
-}
-#LC_minitab_header ul {
-  margin:0;
-  padding:10px 10px 0;
-  list-style:none;
-}
-#LC_minitab_header li {
-  float:left;
-  background:url("/res/adm/pages/minitabmenu_left.gif") no-repeat left top;
-  margin:0;
-  padding:0 0 0 9px;
-}
-#LC_minitab_header a {
-  display:block;
-  background:url("/res/adm/pages/minitabmenu_right.gif") no-repeat right top;
-  padding:5px 15px 4px 6px;
-}
-#LC_minitab_header #LC_current_minitab {
-  background-image:url("/res/adm/pages/minitabmenu_left_on.gif");
-}
-#LC_minitab_header #LC_current_minitab a {
-  background-image:url("/res/adm/pages/minitabmenu_right_on.gif");
-  padding-bottom:5px;
-}
-
-
 END
 }
 
@@ -7845,8 +7663,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'}
@@ -7880,82 +7698,6 @@ sub headtag {
 <meta http-equiv="pragma" content="no-cache" />
 <meta http-equiv="Refresh" content="$time; url=$url" />
 ADDMETA
-    } else {
-        unless (($args->{'frameset'}) || ($args->{'js_ready'}) || ($args->{'only_body'}) || ($args->{'no_nav_bar'})) {
-            my $requrl = $env{'request.uri'};
-            if ($requrl eq '') {
-                $requrl = $ENV{'REQUEST_URI'};
-                $requrl =~ s/\?.+$//;
-            }
-            unless (($requrl =~ m{^/adm/(?:switchserver|login|authenticate|logout|groupsort|cleanup|helper|slotrequest|grades)(\?|$)}) ||
-                    (($requrl =~ m{^/res/}) && (($env{'form.submitted'} eq 'scantron') ||
-                     ($env{'form.grade_symb'}) || ($Apache::lonhomework::scantronmode)))) {
-                my $dom_in_use = $Apache::lonnet::perlvar{'lonDefDomain'};
-                unless (&Apache::lonnet::allowed('mau',$dom_in_use)) {
-                    my %domdefs = &Apache::lonnet::get_domain_defaults($dom_in_use);
-                    if (ref($domdefs{'offloadnow'}) eq 'HASH') {
-                        my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
-                        if ($domdefs{'offloadnow'}{$lonhost}) {
-                            my $newserver = &Apache::lonnet::spareserver(30000,undef,1,$dom_in_use);
-                            if (($newserver) && ($newserver ne $lonhost)) {
-                                my $numsec = 5;
-                                my $timeout = $numsec * 1000;
-                                my ($newurl,$locknum,%locks,$msg);
-                                if ($env{'request.role.adv'}) {
-                                    ($locknum,%locks) = &Apache::lonnet::get_locks();
-                                }
-                                my $disable_submit = 0;
-                                if ($requrl =~ /$LONCAPA::assess_re/) {
-                                    $disable_submit = 1;
-                                }
-                                if ($locknum) {
-                                    my @lockinfo = sort(values(%locks));
-                                    $msg = &mt('Once the following tasks are complete: ')."\\n".
-                                           join(", ",sort(values(%locks)))."\\n".
-                                           &mt('your session will be transferred to a different server, after you click "Roles".');
-                                } else {
-                                    if (($requrl =~ m{^/res/}) && ($env{'form.submitted'} =~ /^part_/)) {
-                                        $msg = &mt('Your LON-CAPA submission has been recorded')."\\n";
-                                    }
-                                    $msg .= &mt('Your current LON-CAPA session will be transferred to a different server in [quant,_1,second].',$numsec);
-                                    $newurl = '/adm/switchserver?otherserver='.$newserver;
-                                    if (($env{'request.role'}) && ($env{'request.role'} ne 'cm')) {
-                                        $newurl .= '&role='.$env{'request.role'};
-                                    }
-                                    if ($env{'request.symb'}) {
-                                        $newurl .= '&symb='.$env{'request.symb'};
-                                    } else {
-                                        $newurl .= '&origurl='.$requrl;
-                                    }
-                                }
-                                &js_escape(\$msg);
-                                $result.=<<OFFLOAD
-<meta http-equiv="pragma" content="no-cache" />
-<script type="text/javascript">
-// <![CDATA[
-function LC_Offload_Now() {
-    var dest = "$newurl";
-    if (dest != '') {
-        window.location.href="$newurl";
-    }
-}
-\$(document).ready(function () {
-    window.alert('$msg');
-    if ($disable_submit) {
-        \$(".LC_hwk_submit").prop("disabled", true);
-        \$( ".LC_textline" ).prop( "readonly", "readonly");
-    }
-    setTimeout('LC_Offload_Now()', $timeout);
-});
-// ]]>
-</script>
-OFFLOAD
-                            }
-                        }
-                    }
-                }
-            }
-        }
     }
     if (!defined($title)) {
 	$title = 'The LearningOnline Network with CAPA';
@@ -7966,21 +7708,14 @@ OFFLOAD
     if (!$args->{'frameset'}) {
         $result .= ' /';
     }
-    $result .= '>'
+    $result .= '>' 
         .$inhibitprint
 	.$head_extra;
-    my $clientmobile;
-    if (($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
-        (undef,undef,undef,undef,undef,undef,$clientmobile) = &decode_user_agent();
-    } else {
-        $clientmobile = $env{'browser.mobile'};
-    }
-    if ($clientmobile) {
+    if ($env{'browser.mobile'}) {
         $result .= '
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
 <meta name="apple-mobile-web-app-capable" content="yes" />';
     }
-    $result .= '<meta name="google" content="notranslate" />'."\n";
     return $result.'</head>';
 }
 
@@ -7999,12 +7734,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;
 }
@@ -8157,15 +7892,14 @@ $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
+             inherit_jsmath -> when creating popup window in a page,
+                                    should it have jsmath forced on by the
+                                    current page
              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
-                               specific group
+             group          -> includes the current group, if page is for a 
+                               specific group  
 
 =back
 
@@ -8195,8 +7929,8 @@ 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);
+                         $args->{'bgcolor'},        $args,
+                         \@advtools);
         }
     }
 
@@ -8229,24 +7963,13 @@ sub start_page {
                 if (@advtools > 0) {
                     &Apache::lonmenu::advtools_crumbs(@advtools);
                 }
-                my $menulink;
-                # if arg: bread_crumbs_nomenu is true pass 0 as $menulink item.
-                if (exists($args->{'bread_crumbs_nomenu'})) {
-                    $menulink = 0;
-                } else {
-                    undef($menulink);
-                }
+
 		#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);
+			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
 		}else{
-			$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$menulink);
+			$result .= &Apache::lonhtmlcommon::breadcrumbs();
 		}
-    } 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;
 }
@@ -8342,13 +8065,13 @@ var modalWindow = {
 };
 	var openMyModal = function(source,width,height,scrolling,transparency,style)
 	{
-                source = source.replace(/'/g,"&#39;");
+                source = source.replace("'","&#39;");
 		modalWindow.windowId = "myModal";
 		modalWindow.width = width;
 		modalWindow.height = height;
 		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='"+transparency+"' src='" + source + "' style='"+style+"'></iframe>";
 		modalWindow.open();
-	};
+	};	
 // END LON-CAPA Internal -->
 // ]]>
 </script>
@@ -8394,7 +8117,7 @@ sub modal_adhoc_inner {
     my ($funcname,$width,$height,$content)=@_;
     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().
@@ -9039,7 +8762,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();
@@ -9435,8 +9158,8 @@ 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')) { 
                     $defquota = $domdefs{$crstype.'quota'};
                 }
                 if ($defquota eq '') {
@@ -9620,6 +9343,8 @@ sub excess_filesize_warning {
 ###############################################
 
 
+
+
 sub get_secgrprole_info {
     my ($cdom,$cnum,$needroles,$type)  = @_;
     my %sections_count = &get_sections($cdom,$cnum);
@@ -9658,24 +9383,8 @@ sub get_secgrprole_info {
 }
 
 sub user_picker {
-    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context,$fixeddom,$noinstd) = @_;
+    my ($dom,$srch,$forcenewuser,$caller,$cancreate,$usertype,$context) = @_;
     my $currdom = $dom;
-    my @alldoms = &Apache::lonnet::all_domains();
-    if (@alldoms == 1) {
-        my %domsrch = &Apache::lonnet::get_dom('configuration',
-                                               ['directorysrch'],$alldoms[0]);
-        my $domdesc = &Apache::lonnet::domain($alldoms[0],'description');
-        my $showdom = $domdesc;
-        if ($showdom eq '') {
-            $showdom = $dom;
-        }
-        if (ref($domsrch{'directorysrch'}) eq 'HASH') {
-            if ((!$domsrch{'directorysrch'}{'available'}) &&
-                ($domsrch{'directorysrch'}{'lcavailable'} eq '0')) {
-                return (&mt('LON-CAPA directory search is not available in domain: [_1]',$showdom),0);
-            }
-        }
-    }
     my %curr_selected = (
                         srchin => 'dom',
                         srchby => 'lastname',
@@ -9696,7 +9405,7 @@ sub user_picker {
         }
         $srchterm = $srch->{'srchterm'};
     }
-    my %html_lt=&Apache::lonlocal::texthash(
+    my %lt=&Apache::lonlocal::texthash(
                     'usr'       => 'Search criteria',
                     'doma'      => 'Domain/institution to search',
                     'uname'     => 'username',
@@ -9709,8 +9418,6 @@ sub user_picker {
                     'exact'     => 'is',
                     'contains'  => 'contains',
                     'begins'    => 'begins with',
-                                       );
-    my %js_lt=&Apache::lonlocal::texthash(
                     'youm'      => "You must include some text to search for.",
                     'thte'      => "The text you are searching for must contain at least two characters when using a 'begins' type search.",
                     'thet'      => "The text you are searching for must contain at least three characters when using a 'contains' type search.",
@@ -9720,16 +9427,7 @@ sub user_picker {
                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
                      'thfo'     => "The following need to be corrected before the search can be run:",
                                        );
-    &html_escape(\%html_lt);
-    &js_escape(\%js_lt);
-    my $domform;
-    my $allow_blank = 1;
-    if ($fixeddom) {
-        $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 $domform = &select_dom_form($currdom,'srchdomain',1,1);
     my $srchinsel = ' <select name="srchin">';
 
     my @srchins = ('crs','dom','alc','instd');
@@ -9741,13 +9439,12 @@ sub user_picker {
         next if ($option eq 'alc');
         next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));  
         next if ($option eq 'crs' && !$env{'request.course.id'});
-        next if (($option eq 'instd') && ($noinstd));
         if ($curr_selected{'srchin'} eq $option) {
             $srchinsel .= ' 
-   <option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
         } else {
             $srchinsel .= '
-   <option value="'.$option.'">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
         }
     }
     $srchinsel .= "\n  </select>\n";
@@ -9756,10 +9453,10 @@ sub user_picker {
     foreach my $option ('lastname','lastfirst','uname') {
         if ($curr_selected{'srchby'} eq $option) {
             $srchbysel .= '
-   <option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
         } else {
             $srchbysel .= '
-   <option value="'.$option.'">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
          }
     }
     $srchbysel .= "\n  </select>\n";
@@ -9768,10 +9465,10 @@ sub user_picker {
     foreach my $option ('begins','contains','exact') {
         if ($curr_selected{'srchtype'} eq $option) {
             $srchtypesel .= '
-   <option value="'.$option.'" selected="selected">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
         } else {
             $srchtypesel .= '
-   <option value="'.$option.'">'.$html_lt{$option}.'</option>';
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
         }
     }
     $srchtypesel .= "\n  </select>\n";
@@ -9856,46 +9553,46 @@ function validateEntry(callingForm) {
 
     if (srchterm == "") {
         checkok = 0;
-        msg += "$js_lt{'youm'}\\n";
+        msg += "$lt{'youm'}\\n";
     }
 
     if (srchtype== 'begins') {
         if (srchterm.length < 2) {
             checkok = 0;
-            msg += "$js_lt{'thte'}\\n";
+            msg += "$lt{'thte'}\\n";
         }
     }
 
     if (srchtype== 'contains') {
         if (srchterm.length < 3) {
             checkok = 0;
-            msg += "$js_lt{'thet'}\\n";
+            msg += "$lt{'thet'}\\n";
         }
     }
     if (srchin == 'instd') {
         if (srchdomain == '') {
             checkok = 0;
-            msg += "$js_lt{'yomc'}\\n";
+            msg += "$lt{'yomc'}\\n";
         }
     }
     if (srchin == 'dom') {
         if (srchdomain == '') {
             checkok = 0;
-            msg += "$js_lt{'ymcd'}\\n";
+            msg += "$lt{'ymcd'}\\n";
         }
     }
     if (srchby == 'lastfirst') {
         if (srchterm.indexOf(",") == -1) {
             checkok = 0;
-            msg += "$js_lt{'whus'}\\n";
+            msg += "$lt{'whus'}\\n";
         }
         if (srchterm.indexOf(",") == srchterm.length -1) {
             checkok = 0;
-            msg += "$js_lt{'whse'}\\n";
+            msg += "$lt{'whse'}\\n";
         }
     }
     if (checkok == 0) {
-        alert("$js_lt{'thfo'}\\n"+msg);
+        alert("$lt{'thfo'}\\n"+msg);
         return;
     }
     if (checkok == 1) {
@@ -9913,10 +9610,10 @@ $new_user_create
 END_BLOCK
 
     $output .= &Apache::lonhtmlcommon::start_pick_box().
-               &Apache::lonhtmlcommon::row_title($html_lt{'doma'}).
+               &Apache::lonhtmlcommon::row_title($lt{'doma'}).
                $domform.
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($html_lt{'usr'}).
+               &Apache::lonhtmlcommon::row_title($lt{'usr'}).
                $srchbysel.
                $srchtypesel. 
                '<input type="text" size="15" name="srchterm" value="'.$srchterm.'" />'.
@@ -9924,165 +9621,61 @@ END_BLOCK
                &Apache::lonhtmlcommon::row_closure(1). 
                &Apache::lonhtmlcommon::end_pick_box().
                '<br />';
-    return ($output,1);
+    return $output;
 }
 
 sub user_rule_check {
     my ($usershash,$checks,$alerts,$rulematch,$inst_results,$curr_rules,$got_rules) = @_;
-    my ($response,%inst_response);
+    my $response;
     if (ref($usershash) eq 'HASH') {
-        if (keys(%{$usershash}) > 1) {
-            my (%by_username,%by_id,%userdoms);
-            my $checkid;
-            if (ref($checks) eq 'HASH') {
-                if ((!defined($checks->{'username'})) && (defined($checks->{'id'}))) {
-                    $checkid = 1;
-                }
-            }
-            foreach my $user (keys(%{$usershash})) {
-                my ($uname,$udom) = split(/:/,$user);
-                if ($checkid) {
-                    if (ref($usershash->{$user}) eq 'HASH') {
-                        if ($usershash->{$user}->{'id'} ne '') {
-                            $by_id{$udom}{$usershash->{$user}->{'id'}} = $uname;
-                            $userdoms{$udom} = 1;
-                            if (ref($inst_results) eq 'HASH') {
-                                $inst_results->{$uname.':'.$udom} = {};
-                            }
-                        }
-                    }
-                } else {
-                    $by_username{$udom}{$uname} = 1;
-                    $userdoms{$udom} = 1;
-                    if (ref($inst_results) eq 'HASH') {
-                        $inst_results->{$uname.':'.$udom} = {};
-                    }
-                }
-            }
-            foreach my $udom (keys(%userdoms)) {
-                if (!$got_rules->{$udom}) {
-                    my %domconfig = &Apache::lonnet::get_dom('configuration',
-                                                             ['usercreation'],$udom);
-                    if (ref($domconfig{'usercreation'}) eq 'HASH') {
-                        foreach my $item ('username','id') {
-                            if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
-                                $$curr_rules{$udom}{$item} =
-                                    $domconfig{'usercreation'}{$item.'_rule'};
-                            }
-                        }
-                    }
-                    $got_rules->{$udom} = 1;
-                }
+        foreach my $user (keys(%{$usershash})) {
+            my ($uname,$udom) = split(/:/,$user);
+            next if ($udom eq '' || $uname eq '');
+            my ($id,$newuser);
+            if (ref($usershash->{$user}) eq 'HASH') {
+                $newuser = $usershash->{$user}->{'newuser'};
+                $id = $usershash->{$user}->{'id'};
             }
-            if ($checkid) {
-                foreach my $udom (keys(%by_id)) {
-                    my ($outcome,$results) = &Apache::lonnet::get_multiple_instusers($udom,$by_id{$udom},'id');
-                    if ($outcome eq 'ok') {
-                        foreach my $id (keys(%{$by_id{$udom}})) {
-                            my $uname = $by_id{$udom}{$id};
-                            $inst_response{$uname.':'.$udom} = $outcome;
-                        }
-                        if (ref($results) eq 'HASH') {
-                            foreach my $uname (keys(%{$results})) {
-                                if (exists($inst_response{$uname.':'.$udom})) {
-                                    $inst_response{$uname.':'.$udom} = $outcome;
-                                    $inst_results->{$uname.':'.$udom} = $results->{$uname};
-                                }
-                            }
-                        }
-                    }
+            my $inst_response;
+            if (ref($checks) eq 'HASH') {
+                if (defined($checks->{'username'})) {
+                    ($inst_response,%{$inst_results->{$user}}) = 
+                        &Apache::lonnet::get_instuser($udom,$uname);
+                } elsif (defined($checks->{'id'})) {
+                    ($inst_response,%{$inst_results->{$user}}) =
+                        &Apache::lonnet::get_instuser($udom,undef,$id);
                 }
             } else {
-                foreach my $udom (keys(%by_username)) {
-                    my ($outcome,$results) = &Apache::lonnet::get_multiple_instusers($udom,$by_username{$udom});
-                    if ($outcome eq 'ok') {
-                        foreach my $uname (keys(%{$by_username{$udom}})) {
-                            $inst_response{$uname.':'.$udom} = $outcome;
-                        }
-                        if (ref($results) eq 'HASH') {
-                            foreach my $uname (keys(%{$results})) {
-                                $inst_results->{$uname.':'.$udom} = $results->{$uname};
-                            }
-                        }
-                    }
-                }
+                ($inst_response,%{$inst_results->{$user}}) =
+                    &Apache::lonnet::get_instuser($udom,$uname);
+                return;
             }
-        } elsif (keys(%{$usershash}) == 1) {
-            my $user = (keys(%{$usershash}))[0];
-            my ($uname,$udom) = split(/:/,$user);
-            if (($udom ne '') && ($uname ne '')) {
-                if (ref($usershash->{$user}) eq 'HASH') {
-                    if (ref($checks) eq 'HASH') {
-                        if (defined($checks->{'username'})) {
-                            ($inst_response{$user},%{$inst_results->{$user}}) =
-                                &Apache::lonnet::get_instuser($udom,$uname);
-                        } elsif (defined($checks->{'id'})) {
-                            if ($usershash->{$user}->{'id'} ne '') {
-                                ($inst_response{$user},%{$inst_results->{$user}}) =
-                                    &Apache::lonnet::get_instuser($udom,undef,
-                                                                  $usershash->{$user}->{'id'});
-                            } else {
-                                ($inst_response{$user},%{$inst_results->{$user}}) =
-                                    &Apache::lonnet::get_instuser($udom,$uname);
-                            }
+            if (!$got_rules->{$udom}) {
+                my %domconfig = &Apache::lonnet::get_dom('configuration',
+                                                  ['usercreation'],$udom);
+                if (ref($domconfig{'usercreation'}) eq 'HASH') {
+                    foreach my $item ('username','id') {
+                        if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
+                            $$curr_rules{$udom}{$item} = 
+                                $domconfig{'usercreation'}{$item.'_rule'};
                         }
-                    } else {
-                       ($inst_response{$user},%{$inst_results->{$user}}) =
-                            &Apache::lonnet::get_instuser($udom,$uname);
-                       return;
-                    }
-                    if (!$got_rules->{$udom}) {
-                        my %domconfig = &Apache::lonnet::get_dom('configuration',
-                                                                 ['usercreation'],$udom);
-                        if (ref($domconfig{'usercreation'}) eq 'HASH') {
-                            foreach my $item ('username','id') {
-                                if (ref($domconfig{'usercreation'}{$item.'_rule'}) eq 'ARRAY') {
-                                   $$curr_rules{$udom}{$item} =
-                                       $domconfig{'usercreation'}{$item.'_rule'};
-                                }
-                            }
-                        }
-                        $got_rules->{$udom} = 1;
                     }
                 }
-            } else {
-                return;
-            }
-        } else {
-            return;
-        }
-        foreach my $user (keys(%{$usershash})) {
-            my ($uname,$udom) = split(/:/,$user);
-            next if (($udom eq '') || ($uname eq ''));
-            my $id;
-            if (ref($inst_results) eq 'HASH') {
-                if (ref($inst_results->{$user}) eq 'HASH') {
-                    $id = $inst_results->{$user}->{'id'};
-                }
-            }
-            if ($id eq '') {
-                if (ref($usershash->{$user})) {
-                    $id = $usershash->{$user}->{'id'};
-                }
+                $got_rules->{$udom} = 1;  
             }
             foreach my $item (keys(%{$checks})) {
                 if (ref($$curr_rules{$udom}) eq 'HASH') {
                     if (ref($$curr_rules{$udom}{$item}) eq 'ARRAY') {
                         if (@{$$curr_rules{$udom}{$item}} > 0) {
-                            my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,
-                                                                             $$curr_rules{$udom}{$item});
+                            my %rule_check = &Apache::lonnet::inst_rulecheck($udom,$uname,$id,$item,$$curr_rules{$udom}{$item});
                             foreach my $rule (@{$$curr_rules{$udom}{$item}}) {
                                 if ($rule_check{$rule}) {
                                     $$rulematch{$user}{$item} = $rule;
-                                    if ($inst_response{$user} eq 'ok') {
+                                    if ($inst_response eq 'ok') {
                                         if (ref($inst_results) eq 'HASH') {
                                             if (ref($inst_results->{$user}) eq 'HASH') {
                                                 if (keys(%{$inst_results->{$user}}) == 0) {
                                                     $$alerts{$item}{$udom}{$uname} = 1;
-                                                } elsif ($item eq 'id') {
-                                                    if ($inst_results->{$user}->{'id'} eq '') {
-                                                        $$alerts{$item}{$udom}{$uname} = 1;
-                                                    }
                                                 }
                                             }
                                         }
@@ -10239,7 +9832,7 @@ sub get_institutional_codes {
         foreach (@currxlists) {
             if (m/^([^:]+):(\w*)$/) {
                 unless (grep/^$1$/,@{$allcourses}) {
-                    push(@{$allcourses},$1);
+                    push @{$allcourses},$1;
                     $$LC_code{$1} = $2;
                 }
             }
@@ -10252,7 +9845,7 @@ sub get_institutional_codes {
                 my $sec = $coursecode.$1;
                 my $lc_sec = $2;
                 unless (grep/^$sec$/,@{$allcourses}) {
-                    push(@{$allcourses},$sec);
+                    push @{$allcourses},$sec;
                     $$LC_code{$sec} = $lc_sec;
                 }
             }
@@ -10350,9 +9943,7 @@ reservable_now - ref to hash of student_
 
     Keys in inner hash are:
     (a) symb: either blank or symb to which slot use is restricted.
-    (b) endreserve: end date of reservation period.
-    (c) uniqueperiod: start,end dates when slot is to be uniquely
-        selected.
+    (b) endreserve: end date of reservation period. 
 
 sorted_future - ref to array of student_schedulable slots reservable in
                 the future, ordered by start date of reservation period.
@@ -10363,8 +9954,6 @@ 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.
-    (c) uniqueperiod: start,end dates when slot is to be uniquely
-        selected.
 
 =back
 
@@ -10418,10 +10007,6 @@ sub get_future_slots {
             my $startreserve = $slots{$slot}->{'startreserve'};
             my $endreserve = $slots{$slot}->{'endreserve'};
             my $symb = $slots{$slot}->{'symb'};
-            my $uniqueperiod;
-            if (ref($slots{$slot}->{'uniqueperiod'}) eq 'ARRAY') {
-                $uniqueperiod = join(',',@{$slots{$slot}->{'uniqueperiod'}});
-            }
             if (($startreserve < $now) &&
                 (!$endreserve || $endreserve > $now)) {
                 my $lastres = $endreserve;
@@ -10430,15 +10015,13 @@ sub get_future_slots {
                 }
                 $reservable_now{$slot} = {
                                            symb       => $symb,
-                                           endreserve => $lastres,
-                                           uniqueperiod => $uniqueperiod,   
+                                           endreserve => $lastres
                                          };
             } elsif (($startreserve > $now) &&
                      (!$endreserve || $endreserve > $startreserve)) {
                 $future_reservable{$slot} = {
                                               symb         => $symb,
-                                              startreserve => $startreserve,
-                                              uniqueperiod => $uniqueperiod,
+                                              startreserve => $startreserve
                                             };
             }
         }
@@ -10619,7 +10202,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'}) {
@@ -10651,18 +10234,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";
                 }
@@ -10741,8 +10324,8 @@ sub ask_for_embedded_content {
     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') {
@@ -10884,7 +10467,7 @@ sub ask_for_embedded_content {
         $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));
@@ -11113,7 +10696,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.
 
@@ -11132,7 +10715,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;
@@ -11471,7 +11054,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 {
@@ -11503,7 +11086,7 @@ sub modify_html_refs {
                 return;
             }
         } 
-        if (open(my $fh,'<',$container)) {
+        if (open(my $fh,"<$container")) {
             $content = join('', <$fh>);
             close($fh);
         } else {
@@ -11568,7 +11151,7 @@ sub modify_html_refs {
                         }
                     }
                 } else {
-                    if (open(my $fh,'>',$container)) {
+                    if (open(my $fh,">$container")) {
                         print $fh $content;
                         close($fh);
                         $output = '<p>'.&mt('Updated [quant,_1,reference] in [_2].',
@@ -11606,7 +11189,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{/([^/]+)$});
@@ -11902,6 +11485,7 @@ function camtasiaToggle() {
     for (var i=0; i<document.uploaded_decompress.autoextract_camtasia.length; i++) {
         if (document.uploaded_decompress.autoextract_camtasia[i].checked) {
             if (document.uploaded_decompress.autoextract_camtasia[i].value == $is_camtasia) {
+
                 document.getElementById('camtasia_titles').style.display='block';
             } else {
                 document.getElementById('camtasia_titles').style.display='none';
@@ -12085,18 +11669,6 @@ sub decompress_uploaded_file {
 
 sub process_decompression {
     my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;
-    unless (($dir_root eq '/userfiles') && ($destination =~ m{^(docs|supplemental)/(default|\d+)/\d+$})) {
-        return '<p class="LC_error">'.&mt('Not extracted.').'<br />'.
-               &mt('Unexpected file path.').'</p>'."\n";
-    }
-    unless (($docudom =~ /^$match_domain$/) && ($docuname =~ /^$match_courseid$/)) {
-        return '<p class="LC_error">'.&mt('Not extracted.').'<br />'.
-               &mt('Unexpected course context.').'</p>'."\n";
-    }
-    unless ($file eq &Apache::lonnet::clean_filename($file)) {
-        return '<p class="LC_error">'.&mt('Not extracted.').'<br />'.
-               &mt('Filename contained unexpected characters.').'</p>'."\n";
-    }
     my ($dir,$error,$warning,$output);
     if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i) {
         $error = &mt('Filename not a supported archive file type.').
@@ -12131,44 +11703,30 @@ sub process_decompression {
                 }
             }
             my $numskip = scalar(@to_skip);
-            my $numoverwrite = scalar(@to_overwrite);
-            if (($numskip) && (!$numoverwrite)) {
+            if (($numskip > 0) && 
+                ($numskip == $env{'form.archive_itemcount'})) {
                 $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.');
             } elsif (!$error) {
                 my ($decompressed,$display);
-                if (($numskip) || ($numoverwrite)) {
+                if ($numskip > 0) {
                     my $tempdir = time.'_'.$$.int(rand(10000));
                     mkdir("$dir/$tempdir",0755);
-                    if (&File::Copy::move("$dir/$file","$dir/$tempdir/$file")) {
-                        ($decompressed,$display) =
-                            &decompress_uploaded_file($file,"$dir/$tempdir");
-                        foreach my $item (@to_skip) {
-                            if (($item ne '') && ($item !~ /\.\./)) {
-                                if (-f "$dir/$tempdir/$item") {
-                                    unlink("$dir/$tempdir/$item");
-                                } elsif (-d "$dir/$tempdir/$item") {
-                                    &File::Path::remove_tree("$dir/$tempdir/$item",{ safe => 1 });
-                                }
-                            }
-                        }
-                        foreach my $item (@to_overwrite) {
-                            if ((-e "$dir/$tempdir/$item") && (-e "$dir/$item")) {
-                                if (($item ne '') && ($item !~ /\.\./)) {
-                                    if (-f "$dir/$item") {
-                                        unlink("$dir/$item");
-                                    } elsif (-d "$dir/$item") {
-                                        &File::Path::remove_tree("$dir/$item",{ safe => 1 });
-                                    }
-                                    &File::Copy::move("$dir/$tempdir/$item","$dir/$item");
-                                }
+                    system("mv $dir/$file $dir/$tempdir/$file");
+                    ($decompressed,$display) = 
+                        &decompress_uploaded_file($file,"$dir/$tempdir");
+                    foreach my $item (@to_skip) {
+                        if (($item ne '') && ($item !~ /\.\./)) {
+                            if (-f "$dir/$tempdir/$item") { 
+                                unlink("$dir/$tempdir/$item");
+                            } elsif (-d "$dir/$tempdir/$item") {
+                                system("rm -rf $dir/$tempdir/$item");
                             }
                         }
-                        if (&File::Copy::move("$dir/$tempdir/$file","$dir/$file")) {
-                            &File::Path::remove_tree("$dir/$tempdir",{ safe => 1 });
-                        }
                     }
+                    system("mv $dir/$tempdir/* $dir");
+                    rmdir("$dir/$tempdir");   
                 } else {
                     ($decompressed,$display) = 
                         &decompress_uploaded_file($file,$dir);
@@ -12242,7 +11800,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;
@@ -12672,7 +12230,7 @@ END
 sub process_extracted_files {
     my ($context,$docudom,$docuname,$destination,$dir_root,$hiddenelem) = @_;
     my $numitems = $env{'form.archive_count'};
-    return if ((!$numitems) || ($numitems =~ /\D/));
+    return unless ($numitems);
     my @ids=&Apache::lonnet::current_machine_ids();
     my ($prefix,$pathtocheck,$dir,$ishome,$error,$warning,%toplevelitems,%is_dir,
         %folders,%containers,%mapinner,%prompttofetch);
@@ -12685,7 +12243,7 @@ sub process_extracted_files {
     } else {
         $prefix = $Apache::lonnet::perlvar{'lonDocRoot'};
         $pathtocheck = "$dir_root/$docudom/$docuname/$destination";
-        $dir = "$dir_root/$docudom/$docuname";
+        $dir = "$dir_root/$docudom/$docuname";    
     }
     my $currdir = "$dir_root/$destination";
     (my $docstype,$mapinner{'0'}) = ($destination =~ m{^(docs|supplemental)/(\w+)/});
@@ -12694,7 +12252,7 @@ sub process_extracted_files {
         $folders{'0'} = $items[-2];
         if ($env{'form.folderpath'} =~ /\:1$/) {
             $containers{'0'}='page';
-        } else {
+        } else {  
             $containers{'0'}='sequence';
         }
     }
@@ -12774,9 +12332,7 @@ sub process_extracted_files {
                                                         '.'.$containers{$outer},1,1);
                             $newseqid{$i} = $newidx;
                             unless ($errtext) {
-                                $result .=  '<li>'.&mt('Folder: [_1] added to course',
-                                                       &HTML::Entities::encode($docstitle,'<>&"')).
-                                            '</li>'."\n";
+                                $result .=  '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n";
                             }
                         }
                     } else {
@@ -12785,47 +12341,38 @@ sub process_extracted_files {
                             my $url = '/uploaded/'.$docudom.'/'.$docuname.'/'.
                                       $docstype.'/'.$mapinner{$outer}.'/'.$newidx.'/'.
                                       $title;
-                            if (($outer !~ /\D/) && ($mapinner{$outer} !~ /\D/) && ($newidx !~ /\D/)) {
-                                if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") {
-                                    mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755);
-                                }
-                                if (!-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") {
-                                    mkdir("$prefix$dir/$docstype/$mapinner{$outer}/$newidx");
-                                }
-                                if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") {
-                                    if (rename("$prefix$path","$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title")) {
-                                        $newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx";
-                                        unless ($ishome) {
-                                            my $fetch = "$newdest{$i}/$title";
-                                            $fetch =~ s/^\Q$prefix$dir\E//;
-                                            $prompttofetch{$fetch} = 1;
-                                        }
-                                    }
+                            if (!-e "$prefix$dir/$docstype/$mapinner{$outer}") {
+                                mkdir("$prefix$dir/$docstype/$mapinner{$outer}",0755);
+                            }
+                            if (!-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") {
+                                mkdir("$prefix$dir/$docstype/$mapinner{$outer}/$newidx");
+                            }
+                            if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx") {
+                                system("mv $prefix$path $prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title");
+                                $newdest{$i} = "$prefix$dir/$docstype/$mapinner{$outer}/$newidx";
+                                unless ($ishome) {
+                                    my $fetch = "$newdest{$i}/$title";
+                                    $fetch =~ s/^\Q$prefix$dir\E//;
+                                    $prompttofetch{$fetch} = 1;
                                 }
-                                $LONCAPA::map::resources[$newidx]=
-                                    $docstitle.':'.$url.':false:normal:res';
-                                push(@LONCAPA::map::order, $newidx);
-                                my ($outtext,$errtext)=
-                                    &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
-                                                            $docuname.'/'.$folders{$outer}.
-                                                            '.'.$containers{$outer},1,1);
-                                unless ($errtext) {
-                                    if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
-                                        $result .= '<li>'.&mt('File: [_1] added to course',
-                                                              &HTML::Entities::encode($docstitle,'<>&"')).
-                                                   '</li>'."\n";
-                                    }
+                            }
+                            $LONCAPA::map::resources[$newidx]=
+                                $docstitle.':'.$url.':false:normal:res';
+                            push(@LONCAPA::map::order, $newidx);
+                            my ($outtext,$errtext)=
+                                &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
+                                                        $docuname.'/'.$folders{$outer}.
+                                                        '.'.$containers{$outer},1,1);
+                            unless ($errtext) {
+                                if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
+                                    $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n";
                                 }
-                            } else {
-                                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',
-                                                &HTML::Entities::encode($path,'<>&"')).'<br />';
                             }
                         }
                     }
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',
-                                &HTML::Entities::encode($path,'<>&"')).'<br />';
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
             }
         }
         for (my $i=1; $i<=$numitems; $i++) {
@@ -12847,7 +12394,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}}";
@@ -12886,9 +12433,7 @@ sub process_extracted_files {
                         }
                         if ($fullpath ne '') {
                             if (-e "$prefix$path") {
-                                unless (rename("$prefix$path","$fullpath/$title")) {
-                                     $warning .= &mt('Failed to rename dependency').'<br />';
-                                }
+                                system("mv $prefix$path $fullpath/$title");
                             }
                             if (-e "$fullpath/$title") {
                                 my $showpath;
@@ -12896,27 +12441,22 @@ sub process_extracted_files {
                                     $showpath = "$relpath/$title";
                                 } else {
                                     $showpath = "/$title";
-                                }
-                                $result .= '<li>'.&mt('[_1] included as a dependency',
-                                                      &HTML::Entities::encode($showpath,'<>&"')).
-                                           '</li>'."\n";
-                            }
+                                } 
+                                $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
+                            } 
                             unless ($ishome) {
                                 my $fetch = "$fullpath/$title";
-                                $fetch =~ s/^\Q$prefix$dir\E//;
+                                $fetch =~ s/^\Q$prefix$dir\E//; 
                                 $prompttofetch{$fetch} = 1;
                             }
                         }
                     }
                 } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') {
                     $warning .= &mt('[_1] is a dependency of [_2], which was discarded.',
-                                    &HTML::Entities::encode($path,'<>&"'),
-                                    &HTML::Entities::encode($env{'form.archive_content_'.$referrer{$i}},'<>&"')).
-                                '<br />';
+                                    $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',
-                                &HTML::Entities::encode($path)).'<br />';
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
             }
         }
         if (keys(%todelete)) {
@@ -13190,14 +12730,12 @@ sub upfile_store {
     $env{'form.upfile'}=~s/\n+/\n/gs;
     $env{'form.upfile'}=~s/\n+$//gs;
 
-    my $datatoken = &valid_datatoken($env{'user.name'}.'_'.$env{'user.domain'}.
-	                             '_enroll_'.$env{'request.course.id'}.'_'.
-                                     time.'_'.$$);
-    return if ($datatoken eq '');
+    my $datatoken=$env{'user.name'}.'_'.$env{'user.domain'}.
+	'_enroll_'.$env{'request.course.id'}.'_'.time.'_'.$$;
     {
         my $datafile = $r->dir_config('lonDaemons').
                            '/tmp/'.$datatoken.'.tmp';
-        if ( open(my $fh,'>',$datafile) ) {
+        if ( open(my $fh,">$datafile") ) {
             print $fh $env{'form.upfile'};
             close($fh);
         }
@@ -13207,22 +12745,21 @@ sub upfile_store {
 
 =pod
 
-=item * &load_tmp_file($r,$datatoken)
+=item * &load_tmp_file($r)
 
 Load uploaded file from tmp, $r should be the HTTP Request object,
-$datatoken is the name to assign to the temporary file.
+needs $env{'form.datatoken'},
 sets $env{'form.upfile'} to the contents of the file
 
 =cut
 
 sub load_tmp_file {
-    my ($r,$datatoken) = @_;
-    return if ($datatoken eq '');
+    my $r=shift;
     my @studentdata=();
     {
         my $studentfile = $r->dir_config('lonDaemons').
-                              '/tmp/'.$datatoken.'.tmp';
-        if ( open(my $fh,'<',$studentfile) ) {
+                              '/tmp/'.$env{'form.datatoken'}.'.tmp';
+        if ( open(my $fh,"<$studentfile") ) {
             @studentdata=<$fh>;
             close($fh);
         }
@@ -13230,14 +12767,6 @@ sub load_tmp_file {
     $env{'form.upfile'}=join('',@studentdata);
 }
 
-sub valid_datatoken {
-    my ($datatoken) = @_;
-    if ($datatoken =~ /^$match_username\_$match_domain\_enroll_(|$match_domain\_$match_courseid)\_\d+_\d+$/) {
-        return $datatoken;
-    }
-    return;
-}
-
 =pod
 
 =item * &upfile_record_sep()
@@ -13678,7 +13207,7 @@ sub DrawBarGraph {
         @Labels = @$labels;
     } else {
         for (my $i=0;$i<@{$Values[0]};$i++) {
-            push(@Labels,$i+1);
+            push (@Labels,$i+1);
         }
     }
     #
@@ -14117,21 +13646,14 @@ 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,
-i.e., predates configuration by DC via domainprefs.pm
-
-$requname username of requester (if mailing type is helpdeskmail)
-
-$requdom domain of requester (if mailing type is helpdeskmail)
-
-$reqemail e-mail address of requester (if mailing type is helpdeskmail)
-
+origmail (scalar - email address of recipient from loncapa.conf, 
+i.e., predates configuration by DC via domainprefs.pm 
 
 Returns: comma separated list of addresses to which to send e-mail.
 
@@ -14142,11 +13664,11 @@ Returns: comma separated list of address
 ############################################################
 ############################################################
 sub build_recipient_list {
-    my ($defmail,$mailing,$defdom,$origmail,$requname,$requdom,$reqemail) = @_;
+    my ($defmail,$mailing,$defdom,$origmail) = @_;
     my @recipients;
-    my ($otheremails,$lastresort,$allbcc,$addtext);
+    my $otheremails;
     my %domconfig =
-        &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+         &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
     if (ref($domconfig{'contacts'}) eq 'HASH') {
         if (exists($domconfig{'contacts'}{$mailing})) {
             if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
@@ -14158,184 +13680,14 @@ sub build_recipient_list {
                             push(@recipients,$addr);
                         }
                     }
-                }
-                $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
-                if ($mailing eq 'helpdeskmail') {
-                    if ($domconfig{'contacts'}{$mailing}{'bcc'}) {
-                        my @bccs = split(/,/,$domconfig{'contacts'}{$mailing}{'bcc'});
-                        my @ok_bccs;
-                        foreach my $bcc (@bccs) {
-                            $bcc =~ s/^\s+//g;
-                            $bcc =~ s/\s+$//g;
-                            if ($bcc =~ m/^[^\@]+\@[^\@]+$/) {
-                                if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) {
-                                    push(@ok_bccs,$bcc);
-                                }
-                            }
-                        }
-                        if (@ok_bccs > 0) {
-                            $allbcc = join(', ',@ok_bccs);
-                        }
-                    }
-                    $addtext = $domconfig{'contacts'}{$mailing}{'include'};
+                    $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
                 }
             }
         } elsif ($origmail ne '') {
-            $lastresort = $origmail;
-        }
-        if ($mailing eq 'helpdeskmail') {
-            if ((ref($domconfig{'contacts'}{'overrides'}) eq 'HASH') &&
-                (keys(%{$domconfig{'contacts'}{'overrides'}}))) {
-                my ($inststatus,$inststatus_checked);
-                if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '') &&
-                    ($env{'user.domain'} ne 'public')) {
-                    $inststatus_checked = 1;
-                    $inststatus = $env{'environment.inststatus'};
-                }
-                unless ($inststatus_checked) {
-                    if (($requname ne '') && ($requdom ne '')) {
-                        if (($requname =~ /^$match_username$/) &&
-                            ($requdom =~ /^$match_domain$/) &&
-                            (&Apache::lonnet::domain($requdom))) {
-                            my $requhome = &Apache::lonnet::homeserver($requname,
-                                                                      $requdom);
-                            unless ($requhome eq 'no_host') {
-                                my %userenv = &Apache::lonnet::userenvironment($requdom,$requname,'inststatus');
-                                $inststatus = $userenv{'inststatus'};
-                                $inststatus_checked = 1;
-                            }
-                        }
-                    }
-                }
-                unless ($inststatus_checked) {
-                    if ($reqemail =~ /^[^\@]+\@[^\@]+$/) {
-                        my %srch = (srchby     => 'email',
-                                    srchdomain => $defdom,
-                                    srchterm   => $reqemail,
-                                    srchtype   => 'exact');
-                        my %srch_results = &Apache::lonnet::usersearch(\%srch);
-                        foreach my $uname (keys(%srch_results)) {
-                            if (ref($srch_results{$uname}{'inststatus'}) eq 'ARRAY') {
-                                $inststatus = join(',',@{$srch_results{$uname}{'inststatus'}});
-                                $inststatus_checked = 1;
-                                last;
-                            }
-                        }
-                        unless ($inststatus_checked) {
-                            my ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query(\%srch);
-                            if ($dirsrchres eq 'ok') {
-                                foreach my $uname (keys(%srch_results)) {
-                                    if (ref($srch_results{$uname}{'inststatus'}) eq 'ARRAY') {
-                                        $inststatus = join(',',@{$srch_results{$uname}{'inststatus'}});
-                                        $inststatus_checked = 1;
-                                        last;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                if ($inststatus ne '') {
-                    foreach my $status (split(/\:/,$inststatus)) {
-                        if (ref($domconfig{'contacts'}{'overrides'}{$status}) eq 'HASH') {
-                            my @contacts = ('adminemail','supportemail');
-                            foreach my $item (@contacts) {
-                                if ($domconfig{'contacts'}{'overrides'}{$status}{$item}) {
-                                    my $addr = $domconfig{'contacts'}{'overrides'}{$status};
-                                    if (!grep(/^\Q$addr\E$/,@recipients)) {
-                                        push(@recipients,$addr);
-                                    }
-                                }
-                            }
-                            $otheremails = $domconfig{'contacts'}{'overrides'}{$status}{'others'};
-                            if ($domconfig{'contacts'}{'overrides'}{$status}{'bcc'}) {
-                                my @bccs = split(/,/,$domconfig{'contacts'}{'overrides'}{$status}{'bcc'});
-                                my @ok_bccs;
-                                foreach my $bcc (@bccs) {
-                                    $bcc =~ s/^\s+//g;
-                                    $bcc =~ s/\s+$//g;
-                                    if ($bcc =~ m/^[^\@]+\@[^\@]+$/) {
-                                        if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) {
-                                            push(@ok_bccs,$bcc);
-                                        }
-                                    }
-                                }
-                                if (@ok_bccs > 0) {
-                                    $allbcc = join(', ',@ok_bccs);
-                                }
-                            }
-                            $addtext = $domconfig{'contacts'}{'overrides'}{$status}{'include'};
-                            last;
-                        }
-                    }
-                }
-            }
+            push(@recipients,$origmail);
         }
     } elsif ($origmail ne '') {
-        $lastresort = $origmail;
-    }
-
-    if (($mailing eq 'helpdeskmail') && ($lastresort ne '')) {
-        unless (grep(/^\Q$defdom\E$/,&Apache::lonnet::current_machine_domains())) {
-            my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
-            my $machinedom = $Apache::lonnet::perlvar{'lonDefDomain'};
-            my %what = (
-                          perlvar => 1,
-                       );
-            my $primary = &Apache::lonnet::domain($defdom,'primary');
-            if ($primary) {
-                my $gotaddr;
-                my ($result,$returnhash) =
-                    &Apache::lonnet::get_remote_globals($primary,{ perlvar => 1 });
-                if (($result eq 'ok') && (ref($returnhash) eq 'HASH')) {
-                    if ($returnhash->{'lonSupportEMail'} =~ /^[^\@]+\@[^\@]+$/) {
-                        $lastresort = $returnhash->{'lonSupportEMail'};
-                        $gotaddr = 1;
-                    }
-                }
-                unless ($gotaddr) {
-                    my $uintdom = &Apache::lonnet::internet_dom($primary);
-                    my $intdom = &Apache::lonnet::internet_dom($lonhost);
-                    unless ($uintdom eq $intdom) {
-                        my %domconfig =
-                            &Apache::lonnet::get_dom('configuration',['contacts'],$machinedom);
-                        if (ref($domconfig{'contacts'}) eq 'HASH') {
-                            if (ref($domconfig{'contacts'}{'otherdomsmail'}) eq 'HASH') {
-                                my @contacts = ('adminemail','supportemail');
-                                foreach my $item (@contacts) {
-                                    if ($domconfig{'contacts'}{'otherdomsmail'}{$item}) {
-                                        my $addr = $domconfig{'contacts'}{$item};
-                                        if (!grep(/^\Q$addr\E$/,@recipients)) {
-                                            push(@recipients,$addr);
-                                        }
-                                    }
-                                }
-                                if ($domconfig{'contacts'}{'otherdomsmail'}{'others'}) {
-                                    $otheremails = $domconfig{'contacts'}{'otherdomsmail'}{'others'};
-                                }
-                                if ($domconfig{'contacts'}{'otherdomsmail'}{'bcc'}) {
-                                    my @bccs = split(/,/,$domconfig{'contacts'}{'otherdomsmail'}{'bcc'});
-                                    my @ok_bccs;
-                                    foreach my $bcc (@bccs) {
-                                        $bcc =~ s/^\s+//g;
-                                        $bcc =~ s/\s+$//g;
-                                        if ($bcc =~ m/^[^\@]+\@[^\@]+$/) {
-                                            if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) {
-                                                push(@ok_bccs,$bcc);
-                                            }
-                                        }
-                                    }
-                                    if (@ok_bccs > 0) {
-                                        $allbcc = join(', ',@ok_bccs);
-                                    }
-                                }
-                                $addtext = $domconfig{'contacts'}{'otherdomsmail'}{'include'};
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        push(@recipients,$origmail);
     }
     if (defined($defmail)) {
         if ($defmail ne '') {
@@ -14355,21 +13707,8 @@ sub build_recipient_list {
             }
         }
     }
-    if ($mailing eq 'helpdeskmail') {
-        if ((!@recipients) && ($lastresort ne '')) {
-            push(@recipients,$lastresort);
-        }
-    } elsif ($lastresort ne '') {
-        if (!grep(/^\Q$lastresort\E$/,@recipients)) {
-            push(@recipients,$lastresort);
-        }
-    }
-    my $recipientlist = join(',',@recipients);
-    if (wantarray) {
-        return ($recipientlist,$allbcc,$addtext);
-    } else {
-        return $recipientlist;
-    }
+    my $recipientlist = join(',',@recipients); 
+    return $recipientlist;
 }
 
 ############################################################
@@ -14593,15 +13932,12 @@ currcat - scalar with an & separated lis
 
 type    - scalar contains course type (Course or Community).
 
-disabled - scalar (optional) contains disabled="disabled" if input elements are
-           to be readonly (e.g., Domain Helpdesk role viewing course settings).
-
 Returns: $output (markup to be displayed) 
 
 =cut
 
 sub assign_categories_table {
-    my ($cathash,$currcat,$type,$disabled) = @_;
+    my ($cathash,$currcat,$type) = @_;
     my $output;
     if (ref($cathash) eq 'HASH') {
         my (@cats,@trails,%allitems,%idx,@jsarray,@path,$maxdepth);
@@ -14637,11 +13973,11 @@ sub assign_categories_table {
                     }
                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
                               '<input type="checkbox" name="usecategory" value="'.
-                              $item.'"'.$checked.$disabled.' />'.$parent_title.'</span>'.
+                              $item.'"'.$checked.' />'.$parent_title.'</span>'.
                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
                     my $depth = 1;
                     push(@path,$parent);
-                    $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories,$disabled);
+                    $table .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
                     pop(@path);
                     $table .= '</tr><tr><td colspan="'.$maxdepth.'" class="LC_row_separator"></td></tr>';
                     $itemcount ++;
@@ -14680,15 +14016,12 @@ path - Array containing all categories b
 
 currcategories - reference to array of current categories assigned to the course
 
-disabled - scalar (optional) contains disabled="disabled" if input elements are
-           to be readonly (e.g., Domain Helpdesk role viewing course settings).
-
 Returns: $output (markup to be displayed).
 
 =cut
 
 sub assign_category_rows {
-    my ($itemcount,$cats,$depth,$parent,$path,$currcategories,$disabled) = @_;
+    my ($itemcount,$cats,$depth,$parent,$path,$currcategories) = @_;
     my ($text,$name,$item,$chgstr);
     if (ref($cats) eq 'ARRAY') {
         my $maxdepth = scalar(@{$cats});
@@ -14711,12 +14044,12 @@ sub assign_category_rows {
                     }
                     $text .= '<tr><td><span class="LC_nobreak"><label>'.
                              '<input type="checkbox" name="usecategory" value="'.
-                             $item.'"'.$checked.$disabled.' />'.$name.'</label></span>'.
+                             $item.'"'.$checked.' />'.$name.'</label></span>'.
                              '<input type="hidden" name="catname" value="'.$name.'" />'.
                              '</td><td>';
                     if (ref($path) eq 'ARRAY') {
                         push(@{$path},$name);
-                        $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories,$disabled);
+                        $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);
                         pop(@{$path});
                     }
                     $text .= '</td></tr>';
@@ -14864,7 +14197,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;
@@ -14947,95 +14280,37 @@ sub check_clone {
                 return ($can_clone, $clonemsg, $cloneid, $clonehome);
             }
         }
-	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) &&
+	if (($env{'request.role.domain'} eq $args->{'clonedomain'}) && 
             (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
 	    $can_clone = 1;
 	} else {
-	    my %clonehash = &Apache::lonnet::get('environment',['cloners','internal.coursecode'],
+	    my %clonehash = &Apache::lonnet::get('environment',['cloners'],
 						 $args->{'clonedomain'},$args->{'clonecourse'});
-            if ($clonehash{'cloners'} eq '') {
-                my %domdefs = &Apache::lonnet::get_domain_defaults($args->{'course_domain'});
-                if ($domdefs{'canclone'}) {
-                    unless ($domdefs{'canclone'} eq 'none') {
-                        if ($domdefs{'canclone'} eq 'domain') {
-                            if ($args->{'ccdomain'} eq $args->{'clonedomain'}) {
-                                $can_clone = 1;
-                            }
-                        } 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'})) {
-                                $can_clone = 1;
-                            }
-                        }
-                    }
-                }
+	    my @cloners = split(/,/,$clonehash{'cloners'});
+            if (grep(/^\*$/,@cloners)) {
+                $can_clone = 1;
+            } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
+                $can_clone = 1;
             } else {
-	        my @cloners = split(/,/,$clonehash{'cloners'});
-                if (grep(/^\*$/,@cloners)) {
-                    $can_clone = 1;
-                } elsif (grep(/^\*\:\Q$args->{'ccdomain'}\E$/,@cloners)) {
-                    $can_clone = 1;
-                } elsif (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners)) {
-                    $can_clone = 1;
-                }
-                unless ($can_clone) {
-                    if (($clonehash{'internal.coursecode'}) && ($args->{'crscode'}) &&
-                        ($args->{'clonedomain'} eq  $args->{'course_domain'})) {
-                        my (%gotdomdefaults,%gotcodedefaults);
-                        foreach my $cloner (@cloners) {
-                            if (($cloner ne '*') && ($cloner !~ /^\*\:$match_domain$/) &&
-                                ($cloner !~ /^$match_username\:$match_domain$/) && ($cloner ne '')) {
-                                my (%codedefaults,@code_order);
-                                if (ref($gotcodedefaults{$args->{'clonedomain'}}) eq 'HASH') {
-                                    if (ref($gotcodedefaults{$args->{'clonedomain'}}{'defaults'}) eq 'HASH') {
-                                        %codedefaults = %{$gotcodedefaults{$args->{'clonedomain'}}{'defaults'}};
-                                    }
-                                    if (ref($gotcodedefaults{$args->{'clonedomain'}}{'order'}) eq 'ARRAY') {
-                                        @code_order = @{$gotcodedefaults{$args->{'clonedomain'}}{'order'}};
-                                    }
-                                } else {
-                                    &Apache::lonnet::auto_instcode_defaults($args->{'clonedomain'},
-                                                                            \%codedefaults,
-                                                                            \@code_order);
-                                    $gotcodedefaults{$args->{'clonedomain'}}{'defaults'} = \%codedefaults;
-                                    $gotcodedefaults{$args->{'clonedomain'}}{'order'} = \@code_order;
-                                }
-                                if (@code_order > 0) {
-                                    if (&Apache::lonnet::check_instcode_cloning(\%codedefaults,\@code_order,
-                                                                                $cloner,$clonehash{'internal.coursecode'},
-                                                                                $args->{'crscode'})) {
-                                        $can_clone = 1;
-                                        last;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            unless ($can_clone) {
                 my $ccrole = 'cc';
                 if ($args->{'crstype'} eq 'Community') {
                     $ccrole = 'co';
                 }
-                my %roleshash =
-                    &Apache::lonnet::get_my_roles($args->{'ccuname'},
-                                                  $args->{'ccdomain'},
-                                                  'userroles',['active'],[$ccrole],
-                                                  [$args->{'clonedomain'}]);
-                if ($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) {
+	        my %roleshash =
+		    &Apache::lonnet::get_my_roles($args->{'ccuname'},
+					 $args->{'ccdomain'},
+                                         'userroles',['active'],[$ccrole],
+					 [$args->{'clonedomain'}]);
+	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
                     $can_clone = 1;
-                } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},
-                                                          $args->{'ccuname'},$args->{'ccdomain'})) {
+                } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
                     $can_clone = 1;
-                }
-            }
-            unless ($can_clone) {
-                if ($args->{'crstype'} eq 'Community') {
-                    $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
                 } else {
-                    $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                    if ($args->{'crstype'} eq 'Community') {
+                        $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                    } else {
+                        $clonemsg = &mt('No new course created.').$linefeed.&mt('The new course could not be cloned from the existing course because the new course owner ([_1]) does not have cloning rights in the existing course ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
+                    }
 	        }
 	    }
         }
@@ -15044,8 +14319,7 @@ sub check_clone {
 }
 
 sub construct_course {
-    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,
-        $cnum,$category,$coderef) = @_;
+    my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname,$context,$cnum,$category,$coderef) = @_;
     my $outcome;
     my $linefeed =  '<br />'."\n";
     if ($context eq 'auto') {
@@ -15193,7 +14467,7 @@ sub construct_course {
                 my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'});
                 $cenv{'internal.sectionnums'} .= $item.',';
                 unless ($addcheck eq 'ok') {
-                    push(@badclasses,$class);
+                    push @badclasses, $class;
                 }
             }
             $cenv{'internal.sectionnums'} =~ s/,$//;
@@ -15221,7 +14495,7 @@ sub construct_course {
                 my $addcheck =  &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'});
                 $cenv{'internal.crosslistings'} .= $item.',';
                 unless ($addcheck eq 'ok') {
-                    push(@badclasses,$xl);
+                    push @badclasses, $xl;
                 }
             }
             $cenv{'internal.crosslistings'} =~ s/,$//;
@@ -15256,29 +14530,28 @@ sub construct_course {
     }
     if (@badclasses > 0) {
         my %lt=&Apache::lonlocal::texthash(
-                'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.',
-                'howi' => 'However, if automated course roster updates are enabled for this class, these particular sections/crosslistings are not guaranteed to contribute towards enrollment.',
-                'itis' => 'It is possible that rights to access enrollment for these classes will be available through assignment of co-owners.',
+                'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course.  However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course',
+                'dnhr' => 'does not have rights to access enrollment in these classes',
+                'adby' => 'as determined by the policies of your institution on access to official classlists'
         );
-        my $badclass_msg = $lt{'tclb'}.$linefeed.$lt{'howi'}.$linefeed.
-                           &mt('That is because the user identified as the course owner ([_1]) does not have rights to access enrollment in these classes, as determined by the policies of your institution on access to official classlists',$cenv{'internal.courseowner'}).$linefeed.$lt{'itis'};
+        my $badclass_msg = $cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.
+                           ' ('.$lt{'adby'}.')';
         if ($context eq 'auto') {
             $outcome .= $badclass_msg.$linefeed;
-        } else {
             $outcome .= '<div class="LC_warning">'.$badclass_msg.$linefeed.'<ul>'."\n";
-        }
-        foreach my $item (@badclasses) {
+            foreach my $item (@badclasses) {
+                if ($context eq 'auto') {
+                    $outcome .= " - $item\n";
+                } else {
+                    $outcome .= "<li>$item</li>\n";
+                }
+            }
             if ($context eq 'auto') {
-                $outcome .= " - $item\n";
+                $outcome .= $linefeed;
             } else {
-                $outcome .= "<li>$item</li>\n";
+                $outcome .= "</ul><br /><br /></div>\n";
             }
-        }
-        if ($context eq 'auto') {
-            $outcome .= $linefeed;
-        } else {
-            $outcome .= "</ul><br /><br /></div>\n";
-        }
+        } 
     }
     if ($args->{'no_end_date'}) {
         $args->{'endaccess'} = 0;
@@ -15310,9 +14583,6 @@ sub construct_course {
        if ($args->{'setcontent'}) {
            $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
        }
-       if ($args->{'setcomment'}) {
-           $cenv{'comment.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
-       }
     }
     if ($args->{'reshome'}) {
 	$cenv{'reshome'}=$args->{'reshome'}.'/';
@@ -15347,7 +14617,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;
             }
@@ -15432,7 +14702,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;
@@ -15658,7 +14928,8 @@ 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) {
+    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+    } else {
 	undef(%userenv);
     }
     if (($userenv{'interface'}) && (!$form->{'interface'})) {
@@ -15710,44 +14981,36 @@ sub init_user_environment {
             $env{'user.noloadbalance'} = $lonhost;
         }
 
-        if ($form->{'noloadbalance'}) {
-            my @hosts = &Apache::lonnet::current_machine_ids();
-            my $hosthere = $form->{'noloadbalance'};
-            if (grep(/^\Q$hosthere\E$/,@hosts)) {
-                $initial_env{"user.noloadbalance"} = $hosthere;
-                $env{'user.noloadbalance'} = $hosthere;
-            }
-        }
-
+        my %is_adv = ( is_adv => $env{'user.adv'} );
+        my %domdef;
         unless ($domain eq 'public') {
-            my %is_adv = ( is_adv => $env{'user.adv'} );
-            my %domdef = &Apache::lonnet::get_domain_defaults($domain);
-
-            foreach my $tool ('aboutme','blog','webdav','portfolio') {
-                $userenv{'availabletools.'.$tool} = 
-                    &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
-                                                      undef,\%userenv,\%domdef,\%is_adv);
-            }
+            %domdef = &Apache::lonnet::get_domain_defaults($domain);
+        }
 
-            foreach my $crstype ('official','unofficial','community','textbook') {
-                $userenv{'canrequest.'.$crstype} =
-                    &Apache::lonnet::usertools_access($username,$domain,$crstype,
-                                                      'reload','requestcourses',
-                                                      \%userenv,\%domdef,\%is_adv);
-            }
+        foreach my $tool ('aboutme','blog','webdav','portfolio') {
+            $userenv{'availabletools.'.$tool} = 
+                &Apache::lonnet::usertools_access($username,$domain,$tool,'reload',
+                                                  undef,\%userenv,\%domdef,\%is_adv);
+        }
 
-            $userenv{'canrequest.author'} =
-                &Apache::lonnet::usertools_access($username,$domain,'requestauthor',
-                                                  'reload','requestauthor',
+        foreach my $crstype ('official','unofficial','community','textbook') {
+            $userenv{'canrequest.'.$crstype} =
+                &Apache::lonnet::usertools_access($username,$domain,$crstype,
+                                                  'reload','requestcourses',
                                                   \%userenv,\%domdef,\%is_adv);
-            my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
-                                                 $domain,$username);
-            my $reqstatus = $reqauthor{'author_status'};
-            if ($reqstatus eq 'approval' || $reqstatus eq 'approved') {
-                if (ref($reqauthor{'author'}) eq 'HASH') {
-                    $userenv{'requestauthorqueued'} = $reqstatus.':'.
-                                                      $reqauthor{'author'}{'timestamp'};
-                }
+        }
+
+        $userenv{'canrequest.author'} =
+            &Apache::lonnet::usertools_access($username,$domain,'requestauthor',
+                                        'reload','requestauthor',
+                                        \%userenv,\%domdef,\%is_adv);
+        my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
+                                             $domain,$username);
+        my $reqstatus = $reqauthor{'author_status'};
+        if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { 
+            if (ref($reqauthor{'author'}) eq 'HASH') {
+                $userenv{'requestauthorqueued'} = $reqstatus.':'.
+                                                  $reqauthor{'author'}{'timestamp'};
             }
         }
 
@@ -15854,12 +15117,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
 
@@ -15875,19 +15138,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
 
@@ -16029,7 +15292,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',
@@ -16158,7 +15421,7 @@ $typeelement
     return $jscript.$clonewarning.$output;
 }
 
-=pod
+=pod 
 
 =item * &timebased_select_form()
 
@@ -16173,7 +15436,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
 
@@ -16210,7 +15473,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
 
@@ -16249,7 +15512,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).
 
@@ -16261,18 +15524,11 @@ 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).
 
-cc_clone - escaped comma separated list of courses for which course cloner has active CC role
-           (and so can clone automatically)
-
-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
 
 Returns: %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
 
@@ -16283,8 +15539,7 @@ Side Effects: None
 
 
 sub search_courses {
-    my ($dom,$type,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles,
-        $cc_clone,$reqcrsdom,$reqinstcode) = @_;
+    my ($dom,$type,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;
     my (%courses,%showcourses,$cloner);
     if (($filter->{'ownerfilter'} ne '') ||
         ($filter->{'ownerdomfilter'} ne '')) {
@@ -16332,10 +15587,10 @@ sub search_courses {
                                              $filter->{'combownerfilter'},
                                              $filter->{'coursefilter'},
                                              undef,undef,$type,$regexpok,undef,undef,
-                                             undef,undef,$cloner,$cc_clone,
+                                             undef,undef,$cloner,$env{'form.cc_clone'},
                                              $filter->{'cloneableonly'},
                                              $createdbefore,$createdafter,undef,
-                                             $domcloner,undef,$reqcrsdom,$reqinstcode);
+                                             $domcloner);
     if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
         my $ccrole;
         if ($type eq 'Community') {
@@ -16355,7 +15610,7 @@ sub search_courses {
                 if (ref($courses{$cid}) eq 'HASH') {
                     if (ref($courses{$cid}{roles}) eq 'ARRAY') {
                         if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) {
-                            push(@{$courses{$cid}{roles}},$courserole);
+                            push (@{$courses{$cid}{roles}},$courserole);
                         }
                     } else {
                         $courses{$cid}{roles} = [$courserole];
@@ -16373,206 +15628,8 @@ sub search_courses {
 
 =back
 
-=head1 Routines for version requirements for current course.
-
-=over 4
-
-=item * &check_release_required()
-
-Compares required LON-CAPA version with version on server, and
-if required version is newer looks for a server with the required version.
-
-Looks first at servers in user's owen domain; if none suitable, looks at
-servers in course's domain are permitted to host sessions for user's domain.
-
-Inputs:
-
-$loncaparev - Version on current server (format: Major.Minor.Subrelease-datestamp)
-
-$courseid - Course ID of current course
-
-$rolecode - User's current role in course (for switchserver query string).
-
-$required - LON-CAPA version needed by course (format: Major.Minor).
-
-
-Returns:
-
-$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.
-
-=cut
-
-sub check_release_required {
-    my ($loncaparev,$courseid,$rolecode,$required) = @_;
-    my ($switchserver,$warning);
-    if ($required ne '') {
-        my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
-        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
-        if ($reqdmajor ne '' && $reqdminor ne '') {
-            my $otherserver;
-            if (($major eq '' && $minor eq '') ||
-                (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
-                my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required,1);
-                my $switchlcrev =
-                    &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
-                                                           $userdomserver);
-                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
-                if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) ||
-                    (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
-                    my $cdom = $env{'course.'.$courseid.'.domain'};
-                    if ($cdom ne $env{'user.domain'}) {
-                        my ($coursedomserver,$coursehostname) = &Apache::lonnet::choose_server($cdom,undef,$required,1);
-                        my $serverhomeID = &Apache::lonnet::get_server_homeID($coursehostname);
-                        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
-                        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
-                        my %udomdefaults = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
-                        my $remoterev = &Apache::lonnet::get_server_loncaparev($serverhomedom,$coursedomserver);
-                        my $canhost =
-                            &Apache::lonnet::can_host_session($env{'user.domain'},
-                                                              $coursedomserver,
-                                                              $remoterev,
-                                                              $udomdefaults{'remotesessions'},
-                                                              $defdomdefaults{'hostedsessions'});
-
-                        if ($canhost) {
-                            $otherserver = $coursedomserver;
-                        } else {
-                            $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$courseid.'.internal.releaserequired'}).'<br />'. &mt("No suitable server could be found amongst servers in either your own domain or in the course's domain.");
-                        }
-                    } else {
-                        $warning = &mt('Requires LON-CAPA version [_1].',$env{'course.'.$courseid.'.internal.releaserequired'}).'<br />'.&mt("No suitable server could be found amongst servers in your own domain (which is also the course's domain).");
-                    }
-                } else {
-                    $otherserver = $userdomserver;
-                }
-            }
-            if ($otherserver ne '') {
-                $switchserver = 'otherserver='.$otherserver.'&amp;role='.$rolecode;
-            }
-        }
-    }
-    return ($switchserver,$warning);
-}
-
-=pod
-
-=item * &check_release_result()
-
-Inputs:
-
-$switchwarning - Warning message if no suitable server found to host session.
-
-$switchserver - query string to append to /adm/switchserver containing lonHostID
-                and current role.
-
-Returns: HTML to display with information about requirement to switch server.
-         Either displaying warning with link to Roles/Courses screen or
-         display link to switchserver.
-
-=cut
-
-sub check_release_result {
-    my ($switchwarning,$switchserver) = @_;
-    my $output = &start_page('Selected course unavailable on this server').
-                 '<p class="LC_warning">';
-    if ($switchwarning) {
-        $output .= $switchwarning.'<br /><a href="/adm/roles">';
-        if (&show_course()) {
-            $output .= &mt('Display courses');
-        } else {
-            $output .= &mt('Display roles');
-        }
-        $output .= '</a>';
-    } elsif ($switchserver) {
-        $output .= &mt('This course requires a newer version of LON-CAPA than is installed on this server.').
-                   '<br />'.
-                   '<a href="/adm/switchserver?'.$switchserver.'">'.
-                   &mt('Switch Server').
-                   '</a>';
-    }
-    $output .= '</p>'.&end_page();
-    return $output;
-}
-
-=pod
-
-=item * &needs_coursereinit()
-
-Determine if course contents stored for user's session needs to be
-refreshed, because content has changed since "Big Hash" last tied.
-
-Check for change is made if time last checked is more than 10 minutes ago
-(by default).
-
-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).
-
-Returns: an array; first element is:
-
-=over 4
-
-'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
-
-''       - if no action required.
-
-=back
-
-If first item element is 'switch':
-
-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.
-
-otherwise: no other elements returned.
-
-=back
-
 =cut
 
-sub needs_coursereinit {
-    my ($loncaparev,$interval) = @_;
-    return() unless ($env{'request.course.id'} && $env{'request.course.tied'});
-    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $now = time;
-    if ($interval eq '') {
-        $interval = 600;
-    }
-    if (($now-$env{'request.course.timechecked'})>$interval) {
-        my $lastchange = &Apache::lonnet::get_coursechange($cdom,$cnum);
-        &Apache::lonnet::appenv({'request.course.timechecked'=>$now});
-        if ($lastchange > $env{'request.course.tied'}) {
-            my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
-            if ($curr_reqd_hash{'internal.releaserequired'} ne '') {
-                my $required = $env{'course.'.$cdom.'_'.$cnum.'.internal.releaserequired'};
-                if ($curr_reqd_hash{'internal.releaserequired'} ne $required) {
-                    &Apache::lonnet::appenv({'course.'.$cdom.'_'.$cnum.'.internal.releaserequired' =>
-                                             $curr_reqd_hash{'internal.releaserequired'}});
-                    my ($switchserver,$switchwarning) =
-                        &check_release_required($loncaparev,$cdom.'_'.$cnum,$env{'request.role'},
-                                                $curr_reqd_hash{'internal.releaserequired'});
-                    if ($switchwarning ne '' || $switchserver ne '') {
-                        return ('switch',$switchwarning,$switchserver);
-                    }
-                }
-            }
-            return ('update');
-        }
-    }
-    return ();
-}
 
 sub update_content_constraints {
     my ($cdom,$cnum,$chome,$cid) = @_;
@@ -16685,8 +15742,8 @@ sub recurse_supplemental {
 }
 
 sub symb_to_docspath {
-    my ($symb,$navmapref) = @_;
-    return unless ($symb && ref($navmapref));
+    my ($symb) = @_;
+    return unless ($symb);
     my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb);
     if ($resurl=~/\.(sequence|page)$/) {
         $mapurl=$resurl;
@@ -16694,11 +15751,9 @@ sub symb_to_docspath {
         $mapurl=$env{'course.'.$env{'request.course.id'}.'.url'};
     }
     my $mapresobj;
-    unless (ref($$navmapref)) {
-        $$navmapref = Apache::lonnavmaps::navmap->new();
-    }
-    if (ref($$navmapref)) {
-        $mapresobj = $$navmapref->getResourceByUrl($mapurl);
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (ref($navmap)) {
+        $mapresobj = $navmap->getResourceByUrl($mapurl);
     }
     $mapurl=~s{^.*/([^/]+)\.(\w+)$}{$1};
     my $type=$2;
@@ -16708,7 +15763,7 @@ sub symb_to_docspath {
         if ($pcslist ne '') {
             foreach my $pc (split(/,/,$pcslist)) {
                 next if ($pc <= 1);
-                my $res = $$navmapref->getByMapPc($pc);
+                my $res = $navmap->getByMapPc($pc);
                 if (ref($res)) {
                     my $thisurl = $res->src();
                     $thisurl=~s{^.*/([^/]+)\.\w+$}{$1};
@@ -16757,30 +15812,29 @@ sub symb_to_docspath {
 sub captcha_display {
     my ($context,$lonhost) = @_;
     my ($output,$error);
-    my ($captcha,$pubkey,$privkey,$version) =
-        &get_captcha_config($context,$lonhost);
+    my ($captcha,$pubkey,$privkey) = &get_captcha_config($context,$lonhost);
     if ($captcha eq 'original') {
         $output = &create_captcha();
         unless ($output) {
             $error = 'captcha';
         }
     } elsif ($captcha eq 'recaptcha') {
-        $output = &create_recaptcha($pubkey,$version);
+        $output = &create_recaptcha($pubkey);
         unless ($output) {
             $error = 'recaptcha';
         }
     }
-    return ($output,$error,$captcha,$version);
+    return ($output,$error,$captcha);
 }
 
 sub captcha_response {
     my ($context,$lonhost) = @_;
     my ($captcha_chk,$captcha_error);
-    my ($captcha,$pubkey,$privkey,$version) = &get_captcha_config($context,$lonhost);
+    my ($captcha,$pubkey,$privkey) = &get_captcha_config($context,$lonhost);
     if ($captcha eq 'original') {
         ($captcha_chk,$captcha_error) = &check_captcha();
     } elsif ($captcha eq 'recaptcha') {
-        $captcha_chk = &check_recaptcha($privkey,$version);
+        $captcha_chk = &check_recaptcha($privkey);
     } else {
         $captcha_chk = 1;
     }
@@ -16789,7 +15843,7 @@ sub captcha_response {
 
 sub get_captcha_config {
     my ($context,$lonhost) = @_;
-    my ($captcha,$pubkey,$privkey,$version,$hashtocheck);
+    my ($captcha,$pubkey,$privkey,$hashtocheck);
     my $hostname = &Apache::lonnet::hostname($lonhost);
     my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname);
     my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
@@ -16805,10 +15859,6 @@ sub get_captcha_config {
                     }
                     if ($privkey && $pubkey) {
                         $captcha = 'recaptcha';
-                        $version = $hashtocheck->{'recaptchaversion'};
-                        if ($version ne '2') {
-                            $version = 1;
-                        }
                     } else {
                         $captcha = 'original';
                     }
@@ -16826,10 +15876,6 @@ sub get_captcha_config {
             $privkey = $domconfhash{$serverhomedom.'.login.recaptchakeys_private'};
             if ($privkey && $pubkey) {
                 $captcha = 'recaptcha';
-                $version = $domconfhash{$serverhomedom.'.login.recaptchaversion'};
-                if ($version ne '2') {
-                    $version = 1;
-                }
             } else {
                 $captcha = 'original';
             }
@@ -16837,7 +15883,7 @@ sub get_captcha_config {
             $captcha = 'original';
         }
     }
-    return ($captcha,$pubkey,$privkey,$version);
+    return ($captcha,$pubkey,$privkey);
 }
 
 sub create_captcha {
@@ -16896,61 +15942,38 @@ sub check_captcha {
 }
 
 sub create_recaptcha {
-    my ($pubkey,$version) = @_;
-    if ($version >= 2) {
-        return '<div class="g-recaptcha" data-sitekey="'.$pubkey.'"></div>';
-    } else {
-        my $use_ssl;
-        if ($ENV{'SERVER_PORT'} == 443) {
-            $use_ssl = 1;
-        }
-        my $captcha = Captcha::reCAPTCHA->new;
-        return $captcha->get_options_setter({theme => 'white'})."\n".
-               $captcha->get_html($pubkey,undef,$use_ssl).
-               &mt('If the text is hard to read, [_1] will replace them.',
-                   '<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
-               '<br /><br />';
-     }
+    my ($pubkey) = @_;
+    my $use_ssl;
+    if ($ENV{'SERVER_PORT'} == 443) {
+        $use_ssl = 1;
+    }
+    my $captcha = Captcha::reCAPTCHA->new;
+    return $captcha->get_options_setter({theme => 'white'})."\n".
+           $captcha->get_html($pubkey,undef,$use_ssl).
+           &mt('If either word 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 ($privkey) = @_;
     my $captcha_chk;
-    if ($version >= 2) {
-        my $ua = LWP::UserAgent->new;
-        $ua->timeout(10);
-        my %info = (
-                     secret   => $privkey,
-                     response => $env{'form.g-recaptcha-response'},
-                     remoteip => $ENV{'REMOTE_ADDR'},
-                   );
-        my $response = $ua->post('https://www.google.com/recaptcha/api/siteverify',\%info);
-        if ($response->is_success)  {
-            my $data = JSON::DWIW->from_json($response->decoded_content);
-            if (ref($data) eq 'HASH') {
-                if ($data->{'success'}) {
-                    $captcha_chk = 1;
-                }
-            }
-        }
-    } else {
-        my $captcha = Captcha::reCAPTCHA->new;
-        my $captcha_result =
-            $captcha->check_answer(
-                                    $privkey,
-                                    $ENV{'REMOTE_ADDR'},
-                                    $env{'form.recaptcha_challenge_field'},
-                                    $env{'form.recaptcha_response_field'},
-                                  );
-        if ($captcha_result->{is_valid}) {
-            $captcha_chk = 1;
-        }
+    my $captcha = Captcha::reCAPTCHA->new;
+    my $captcha_result =
+        $captcha->check_answer(
+                                $privkey,
+                                $ENV{'REMOTE_ADDR'},
+                                $env{'form.recaptcha_challenge_field'},
+                                $env{'form.recaptcha_response_field'},
+                              );
+    if ($captcha_result->{is_valid}) {
+        $captcha_chk = 1;
     }
     return $captcha_chk;
 }
 
 sub emailusername_info {
-    my @fields = ('firstname','lastname','institution','web','location','officialemail','id');
+    my @fields = ('firstname','lastname','institution','web','location','officialemail');
     my %titles = &Apache::lonlocal::texthash (
                      lastname      => 'Last Name',
                      firstname     => 'First Name',
@@ -16958,7 +15981,6 @@ sub emailusername_info {
                      location      => "School's city, state/province, country",
                      web           => "School's web address",
                      officialemail => 'E-mail address at institution (if different)',
-                     id            => 'Student/Employee ID',
                  );
     return (\@fields,\%titles);
 }
@@ -16990,18 +16012,18 @@ sub cleanup_html {
 sub critical_redirect {
     my ($interval) = @_;
     if ((time-$env{'user.criticalcheck.time'})>$interval) {
-        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]!~/^error\:/)) {
-                $redirecturl='/adm/email?critical=display';
-                my $url=&Apache::lonnet::absolute_url().$redirecturl;
+	    if (($what[0] ne 'con_lost') && ($what[0]!~/^error\:/)) {
+	        $redirecturl='/adm/email?critical=display';
+	        my $url=&Apache::lonnet::absolute_url().$redirecturl;
                 return (1, $url);
             }
         }
-    }
+    } 
     return ();
 }
 
@@ -17039,19 +16061,11 @@ sub des_decrypt {
     } else {
         $cypher=new DES $keybin;
     }
-    my $plaintext='';
-    my $cypherlength = length($cyphertext);
-    my $numchunks = int($cypherlength/32);
-    for (my $j=0; $j<$numchunks; $j++) {
-        my $start = $j*32;
-        my $cypherblock = substr($cyphertext,$start,32);
-        my $chunk =
-            $cypher->decrypt(unpack("a8",pack("H16",substr($cypherblock,0,16))));
-        $chunk .=
-            $cypher->decrypt(unpack("a8",pack("H16",substr($cypherblock,16,16))));
-        $chunk=substr($chunk,1,ord(substr($chunk,0,1)) );
-        $plaintext .= $chunk;
-    }
+    my $plaintext=
+        $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,0,16))));
+    $plaintext.=
+        $cypher->decrypt(unpack("a8",pack("H16",substr($cyphertext,16,16))));
+    $plaintext=substr($plaintext,1,ord(substr($plaintext,0,1)) );
     return $plaintext;
 }