--- loncom/interface/loncommon.pm	2013/12/14 00:53:22	1.1075.2.57
+++ loncom/interface/loncommon.pm	2013/07/02 19:04:36	1.1134
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.57 2013/12/14 00:53:22 raeburn Exp $
+# $Id: loncommon.pm,v 1.1134 2013/07/02 19:04:36 raeburn 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 {
@@ -1362,23 +1388,22 @@ sub top_nav_help {
 
     return <<"END";
 $banner_link
-<a href="$link" title="$title">$text</a>
+ <a href="$link" title="$title">$text</a>
 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,*",},});
@@ -1724,6 +1749,8 @@ RESIZE
 
 =head1 Excel and CSV file utility routines
 
+=over 4
+
 =cut
 
 ###############################################################
@@ -1731,8 +1758,6 @@ RESIZE
 
 =pod
 
-=over 4
-
 =item * &csv_translate($text) 
 
 Translate $text to allow it to be output as a 'comma separated values' 
@@ -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
 
@@ -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);
@@ -5108,39 +5179,23 @@ sub bodytag {
 
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
 
-    if ($env{'request.state'} eq 'construct') { $forcereg=1; }
-
-
-
-    my $funclist;
-    if (($env{'environment.remote'} eq 'on') && ($env{'request.state'} ne 'construct')) {
-        $bodytag .= Apache::lonhtmlcommon::scripttag(Apache::lonmenu::utilityfunctions($httphost), 'start')."\n".
-                    Apache::lonmenu::serverform();
-        my $forbodytag;
-        &Apache::lonmenu::prepare_functions($env{'request.noversionuri'},
-                                            $forcereg,$args->{'group'},
-                                            $args->{'bread_crumbs'},
-                                            $advtoolsref,'',\$forbodytag);
-        unless (ref($args->{'bread_crumbs'}) eq 'ARRAY') {
-            $funclist = $forbodytag;
-        }
-    } 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');
+            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">$left $role<br />
+                <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
 
@@ -5157,24 +5212,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 +5236,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,19 +5267,12 @@ 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;
-    foreach my $attr (sort(keys(%$attr_ref))) {
+    foreach my $attr (keys(%$attr_ref)) {
 	$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
     }
     return $attr_string;
@@ -6485,14 +6486,6 @@ div.LC_edit_problem_saves {
   white-space: nowrap;
 }
 
-.LC_edit_problem_latexhelper{
-    text-align: right;
-}
-
-#LC_edit_problem_colorful div{
-    margin-left: 40px;
-}
-
 img.stift {
   border-width: 0;
   vertical-align: middle;
@@ -6716,7 +6709,6 @@ ul#LC_secondary_menu li {
   font-weight: bold;
   line-height: 1.8em;
   border-right: 1px solid black;
-  vertical-align: middle;
   float: left;
 }
 
@@ -7259,7 +7251,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(),
@@ -7270,20 +7261,20 @@ sub headtag {
 
     my $result =
 	'<head>'.
-	&font_settings($args);
+	&font_settings();
 
     my $inhibitprint = &print_suppression();
 
     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();
@@ -7321,11 +7312,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>';
 }
 
@@ -7335,17 +7321,15 @@ ADDMETA
 
 Returns neccessary <meta> to set the proper encoding
 
-Inputs: optional reference to HASH -- $args passed to &headtag()
+Inputs: none
 
 =cut
 
 sub font_settings {
-    my ($args) = @_;
     my $headerstring='';
-    if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) ||
-        ((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) {
+    if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
 	$headerstring.=
-	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n";
+	    '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
     }
     return $headerstring;
 }
@@ -7449,8 +7433,8 @@ sub xml_begin {
             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' 
 	    .'xmlns="http://www.w3.org/1999/xhtml">';
     } else {
-	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n"
-           .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";
+	$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+           .'<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
     }
     return $output;
 }
@@ -7494,16 +7478,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
 
@@ -7533,8 +7515,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);
         }
     }
 
@@ -7574,11 +7556,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;
 }
@@ -7668,12 +7645,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 -->
@@ -7683,18 +7660,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
 }
@@ -7722,10 +7697,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);
 }
@@ -7942,27 +7917,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
 }
 
@@ -7970,98 +7938,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);
@@ -8366,7 +8247,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();
@@ -8687,9 +8568,7 @@ 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
+   (if no quota name provided, defaults to portfolio).  
 
 Returns:
 1. Disk quota (in Mb) assigned to student.
