--- loncom/interface/loncommon.pm	2013/09/22 01:58:13	1.1075.2.53
+++ loncom/interface/loncommon.pm	2013/04/11 16:30:37	1.1122
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.53 2013/09/22 01:58:13 raeburn Exp $
+# $Id: loncommon.pm,v 1.1122 2013/04/11 16:30:37 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,6 +72,7 @@ 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 +159,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 +194,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);
@@ -663,7 +666,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));
@@ -899,12 +902,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;
         }
     }
@@ -1014,6 +1017,33 @@ sub select_language {
 
 =pod
 
+
+=item * &list_languages()
+
+Returns an array reference that is suitable for use in language prompters.
+Each array element is itself a two element array.  The first element
+is the language code.  The second element a descsriptiuon of the 
+language itself.  This is suitable for use in e.g.
+&Apache::edit::select_arg (once dereferenced that is).
+
+=cut 
+
+sub list_languages {
+    my @lang_choices;
+
+    foreach my $id (&languageids()) {
+	my $code = &supportedlanguagecode($id);
+	if ($code) {
+	    my $selector    = $supported_codes{$id};
+	    my $description = &plainlanguagedescription($id);
+	    push (@lang_choices, [$selector, $description]);
+	}
+    }
+    return \@lang_choices;
+}
+
+=pod
+
 =item * &linked_select_forms(...)
 
 linked_select_forms returns a string containing a <script></script> block
@@ -1234,11 +1264,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 {
@@ -1367,18 +1393,17 @@ END
 }
 
 sub help_menu_js {
-    my ($httphost) = @_;
+    my ($text) = @_;
     my $stayOnPage = 1;
     my $width = 620;
     my $height = 600;
     my $helptopic=&general_help();
-    my $details_link = $httphost.'/adm/help/'.$helptopic.'.hlp';
+    my $details_link = '/adm/help/'.$helptopic.'.hlp';
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $start_page =
         &Apache::loncommon::start_page('Help Menu', undef,
 				       {'frameset'    => 1,
 					'js_ready'    => 1,
-                                        'use_absolute' => $httphost, 
 					'add_entries' => {
 					    'border' => '0',
 					    'rows'   => "110,*",},});
@@ -2181,7 +2206,7 @@ The optional $onchange argument specifie
 
 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 $excdoms is a reference to an array of domains which will be excluded from the available options.
 
 =cut
 
@@ -2199,7 +2224,7 @@ sub select_dom_form {
     }
     if ($includeempty) { @domains=('',@domains); }
     if (ref($excdoms) eq 'ARRAY') {
-        map { $exclude{$_} = 1; } @{$excdoms};
+        map { $exclude{$_} = 1; } @{$excdoms}; 
     }
     my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
     foreach my $dom (@domains) {
@@ -2324,10 +2349,6 @@ Outputs:
 
 =item * $clientos
 
-=item * $clientmobile
-
-=item * $clientinfo
-
 =back
 
 =back 
@@ -2346,7 +2367,6 @@ sub decode_user_agent {
     my $clientversion='0';
     my $clientmathml='';
     my $clientunicode='0';
-    my $clientmobile=0;
     for (my $i=0;$i<=$#browsertype;$i++) {
         my ($bname,$match,$notmatch,$vreg,$minv,$univ)=split(/\:/,$browsertype[$i]);
 	if (($httpbrowser=~/$match/i)  && ($httpbrowser!~/$notmatch/i)) {
@@ -2358,7 +2378,6 @@ sub decode_user_agent {
 	}
     }
     my $clientos='unknown';
-    my $clientinfo;
     if (($httpbrowser=~/linux/i) ||
         ($httpbrowser=~/unix/i) ||
         ($httpbrowser=~/ux/i) ||
@@ -2370,16 +2389,8 @@ sub decode_user_agent {
         ($httpbrowser=~/powerpc/i)) { $clientos='mac'; }
     if ($httpbrowser=~/win/i) { $clientos='win'; }
     if ($httpbrowser=~/embed/i) { $clientos='pda'; }
-    if ($httpbrowser=~/(Android|iPod|iPad|iPhone|webOS|Blackberry|Windows Phone|Opera m(?:ob|in)|Fennec)/i) {
-        $clientmobile=lc($1);
-    }
-    if ($httpbrowser=~ m{Firefox/(\d+\.\d+)}) {
-        $clientinfo = 'firefox-'.$1;
-    } elsif ($httpbrowser=~ m{chromeframe/(\d+\.\d+)\.}) {
-        $clientinfo = 'chromeframe-'.$1;
-    }
     return ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
-            $clientunicode,$clientos,$clientmobile,$clientinfo);
+            $clientunicode,$clientos,);
 }
 
 ###############################################################
@@ -2546,7 +2557,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');
@@ -3042,6 +3053,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
 
@@ -3049,6 +3099,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
 
@@ -3239,7 +3314,7 @@ sub screenname {
 # ------------------------------------------------------------- Confirm Wrapper
 =pod
 
-=item * &confirmwrapper($message)
+=item confirmwrapper
 
 Wrap messages about completion of operation in box
 
@@ -4857,7 +4932,7 @@ sub designparm {
 
 Inputs: $url (usually will be undef).
 
-Returns: Path to Authoring Space containing the resource or 
+Returns: Path to Construction Space containing the resource or 
          directory being viewed (or for which action is being taken). 
          If $url is provided, and begins /priv/<domain>/<uname>
          the path will be that portion of the $context argument.
@@ -4920,7 +4995,7 @@ Input: (optional) filename from which br
        is appropriate for use in building the breadcrumb trail.
 
 Returns: HTML div with CSTR path and recent box
-         To be included on Authoring Space pages
+         To be included on Construction Space pages
 
 =cut
 
@@ -4951,7 +5026,7 @@ sub CSTR_pageheader {
     my $output =
          '<div>'
         .&Apache::loncommon::help_open_menu('','',3,'Authoring') #FIXME: Broken? Where is it?
-        .'<b>'.&mt('Authoring Space:').'</b> '
+        .'<b>'.&mt('Construction Space:').'</b> '
         .'<form name="dirs" method="post" action="'.$formaction
         .'" target="_top">' #FIXME lonpubdir: target="_parent"
         .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);
@@ -5010,9 +5085,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,
@@ -5034,7 +5106,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'))
@@ -5042,7 +5114,6 @@ sub bodytag {
         $public = 1;
     }
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
-    my $httphost = $args->{'use_absolute'};
 
     $function = &get_users_function() if (!$function);
     my $img =    &designparm($function.'.img',$domain);
@@ -5084,14 +5155,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>';
@@ -5107,48 +5180,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($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
         #    }
 
-        $bodytag .= Apache::lonhtmlcommon::scripttag(
-            Apache::lonmenu::utilityfunctions($httphost), '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);
@@ -5157,24 +5219,21 @@ sub bodytag {
 
         #don't show menus for public users
         if (!$public){
-            $bodytag .= Apache::lonmenu::secondary_menu($httphost);
+            $bodytag .= Apache::lonmenu::secondary_menu();
             $bodytag .= Apache::lonmenu::serverform();
             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
             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
@@ -5184,50 +5243,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($httphost), 'start').
-                            &Apache::lonhtmlcommon::scripttag('','end').
-                            &Apache::lonmenu::innerregister($forcereg,
-                                                            $args->{'bread_crumbs'});
-            }
-        }
-    }
-    return $bodytag."\n".$funclist;
 }
 
 sub dc_courseid_toggle {
@@ -5259,15 +5274,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;
@@ -5402,14 +5410,6 @@ form, .inline {
   vertical-align:middle;
 }
 
-.LC_floatleft {
-  float: left;
-}
-
-.LC_floatright {
-  float: right;
-}
-
 .LC_400Box {
   width:400px;
 }
@@ -6480,11 +6480,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;
@@ -6499,7 +6494,6 @@ div.LC_createcourse {
 }
 
 .LC_dccid {
-  float: right;
   margin: 0.2em 0 0 0;
   padding: 0;
   font-size: 90%;
@@ -6597,6 +6591,7 @@ fieldset > legend {
 }
 
 ol.LC_primary_menu {
+  float: right;
   margin: 0;
   padding: 0;
   background-color: $pgbg_or_bgcolor;
@@ -6708,7 +6703,6 @@ ul#LC_secondary_menu li {
   font-weight: bold;
   line-height: 1.8em;
   border-right: 1px solid black;
-  vertical-align: middle;
   float: left;
 }
 
@@ -7251,7 +7245,6 @@ sub headtag {
     my $function = $args->{'function'} || &get_users_function();
     my $domain   = $args->{'domain'}   || &determinedomain();
     my $bgcolor  = $args->{'bgcolor'}  || &designparm($function.'.pgbg',$domain);
-    my $httphost = $args->{'use_absolute'};
     my $url = join(':',$env{'user.name'},$env{'user.domain'},
 		   $Apache::lonnet::perlvar{'lonVersion'},
 		   #time(),
@@ -7269,13 +7262,13 @@ 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'}
 	&& !$args->{'frameset'}) {
-	$result .= &help_menu_js($httphost);
+	$result .= &help_menu_js();
         $result.=&modal_window();
         $result.=&togglebox_script();
         $result.=&wishlist_window();
@@ -7313,11 +7306,6 @@ ADDMETA
 	.'<link rel="stylesheet" type="text/css" href="'.$url.'" />'
         .$inhibitprint
 	.$head_extra;
-    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" />';
-    }
     return $result.'</head>';
 }
 
@@ -7484,16 +7472,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
 
@@ -7523,8 +7509,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);
         }
     }
 
@@ -7564,11 +7550,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;
 }
@@ -7658,12 +7639,12 @@ var modalWindow = {
 		$(".LCmodal-overlay").click(function(){modalWindow.close();});
 	}
 };
-	var openMyModal = function(source,width,height,scrolling,transparency,style)
+	var openMyModal = function(source,width,height,scrolling)
 	{
 		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+"'>&lt/iframe>";
+		modalWindow.content = "<iframe width='"+width+"' height='"+height+"' frameborder='0' scrolling='"+scrolling+"' allowtransparency='true' src='" + source + "'>&lt/iframe>";
 		modalWindow.open();
 	};	
 // END LON-CAPA Internal -->
@@ -7673,18 +7654,16 @@ ENDMODAL
 }
 
 sub modal_link {
-    my ($link,$linktext,$width,$height,$target,$scrolling,$title,$transparency,$style)=@_;
+    my ($link,$linktext,$width,$height,$target,$scrolling,$title)=@_;
     unless ($width) { $width=480; }
     unless ($height) { $height=400; }
     unless ($scrolling) { $scrolling='yes'; }
-    unless ($transparency) { $transparency='true'; }
-
     my $target_attr;
     if (defined($target)) {
         $target_attr = 'target="'.$target.'"';
     }
     return <<"ENDLINK";
-<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling','$transparency','$style'); return false;">
+<a href="$link" $target_attr title="$title" onclick="javascript:openMyModal('$link',$width,$height,'$scrolling'); return false;">
            $linktext</a>
 ENDLINK
 }
