--- loncom/interface/loncommon.pm	2013/05/26 22:44:02	1.1075.2.38
+++ loncom/interface/loncommon.pm	2013/01/01 19:53:26	1.1108
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.38 2013/05/26 22:44:02 raeburn Exp $
+# $Id: loncommon.pm,v 1.1108 2013/01/01 19:53:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,10 +68,10 @@ use Apache::loncoursedata();
 use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use Apache::lonuserutils();
-use Apache::lonuserstate();
 use LONCAPA qw(:DEFAULT :match);
 use DateTime::TimeZone;
 use DateTime::Locale::Catalog;
+use Text::Aspell;
 use Authen::Captcha;
 use Captcha::reCAPTCHA;
 
@@ -158,6 +158,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;
@@ -192,14 +193,15 @@ BEGIN {
             while (my $line = <$fh>) {
                 next if ($line=~/^\#/);
                 chomp($line);
-                my ($key,$two,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
+                my ($key,$code,$country,$three,$enc,$val,$sup,$latex)=(split(/\t/,$line));
                 $language{$key}=$val.' - '.$enc;
                 if ($sup) {
                     $supported_language{$key}=$sup;
+		    $supported_codes{$key}   = $code;
                 }
 		if ($latex) {
 		    $latex_language_bykey{$key} = $latex;
-		    $latex_language{$two} = $latex;
+		    $latex_language{$code} = $latex;
 		}
             }
             close($fh);
@@ -528,8 +530,7 @@ ENDAUTHORBRW
 }
 
 sub coursebrowser_javascript {
-    my ($domainfilter,$sec_element,$formname,$role_element,$crstype,
-        $credits_element) = @_;
+    my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
     my $wintitle = 'Course_Browser';
     if ($crstype eq 'Community') {
         $wintitle = 'Community_Browser';
@@ -592,9 +593,8 @@ sub coursebrowser_javascript {
     }
 $id_functions
 ENDSTDBRW
-    if (($sec_element ne '') || ($role_element ne '') || ($credits_element ne '')) {
-        $output .= &setsec_javascript($sec_element,$formname,$role_element,
-                                      $credits_element);
+    if (($sec_element ne '') || ($role_element ne '')) {
+        $output .= &setsec_javascript($sec_element,$formname,$role_element);
     }
     $output .= '
 // ]]>
@@ -663,7 +663,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));
@@ -751,7 +751,7 @@ ENDUSERBRW
 }
 
 sub setsec_javascript {
-    my ($sec_element,$formname,$role_element,$credits_element) = @_;
+    my ($sec_element,$formname,$role_element) = @_;
     my (@courserolenames,@communityrolenames,$rolestr,$courserolestr,
         $communityrolestr);
     if ($role_element ne '') {
@@ -846,14 +846,6 @@ function setRole(crstype) {
 }
 |;
     }
-    if ($credits_element) {
-        $setsections .= qq|
-function setCredits(defaultcredits) {
-    document.$formname.$credits_element.value = defaultcredits;
-    return;
-}
-|;
-    }
     return $setsections;
 }
 
@@ -899,12 +891,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;
         }
     }
@@ -1008,12 +1000,38 @@ sub select_language {
             $langchoices{$code} = &plainlanguagedescription($id);
         }
     }
-    %langchoices = &Apache::lonlocal::texthash(%langchoices);
     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
+
 =item * &linked_select_forms(...)
 
 linked_select_forms returns a string containing a <script></script> block
@@ -1040,12 +1058,6 @@ linked_select_forms takes the following
 
 =item * $menuorder, the order of values in the first menu
 
-=item * $onchangefirst, additional javascript call to execute for an onchange
-        event for the first <select> tag
-
-=item * $onchangesecond, additional javascript call to execute for an onchange
-        event for the second <select> tag
-
 =back 
 
 Below is an example of such a hash.  Only the 'text', 'default', and 
@@ -1099,8 +1111,6 @@ sub linked_select_forms {
         $secondselectname, 
         $hashref,
         $menuorder,
-        $onchangefirst,
-        $onchangesecond
         ) = @_;
     my $second = "document.$formname.$secondselectname";
     my $first = "document.$formname.$firstselectname";
@@ -1157,7 +1167,7 @@ function select1_changed() {
 </script>
 END
     # output the initial values for the selection lists
-    $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed();$onchangefirst\">\n";
+    $result .= "<select size=\"1\" name=\"$firstselectname\" onchange=\"select1_changed()\">\n";
     my @order = sort(keys(%{$hashref}));
     if (ref($menuorder) eq 'ARRAY') {
         @order = @{$menuorder};
@@ -1170,11 +1180,7 @@ END
     $result .= "</select>\n";
     my %select2 = %{$hashref->{$firstdefault}->{'select2'}};
     $result .= $middletext;
-    $result .= "<select size=\"1\" name=\"$secondselectname\"";
-    if ($onchangesecond) {
-        $result .= ' onchange="'.$onchangesecond.'"';
-    }
-    $result .= ">\n";
+    $result .= "<select size=\"1\" name=\"$secondselectname\">\n";
     my $seconddefault = $hashref->{$firstdefault}->{'default'};
     
     my @secondorder = sort(keys(%select2));
@@ -2161,7 +2167,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoma,$excdoms)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -2174,31 +2180,25 @@ If the $showdomdesc flag is set, the dom
 
 The optional $onchange argument specifies what should occur if the domain selector is changed, e.g., 'this.form.submit()' if the form is to be automatically submitted.
 
-The optional $incdoms is a reference to an array of domains which will be the only available options.
-
-The optional $excdoms is a reference to an array of domains which will be excluded from the available options. 
+The optional $incdoms is a reference to an array of domains which will be the only available options. 
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms,$excdoms) = @_;
+    my ($defdom,$name,$includeempty,$showdomdesc,$onchange,$incdoms) = @_;
     if ($onchange) {
         $onchange = ' onchange="'.$onchange.'"';
     }