@@ -8711,7 +8590,7 @@ defined for the user's institutional sta
 
 
 sub get_user_quota {
-    my ($uname,$udom,$quotaname,$crstype) = @_;
+    my ($uname,$udom,$quotaname) = @_;
     my ($quota,$quotatype,$settingstatus,$defquota);
     if (!defined($udom)) {
         $udom = $env{'user.domain'};
@@ -8762,12 +8641,7 @@ sub get_user_quota {
         if ($quota eq '' || wantarray) {
             if ($quotaname eq 'course') {
                 my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
-                if (($crstype eq 'official') || ($crstype eq 'unofficial') || ($crstype eq 'community')) {
-                    $defquota = $domdefs{$crstype.'quota'};
-                }
-                if ($defquota eq '') {
-                    $defquota = 500;
-                }
+                $defquota = $domdefs{'uploadquota'};
             } else {
                 ($defquota,$settingstatus) = &default_quota($udom,$inststatus,$quotaname);
             }
@@ -8796,7 +8670,6 @@ 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.)
@@ -8807,7 +8680,6 @@ Incoming parameters:
    (if no quota name provided, defaults to portfolio).
 
 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.
@@ -8821,6 +8693,8 @@ If the user's status includes multiple t
 the largest default quota which applies to the user determines the
 default quota returned.
 
+=back
+
 =cut
 
 ###############################################
@@ -8869,11 +8743,6 @@ sub default_quota {
                 $defquota = $quotahash{'quotas'}{'default'};
             }
             $settingstatus = 'default';
-            if ($defquota eq '') {
-                if ($quotaname eq 'author') {
-                    $defquota = 500;
-                }
-            }
         }
     } else {
         $settingstatus = 'default';
@@ -8890,61 +8759,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);
@@ -9784,10 +9598,11 @@ 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,$cdom,$cnum);
     if ($env{'request.course.id'}) {
         if ($actionurl eq '/adm/dependencies') {
             $navmap = Apache::lonnavmaps::navmap->new();
@@ -9795,7 +9610,7 @@ sub ask_for_embedded_content {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     }
-    if (($actionurl eq '/adm/portfolio') ||
+    if (($actionurl eq '/adm/portfolio') || 
         ($actionurl eq '/adm/coursegrp_portfolio')) {
         my $current_path='/';
         if ($env{'form.currentpath'}) {
@@ -9827,18 +9642,18 @@ sub ask_for_embedded_content {
             $toplevel = $url;
             if ($args->{'context'} eq 'paste') {
                 ($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});
-                ($path) =
+                ($path) = 
                     ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
                 $fileloc = &Apache::lonnet::filelocation('',$toplevel);
                 $fileloc =~ s{^/}{};
             }
         }
-    } elsif ($actionurl eq '/adm/dependencies') {
+    } elsif ($actionurl eq '/adm/dependencies')  {
         if ($env{'request.course.id'} ne '') {
             if (ref($args) eq 'HASH') {
                 $url = $args->{'docs_url'};
                 $title = $args->{'docs_title'};
-                $toplevel = $url;
+                $toplevel = $url; 
                 unless ($toplevel =~ m{^/}) {
                     $toplevel = "/$url";
                 }
@@ -9871,18 +9686,17 @@ sub ask_for_embedded_content {
         } else {
             $embed_file = $file;
         }
-        my ($absolutepath,$cleaned_file);
+        my $absolutepath;
         if ($embed_file =~ m{^\w+://}) {
-            $cleaned_file = $embed_file;
-            $newfiles{$cleaned_file} = 1;
-            $mapping{$cleaned_file} = $embed_file;
+            $newfiles{$embed_file} = 1;
+            $mapping{$embed_file} = $embed_file;
         } else {
-            $cleaned_file = &clean_path($embed_file);
             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 '') {
@@ -9899,9 +9713,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;
                 }
             }
         }
@@ -9909,8 +9723,8 @@ sub ask_for_embedded_content {
     my $dirptr = 16384;
     foreach my $path (keys(%subdependencies)) {
         $currsubfile{$path} = {};
-        if (($actionurl eq '/adm/portfolio') ||
-            ($actionurl eq '/adm/coursegrp_portfolio')) { 
+        if (($actionurl eq '/adm/portfolio') || 
+            ($actionurl eq '/adm/coursegrp_portfolio')) {
             my ($sublistref,$listerror) =
                 &Apache::lonnet::dirlist($url.$path,$udom,$uname,$getpropath);
             if (ref($sublistref) eq 'ARRAY') {
@@ -10052,7 +9866,7 @@ sub ask_for_embedded_content {
         $counter = scalar(keys(%existing));
         $numpathchg = scalar(keys(%pathchanges));
         return ($output,$counter,$numpathchg,\%existing);
-    } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") &&
+    } elsif (($actionurl eq "/public/$cdom/$cnum/syllabus") && 
              (ref($args) eq 'HASH') && ($args->{'context'} eq 'rewrites')) {
         $counter = scalar(keys(%existing));
         $numpathchg = scalar(keys(%pathchanges));
@@ -10275,46 +10089,6 @@ sub ask_for_embedded_content {
     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') &&
@@ -10439,8 +10213,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)))) {
@@ -10639,7 +10412,7 @@ sub modify_html_refs {
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');
-    unless ((@changes > 0)  || ($context eq 'syllabus')) {
+    unless ((@changes > 0) || ($context eq 'syllabus')) {
         if (wantarray) {
             return ('',0,0); 
         } else {
@@ -10704,7 +10477,6 @@ sub modify_html_refs {
                         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});
@@ -10774,7 +10546,7 @@ sub modify_html_refs {
                         }
                     }
                     if ($rewrites) {
-                        my $saveresult;
+                        my $saveresult; 
                         my $url = &Apache::lonnet::store_edited_file($container,$content,$udom,$uname,\$saveresult);
                         if ($url eq $container) {
                             my ($fname) = ($container =~ m{/([^/]+)$});
@@ -11783,7 +11555,7 @@ sub process_extracted_files {
         $folders{'0'} = $items[-2];
         if ($env{'form.folderpath'} =~ /\:1$/) {
             $containers{'0'}='page';
-        } else {
+        } else {  
             $containers{'0'}='sequence';
         }
     }
@@ -11903,7 +11675,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++) {
@@ -11925,7 +11697,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}}";
@@ -11972,12 +11744,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;
                             }
                         }
@@ -11987,7 +11759,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)) {
@@ -12065,7 +11837,7 @@ sub cleanup_empty_dirs {
 
 =pod
 
-=item * &get_folder_hierarchy()
+=item &get_folder_hierarchy()
 
 Provides hierarchy of names of folders/sub-folders containing the current
 item,
@@ -12175,9 +11947,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);
                             }
                         }
@@ -12186,9 +11955,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') {
@@ -12229,9 +11995,6 @@ sub get_turnedin_filepath {
                 $restitle = time;
             }
         }
-        if (length($restitle) > 12) {
-            $restitle = substr($restitle,0,12);
-        }
         push(@pathitems,$restitle);
         $path .= join('/',@pathitems);
     }
@@ -13169,22 +12932,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.
 
@@ -13378,7 +13137,7 @@ sub extract_categories {
 
 =pod
 
-=item * &recurse_categories()
+=item *&recurse_categories()
 
 Recursively used to generate breadcrumb trails for course categories.
 
@@ -13449,7 +13208,7 @@ sub recurse_categories {
 
 =pod
 
-=item * &assign_categories_table()
+=item *&assign_categories_table()
 
 Create a datatable for display of hierarchical categories in a domain,
 with checkboxes to allow a course to be categorized. 
@@ -13526,7 +13285,7 @@ sub assign_categories_table {
 
 =pod
 
-=item * &assign_category_rows()
+=item *&assign_category_rows()
 
 Create a datatable row for display of nested categories in a domain,
 with checkboxes to allow a course to be categorized,called recursively.
@@ -13560,7 +13319,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;
@@ -13722,7 +13481,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;
@@ -14358,7 +14117,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
 
@@ -14389,8 +14148,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" => '',
@@ -14410,12 +14167,6 @@ sub init_user_environment {
 	    $env{'browser.interface'}=$form->{'interface'};
 	}
 
-        if ($form->{'iptoken'}) {
-            my $lonhost = $r->dir_config('lonHostID');
-            $initial_env{"user.noloadbalance"} = $lonhost;
-            $env{'user.noloadbalance'} = $lonhost;
-        }
-
         my %is_adv = ( is_adv => $env{'user.adv'} );
         my %domdef;
         unless ($domain eq 'public') {
@@ -14442,7 +14193,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'};
@@ -14649,30 +14400,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);
@@ -14702,7 +14429,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().
@@ -14718,7 +14445,7 @@ sub symb_to_docspath {
         }
         $path .= (($path ne '')? '&' : '').
                  &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                 &escape($maptitle).
+                 &Apache::lonhtmlcommon::entity_encode($maptitle).
                  ':'.$mapresobj->randompick().
                  ':'.$mapresobj->randomout().
                  ':'.$mapresobj->encrypted().
@@ -14731,11 +14458,11 @@ sub symb_to_docspath {
             $maptitle = 'Main Content';
         }
         $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 Content').
                 ':::::&'.$path;
     }
     return $path;
@@ -14748,12 +14475,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);
@@ -14874,13 +14601,9 @@ 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" />').
            '<br /><br />';
@@ -14903,28 +14626,6 @@ sub check_recaptcha {
     return $captcha_chk;
 }
 
-sub cleanup_html {
-    my ($incoming) = @_;
-    my $outgoing;
-    if ($incoming ne '') {
-        $outgoing = $incoming;
-        $outgoing =~ s/;/&#059;/g;
-        $outgoing =~ s/\#/&#035;/g;
-        $outgoing =~ s/\&/&#038;/g;
-        $outgoing =~ s/</&#060;/g;
-        $outgoing =~ s/>/&#062;/g;
-        $outgoing =~ s/\(/&#040/g;
-        $outgoing =~ s/\)/&#041;/g;
-        $outgoing =~ s/"/&#034;/g;
-        $outgoing =~ s/'/&#039;/g;
-        $outgoing =~ s/\$/&#036;/g;
-        $outgoing =~ s{/}{&#047;}g;
-        $outgoing =~ s/=/&#061;/g;
-        $outgoing =~ s/\\/&#092;/g
-    }
-    return $outgoing;
-}
-
 =pod
 
 =back