@@ -7712,10 +7691,10 @@ sub modal_adhoc_inner {
     my $innerwidth=$width-20;
     $content=&js_ready(
                &start_page('Dialog',undef,{'only_body'=>1,'bgcolor'=>'#FFFFFF'}).
-                 &start_scrollbox($width.'px',$innerwidth.'px',$height.'px','myModal','#FFFFFF',undef,1).
-                 $content.
+                 &start_scrollbox($width.'px',$innerwidth.'px',$height.'px').
+                    $content.
                  &end_scrollbox().
-                 &end_page()
+               &end_page()
              );
     return &modal_adhoc_script($funcname,$width,$height,$content);
 }
@@ -7932,27 +7911,20 @@ sub validate_page {
 
 
 sub start_scrollbox {
-    my ($outerwidth,$width,$height,$id,$bgcolor,$cursor,$needjsready)=@_;
+    my ($outerwidth,$width,$height,$id,$bgcolor)=@_;
     unless ($outerwidth) { $outerwidth='520px'; }
     unless ($width) { $width='500px'; }
     unless ($height) { $height='200px'; }
     my ($table_id,$div_id,$tdcol);
     if ($id ne '') {
-        $table_id = ' id="table_'.$id.'"';
-        $div_id = ' id="div_'.$id.'"';
+        $table_id = " id='table_$id'";
+        $div_id = " id='div_$id'";
     }
     if ($bgcolor ne '') {
         $tdcol = "background-color: $bgcolor;";
     }
-    my $nicescroll_js;
-    if ($env{'browser.mobile'}) {
-        $nicescroll_js = &nicescroll_javascript('div_'.$id,$cursor,$needjsready);
-    }
     return <<"END";
-$nicescroll_js
-
-<table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol">
-<div style="overflow:auto; width:$width; height: $height;"$div_id>
+<table style="width: $outerwidth; border: 1px solid none;"$table_id><tr><td style="width: $width;$tdcol"><div style="overflow:auto; width:$width; height: $height;"$div_id>
 END
 }
 
@@ -7960,98 +7932,11 @@ sub end_scrollbox {
     return '</div></td></tr></table>';
 }
 
-sub nicescroll_javascript {
-    my ($id,$cursor,$needjsready,$framecheck,$location) = @_;
-    my %options;
-    if (ref($cursor) eq 'HASH') {
-        %options = %{$cursor};
-    }
-    unless ($options{'railalign'} =~ /^left|right$/) {
-        $options{'railalign'} = 'left';
-    }
-    unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
-        my $function  = &get_users_function();
-        $options{'cursorcolor'} = &designparm($function.'.sidebg',$env{'request.role.domain'});
-        unless ($options{'cursorcolor'} =~ /^\#\w+$/) {
-            $options{'cursorcolor'} = '#00F';
-        }
-    }
-    if ($options{'cursoropacity'} =~ /^[\d.]+$/) {
-        unless ($options{'cursoropacity'} >= 0.0 && $options{'cursoropacity'} <=1.0) {
-            $options{'cursoropacity'}='1.0';
-        }
-    } else {
-        $options{'cursoropacity'}='1.0';
-    }
-    if ($options{'cursorfixedheight'} eq 'none') {
-        delete($options{'cursorfixedheight'});
-    } else {
-        unless ($options{'cursorfixedheight'} =~ /^\d+$/) { $options{'cursorfixedheight'}='50'; }
-    }
-    unless ($options{'railoffset'} =~ /^{[\w\:\d\-,]+}$/) {
-        delete($options{'railoffset'});
-    }
-    my @niceoptions;
-    while (my($key,$value) = each(%options)) {
-        if ($value =~ /^\{.+\}$/) {
-            push(@niceoptions,$key.':'.$value);
-        } else {
-            push(@niceoptions,$key.':"'.$value.'"');
-        }
-    }
-    my $nicescroll_js = '
-$(document).ready(
-      function() {
-          $("#'.$id.'").niceScroll({'.join(',',@niceoptions).'});
-      }
-);
-';
-    if ($framecheck) {
-        $nicescroll_js .= '
-function expand_div(caller) {
-    if (top === self) {
-        document.getElementById("'.$id.'").style.width = "auto";
-        document.getElementById("'.$id.'").style.height = "auto";
-    } else {
-        try {
-            if (parent.frames) {
-                if (parent.frames.length > 1) {
-                    var framesrc = parent.frames[1].location.href;
-                    var currsrc = framesrc.replace(/\#.*$/,"");
-                    if ((caller == "search") || (currsrc == "'.$location.'")) {
-                        document.getElementById("'.$id.'").style.width = "auto";
-                        document.getElementById("'.$id.'").style.height = "auto";
-                    }
-                }
-            }
-        } catch (e) {
-            return;
-        }
-    }
-    return;
-}
-';
-    }
-    if ($needjsready) {
-        $nicescroll_js = '
-<script type="text/javascript">'."\n".$nicescroll_js."\n</script>\n";
-    } else {
-        $nicescroll_js = &Apache::lonhtmlcommon::scripttag($nicescroll_js);
-    }
-    return $nicescroll_js;
-}
-
 sub simple_error_page {
-    my ($r,$title,$msg,$args) = @_;
-    if (ref($args) eq 'HASH') {
-        if (!$args->{'no_auto_mt_msg'}) { $msg = &mt($msg); }
-    } else {
-        $msg = &mt($msg);
-    }
-
+    my ($r,$title,$msg) = @_;
     my $page =
 	&Apache::loncommon::start_page($title).
-	'<p class="LC_error">'.$msg.'</p>'.
+	'<p class="LC_error">'.&mt($msg).'</p>'.
 	&Apache::loncommon::end_page();
     if (ref($r)) {
 	$r->print($page);
@@ -8356,7 +8241,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();
@@ -8670,16 +8555,11 @@ sub get_user_info {
 
 =item * &get_user_quota()
 
-Retrieves quota assigned for storage of user files.
-Default is to report quota for portfolio files.
+Retrieves quota assigned for storage of portfolio files for a user  
 
 Incoming parameters:
 1. user's username
 2. user's domain
-3. quota name - portfolio, author, or course
-   (if no quota name provided, defaults to portfolio).
-4. crstype - official, unofficial or community, if quota name is
-   course
 
 Returns:
 1. Disk quota (in Mb) assigned to student.
@@ -8693,7 +8573,7 @@ Returns:
 
 If a value has been stored in the user's environment, 
 it will return that, otherwise it returns the maximal default
-defined for the user's institutional status(es) in the domain.
+defined for the user's instituional status(es) in the domain.
 
 =cut
 
@@ -8701,7 +8581,7 @@ defined for the user's institutional sta
 
 
 sub get_user_quota {
-    my ($uname,$udom,$quotaname,$crstype) = @_;
+    my ($uname,$udom) = @_;
     my ($quota,$quotatype,$settingstatus,$defquota);
     if (!defined($udom)) {
         $udom = $env{'user.domain'};
@@ -8716,57 +8596,27 @@ sub get_user_quota {
         $defquota = 0; 
     } else {
         my $inststatus;
-        if ($quotaname eq 'course') {
-            if (($env{'course.'.$udom.'_'.$uname.'.num'} eq $uname) &&
-                ($env{'course.'.$udom.'_'.$uname.'.domain'} eq $udom)) {
-                $quota = $env{'course.'.$udom.'_'.$uname.'.internal.uploadquota'};
-            } else {
-                my %cenv = &Apache::lonnet::coursedescription("$udom/$uname");
-                $quota = $cenv{'internal.uploadquota'};
-            }
+        if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
+            $quota = $env{'environment.portfolioquota'};
+            $inststatus = $env{'environment.inststatus'};
+        } else {
+            my %userenv = 
+                &Apache::lonnet::get('environment',['portfolioquota',
+                                     'inststatus'],$udom,$uname);
+            my ($tmp) = keys(%userenv);
+            if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+                $quota = $userenv{'portfolioquota'};
+                $inststatus = $userenv{'inststatus'};
+            } else {
+                undef(%userenv);
+            }
+        }
+        ($defquota,$settingstatus) = &default_quota($udom,$inststatus);
+        if ($quota eq '') {
+            $quota = $defquota;
+            $quotatype = 'default';
         } else {
-            if ($udom eq $env{'user.domain'} && $uname eq $env{'user.name'}) {
-                if ($quotaname eq 'author') {
-                    $quota = $env{'environment.authorquota'};
-                } else {
-                    $quota = $env{'environment.portfolioquota'};
-                }
-                $inststatus = $env{'environment.inststatus'};
-            } else {
-                my %userenv = 
-                    &Apache::lonnet::get('environment',['portfolioquota',
-                                         'authorquota','inststatus'],$udom,$uname);
-                my ($tmp) = keys(%userenv);
-                if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-                    if ($quotaname eq 'author') {
-                        $quota = $userenv{'authorquota'};
-                    } else {
-                        $quota = $userenv{'portfolioquota'};
-                    }
-                    $inststatus = $userenv{'inststatus'};
-                } else {
-                    undef(%userenv);
-                }
-            }
-        }
-        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')) {
-                    $defquota = $domdefs{$crstype.'quota'};
-                }
-                if ($defquota eq '') {
-                    $defquota = 500;
-                }
-            } else {
-                ($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname);
-            }
-            if ($quota eq '') {
-                $quota = $defquota;
-                $quotatype = 'default';
-            } else {
-                $quotatype = 'custom';
-            }
+            $quotatype = 'custom';
         }
     }
     if (wantarray) {
@@ -8786,18 +8636,14 @@ Retrieves default quota assigned for sto
 given an (optional) user's institutional status.
 
 Incoming parameters:
-
 1. domain
 2. (Optional) institutional status(es).  This is a : separated list of 
    status types (e.g., faculty, staff, student etc.)
    which apply to the user for whom the default is being retrieved.
    If the institutional status string in undefined, the domain
-   default quota will be returned.
-3.  quota name - portfolio, author, or course
-   (if no quota name provided, defaults to portfolio).
+   default quota will be returned. 
 
 Returns:
-
 1. Default disk quota (in Mb) for user portfolios in the domain.
 2. (Optional) institutional type which determined the value of the
    default quota.
@@ -8811,35 +8657,33 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
+=back
+
 =cut
 
 ###############################################
 
 
 sub default_quota {
-    my ($udom,$inststatus,$quotaname) = @_;
+    my ($udom,$inststatus) = @_;
     my ($defquota,$settingstatus);
     my %quotahash = &Apache::lonnet::get_dom('configuration',
                                             ['quotas'],$udom);
-    my $key = 'defaultquota';
-    if ($quotaname eq 'author') {
-        $key = 'authorquota';
-    }
     if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
             my @statuses = map { &unescape($_); } split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if (ref($quotahash{'quotas'}{$key}) eq 'HASH') {
-                    if ($quotahash{'quotas'}{$key}{$item} ne '') {
+                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
                         if ($defquota eq '') {
-                            $defquota = $quotahash{'quotas'}{$key}{$item};
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
                             $settingstatus = $item;
-                        } elsif ($quotahash{'quotas'}{$key}{$item} > $defquota) {
-                            $defquota = $quotahash{'quotas'}{$key}{$item};
+                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
+                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
                             $settingstatus = $item;
                         }
                     }
-                } elsif ($key eq 'defaultquota') {
+                } else {
                     if ($quotahash{'quotas'}{$item} ne '') {
                         if ($defquota eq '') {
                             $defquota = $quotahash{'quotas'}{$item};
@@ -8853,25 +8697,16 @@ sub default_quota {
             }
         }
         if ($defquota eq '') {
-            if (ref($quotahash{'quotas'}{$key}) eq 'HASH') {
-                $defquota = $quotahash{'quotas'}{$key}{'default'};
-            } elsif ($key eq 'defaultquota') {
+            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
+                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
+            } else {
                 $defquota = $quotahash{'quotas'}{'default'};
             }
             $settingstatus = 'default';
-            if ($defquota eq '') {
-                if ($quotaname eq 'author') {
-                    $defquota = 500;
-                }
-            }
         }
     } else {
         $settingstatus = 'default';
-        if ($quotaname eq 'author') {
-            $defquota = 500;
-        } else {
-            $defquota = 20;
-        }
+        $defquota = 20;
     }
     if (wantarray) {
         return ($defquota,$settingstatus);
@@ -8880,61 +8715,6 @@ sub default_quota {
     }
 }
 
-###############################################
-
-=pod
-
-=item * &excess_filesize_warning()
-
-Returns warning message if upload of file to authoring space, or copying
-of existing file within authoring space will cause quota for the authoring
-space to be exceeded.
-
-Same, if upload of a file directly to a course/community via Course Editor
-will cause quota for uploaded content for the course to be exceeded.
-
-Inputs: 6
-1. username or coursenum
-2. domain
-3. context ('author' or 'course')
-4. filename of file for which action is being requested
-5. filesize (kB) of file
-6. action being taken: copy or upload.
-
-Returns: 1 scalar: HTML to display containing warning if quota would be exceeded,
-         otherwise return null.
-
-=back
-
-=cut
-
-sub excess_filesize_warning {
-    my ($uname,$udom,$context,$filename,$filesize,$action) = @_;
-    my $current_disk_usage = 0;
-    my $disk_quota = &get_user_quota($uname,$udom,$context); #expressed in MB
-    if ($context eq 'author') {
-        my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname";
-        $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$authorspace);
-    } else {
-        foreach my $subdir ('docs','supplemental') {
-            $current_disk_usage += &Apache::lonnet::diskusage($udom,$uname,"userfiles/$subdir",1);
-        }
-    }
-    $disk_quota = int($disk_quota * 1000);
-    if (($current_disk_usage + $filesize) > $disk_quota) {
-        return '<p><span class="LC_warning">'.
-                &mt("Unable to $action [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.",
-                    '<span class="LC_filename">'.$filename.'</span>',$filesize).'</span>'.
-               '<br />'.&mt('Disk quota is [_1] kilobytes. Your current disk usage is [_2] kilobytes.',
-                            $disk_quota,$current_disk_usage).
-               '</p>';
-    }
-    return;
-}
-
-###############################################
-
-
 sub get_secgrprole_info {
     my ($cdom,$cnum,$needroles,$type)  = @_;
     my %sections_count = &get_sections($cdom,$cnum);
@@ -9774,26 +9554,22 @@ sub ask_for_embedded_content {
     my $numexisting = 0;
     my $numunused = 0;
     my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum,
-        $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path,$navmap);
+        $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path);
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
+    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'};
@@ -9817,61 +9593,43 @@ 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;
-        my $cleaned_file = &clean_path($embed_file);
-        if ($cleaned_file =~ m{^\w+://}) {
-            $newfiles{$cleaned_file} = 1;
-            $mapping{$cleaned_file} = $embed_file;
+        if ($embed_file =~ m{^\w+://}) {
+            $newfiles{$embed_file} = 1;
+            $mapping{$embed_file} = $embed_file;
         } else {
             if ($embed_file =~ m{^/}) {
                 $absolutepath = $embed_file;
+                $embed_file =~ s{^(/+)}{};
             }
-            if ($cleaned_file =~ m{/}) {
-                my ($path,$fname) = ($cleaned_file =~ m{^(.+)/([^/]*)$});
+            if ($embed_file =~ m{/}) {
+                my ($path,$fname) = ($embed_file =~ m{^(.+)/([^/]*)$});
                 $path = &check_for_traversal($path,$url,$toplevel);
                 my $item = $fname;
                 if ($path ne '') {
@@ -9888,9 +9646,9 @@ sub ask_for_embedded_content {
             } else {
                 $dependencies{$embed_file} = 1;
                 if ($absolutepath) {
-                    $mapping{$cleaned_file} = $absolutepath;
+                    $mapping{$embed_file} = $absolutepath;
                 } else {
-                    $mapping{$cleaned_file} = $embed_file;
+                    $mapping{$embed_file} = $embed_file;
                 }
             }
         }
@@ -9898,8 +9656,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') {
@@ -9915,15 +9672,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,'/');
@@ -9971,8 +9722,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') {
@@ -9988,8 +9738,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 '') {
@@ -10024,14 +9773,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;
         }
@@ -10040,38 +9787,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 ++;
@@ -10100,9 +9837,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";
         }
     }
@@ -10197,7 +9933,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";
             }
@@ -10240,7 +9976,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";
@@ -10253,58 +9989,17 @@ 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);
 }
 
-
-=pod
-
-=item * clean_path($name)
-
-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
-"Upload embedded images/multimedia files if HTML file" checkbox was
-checked.
-
-Clean-up is similar to replacements in lonnet::clean_filename()
-except each / between sub-directory and next level is preserved.
-
-=cut
-
-sub clean_path {
-    my ($embed_file) = @_;
-    $embed_file =~s{^/+}{};
-    my @contents;
-    if ($embed_file =~ m{/}) {
-        @contents = split(/\//,$embed_file);
-    } else {
-        @contents = ($embed_file);
-    }
-    my $lastidx = scalar(@contents)-1;
-    for (my $i=0; $i<=$lastidx; $i++) {
-        $contents[$i]=~s{\\}{/}g;
-        $contents[$i]=~s/\s+/\_/g;
-        $contents[$i]=~s{[^/\w\.\-]}{}g;
-        if ($i == $lastidx) {
-            $contents[$i]=~s/\.(\d+)(?=\.)/_$1/g;
-        }
-    }
-    if ($lastidx > 0) {
-        return join('/',@contents);
-    } else {
-        return $contents[0];
-    }
-}
-
 sub embedded_file_element {
     my ($context,$num,$embed_file,$mapping,$allfiles,$codebase,$type) = @_;
     return unless ((ref($mapping) eq 'HASH') && (ref($allfiles) eq 'HASH') &&
@@ -10429,8 +10124,7 @@ sub upload_embedded {
         # Check if extension is valid
         if (($fname =~ /\.(\w+)$/) &&
             (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
-            $output .= &mt('Invalid file extension ([_1]) - reserved for internal use.',$1)
-                      .' '.&mt('Rename the file with a different extension and re-upload.').'<br />';
+            $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'<br />';
             next;
         } elsif (($fname =~ /\.(\w+)$/) &&
                  (!defined(&Apache::loncommon::fileembstyle($1)))) {
@@ -10441,19 +10135,17 @@ sub upload_embedded {
             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].'
@@ -10465,11 +10157,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].'
@@ -10479,9 +10170,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
@@ -10613,7 +10301,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'};
@@ -10622,14 +10310,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 {
@@ -10637,7 +10323,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);
@@ -10693,8 +10379,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};
-                        delete($allfiles{$ref});
                     }
                     if ($env{'form.embedded_codebase_'.$i} ne '') {
                         $codebase = &unescape($env{'form.embedded_codebase_'.$i});
@@ -10703,11 +10387,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{/([^/]+)$});
@@ -10720,11 +10403,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;
@@ -10740,47 +10418,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);
@@ -11773,7 +11410,7 @@ sub process_extracted_files {
         $folders{'0'} = $items[-2];
         if ($env{'form.folderpath'} =~ /\:1$/) {
             $containers{'0'}='page';
-        } else {
+        } else {  
             $containers{'0'}='sequence';
         }
     }
@@ -11893,7 +11530,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++) {
@@ -11915,7 +11552,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}}";
@@ -11962,12 +11599,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;
                             }
                         }