-    my (@domains,%exclude);
+    my @domains;
     if (ref($incdoms) eq 'ARRAY') {
         @domains = sort {lc($a) cmp lc($b)} (@{$incdoms});
     } else {
         @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     }
     if ($includeempty) { @domains=('',@domains); }
-    if (ref($excdoms) eq 'ARRAY') {
-        map { $exclude{$_} = 1; } @{$excdoms};
-    }
     my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
-        next if ($exclude{$dom});
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
         if ($showdomdesc) {
@@ -2527,7 +2527,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');
@@ -3023,6 +3023,45 @@ sub get_related_words {
     untie %thesaurus_db;
     return @Words;
 }
+###############################################################
+#
+#  Spell checking
+#
+
+=pod
+
+=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
+
 
 =pod
 
@@ -3030,6 +3069,31 @@ sub get_related_words {
 
 =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
 
@@ -4916,7 +4980,7 @@ sub CSTR_pageheader {
 
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my ($udom,$uname,$thisdisfn)=
-        ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)(?:|/(.*))$});
+        ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$});
     my $formaction = "/priv/$udom/$uname/$thisdisfn";
     $formaction =~ s{/+}{/}g;
 
@@ -4991,9 +5055,6 @@ Inputs:
 
 =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
 
-=item * $no_inline_link, if true and in remote mode, don't show the
-         'Switch To Inline Menu' link
-
 =item * $args, optional argument valid values are
             no_auto_mt_title -> prevents &mt()ing the title arg
             inherit_jsmath -> when creating popup window in a page,
@@ -5015,7 +5076,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'))
@@ -5064,14 +5125,16 @@ sub bodytag {
     my $bodytag = "<body $extra_body_attr>".
 	&Apache::lontexconvert::init_math_support($args->{'inherit_jsmath'});
 
-    &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
-
-    if (($bodyonly) || ($no_nav_bar) || ($env{'form.inhibitmenu'} eq 'yes')) {
+    if ($bodyonly) {
         return $bodytag;
-    }
+    } 
 
+    my $name = &plainname($env{'user.name'},$env{'user.domain'});
     if ($public) {
 	undef($role);
+    } else {
+	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'},
+                                undef,'LC_menubuttons_link');
     }
     
     my $titleinfo = '<h1>'.$title.'</h1>';
@@ -5087,48 +5150,37 @@ sub bodytag {
     }
 
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
+    &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
-    if ($env{'request.state'} eq 'construct') { $forcereg=1; }
-
-
+        if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
+            return $bodytag; 
+        } 
 
-    my $funclist;
-    if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
-        $bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions(), '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
         #    }
 
-        $bodytag .= Apache::lonhtmlcommon::scripttag(
-            Apache::lonmenu::utilityfunctions(), 'start');
 
-        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">$name $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
         unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
-            $bodytag .= qq|<div id="LC_nav_bar">$left $role</div>|;
+            $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
         }
 
-        $bodytag .= $right;
+        $bodytag .= Apache::lonhtmlcommon::scripttag(
+            Apache::lonmenu::utilityfunctions(), 'start');
+
+        $bodytag .= Apache::lonmenu::primary_menu();
 
         if ($dc_info) {
             $dc_info = &dc_courseid_toggle($dc_info);
@@ -5143,18 +5195,15 @@ sub bodytag {
             if ($env{'request.state'} eq 'construct') {
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,
                                 $args->{'bread_crumbs'});
-            } elsif ($forcereg) { 
+            } elsif ($forcereg) {
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg,undef,
                                                             $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
@@ -5164,50 +5213,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.'" />';
-
-    # 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>$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(), 'start').
-                            &Apache::lonhtmlcommon::scripttag('','end').
-                            &Apache::lonmenu::innerregister($forcereg,
-                                                            $args->{'bread_crumbs'});
-            }
-        }
-    }
-    return $bodytag."\n".$funclist;
 }
 
 sub dc_courseid_toggle {
@@ -5239,15 +5244,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;
@@ -5382,14 +5380,6 @@ form, .inline {
   vertical-align:middle;
 }
 
-.LC_floatleft {
-  float: left;
-}
-
-.LC_floatright {
-  float: right;
-}
-
 .LC_400Box {
   width:400px;
 }
@@ -5733,8 +5723,7 @@ table.LC_nested tr.LC_empty_row td {
   padding: 8px;
 }
 
-table.LC_data_table tr.LC_empty_row td,
-table.LC_data_table tr.LC_footer_row td {
+table.LC_data_table tr.LC_empty_row td {
   background-color: $sidebg;
 }
 
@@ -6460,11 +6449,6 @@ div.LC_edit_problem_saves {
   padding-bottom: 5px;
 }
 
-.LC_edit_opt {
-  padding-left: 1em;
-  white-space: nowrap;
-}
-
 img.stift {
   border-width: 0;
   vertical-align: middle;
@@ -6479,7 +6463,6 @@ div.LC_createcourse {
 }
 
 .LC_dccid {
-  float: right;
   margin: 0.2em 0 0 0;
   padding: 0;
   font-size: 90%;
@@ -6577,6 +6560,7 @@ fieldset > legend {
 }
 
 ol.LC_primary_menu {
+  float: right;
   margin: 0;
   padding: 0;
   background-color: $pgbg_or_bgcolor;
@@ -6688,7 +6672,6 @@ ul#LC_secondary_menu li {
   font-weight: bold;
   line-height: 1.8em;
   border-right: 1px solid black;
-  vertical-align: middle;
   float: left;
 }
 
@@ -6721,7 +6704,7 @@ ul#LC_secondary_menu li ul li {
   vertical-align: top;
   border-left: 1px solid black;
   border-right: 1px solid black;
-  background-color: $data_table_light;
+  background-color: $data_table_light
   list-style:none;
   float: none;
 }
@@ -7248,8 +7231,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'}
@@ -7458,16 +7441,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
-             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
 
@@ -7497,8 +7478,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);
         }
     }
 
@@ -7538,11 +7519,6 @@ sub start_page {
 		}else{
 			$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;
 }
@@ -7806,9 +7782,11 @@ sub LCprogressbar {
     $LCcurrentid=$$.'_'.$LCidcnt;
     my $starting=&mt('Starting');
     my $content=(<<ENDPROGBAR);
+<p>
   <div id="progressbar$LCcurrentid">
     <span class="pblabel">$starting</span>
   </div>
+</p>
 ENDPROGBAR
     &r_print($r,$content.&LCprogressbar_script($LCcurrentid));
 }