@@ -11977,7 +11614,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)) {
@@ -12083,7 +11720,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)) {
@@ -12098,7 +11735,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;
@@ -12165,9 +11802,6 @@ sub get_turnedin_filepath {
                             my $title = $res->compTitle();
                             $title =~ s/\W+/_/g;
                             if ($title ne '') {
-                                if (($pc > 1) && (length($title) > 12)) {
-                                    $title = substr($title,0,12);
-                                }
                                 push(@pathitems,$title);
                             }
                         }
@@ -12176,9 +11810,6 @@ sub get_turnedin_filepath {
                 my $maptitle = $mapres->compTitle();
                 $maptitle =~ s/\W+/_/g;
                 if ($maptitle ne '') {
-                    if (length($maptitle) > 12) {
-                        $maptitle = substr($maptitle,0,12);
-                    }
                     push(@pathitems,$maptitle);
                 }
                 unless ($env{'request.state'} eq 'construct') {
@@ -12219,9 +11850,6 @@ sub get_turnedin_filepath {
                 $restitle = time;
             }
         }
-        if (length($restitle) > 12) {
-            $restitle = substr($restitle,0,12);
-        }
         push(@pathitems,$restitle);
         $path .= join('/',@pathitems);
     }
@@ -13159,22 +12787,18 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for following types of e-mail:
+Build recipient lists for five types of e-mail:
 (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
-(d) Help requests, (e) Course requests needing approval, (f) loncapa
-module change checking, student/employee ID conflict checks, as
-generated by lonerrorhandler.pm, CHECKRPMS, loncron,
-lonsupportreq.pm, loncoursequeueadmin.pm, searchcat.pl respectively.
+(d) Help requests, (e) Course requests needing approval,  generated by
+lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
+loncoursequeueadmin.pm respectively.
 
 Inputs:
-defmail (scalar - email address of default recipient),
-mailing type (scalar: errormail, packagesmail, helpdeskmail,
-requestsmail, updatesmail, or idconflictsmail).
-
+defmail (scalar - email address of default recipient), 
+mailing type (scalar - errormail, packagesmail, or helpdeskmail), 
 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
+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.
 
@@ -13550,7 +13174,7 @@ sub assign_category_rows {
             if (ref($cats->[$depth]{$parent}) eq 'ARRAY') {
                 my $numchildren = @{$cats->[$depth]{$parent}};
                 my $css_class = $itemcount%2?' class="LC_odd_row"':'';
-                $text .= '<td><table class="LC_data_table">';
+                $text .= '<td><table class="LC_datatable">';
                 for (my $j=0; $j<$numchildren; $j++) {
                     $name = $cats->[$depth]{$parent}[$j];
                     $item = &escape($name).':'.&escape($parent).':'.$depth;
@@ -13712,7 +13336,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;
@@ -14348,7 +13972,7 @@ sub init_user_environment {
 # ------------------------------------ Check browser type and MathML capability
 
     my ($httpbrowser,$clientbrowser,$clientversion,$clientmathml,
-        $clientunicode,$clientos,$clientmobile,$clientinfo) = &decode_user_agent($r);
+        $clientunicode,$clientos) = &decode_user_agent($r);
 
 # ------------------------------------------------------------- Get environment
 
@@ -14379,8 +14003,6 @@ sub init_user_environment {
 	     "browser.mathml"     => $clientmathml,
 	     "browser.unicode"    => $clientunicode,
 	     "browser.os"         => $clientos,
-             "browser.mobile"     => $clientmobile,
-             "browser.info"       => $clientinfo,
 	     "server.domain"      => $Apache::lonnet::perlvar{'lonDefDomain'},
 	     "request.course.fn"  => '',
 	     "request.course.uri" => '',
@@ -14426,7 +14048,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'};
@@ -14633,30 +14255,6 @@ sub parse_supplemental_title {
     return $title;
 }
 
-sub recurse_supplemental {
-    my ($cnum,$cdom,$suppmap,$numfiles,$errors) = @_;
-    if ($suppmap) {
-        my ($errtext,$fatal) = &LONCAPA::map::mapread('/uploaded/'.$cdom.'/'.$cnum.'/'.$suppmap);
-        if ($fatal) {
-            $errors ++;
-        } else {
-            if ($#LONCAPA::map::resources > 0) {
-                foreach my $res (@LONCAPA::map::resources) {
-                    my ($title,$src,$ext,$type,$status)=split(/\:/,$res);
-                    if (($src ne '') && ($status eq 'res')) {
-                        if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
-                            ($numfiles,$errors) = &recurse_supplemental($cnum,$cdom,$1,$numfiles,$errors);
-                        } else {
-                            $numfiles ++;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return ($numfiles,$errors);
-}
-
 sub symb_to_docspath {
     my ($symb) = @_;
     return unless ($symb);
@@ -14686,7 +14284,7 @@ sub symb_to_docspath {
                     my $thistitle = $res->title();
                     $path .= '&'.
                              &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
-                             &escape($thistitle).
+                             &Apache::lonhtmlcommon::entity_encode($thistitle).
                              ':'.$res->randompick().
                              ':'.$res->randomout().
                              ':'.$res->encrypted().
@@ -14698,11 +14296,11 @@ 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).'&'.
-                 &escape($maptitle).
+                 &Apache::lonhtmlcommon::entity_encode($maptitle).
                  ':'.$mapresobj->randompick().
                  ':'.$mapresobj->randomout().
                  ':'.$mapresobj->encrypted().
@@ -14712,14 +14310,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).'&'.
-                &escape($maptitle).':::::'.$ispage;
+                &Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
     }
     unless ($mapurl eq 'default') {
         $path = 'default&'.
-                &escape('Main Content').
+                &Apache::lonhtmlcommon::entity_encode('Main Course Documents').
                 ':::::&'.$path;
     }
     return $path;
@@ -14732,12 +14330,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);
@@ -14858,15 +14456,11 @@ sub check_captcha {
 
 sub create_recaptcha {
     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).
+           $captcha->get_html($pubkey).
            &mt('If either word is hard to read, [_1] will replace them.',
-               '<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
+               '<image src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
            '<br /><br />';
 }