@@ -8222,19 +8200,7 @@ sub get_sections {
     my %sectioncount;
     my $now = time;
 
-    my $check_students = 1;
-    my $only_students = 0;
-    if (ref($possible_roles) eq 'ARRAY') {
-        if (grep(/^st$/,@{$possible_roles})) {
-            if (@{$possible_roles} == 1) {
-                $only_students = 1;
-            }
-        } else {
-            $check_students = 0;
-        }
-    }
-
-    if ($check_students) {
+    if (!defined($possible_roles) || (grep(/^st$/,@$possible_roles))) {
 	my ($classlist) = &Apache::loncoursedata::get_classlist($cdom,$cnum);
 	my $sec_index = &Apache::loncoursedata::CL_SECTION();
 	my $status_index = &Apache::loncoursedata::CL_STATUS();
@@ -8261,9 +8227,6 @@ sub get_sections {
 	    }
 	}
     }
-    if ($only_students) {
-        return %sectioncount;
-    }
     my %courseroles = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum);
     foreach my $user (sort(keys(%courseroles))) {
 	if ($user !~ /^(\w{2})/) { next; }
@@ -8411,7 +8374,7 @@ sub get_course_users {
                               active   => 'Active',
                               future   => 'Future',
                             );
-        my (%nothide,@possdoms);
+        my %nothide;
         if ($hidepriv) {
             my %coursehash=&Apache::lonnet::coursedescription($cdom.'_'.$cnum);
             foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
@@ -8421,10 +8384,6 @@ sub get_course_users {
                     $nothide{$user} = 1;
                 }
             }
-            my @possdoms = ($cdom);
-            if ($coursehash{'checkforpriv'}) {
-                push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
-            }
         }
         foreach my $person (sort(keys(%coursepersonnel))) {
             my $match = 0;
@@ -8460,7 +8419,7 @@ sub get_course_users {
                 }
                 if ($uname ne '' && $udom ne '') {
                     if ($hidepriv) {
-                        if ((&Apache::lonnet::privileged($uname,$udom,\@possdoms)) &&
+                        if ((&Apache::lonnet::privileged($uname,$udom)) &&
                             (!$nothide{$uname.':'.$udom})) {
                             next;
                         }
@@ -9551,23 +9510,18 @@ sub ask_for_embedded_content {
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
-    my ($navmap,$cdom,$cnum);
+    my $navmap;
     if ($env{'request.course.id'}) {
-        if ($actionurl eq '/adm/dependencies') {
-            $navmap = Apache::lonnavmaps::navmap->new();
-        }
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $navmap = Apache::lonnavmaps::navmap->new();
     }
-    if (($actionurl eq '/adm/portfolio') ||
-        ($actionurl eq '/adm/coursegrp_portfolio')) {
+    if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
         my $current_path='/';
         if ($env{'form.currentpath'}) {
             $current_path = $env{'form.currentpath'};
         }
         if ($actionurl eq '/adm/coursegrp_portfolio') {
-            $udom = $cdom;
-            $uname = $cnum;
+            $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
             $url = '/userfiles/groups/'.$env{'form.group'}.'/portfolio';
         } else {
             $udom = $env{'user.domain'};
@@ -9591,50 +9545,32 @@ 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 '') {
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            $cnum =  $env{'course.'.$env{'request.course.id'}.'.num'};
             if (ref($args) eq 'HASH') {
                 $url = $args->{'docs_url'};
                 $title = $args->{'docs_title'};
-                $toplevel = $url;
-                unless ($toplevel =~ m{^/}) {
-                    $toplevel = "/$url";
-                }
+                $toplevel = "/$url";
                 ($rem) = ($toplevel =~ m{^(.+/)[^/]+$});
-                if ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E)}) {
-                    $path = $1;
-                } else {
-                    ($path) =
-                        ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
-                }
+                ($path) =  
+                    ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
                 $fileloc = &Apache::lonnet::filelocation('',$toplevel);
                 $fileloc =~ s{^/}{};
                 ($filename) = ($fileloc =~ m{.+/([^/]+)$});
                 $heading = &mt('Status of dependencies in [_1]',"$title ($filename)");
             }
         }
-    } elsif ($actionurl eq "/public/$cdom/$cnum/syllabus") {
-        $udom = $cdom;
-        $uname = $cnum;
-        $url = "/uploaded/$cdom/$cnum/portfolio/syllabus";
-        $toplevel = $url;
-        $path = $url;
-        $fileloc = &Apache::lonnet::filelocation('',$toplevel).'/';
-        $fileloc =~ s{^/}{};
-    }
-    foreach my $file (keys(%{$allfiles})) {
-        my $embed_file;
-        if (($path eq "/uploaded/$cdom/$cnum/portfolio/syllabus") && ($file =~ m{^\Q$path/\E(.+)$})) {
-            $embed_file = $1;
-        } else {
-            $embed_file = $file;
-        }
+    }
+    my $now = time();
+    foreach my $embed_file (keys(%{$allfiles})) {
         my $absolutepath;
         if ($embed_file =~ m{^\w+://}) {
             $newfiles{$embed_file} = 1;
@@ -9672,8 +9608,7 @@ 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') {
@@ -9689,15 +9624,9 @@ sub ask_for_embedded_content {
             }
         } elsif (($actionurl eq '/adm/dependencies') ||
                  (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
-                  ($args->{'context'} eq 'paste')) ||
-                 ($actionurl eq "/public/$cdom/$cnum/syllabus")) {
+                  ($args->{'context'} eq 'paste'))) {
             if ($env{'request.course.id'} ne '') {
-                my $dir;
-                if ($actionurl eq "/public/$cdom/$cnum/syllabus") {
-                    $dir = $fileloc;
-                } else {
-                    ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
-                }
+                my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
                 if ($dir ne '') {
                     my ($sublistref,$listerror) =
                         &Apache::lonnet::dirlist($dir.$path,$cdom,$cnum,$getpropath,undef,'/');
@@ -9745,8 +9674,7 @@ sub ask_for_embedded_content {
         }
     }
     my %currfile;
-    if (($actionurl eq '/adm/portfolio') ||
-        ($actionurl eq '/adm/coursegrp_portfolio')) {
+    if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
         my ($dirlistref,$listerror) =
             &Apache::lonnet::dirlist($url,$udom,$uname,$getpropath);
         if (ref($dirlistref) eq 'ARRAY') {
@@ -9762,8 +9690,7 @@ sub ask_for_embedded_content {
         }
     } elsif (($actionurl eq '/adm/dependencies') ||
              (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
-              ($args->{'context'} eq 'paste')) ||
-             ($actionurl eq "/public/$cdom/$cnum/syllabus")) {
+              ($args->{'context'} eq 'paste'))) {
         if ($env{'request.course.id'} ne '') {
             my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
             if ($dir ne '') {
@@ -9798,14 +9725,12 @@ sub ask_for_embedded_content {
                 ($file eq $filename.'.bak') ||
                 ($dependencies{$file})) {
             if ($actionurl eq '/adm/dependencies') {
-                unless ($toplevel =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus\E}) {
-                    next if (($rem ne '') &&
-                             (($env{"httpref.$rem".$file} ne '') ||
-                              (ref($navmap) &&
-                              (($navmap->getResourceByUrl($rem.$file) ne '') ||
-                               (($file =~ /^(.*\.s?html?)\.bak$/i) &&
-                                ($navmap->getResourceByUrl($rem.$1)))))));
-                }
+                next if (($rem ne '') &&
+                         (($env{"httpref.$rem".$file} ne '') ||
+                          (ref($navmap) &&
+                          (($navmap->getResourceByUrl($rem.$file) ne '') ||
+                           (($file =~ /^(.*\.s?html?)\.bak$/i) &&
+                            ($navmap->getResourceByUrl($rem.$1)))))));
             }
             $unused{$file} = 1;
         }
@@ -9814,38 +9739,28 @@ sub ask_for_embedded_content {
         ($args->{'context'} eq 'paste')) {
         $counter = scalar(keys(%existing));
         $numpathchg = scalar(keys(%pathchanges));
-        return ($output,$counter,$numpathchg,\%existing);
-    } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&
-             (ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {
-        $counter = scalar(keys(%existing));
-        $numpathchg = scalar(keys(%pathchanges));
-        return ($output,$counter,$numpathchg,\%existing,\%mapping);
+        return ($output,$counter,$numpathchg,\%existing); 
     }
     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
         if ($actionurl eq '/adm/dependencies') {
             next if ($embed_file =~ m{^\w+://});
         }
         $upload_output .= &start_data_table_row().
-                          '<td valign="top"><img src="'.&icon($embed_file).'" />&nbsp;'.
+                          '<td><img src="'.&icon($embed_file).'" />&nbsp;'.
                           '<span class="LC_filename">'.$embed_file.'</span>';
         unless ($mapping{$embed_file} eq $embed_file) {
-            $upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.
-                              &mt('changed from: [_1]',$mapping{$embed_file}).'</span>';
+            $upload_output .= '<br /><span class="LC_info" style="font-size:smaller;">'.&mt('changed from: [_1]',$mapping{$embed_file}).'</span>';
         }
-        $upload_output .= '</td>';
+        $upload_output .= '</td><td>';
         if ($args->{'ignore_remote_references'} && $embed_file =~ m{^\w+://}) { 
-            $upload_output.='<td align="right">'.
-                            '<span class="LC_info LC_fontsize_medium">'.
-                            &mt("URL points to web address").'</span>';
+            $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
             $numremref++;
         } elsif ($args->{'error_on_invalid_names'}
             && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
-            $upload_output.='<td align="right"><span class="LC_warning">'.
-                            &mt('Invalid characters').'</span>';
+            $upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';
             $numinvalid++;
         } else {
-            $upload_output .= '<td>'.
-                              &embedded_file_element('upload_embedded',$counter,
+            $upload_output .= &embedded_file_element('upload_embedded',$counter,
                                                      $embed_file,\%mapping,
                                                      $allfiles,$codebase,'upload');
             $counter ++;
@@ -9874,9 +9789,8 @@ sub ask_for_embedded_content {
             $counter ++;
         } else {
             $upload_output .= &start_data_table_row().
-                              '<td valign="top"><img src="'.&icon($embed_file).'" />&nbsp;'.
-                              '<span class="LC_filename">'.$embed_file.'</span></td>'.
-                              '<td align="right"><span class="LC_info LC_fontsize_medium">'.&mt('Already exists').'</span></td>'.
+                              '<td><span class="LC_filename">'.$embed_file.'</span></td>';
+                              '<td><span class="LC_warning">'.&mt('Already exists').'</span></td>'.
                               &Apache::loncommon::end_data_table_row()."\n";
         }
     }
@@ -9971,7 +9885,7 @@ sub ask_for_embedded_content {
         $output = '<b>'.&mt('Referenced files').'</b>:<br />';
         if ($applies > 1) {
             $output .=  
-                &mt('No dependencies need to be uploaded, as one of the following applies to each reference:').'<ul>';
+                &mt('No files need to be uploaded, as one of the following applies to each reference:').'<ul>';
             if ($numremref) {
                 $output .= '<li>'.&mt('reference is to a URL which points to another server').'</li>'."\n";
             }
@@ -10014,7 +9928,7 @@ sub ask_for_embedded_content {
             $chgcount ++;
         }
     }
-    if (($counter) || ($numunused)) {
+    if ($counter) {
         if ($numpathchg) {
             $output .= '<input type ="hidden" name="number_pathchange_items" value="'.
                        $numpathchg.'" />'."\n";
@@ -10027,13 +9941,13 @@ sub ask_for_embedded_content {
         } elsif ($actionurl eq '/adm/dependencies') {
             $output .= '<input type="hidden" name="action" value="process_changes" />';
         }
-        $output .= '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n";
+        $output .=  '<input type ="submit" value="'.$buttontext.'" />'."\n".'</form>'."\n";
     } elsif ($numpathchg) {
         my %pathchange = ();
         $output .= &modify_html_form('pathchange',$actionurl,$state,\%pathchange,$pathchange_output);
         if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
             $output .= '<p>'.&mt('or').'</p>'; 
-        }
+        } 
     }
     return ($output,$counter,$numpathchg);
 }
@@ -10169,23 +10083,21 @@ sub upload_embedded {
             $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';
             next;
         } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
-            $output .= &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
+            $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
             next;
         }
         $env{'form.embedded_item_'.$i.'.filename'}=$fname;
-        my $subdir = $path;
-        $subdir =~ s{/+$}{};
         if ($context eq 'portfolio') {
             my $result;
             if ($state eq 'existingfile') {
                 $result=
                     &Apache::lonnet::userfileupload('embedded_item_'.$i,'existingfile',
-                                                    $dirpath.$env{'form.currentpath'}.$subdir);
+                                                    $dirpath.$env{'form.currentpath'}.$path);
             } else {
                 $result=
                     &Apache::lonnet::userfileupload('embedded_item_'.$i,'',
                                                     $dirpath.
-                                                    $env{'form.currentpath'}.$subdir);
+                                                    $env{'form.currentpath'}.$path);
                 if ($result !~ m|^/uploaded/|) {
                     $output .= '<span class="LC_error">'
                                .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
@@ -10197,11 +10109,10 @@ sub upload_embedded {
                                $path.$fname.'</span>').'<br />';     
                 }
             }
-        } elsif (($context eq 'coursedoc') || ($context eq 'syllabus')) {
-            my $extendedsubdir = $dirpath.'/'.$subdir;
-            $extendedsubdir =~ s{/+$}{};
+        } elsif ($context eq 'coursedoc') {
             my $result =
-                &Apache::lonnet::userfileupload('embedded_item_'.$i,$context,$extendedsubdir);
+                &Apache::lonnet::userfileupload('embedded_item_'.$i,'coursedoc',
+                                                $dirpath.'/'.$path);
             if ($result !~ m|^/uploaded/|) {
                 $output .= '<span class="LC_error">'
                            .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'
@@ -10211,9 +10122,6 @@ sub upload_embedded {
             } else {
                 $output .= &mt('Uploaded [_1]','<span class="LC_filename">'.
                            $path.$fname.'</span>').'<br />';
-                if ($context eq 'syllabus') {
-                    &Apache::lonnet::make_public_indefinitely($result);
-                }
             }
         } else {
 # Save the file
@@ -10345,7 +10253,7 @@ sub modify_html_form {
 }
 
 sub modify_html_refs {
-    my ($context,$dirpath,$uname,$udom,$dir_root,$url) = @_;
+    my ($context,$dirpath,$uname,$udom,$dir_root) = @_;
     my $container;
     if ($context eq 'portfolio') {
         $container = $env{'form.container'};
@@ -10354,14 +10262,12 @@ sub modify_html_refs {
     } elsif ($context eq 'manage_dependencies') {
         (undef,undef,$container) = &Apache::lonnet::decode_symb($env{'form.symb'});
         $container = "/$container";
-    } elsif ($context eq 'syllabus') {
-        $container = $url;
     } else {
         $container = $Apache::lonnet::perlvar{'lonDocRoot'}.$env{'form.filename'};
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');
-    unless ((@changes > 0)  || ($context eq 'syllabus')) {
+    unless (@changes > 0) {
         if (wantarray) {
             return ('',0,0); 
         } else {
@@ -10369,7 +10275,7 @@ sub modify_html_refs {
         }
     }
     if (($context eq 'portfolio') || ($context eq 'coursedoc') || 
-        ($context eq 'manage_dependencies') || ($context eq 'syllabus')) {
+        ($context eq 'manage_dependencies')) {
         unless ($container =~ m{^/uploaded/\Q$udom\E/\Q$uname\E/}) {
             if (wantarray) {
                 return ('',0,0);
@@ -10425,7 +10331,6 @@ sub modify_html_refs {
                     if ($content =~ m{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}) {
                         my $numchg = ($content =~ s{($attrib_regexp\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
                         $count += $numchg;
-                        $allfiles{$newname} = $allfiles{$ref};
                     }
                     if ($env{'form.embedded_codebase_'.$i} ne '') {
                         $codebase = &unescape($env{'form.embedded_codebase_'.$i});
@@ -10434,11 +10339,10 @@ sub modify_html_refs {
                     }
                 }
             }
-            my $skiprewrites;
             if ($count || $codebasecount) {
                 my $saveresult;
                 if (($context eq 'portfolio') || ($context eq 'coursedoc') || 
-                    ($context eq 'manage_dependencies') || ($context eq 'syllabus')) {
+                    ($context eq 'manage_dependencies')) {
                     my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
                     if ($url eq $container) {
                         my ($fname) = ($container =~ m{/([^/]+)$});
@@ -10451,11 +10355,6 @@ sub modify_html_refs {
                                    '<span class="LC_filename">'.
                                    $container.'</span>').'</p>';
                     }
-                    if ($context eq 'syllabus') {
-                        unless ($saveresult eq 'ok') {
-                            $skiprewrites = 1;
-                        }
-                    }
                 } else {
                     if (open(my $fh,">$container")) {
                         print $fh $content;
@@ -10471,47 +10370,6 @@ sub modify_html_refs {
                     }
                 }
             }
-            if (($context eq 'syllabus') && (!$skiprewrites)) {
-                my ($actionurl,$state);
-                $actionurl = "/public/$udom/$uname/syllabus";
-                my ($ignore,$num,$numpathchanges,$existing,$mapping) =
-                    &ask_for_embedded_content($actionurl,$state,\%allfiles,
-                                              \%codebase,
-                                              {'context' => 'rewrites',
-                                               'ignore_remote_references' => 1,});
-                if (ref($mapping) eq 'HASH') {
-                    my $rewrites = 0;
-                    foreach my $key (keys(%{$mapping})) {
-                        next if ($key =~ m{^https?://});
-                        my $ref = $mapping->{$key};
-                        my $newname = "/uploaded/$udom/$uname/portfolio/syllabus/$key";
-                        my $attrib;
-                        if (ref($allfiles{$mapping->{$key}}) eq 'ARRAY') {
-                            $attrib = join('|',@{$allfiles{$mapping->{$key}}});
-                        }
-                        if ($content =~ m{($attrib\s*=\s*['"]?)\Q$ref\E(['"]?)}) {
-                            my $numchg = ($content =~ s{($attrib\s*=\s*['"]?)\Q$ref\E(['"]?)}{$1$newname$2}gi);
-                            $rewrites += $numchg;
-                        }
-                    }
-                    if ($rewrites) {
-                        my $saveresult;
-                        my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
-                        if ($url eq $container) {
-                            my ($fname) = ($container =~ m{/([^/]+)$});
-                            $output .= '<p>'.&mt('Rewrote [quant,_1,link] as [quant,_1,absolute link] in [_2].',
-                                            $count,'<span class="LC_filename">'.
-                                            $fname.'</span>').'</p>';
-                        } else {
-                            $output .= '<p class="LC_error">'.
-                                       &mt('Error: could not update links in [_1].',
-                                       '<span class="LC_filename">'.
-                                       $container.'</span>').'</p>';
-
-                        }
-                    }
-                }
-            }
         } else {
             &logthis('Failed to parse '.$container.
                      ' to modify references: '.$parse_result);
@@ -10927,8 +10785,8 @@ sub process_decompression {
     my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;
     my ($dir,$error,$warning,$output);
     if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
-        $error = &mt('Filename not a supported archive file type.').
-                 '<br />'.&mt('Filename should end with one of: [_1].',
+        $error = &mt('File name not a supported archive file type.').
+                 '<br />'.&mt('File name should end with one of: [_1].',
                               '.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz');
     } else {
         my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);
@@ -11504,7 +11362,7 @@ sub process_extracted_files {
         $folders{'0'} = $items[-2];
         if ($env{'form.folderpath'} =~ /\:1$/) {
             $containers{'0'}='page';
-        } else {
+        } else {  
             $containers{'0'}='sequence';
         }
     }
@@ -11624,7 +11482,7 @@ sub process_extracted_files {
                     }
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
             }
         }
         for (my $i=1; $i<=$numitems; $i++) {
@@ -11646,7 +11504,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}}";
@@ -11693,12 +11551,12 @@ sub process_extracted_files {
                                     $showpath = "$relpath/$title";
                                 } else {
                                     $showpath = "/$title";
-                                }
+                                } 
                                 $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;
                             }
                         }
@@ -11708,7 +11566,7 @@ sub process_extracted_files {
                                     $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
             }
         }
         if (keys(%todelete)) {
@@ -11767,7 +11625,7 @@ sub cleanup_empty_dirs {
             my $numitems = 0;
             foreach my $item (@dircontents) {
                 if (-d "$path/$item") {
-                    &cleanup_empty_dirs("$path/$item");
+                    &recurse_dirs("$path/$item");
                     if (-e "$path/$item") {
                         $numitems ++;
                     }
@@ -11814,7 +11672,7 @@ sub get_folder_hierarchy {
                 my @pcs = split(/,/,$pcslist);
                 foreach my $pc (@pcs) {
                     if ($pc == 1) {
-                        push(@pathitems,&mt('Main Content'));
+                        push(@pathitems,&mt('Main Course Documents'));
                     } else {
                         my $res = $navmap->getByMapPc($pc);
                         if (ref($res)) {
@@ -11829,7 +11687,7 @@ sub get_folder_hierarchy {
             }
             if ($showitem) {
                 if ($mapres->{ID} eq '0.0') {
-                    push(@pathitems,&mt('Main Content'));
+                    push(@pathitems,&mt('Main Course Documents'));
                 } else {
                     my $maptitle = $mapres->compTitle();
                     $maptitle =~ s/\W+/_/g;
@@ -13316,7 +13174,7 @@ sub commit_customrole {
 }
 
 sub commit_standardrole {
-    my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,$credits) = @_;
+    my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
     my ($output,$logmsg,$linefeed);
     if ($context eq 'auto') {
         $linefeed = "\n";
@@ -13325,7 +13183,7 @@ sub commit_standardrole {
     }  
     if ($three eq 'st') {
         my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,
-                                         $one,$two,$sec,$context,$credits);
+                                         $one,$two,$sec,$context);
         if (($result =~ /^error/) || ($result eq 'not_in_class') || 
             ($result eq 'unknown_course') || ($result eq 'refused')) {
             $output = $logmsg.' '.&mt('Error: ').$result."\n"; 
@@ -13356,8 +13214,7 @@ sub commit_standardrole {
 }
 
 sub commit_studentrole {
-    my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context,
-        $credits) = @_;
+    my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec,$context) = @_;
     my ($result,$linefeed,$oldsecurl,$newsecurl);
     if ($context eq 'auto') {
         $linefeed = "\n";
@@ -13404,11 +13261,7 @@ sub commit_studentrole {
             }
         }
         if (($expire_role_result eq 'ok') || ($secchange == 0)) {
-            $modify_section_result = 
-                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,
-                                                           undef,undef,undef,$sec,
-                                                           $end,$start,'','',$cid,
-                                                           '',$context,$credits);
+            $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid,'',$context);
             if ($modify_section_result =~ /^ok/) {
                 if ($secchange == 1) {
                     if ($sec eq '') {
@@ -13648,7 +13501,6 @@ sub construct_course {
                    'pch.users.denied',
                    'plc.users.denied',
                    'hidefromcat',
-                   'checkforpriv',
                    'categories'],
                    $$crsudom,$$crsunum);
     }
@@ -13678,9 +13530,6 @@ sub construct_course {
     } else {
         $cenv{'internal.courseowner'} = $args->{'curruser'};
     }
-    if ($args->{'defaultcredits'}) {
-        $cenv{'internal.defaultcredits'} = $args->{'defaultcredits'};
-    }
     my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner.
     if ($args->{'crssections'}) {
         $cenv{'internal.sectionnums'} = '';
@@ -13705,11 +13554,6 @@ sub construct_course {
 # do not hide course coordinator from staff listing, 
 # even if privileged
     $cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
-# add course coordinator's domain to domains to check for privileged users
-# if different to course domain
-    if ($$crsudom ne $args->{'ccdomain'}) {
-        $cenv{'checkforpriv'} = $args->{'ccdomain'};
-    }
 # add crosslistings
     if ($args->{'crsxlist'}) {
         $cenv{'internal.crosslistings'}='';
@@ -14142,7 +13986,7 @@ sub init_user_environment {
         my %reqauthor = &Apache::lonnet::get('requestauthor',['author_status','author'],
                                              $domain,$username);
         my $reqstatus = $reqauthor{'author_status'};
-        if ($reqstatus eq 'approval' || $reqstatus eq 'approved') {
+        if ($reqstatus eq 'approval' || $reqstatus eq 'approved') { 
             if (ref($reqauthor{'author'}) eq 'HASH') {
                 $userenv{'requestauthorqueued'} = $reqstatus.':'.
                                                   $reqauthor{'author'}{'timestamp'};
@@ -14300,32 +14144,6 @@ sub update_content_constraints {
     return;
 }
 
-sub allmaps_incourse {
-    my ($cdom,$cnum,$chome,$cid) = @_;
-    if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') {
-        $cid = $env{'request.course.id'};
-        $cdom = $env{'course.'.$cid.'.domain'};
-        $cnum = $env{'course.'.$cid.'.num'};
-        $chome = $env{'course.'.$cid.'.home'};
-    }
-    my %allmaps = ();
-    my $lastchange =
-        &Apache::lonnet::get_coursechange($cdom,$cnum);
-    if ($lastchange > $env{'request.course.tied'}) {
-        my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
-        unless ($ferr) {
-            &update_content_constraints($cdom,$cnum,$chome,$cid);
-        }
-    }
-    my $navmap = Apache::lonnavmaps::navmap->new();
-    if (defined($navmap)) {
-        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
-            $allmaps{$res->src()} = 1;
-        }
-    }
-    return \%allmaps;
-}
-
 sub parse_supplemental_title {
     my ($title) = @_;
 
@@ -14390,7 +14208,7 @@ sub symb_to_docspath {
         $path =~ s/^\&//;
         my $maptitle = $mapresobj->title();
         if ($mapurl eq 'default') {
-            $maptitle = 'Main Content';
+            $maptitle = 'Main Course Documents';
         }
         $path .= (($path ne '')? '&' : '').
                  &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
@@ -14404,14 +14222,14 @@ sub symb_to_docspath {
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $ispage = (($type eq 'page')? 1 : '');
         if ($mapurl eq 'default') {
-            $maptitle = 'Main Content';
+            $maptitle = 'Main Course Documents';
         }
         $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
                 &Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
     }
     unless ($mapurl eq 'default') {
         $path = 'default&'.
-                &Apache::lonhtmlcommon::entity_encode('Main Content').
+                &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
                 ':::::&'.$path;
     }
     return $path;
@@ -14424,12 +14242,12 @@ sub captcha_display {
     if ($captcha eq 'original') {
         $output = &create_captcha();
         unless ($output) {
-            $error = 'captcha';
+            $error = 'captcha'; 
         }
     } elsif ($captcha eq 'recaptcha') {
         $output = &create_recaptcha($pubkey);
         unless ($output) {
-            $error = 'recaptcha';
+            $error = 'recaptcha'; 
         }
     }
     return ($output,$error);
@@ -14535,7 +14353,7 @@ sub check_captcha {
                       output_folder => $captcha_params{'output_dir'},
                       data_folder   => $captcha_params{'db_dir'},
                   );
-    $captcha_chk = $captcha->check_code($code,$md5sum);
+    my $captcha_chk = $captcha->check_code($code,$md5sum);
     my %captcha_hash = (
                         0       => 'Code not checked (file error)',
                        -1      => 'Failed: code expired',