--- loncom/interface/loncommon.pm	2009/05/21 15:43:52	1.692.4.3
+++ loncom/interface/loncommon.pm	2008/11/22 19:08:21	1.694
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.692.4.3 2009/05/21 15:43:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.694 2008/11/22 19:08:21 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -406,9 +406,9 @@ sub studentbrowser_javascript {
          || ($env{'request.role'}=~/^(au|dc|su)/)
           ) { return ''; }  
    return (<<'ENDSTDBRW');
-<script type="text/javascript" language="Javascript">
+<script type="text/javascript" language="Javascript" >
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter,courseadvonly) {
+    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
         var url = '/adm/pickstudent?';
         var filter;
 	if (!ignorefilter) {
@@ -422,7 +422,6 @@ sub studentbrowser_javascript {
         url += 'form=' + formname + '&unameelement='+uname+
                                     '&udomelement='+udom;
 	if (roleflag) { url+="&roles=1"; }
-        if (courseadvonly) { url+="&courseadvonly=1"; }
         var title = 'Student_Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
         options += ',width=700,height=600';
@@ -434,26 +433,19 @@ ENDSTDBRW
 }
 
 sub selectstudent_link {
-   my ($form,$unameele,$udomele,$courseadvonly)=@_;
-   my $callargs = "'".$form."','".$unameele."','".$udomele."'";
+   my ($form,$unameele,$udomele)=@_;
    if ($env{'request.course.id'}) {  
        if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	   && !&Apache::lonnet::allowed('srm',$env{'request.course.id'}.
 					'/'.$env{'request.course.sec'})) {
 	   return '';
        }
-       if ($courseadvonly)  {
-           $callargs .= ",'',1,1";
-       }
-       return '<span class="LC_nobreak">'.
-              '<a href="javascript:openstdbrowser('.$callargs.');">'.
-              &mt('Select User').'</a></span>';
+       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
-       $callargs .= ",1";
-       return '<span class="LC_nobreak">'.
-              '<a href="javascript:openstdbrowser('.$callargs.');">'.
-              &mt('Select User').'</a></span>';
+       return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'",1);'."'>".&mt('Select User')."</a>";
    }
    return '';
 }
@@ -481,7 +473,7 @@ sub coursebrowser_javascript {
     my ($domainfilter,$sec_element,$formname)=@_;
     my $crs_or_grp_alert = &mt('Please select the type of LON-CAPA entity - Course or Group - for which you wish to add/modify a user role');
    my $output = '
-<script type="text/javascript" language="JavaScript">
+<script type="text/javascript">
     var stdeditbrowser;'."\n";
    $output .= <<"ENDSTDBRW";
     function opencrsbrowser(formname,uname,udom,desc,extra_element,multflag,crstype) {
@@ -610,13 +602,8 @@ function setSect(sectionlist) {
 
 sub selectcourse_link {
    my ($form,$unameele,$udomele,$desc,$extra_element,$multflag,$selecttype)=@_;
-   return '<span class="LC_nobreak">'
-         ."<a href='"
-         .'javascript:opencrsbrowser("'.$form.'","'.$unameele
-         .'","'.$udomele.'","'.$desc.'","'.$extra_element
-         .'","'.$multflag.'","'.$selecttype.'");'
-         ."'>".&mt('Select Course').'</a>'
-         .'</span>';
+   return "<a href='".'javascript:opencrsbrowser("'.$form.'","'.$unameele.
+        '","'.$udomele.'","'.$desc.'","'.$extra_element.'","'.$multflag.'","'.$selecttype.'");'."'>".&mt('Select Course')."</a>";
 }
 
 sub selectauthor_link {
@@ -690,7 +677,7 @@ sub select_datelocale {
             if ($id ne '') {
                 my $en_terr = $locale->{'en_territory'};
                 my $native_terr = $locale->{'native_territory'};
-                my @languages = &Apache::lonlocal::preferred_languages();
+                my @languages = &preferred_languages();
                 if (grep(/^en$/,@languages) || !@languages) {
                     if ($en_terr ne '') {
                         $locale_names{$id} = '('.$en_terr.')';
@@ -723,21 +710,6 @@ sub select_datelocale {
     return $output;
 }
 
-sub select_language {
-    my ($name,$selected,$includeempty) = @_;
-    my %langchoices;
-    if ($includeempty) {
-        %langchoices = ('' => 'No language preference');
-    }
-    foreach my $id (&languageids()) {
-        my $code = &supportedlanguagecode($id);
-        if ($code) {
-            $langchoices{$code} = &plainlanguagedescription($id);
-        }
-    }
-    return &select_form($selected,$name,%langchoices);
-}
-
 =pod
 
 =item * &linked_select_forms(...)
@@ -824,7 +796,7 @@ sub linked_select_forms {
     my $first = "document.$formname.$firstselectname";
     # output the javascript to do the changing
     my $result = '';
-    $result.='<script type="text/javascript" language="JavaScript">'."\n";
+    $result.="<script type=\"text/javascript\">\n";
     $result.="var select2data = new Object();\n";
     $" = '","';
     my $debug = '';
@@ -960,12 +932,10 @@ sub help_open_topic {
     # Add the graphic
     my $title = &mt('Online Help');
     my $helpicon=&lonhttpdurl("/adm/help/help.png");
-    $template .= '<a target="_top" href="'.$link.'" title="'.$title.'">'.
-                 '<img src="'.$helpicon.'" border="0" alt="'.&mt('Help: [_1]',$topic).
-                 '" title="'.$title.'" /></a>';
-    if ($text ne '') {
-        $template.='</span></td></tr></table>';
-    }
+    $template .= <<"ENDTEMPLATE";
+ <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
+ENDTEMPLATE
+    if ($text ne '') { $template.='</span></td></tr></table>' };
     return $template;
 
 }
@@ -973,30 +943,24 @@ sub help_open_topic {
 # This is a quicky function for Latex cheatsheet editing, since it 
 # appears in at least four places
 sub helpLatexCheatsheet {
-    my ($topic,$text,$not_author) = @_;
-    my $out;
+    my $other = shift;
     my $addOther = '';
-    if ($topic) {
-	$addOther = &Apache::loncommon::help_open_topic($topic,$text,
+    if ($other) {
+	$addOther = Apache::loncommon::help_open_topic($other, shift,
 						       undef, undef, 600) .
 							   '</td><td>';
     }
-    $out = '<table><tr><td>'.
-           $addOther .
-           &Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
-                                               undef,undef,600).
-           '</td><td>'.
-           &Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
-                                               undef,undef,600).
-           '</td>';
-    unless ($not_author) {
-        $out .= '<td>'.
-                &Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
-                                                    undef,undef,600).
-                '</td>';
-    }
-    $out .= '</tr></table>';
-    return $out;
+    return '<table><tr><td>'.
+	$addOther .
+	&Apache::loncommon::help_open_topic("Greek_Symbols",&mt('Greek Symbols'),
+					    undef,undef,600)
+	.'</td><td>'.
+	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
+					    undef,undef,600)
+	.'</td><td>'.
+	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+	                                    undef,undef,600)
+	.'</td></tr></table>';
 }
 
 sub general_help {
@@ -1665,7 +1629,7 @@ sub multiple_select_form {
             $size = scalar(keys(%$hash));
         }
     }
-    $output.="\n".'<select name="'.$name.'" size="'.$size.'" multiple="multiple">';
+    $output.="\n<select name='$name' size='$size' multiple='1'>";
     my @order;
     if (ref($order) eq 'ARRAY')  {
         @order = @{$order};
@@ -1722,17 +1686,17 @@ sub select_form {
 sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }
     if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
-    return '<span class="LC_nobreak"><label>'.&mt('Records [_1]',
+    return '<nobr><label>'.&mt('Records [_1]',
 			       &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
 							   (&mt('all'),10,20,50,100,1000,10000))).
-	   '</label></span> <span class="LC_nobreak">'.
+	   '</label></nobr> <nobr>'.
            &mt('Filter [_1]',
 	   &select_form($env{'form.displayfilter'},
 			'displayfilter',
 			('currentfolder' => 'Current folder/page',
 			 'containing' => 'Containing phrase',
 			 'none' => 'None'))).
-			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></span>';
+			 '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
 }
 
 sub gradeleveldescription {
@@ -1776,7 +1740,7 @@ sub select_level_form {
 
 =pod
 
-=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc,$autosubmit)
+=item * &select_dom_form($defdom,$name,$includeempty,$showdomdesc)
 
 Returns a string containing a <select name='$name' size='1'> form to 
 allow a user to select the domain to preform an operation in.  
@@ -1785,22 +1749,16 @@ See loncreateuser.pm for an example invo
 If the $includeempty flag is set, it also includes an empty choice ("no domain
 selected");
 
-If the $showdomdesc flag is set, the domain name is followed by the domain description.
-
-If the $autosubmit flag is set, the form containing the domain selector will be auto-submitted by an onchange action.
+If the $showdomdesc flag is set, the domain name is followed by the domain description. 
 
 =cut
 
 #-------------------------------------------
 sub select_dom_form {
-    my ($defdom,$name,$includeempty,$showdomdesc,$autosubmit) = @_;
-    my $onchange;
-    if ($autosubmit) {
-        $onchange = ' onchange="this.form.submit()"';
-    }
+    my ($defdom,$name,$includeempty,$showdomdesc) = @_;
     my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
-    my $selectdomain = "<select name=\"$name\" size=\"1\"$onchange>\n";
+    my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
         $selectdomain.="<option value=\"$dom\" ".
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
@@ -1856,7 +1814,7 @@ sub home_server_form_item {
     if ($numlib > 1) {
         $result .= '<select name="'.$name.'" />'."\n";
         if ($default) {
-            $result .= '<option value="default" selected="selected">'.&mt('default').
+            $result .= '<option value="default" selected>'.&mt('default').
                        '</option>'."\n";
         }
         foreach my $hostid (sort(keys(%servers))) {
@@ -2151,14 +2109,14 @@ sub authform_kerberos {
         $autharg,$jscall);
     my ($authnum,%can_assign) =  &get_assignable_auth($in{'domain'});
     if ($in{'kerb_def_auth'} eq 'krb5') {
-       $check5 = ' checked="checked"';
+       $check5 = ' checked="on"';
     } else {
-       $check4 = ' checked="checked"';
+       $check4 = ' checked="on"';
     }
     $krbarg = $in{'kerb_def_dom'};
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'krb') {
-            $krbcheck = ' checked="checked"';
+            $krbcheck = ' checked="on"';
             if (defined($in{'mode'})) {
                 if ($in{'mode'} eq 'modifyuser') {
                     $krbcheck = '';
@@ -2166,10 +2124,10 @@ sub authform_kerberos {
             }
             if (defined($in{'curr_kerb_ver'})) {
                 if ($in{'curr_krb_ver'} eq '5') {
-                    $check5 = ' checked="checked"';
+                    $check5 = ' checked="on"';
                     $check4 = '';
                 } else {
-                    $check4 = ' checked="checked"';
+                    $check4 = ' checked="on"';
                     $check5 = '';
                 }
             }
@@ -2190,7 +2148,7 @@ sub authform_kerberos {
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="krb" />';
+            $authtype = '<input type="hidden" name="login" value="krb">';
         }
     }
     if (!$can_assign{'krb4'} && !$can_assign{'krb5'}) {
@@ -2199,7 +2157,7 @@ sub authform_kerberos {
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="krb" />';
+                    $authtype = '<input type="hidden" name="login" value="krb">';
                 }
             }
         }
@@ -2260,7 +2218,7 @@ sub authform_internal{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'int') {
             if ($can_assign{'int'}) {
-                $intcheck = 'checked="checked" ';
+                $intcheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $intcheck = '';
@@ -2276,7 +2234,7 @@ sub authform_internal{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="int" />';
+            $authtype = '<input type="hidden" name="login" value="int">';
         }
     }
     if (!$can_assign{'int'}) {
@@ -2285,7 +2243,7 @@ sub authform_internal{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="int" />';
+                    $authtype = '<input type="hidden" name="login" value="int">';
                 }
             }
         }
@@ -2315,7 +2273,7 @@ sub authform_local{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'loc') {
             if ($can_assign{'loc'}) {
-                $loccheck = 'checked="checked" ';
+                $loccheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $loccheck = '';
@@ -2331,7 +2289,7 @@ sub authform_local{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="loc" />';
+            $authtype = '<input type="hidden" name="login" value="loc">';
         }
     }
     if (!$can_assign{'loc'}) {
@@ -2340,7 +2298,7 @@ sub authform_local{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="loc" />';
+                    $authtype = '<input type="hidden" name="login" value="loc">';
                 }
             }
         }
@@ -2369,7 +2327,7 @@ sub authform_filesystem{
     if (defined($in{'curr_authtype'})) {
         if ($in{'curr_authtype'} eq 'fsys') {
             if ($can_assign{'fsys'}) {
-                $fsyscheck = 'checked="checked" ';
+                $fsyscheck = 'checked="on" ';
                 if (defined($in{'mode'})) {
                     if ($in{'mode'} eq 'modifyuser') {
                         $fsyscheck = '';
@@ -2382,7 +2340,7 @@ sub authform_filesystem{
         }
     } else {
         if ($authnum == 1) {
-            $authtype = '<input type="hidden" name="login" value="fsys" />';
+            $authtype = '<input type="hidden" name="login" value="fsys">';
         }
     }
     if (!$can_assign{'fsys'}) {
@@ -2391,7 +2349,7 @@ sub authform_filesystem{
         if (defined($in{'mode'})) {
             if ($in{'mode'} eq 'modifycourse') {
                 if ($authnum == 1) {
-                    $authtype = '<input type="hidden" name="login" value="fsys" />';
+                    $authtype = '<input type="hidden" name="login" value="fsys">';
                 }
             }
         }
@@ -2759,43 +2717,6 @@ sub flush_email_cache {
     &Apache::lonnet::devalidate_cache_new('emailscache',$id);
 }
 
-# -------------------------------------------------------------------- getlangs
-
-=pod
-
-=item * &getlangs($uname,$udom)
-
-Gets a user's language preference and returns it as a hash with key:
-language.
-
-=cut
-
-
-sub getlangs {
-    my ($uname,$udom) = @_;
-    if (!$udom)  { $udom =$env{'user.domain'}; }
-    if (!$uname) { $uname=$env{'user.name'};   }
-    my $id=$uname.':'.$udom;
-    my ($langs,$cached)=&Apache::lonnet::is_cached_new('userlangs',$id);
-    if ($cached) {
-        return %{$langs};
-    } else {
-        my %loadlangs=&Apache::lonnet::get('environment',['languages'],
-                                           $udom,$uname);
-        &Apache::lonnet::do_cache_new('userlangs',$id,\%loadlangs);
-        return %loadlangs;
-    }
-}
-
-sub flush_langs_cache {
-    my ($uname,$udom)=@_;
-    if (!$udom)  { $udom =$env{'user.domain'}; }
-    if (!$uname) { $uname=$env{'user.name'};   }
-    return if ($udom eq 'public' && $uname eq 'public');
-    my $id=$uname.':'.$udom;
-    &Apache::lonnet::devalidate_cache_new('userlangs',$id);
-}
-
 # ------------------------------------------------------------------ Screenname
 
 =pod
@@ -2814,25 +2735,6 @@ sub screenname {
     return $names{'screenname'};
 }
 
-# ------------------------------------------------------------- Confirm Wrapper
-=pod
-
-=item confirmwrapper
-
-Wrap messages about completion of operation in box
-
-=cut
-
-sub confirmwrapper {
-    my ($message)=@_;
-    if ($message) {
-        return "\n".'<div class="LC_confirm_box">'."\n"
-               .$message."\n"
-               .'</div>'."\n";
-    } else {
-        return $message;
-    }
-}
 
 # ------------------------------------------------------------- Message Wrapper
 
@@ -2859,7 +2761,7 @@ sub aboutmewrapper {
         return;
     }
     return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'.
-	($target?' target="$target"':'').' title="'.&mt("View this user's personal information page").'">'.$link.'</a>';
+	($target?' target="$target"':'').' title="'.&mt("View this user's personal page").'">'.$link.'</a>';
 }
 
 # ------------------------------------------------------------ Syllabus Wrapper
@@ -2894,27 +2796,6 @@ sub track_student_link {
 	&help_open_topic('View_recent_activity');
 }
 
-sub slot_reservations_link {
-    my ($linktext,$sname,$sdom,$target) = @_;
-    my $link ="/adm/slotrequest?command=showresv&amp;origin=aboutme";
-    my $title = 'View slot reservation history';
-    if (defined($sname) && $sname !~ /^\s*$/ &&
-        defined($sdom)  && $sdom  !~ /^\s*$/) {
-        $link .= "&amp;uname=$sname&amp;udom=$sdom";
-        $title .= ' of this student';
-    }
-    if (defined($target) && $target !~ /^\s*$/) {
-        $target = qq{target="$target"};
-    } else {
-        $target = '';
-    }
-    $title = &mt($title);
-    $linktext = &mt($linktext);
-    return qq{<a href="$link" title="$title" $target>$linktext</a>};
-# FIXME uncomment when help item created: &help_open_topic('Slot_Reservation_History');
-
-}
-
 # ===================================================== Display a student photo
 
 
@@ -3117,7 +2998,7 @@ sub fileextensions {
 
 sub display_languages {
     my %languages=();
-    foreach my $lang (&Apache::lonlocal::preferred_languages()) {
+    foreach my $lang (&preferred_languages()) {
 	$languages{$lang}=1;
     }
     &get_unprocessed_cgi($ENV{'QUERY_STRING'},['displaylanguage']);
@@ -3129,9 +3010,59 @@ sub display_languages {
     return %languages;
 }
 
+sub preferred_languages {
+    my @languages=();
+    if (($env{'request.role.adv'}) && ($env{'form.languages'})) {
+        @languages=(@languages,split(/\s*(\,|\;|\:)\s*/,$env{'form.languages'}));
+    }
+    if ($env{'course.'.$env{'request.course.id'}.'.languages'}) {
+	@languages=(@languages,split(/\s*(\,|\;|\:)\s*/,
+	         $env{'course.'.$env{'request.course.id'}.'.languages'}));
+    }
+
+    if ($env{'environment.languages'}) {
+	@languages=(@languages,
+		    split(/\s*(\,|\;|\:)\s*/,$env{'environment.languages'}));
+    }
+    my $browser=$ENV{'HTTP_ACCEPT_LANGUAGE'};
+    if ($browser) {
+	my @browser = 
+	    map { (split(/\s*;\s*/,$_))[0] } (split(/\s*,\s*/,$browser));
+	push(@languages,@browser);
+    }
+
+    foreach my $domtype ($env{'user.domain'},$env{'request.role.domain'},
+                         $Apache::lonnet::perlvar{'lonDefDomain'}) {
+        if ($domtype ne '') {
+            my %domdefs = &Apache::lonnet::get_domain_defaults($domtype);
+            if ($domdefs{'lang_def'} ne '') {
+                push(@languages,$domdefs{'lang_def'});
+            }
+        }
+    }
+    return &get_genlanguages(@languages);
+}
+
+sub get_genlanguages {
+    my (@languages) = @_;
+# turn "en-ca" into "en-ca,en"
+    my @genlanguages;
+    foreach my $lang (@languages) {
+        unless ($lang=~/\w/) { next; }
+        push(@genlanguages,$lang);
+        if ($lang=~/(\-|\_)/) {
+            push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
+        }
+    }
+    #uniqueify the languages list
+    my %count;
+    @genlanguages = map { $count{$_}++ == 0 ? $_ : () } @genlanguages;
+    return @genlanguages;
+}
+
 sub languages {
     my ($possible_langs) = @_;
-    my @preferred_langs = &Apache::lonlocal::preferred_languages();
+    my @preferred_langs = &preferred_languages();
     if (!ref($possible_langs)) {
 	if( wantarray ) {
 	    return @preferred_langs;
@@ -3152,28 +3083,6 @@ sub languages {
     return $preferred_possibilities[0];
 }
 
-sub user_lang {
-    my ($touname,$toudom,$fromcid) = @_;
-    my @userlangs;
-    if (($fromcid ne '') && ($env{'course.'.$fromcid.'.languages'} ne '')) {
-        @userlangs=(@userlangs,split(/\s*(\,|\;|\:)\s*/,
-                    $env{'course.'.$fromcid.'.languages'}));
-    } else {
-        my %langhash = &getlangs($touname,$toudom);
-        if ($langhash{'languages'} ne '') {
-            @userlangs = split(/\s*(\,|\;|\:)\s*/,$langhash{'languages'});
-        } else {
-            my %domdefs = &Apache::lonnet::get_domain_defaults($toudom);
-            if ($domdefs{'lang_def'} ne '') {
-                @userlangs = ($domdefs{'lang_def'});
-            }
-        }
-    }
-    my @languages=&Apache::lonlocal::get_genlanguages(@userlangs);
-    my $user_lh = Apache::localize->get_handle(@languages);
-    return $user_lh;
-}
-
 ###############################################################
 ##               Student Answer Attempts                     ##
 ###############################################################
@@ -3312,7 +3221,7 @@ sub relative_to_absolute {
     }
     $thisdir=~s-/[^/]*$--;
     foreach my $link (@rlinks) {
-	unless (($link=~/^https?\:\/\//i) ||
+	unless (($link=~/^http:\/\//i) ||
 		($link=~/^\//) ||
 		($link=~/^javascript:/i) ||
 		($link=~/^mailto:/i) ||
@@ -3889,7 +3798,7 @@ sub blocking_status {
                              &Apache::lonnet::coursedescription($course);
                         $coursedesc = $courseinfo{'description'};
                     }
-                    $category = "Group portfolio files in the course '$coursedesc'";
+                    $category = "Group files in the course '$coursedesc'";
                 } else {
                     $category = 'Portfolio files belonging to ';
                     if ($env{'user.name'} eq 'public' && 
@@ -4021,14 +3930,7 @@ sub get_domainconf {
         if (ref($domconfig{'login'}) eq 'HASH') {
             if (keys(%{$domconfig{'login'}})) {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
-                    if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                        foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                            $designhash{$udom.'.login.'.$key.'_'.$img} =
-                                $domconfig{'login'}{$key}{$img};
-                        }
-                    } else {
-                        $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
-                    }
+                    $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
                 }
             } else {
                 $legacy{'login'} = 1;
@@ -4250,7 +4152,7 @@ sub bodytag {
     my $font =   &designparm($function.'.font',$domain);
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
 
-    my %design = ( 'style'   => 'margin-top: 0',
+    my %design = ( 'style'   => 'margin-top: 0px',
 		   'bgcolor' => $pgbg,
 		   'text'    => $font,
                    'alink'   => &designparm($function.'.alink',$domain),
@@ -4552,11 +4454,10 @@ sub standard_css {
     my $mail_other_hover     = '#669999';
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
-    my $lg_border_color      = '#C8C8C8';
 
     my $border = ($env{'browser.type'} eq 'explorer' ||
-		  $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
-	                                                 : '0 3px 0 4px';
+		  $env{'browser.type'} eq 'safari'     ) ? '0px 2px 0px 2px'
+	                                                 : '0px 3px 0px 4px';
 
 
     return <<END;
@@ -4591,34 +4492,25 @@ form, .inline { display: inline; }
 .LC_diff_added {
   color: green;
 }
-
-div.LC_confirm_box {
-  background-color: #FAFAFA;
-  border: 1px solid $lg_border_color;
-  margin-right: 0;
-  padding: 5px;
-}
-
-div.LC_confirm_box .LC_error img,
-div.LC_confirm_box .LC_success img {
-  vertical-align: middle;
+.LC_unknown {
+  color: yellow;
 }
 
 .LC_icon {
-  border: none;
+  border: 0px;
 }
 .LC_indexer_icon {
-  border: 0;
+  border: 0px;
   height: 22px;
 }
 .LC_docs_spacer {
   width: 25px;
   height: 1px;
-  border: none;
+  border: 0px;
 }
 
 .LC_internal_info {
-  color: #999999;
+  color: #999;
 }
 
 table.LC_pastsubmission {
@@ -4631,7 +4523,7 @@ table#LC_top_nav, table#LC_menubuttons,t
   background: $pgbg;
   border: 2px;
   border-collapse: separate;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_title_bar, table.LC_breadcrumbs, 
@@ -4644,7 +4536,7 @@ table#LC_title_bar.LC_with_remote {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
 
 table.LC_docs_path {
@@ -4653,7 +4545,7 @@ table.LC_docs_path {
   background: $pgbg;
   font-family: $sans;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_title_bar td {
@@ -4674,27 +4566,27 @@ span.LC_title_bar_title {
 table#LC_title_bar td.LC_title_bar_domain_logo {
   background: $sidebg;
   text-align: right;
-  padding: 0;
+  padding: 0px;
 }
 table#LC_title_bar td.LC_title_bar_role_logo {
   background: $sidebg;
-  padding: 0;
+  padding: 0px;
 }
 
 table#LC_menubuttons_mainmenu {
   width: 100%;
-  border: 0;
+  border: 0px;
   border-spacing: 1px;
-  padding: 0 1px;
-  margin: 0;
+  padding: 0px 1px;
+  margin: 0px;
   border-collapse: separate;
 }
 table#LC_menubuttons img, table#LC_menubuttons_mainmenu img {
-  border: none;
+  border: 0px;
 }
 table#LC_top_nav td {
   background: $tabbg;
-  border: none;
+  border: 0px;
   font-size: small;
 }
 table#LC_top_nav td a, div#LC_top_nav a {
@@ -4708,7 +4600,7 @@ table#LC_top_nav td.LC_top_nav_logo {
   width: 31px;
 }
 table#LC_top_nav td.LC_top_nav_logo img {
-  border: none;
+  border: 0px;
   vertical-align: bottom;
 }
 table#LC_top_nav td.LC_top_nav_exit,
@@ -4749,7 +4641,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 .LC_menubuttons_link {
   text-decoration: none;
 }
-/*2008--9-5: new menu style sheet.Changed category*/
+#2008--9-5: new menu style sheet.Changed category
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -4777,6 +4669,35 @@ td.LC_menubuttons_img {
   font-weight: bold;
 }
 
+.LC_rolesmenu_is {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_selected {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_future {
+  font-family: $sans;
+}
+
+
+.LC_rolesmenu_will {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_will_not {
+  font-family: $sans;
+}
+
+.LC_rolesmenu_expired {
+  font-family: $sans;
+}
+
+.LC_rolesinfo {
+  font-family: $sans;
+}
+
 .LC_dropadd_labeltext {
   font-family: $sans;
   text-align: right;
@@ -4791,14 +4712,10 @@ td.LC_menubuttons_img {
   font-size: smaller;
 }
 
-.LC_mail_functions {
-    font-weight: bold;
-}
-
 table.LC_aboutme_port {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
 }
 table.LC_data_table, table.LC_mail_list {
   border: 1px solid #000000;
@@ -4812,13 +4729,13 @@ table.LC_data_table, table.LC_mail_list
 table.LC_nested_outer {
   border: 1px solid #000000;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
   width: 100%;
 }
 table.LC_nested {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
-  border-spacing: 0;
+  border-spacing: 0px;
   width: 100%;
 }
 table.LC_data_table tr th, table.LC_calendar tr th, table.LC_mail_list tr th,
@@ -4827,22 +4744,14 @@ table.LC_prior_tries tr th {
   background-color: $data_table_head;
   font-size: smaller;
 }
-table.LC_data_table tr.LC_info_row > td {
-  background-color: #CCCCCC;
-  font-weight: bold;
-  text-align: left;
-}
 table.LC_data_table tr.LC_odd_row > td, 
-table.LC_pick_box tr > td.LC_odd_row,
 table.LC_aboutme_port tr td {
   background-color: $data_table_light;
   padding: 2px;
 }
 table.LC_data_table tr.LC_even_row > td,
-table.LC_pick_box tr > td.LC_even_row,
 table.LC_aboutme_port tr.LC_even_row td {
   background-color: $data_table_dark;
-  padding: 2px;
 }
 table.LC_data_table tr.LC_data_table_highlight td {
   background-color: $data_table_darker;
@@ -4876,7 +4785,7 @@ table.LC_nested_outer tr td.LC_subheader
   text-align: right;
 }
 table.LC_nested tr.LC_info_row td {
-  background-color: #CCCCCC;
+  background-color: #CCC;
   font-weight: bold;
   font-size: small;
   text-align: center;
@@ -4886,7 +4795,7 @@ table.LC_nested_outer tr th.LC_left_item
   text-align: left;
 }
 table.LC_nested td {
-  background-color: #FFFFFF;
+  background-color: #FFF;
   font-size: small;
 }
 table.LC_nested_outer tr th.LC_right_item,
@@ -4897,7 +4806,7 @@ table.LC_nested tr td.LC_right_item {
 }
 
 table.LC_nested tr.LC_odd_row td {
-  background-color: #EEEEEE;
+  background-color: #EEE;
 }
 
 table.LC_createuser {
@@ -4908,7 +4817,7 @@ table.LC_createuser tr.LC_section_row td
 }
 
 table.LC_createuser tr.LC_info_row td  {
-  background-color: #CCCCCC;
+  background-color: #CCC;
   font-weight: bold;
   text-align: center;
 }
@@ -4964,10 +4873,10 @@ table.LC_mail_list tr.LC_mail_odd {
 table#LC_portfolio_actions {
   width: auto;
   background: $pgbg;
-  border: none;
+  border: 0px;
   border-spacing: 2px 2px;
-  padding: 0;
-  margin: 0;
+  padding: 0px;
+  margin: 0px;
   border-collapse: separate;
 }
 table#LC_portfolio_actions td.LC_label {
@@ -5023,26 +4932,6 @@ table#LC_browser tr.LC_browser_file_meta
 table#LC_browser tr.LC_browser_folder {
   background: #CCCCFF;
 }
-
-table.LC_data_table tr > td.LC_roles_is {
-/*  background: #77FF77; */
-}
-table.LC_data_table tr > td.LC_roles_future {
-  background: #FFFF77;
-}
-table.LC_data_table tr > td.LC_roles_will {
-  background: #FFAA77;
-}
-table.LC_data_table tr > td.LC_roles_expired {
-  background: #FF7777;
-}
-table.LC_data_table tr > td.LC_roles_will_not {
-  background: #AAFF77;
-}
-table.LC_data_table tr > td.LC_roles_selected {
-  background: #11CC55;
-}
-
 span.LC_current_location {
   font-size: x-large;
   background: $pgbg;
@@ -5088,9 +4977,9 @@ table.LC_parm_overview_restrictions th {
   border-color: $pgbg;
 }
 table#LC_helpmenu {
-  border: none;
+  border: 0px;
   height: 55px;
-  border-spacing: 0;
+  border-spacing: 0px;
 }
 
 table#LC_helpmenu fieldset legend {
@@ -5101,7 +4990,7 @@ table#LC_helpmenu_links {
   width: 100%;
   border: 1px solid black;
   background: $pgbg;
-  padding: 0;
+  padding: 0px;
   border-spacing: 1px;
 }
 table#LC_helpmenu_links tr td {
@@ -5143,7 +5032,6 @@ table.LC_pick_box td.LC_pick_box_title {
   background: $tabbg;
   font-weight: bold;
   text-align: right;
-  vertical-align: top;
   width: 184px;
   padding: 8px;
 }
@@ -5164,7 +5052,7 @@ table.LC_pick_box td.LC_pick_box_select
   padding: 8px;
 }
 table.LC_pick_box td.LC_pick_box_separator {
-  padding: 0;
+  padding: 0px;
   height: 1px;
   background: black;
 }
@@ -5206,7 +5094,7 @@ table.LC_helpform_receipt td.LC_oddrow_v
   background-color: $data_table_light;
 }
 table.LC_helpform_receipt td.LC_pick_box_separator {
-  padding: 0;
+  padding: 0px;
   height: 1px;
   background: black;
 }
@@ -5239,7 +5127,7 @@ table.LC_group_priv_box td.LC_groups_fun
 }
 table.LC_group_priv td {
   text-align: left;
-  padding: 0;
+  padding: 0px;
 }
 
 table.LC_notify_front_page {
@@ -5260,7 +5148,6 @@ table.LC_notify_front_page td {
   background: $tabbg;
   vertical-align: middle;
   margin: 2ex 0ex 2ex 0ex;
-  padding: 3px;
 }
 .LC_topic_bar span {
   vertical-align: middle;
@@ -5377,7 +5264,7 @@ span.LC_cusr_subheading {
 
 table.LC_docs_documents {
   background: #BBBBBB;
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
 }
 
@@ -5394,7 +5281,7 @@ table.LC_docs_documents td.LC_docs_docum
 }
 
 .LC_docs_entry_move {
-  border: none;
+  border: 0px;
   border-collapse: collapse;
 }
 
@@ -5450,7 +5337,7 @@ table.LC_sty_end {
 }
 
 table.LC_double_column {
-  border-width: 0;
+  border-width: 0px;
   border-collapse: collapse;
   width: 100%;
   padding: 2px;
@@ -5589,7 +5476,7 @@ table.LC_edit_problem_header_title {
 
   background: $tabbg;
   border-collapse: collapse;
-  padding: 0;
+  padding: 0px
 }
 
 div.LC_edit_problem_discards {
@@ -5605,7 +5492,7 @@ hr.LC_edit_problem_divide {
   color: $tabbg;
   background-color: $tabbg;
   height: 3px;
-  border: none;
+  border: 0px;
 }
 img.stift{
   border-width:0;
@@ -5630,14 +5517,334 @@ table#LC_mainmenu td.LC_mainmenu_col_fie
   font-weight: bold;
 }
 fieldset#LC_mainmenu_fieldset {
-  margin:0 10px 10px 0;
+  margin:0px 10px 10px 0px;
+
+}
+/* ---- Remove when done ----
+# The following styles is part of the redesign of LON-CAPA and are
+# subject to change during this project.
+# Don't rely on their current functionality as they might be 
+# changed or removed.
+# --------------------------*/
+
+
+body {
+	font-family: Tahoma, Arial,Helvetica,sans-serif;
+	font-size: 0.85em;
+	line-height: 130%;
+	color: RGB(45, 45, 45);
+}
+
+a:link,a:visited {
+	/*color: RGB(0, 118, 127);*/
+	/*text-decoration: underline;*/
+}
+
+a:hover{
+	text-decoration:none;
+}
+/*a:hover,
+UL.smallMenu A:hover,
+UL.MenuBreadcrumbs A:hover,
+UL#TabMainMenuContent A:hover{
+	color: rgb(200, 10, 50);
+}*/
+
+h1 { 
+	padding:5px 10px 5px 20px;
+	line-height:130%;
+}
+h2,h4,h6 {
+	/*color: RGB(0, 118, 127);*/
+}
+h2,h3,h4,h5,h6
+{
+margin:5px 0px 5px 0px;
+line-height:130%;
+}
+
+.right {
+	text-align: right;
+}
+
+.center {
+	text-align: center;
+}
+
+.left {
+	text-align: left;
+}
+
+
+.HeadRight {
+	text-align: right;
+	float: right;
+	margin: 0px;
+	padding: 0px;
+	 right:0;
+        position:absolute;
+}
+
+img {
+/*	border: 0px; */
+}
+
+.personalBgColor {
+	background: RGB(237, 239, 0) url(images/headHighlight.png) repeat-y left top;
+}
+
+p {
+	padding: 10px;
+}
+DL,UL,Div,Fieldset {
+	/*margin: 10px;*/
+	overflow:hidden;
+}
+OL.smallMenu {
+	margin: 0px 0px 0px 0px;
+}
+
+OL.smallMenu li {
+	display: inline;
+	padding: 5px 5px 0px 10px;
+	vertical-align: top;
+}
+
+OL.smallMenu li img {
+	vertical-align: bottom;
+}
+
+OL.smallMenu A {
+	font-size: 90%;
+	color: RGB(80, 80, 80);
+	text-decoration: none;
+}
+
+OL#TabMainMenuContent {
+	
+	margin: 0px 0px 10px 0px;
+	padding: 0px;
+}
+
+OL#TabMainMenuContent LI {
+	display: inline;
+	vertical-align: bottom;
+	border-bottom: solid 1px RGB(175, 175, 175);
+	border-right: solid 1px RGB(175, 175, 175);
+	padding: 5px 15px 5px 15px;
+	margin-right:4px;
+	line-height: 140%;
+	font-weight: bold;
+	overflow:hidden;
+	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left top;
+}
+
+OL#TabMainMenuContent LI A {
+	color: RGB(47, 47, 47);
+	text-decoration: none;
+}
+
+OL#TabMainMenuContent DIV.columnSection {
+	margin-bottom: 0px;
+}
+
+OL#MenuBreadcrumbs {
+	border-top: solid 1px RGB(255, 255, 255);
+	height: 20px;
+	line-height: 20px;
+	vertical-align: bottom;
+	margin: 0px 0px 30px 0px;
+	padding-left: 10px;
+	list-style-position: inside;
+	background: RGB(211, 206, 205) URL(images/TabMenuBG.png) repeat-x left
+		top;
+}
+
+OL#MenuBreadcrumbs li {
+	background: url(images/pfeil_white.png) no-repeat left center;
+	display: inline;
+	padding: 0px 0px 0px 10px;
+	vertical-align: bottom;
+	overflow:hidden;
+}
+
+OL#MenuBreadcrumbs LI A {
+	text-decoration: none;
+	font-size:90%;
+}
+
+h4.hcell {
+	padding: 3px 10px 3px 10px;
+	margin: 0px;
+	background: RGB(0, 118, 127);
+	color: white;
+	border: outset 1px;
+}
+
+DIV.DivContentBoxSpecial
+{
+	border: solid 1px RGB(100, 100, 100);
+}
+
+FIELDSET
+{
+	/*width:78%;*/
+}
+DIV.DivContentBox,
+DIV.DivContentBoxSpecial {
+	width: 80%;
+	margin:10px;
+}
+
+FIELDSET legend,DL DT {
+	font-weight: bold;
+	font-size: 110%;
+	/*padding-left: 0px;*/
+/*	margin-left: 0px;*/
+}
+
+DIV.DivImportant {
+	background: url(images/important.png) no-repeat center top;
+	padding: 100px 10px 10px 10px;
+	width: 200px;
+	border: double 4px RGB(200, 200, 200);
+}
+
+
+
+DL.ListStyleClean DT {
+	padding-right: 5px;
+	display: table-header-group;
+}
+
+DL.ListStyleClean DD {
+	display: table-row;
+}
+
+.ListStyleClean,
+.ListStyleSimple,
+.ListStyleNormal,
+.ListStyleNormal_Border,
+.ListStyleSpecial
+	{
+	/*display:block;	*/
+	width: 400px;
+	list-style-position: inside;
+	list-style-type: none;
+	overflow: hidden;
+	padding: 0px;
+}
+
+.ListStyleClean li,
+.ListStyleSimple li,
+.ListStyleSimple DD,
+.ListStyleNormal li,
+.ListStyleNormal DD,
+.ListStyleSpecial li,
+.ListStyleSpecial DD
+	{
+	margin: 0px;
+	padding: 5px 5px 5px 10px;
+	clear: both;
+	/*display:block;*/
+}
+
+.ListStyleClean LI,
+.ListStyleClean DD {
+	padding-top: 0px;
+	padding-bottom: 0px;
+}
+
+.ListStyleSimple DD,
+.ListStyleSimple LI{
+	border-bottom: solid 1px RGB(150, 150, 150);
+}
+
+.ListStyleSpecial LI,
+.ListStyleSpecial DD {
+	list-style-type: none;
+	background-color: RGB(220, 220, 220);
+	margin-bottom: 4px;
+}
+
+table.SimpleTable *{
+	padding:10px;
+	}
+
+table.SimpleTable td {
+	vertical-align:top;
+	border:solid 1px RGB(210,210,210);
+}
+table.SimpleTable thead{
+	 background:rgb(210,210,210);
+}
+
+DIV.columnSection {
+	display: block;
+	clear: both;
+	overflow: hidden;
+	margin:0px;
+}
+
+DIV.columnSection>* {
+	float: left;
+	margin: 10px 20px 10px 0px;
+	overflow:hidden;	
+}
+
+DIV.columnSection>FIELDSET,
+DIV.columnSection>DIV.DivContentBox,
+DIV.columnSection>DIV.DivContentBoxSpecial
+	{
+	width: 480px;
+	
+}
+
+.LC_loginpage_container {
+	text-align:left;
+	margin : 0 auto;
+	width:65%;
+	padding: 10px;
+	height: auto;
+	background-color:#FFFFFF;
+	border:1px solid #CCCCCC;
+}
+
+
+.LC_loginpage_loginContainer {
+	float:left;
+	width:60%;
+}
+
+.LC_loginpage_loginInfo {
+	margin-top:20px;
+	margin-left:20px;
+	float:left;
+	width:30%;
+	border:1px solid #CCCCCC;
+	padding:10px;
+}
 
+.LC_loginpage_space {
+	clear:both;
+	margin-bottom:20px;
+	border-bottom: 1px solid #CCCCCC;
 }
 
-div.LC_createcourse {
-    margin: 10px 10px 10px 10px;
+.LC_loginpage_fieldset{
+	border: 1px solid #CCCCCC;
+	margin: 0 auto;
 }
 
+.LC_loginpage_legend{
+	padding: 2px;
+	margin: 0px;
+	font-size:14px;
+	font-weight:bold;
+}
+
+
+
 END
 }
 
@@ -5906,26 +6113,10 @@ sub start_page {
     if ($args->{'html_encode'}) {
 	$result = &html_encode($result);
     }
-    #Breadcrumbs
-    if (exists($args->{'bread_crumbs'}) or exists($args->{'bread_crumbs_component'})) {
-        &Apache::lonhtmlcommon::clear_breadcrumbs();
-        #if any br links exists, add them to the breadcrumbs
-        if (exists($args->{'bread_crumbs'}) and ref($args->{'bread_crumbs'}) eq 'ARRAY') {
-            foreach my $crumb (@{$args->{'bread_crumbs'}}){
-                &Apache::lonhtmlcommon::add_breadcrumb($crumb);
-            }
-        }
-
-        #if bread_crumbs_component exists show it as headline else show only the breadcrumbs
-        if (exists($args->{'bread_crumbs_component'})){
-            $result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
-        } else {
-            $result .= &Apache::lonhtmlcommon::breadcrumbs();
-        }
-    }
     return $result;
 }
 
+
 =pod
 
 =item * &head()
@@ -6167,37 +6358,6 @@ sub get_users_function {
 
 =pod
 
-=item * &show_course()
-
-Used by lonmenu.pm and lonroles.pm to determine whether to use the word
-'Courses' or 'Roles' in inline navigation and on screen displaying user's roles.
-Inputs:
-None
-
-Outputs:
-Scalar: 1 if 'Course' to be used, 0 otherwise.
-
-=cut
-
-###############################################
-sub show_course {
-    my $course = !$env{'user.adv'};
-    if (!$env{'user.adv'}) {
-        foreach my $env (keys(%env)) {
-            next if ($env !~ m/^user\.priv\./);
-            if ($env !~ m/^user\.priv\.(?:st|cm)/) {
-                $course = 0;
-                last;
-            }
-        }
-    }
-    return $course;
-}
-
-###############################################
-
-=pod
-
 =item * &check_user_status()
 
 Determines current status of supplied role for a
@@ -6713,37 +6873,21 @@ sub default_quota {
                                             ['quotas'],$udom);
     if (ref($quotahash{'quotas'}) eq 'HASH') {
         if ($inststatus ne '') {
-            my @statuses = map { &unescape($_); } split(/:/,$inststatus);
+            my @statuses = split(/:/,$inststatus);
             foreach my $item (@statuses) {
-                if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                    if ($quotahash{'quotas'}{'defaultquota'}{$item} ne '') {
-                        if ($defquota eq '') {
-                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                            $settingstatus = $item;
-                        } elsif ($quotahash{'quotas'}{'defaultquota'}{$item} > $defquota) {
-                            $defquota = $quotahash{'quotas'}{'defaultquota'}{$item};
-                            $settingstatus = $item;
-                        }
-                    }
-                } else {
-                    if ($quotahash{'quotas'}{$item} ne '') {
-                        if ($defquota eq '') {
-                            $defquota = $quotahash{'quotas'}{$item};
-                            $settingstatus = $item;
-                        } elsif ($quotahash{'quotas'}{$item} > $defquota) {
-                            $defquota = $quotahash{'quotas'}{$item};
-                            $settingstatus = $item;
-                        }
+                if ($quotahash{'quotas'}{$item} ne '') {
+                    if ($defquota eq '') {
+                        $defquota = $quotahash{'quotas'}{$item};
+                        $settingstatus = $item;
+                    } elsif ($quotahash{'quotas'}{$item} > $defquota) {
+                        $defquota = $quotahash{'quotas'}{$item};
+                        $settingstatus = $item;
                     }
                 }
             }
         }
         if ($defquota eq '') {
-            if (ref($quotahash{'quotas'}{'defaultquota'}) eq 'HASH') {
-                $defquota = $quotahash{'quotas'}{'defaultquota'}{'default'};
-            } else {
-                $defquota = $quotahash{'quotas'}{'default'};
-            }
+            $defquota = $quotahash{'quotas'}{'default'};
             $settingstatus = 'default';
         }
     } else {
@@ -6892,14 +7036,12 @@ sub user_picker {
                 if ($cancreate) {
                     $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
                 } else {
-                    my $helplink = 'javascript:helpMenu('."'display'".')';
+                    my $helplink = ' href="javascript:helpMenu('."'display'".')"';
                     my %usertypetext = (
                         official   => 'institutional',
                         unofficial => 'non-institutional',
                     );
-                    $new_user_create = '<p class="LC_warning">'.
-                                       &mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.
-                                       &mt('Please contact the [_1]helpdesk[_2] for assistance.','<a href="'.$helplink.'">','</a>').'</p><br />';
+                    $new_user_create = '<br /><span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
                 }
             }
         }
@@ -7181,7 +7323,6 @@ sub personal_data_fieldtitles {
                         middlename => 'Middle Name',
                         generation => 'Generation',
                         gen => 'Generation',
-                        inststatus => 'Affiliation',
                    );
     return %fieldtitles;
 }
@@ -7251,56 +7392,6 @@ sub get_institutional_codes {
 
 =pod
 
-=head1 Slot Helpers
-
-=over 4
-
-=item * sorted_slots()
-
-Sorts an array of slot names in order of slot start time (earliest first).
-
-Inputs:
-
-=over 4
-
-slotsarr  - Reference to array of unsorted slot names.
-
-slots     - Reference to hash of hash, where outer hash keys are slot names.
-
-=back
-
-Returns:
-
-=over 4
-
-sorted   - An array of slot names sorted by the start time of the slot.
-
-=back
-
-=back
-
-=cut
-
-
-sub sorted_slots {
-    my ($slotsarr,$slots) = @_;
-    my @sorted;
-    if ((ref($slotsarr) eq 'ARRAY') && (ref($slots) eq 'HASH')) {
-        @sorted =
-            sort {
-                     if (ref($slots->{$a}) && ref($slots->{$b})) {
-                         return $slots->{$a}{'starttime'} <=> $slots->{$b}{'starttime'}
-                     }
-                     if (ref($slots->{$a})) { return -1;}
-                     if (ref($slots->{$b})) { return 1;}
-                     return 0;
-                 } @{$slotsarr};
-    }
-    return @sorted;
-}
-
-=pod
-
 =back
 
 =head1 HTTP Helpers
@@ -7853,7 +7944,7 @@ sub upfile_select_html {
 #                 xml   => &mt('HTML/XML'),
                  );
     my $Str = '<input type="file" name="upfile" size="50" />'.
-        '<br />'.&mt('Type').': <select name="upfiletype">';
+        '<br />Type: <select name="upfiletype">';
     foreach my $type (sort(keys(%Types))) {
         $Str .= '<option value="'.$type.'" >'.$Types{$type}."</option>\n";
     }
@@ -8597,10 +8688,9 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for four types of e-mail:
-(a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
-(d) Help requests, generated by
-lonerrorhandler.pm, CHECKRPMS, loncron, and lonsupportreq.pm respectively.
+Build recipient lists for three types of e-mail:
+(a) Error Reports, (b) Package Updates, (c) Help requests, generated by
+lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively.
 
 Inputs:
 defmail (scalar - email address of default recipient), 
@@ -8624,21 +8714,17 @@ sub build_recipient_list {
     my %domconfig =
          &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
     if (ref($domconfig{'contacts'}) eq 'HASH') {
-        if (exists($domconfig{'contacts'}{$mailing})) {
-            if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
-                my @contacts = ('adminemail','supportemail');
-                foreach my $item (@contacts) {
-                    if ($domconfig{'contacts'}{$mailing}{$item}) {
-                        my $addr = $domconfig{'contacts'}{$item};
-                        if (!grep(/^\Q$addr\E$/,@recipients)) {
-                            push(@recipients,$addr);
-                        }
+        if (ref($domconfig{'contacts'}{$mailing}) eq 'HASH') {
+            my @contacts = ('adminemail','supportemail');
+            foreach my $item (@contacts) {
+                if ($domconfig{'contacts'}{$mailing}{$item}) {
+                    my $addr = $domconfig{'contacts'}{$item}; 
+                    if (!grep(/^\Q$addr\E$/,@recipients)) {
+                        push(@recipients,$addr);
                     }
-                    $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
                 }
+                $otheremails = $domconfig{'contacts'}{$mailing}{'others'};
             }
-        } elsif ($origmail ne '') {
-            push(@recipients,$origmail);
         }
     } elsif ($origmail ne '') {
         push(@recipients,$origmail);
@@ -9282,9 +9368,7 @@ sub construct_course {
                    'policy.email',
                    'comment.email',
                    'pch.users.denied',
-                   'plc.users.denied',
-                   'hidefromcat',
-                   'categories'],
+                   'plc.users.denied'],
                    $$crsudom,$$crsunum);
     }
 
@@ -9612,22 +9696,6 @@ sub escape_url {
     return join('/',@urlslices).'/'.$lastitem;
 }
 
-sub compare_arrays {
-    my ($arrayref1,$arrayref2) = @_;
-    my (@difference,%count);
-    @difference = ();
-    %count = ();
-    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) {
-        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
-        foreach my $element (keys(%count)) {
-            if ($count{$element} == 1) {
-                push(@difference,$element);
-            }
-        }
-    }
-    return @difference;
-}
-
 # -------------------------------------------------------- Initliaze user login
 sub init_user_environment {
     my ($r, $username, $domain, $authhost, $form, $args) = @_;
@@ -9758,17 +9826,6 @@ sub init_user_environment {
 	    }
 	}
 
-        foreach my $tool ('aboutme','blog','portfolio') {
-            $userenv{'availabletools.'.$tool} =
-                &Apache::lonnet::usertools_access($username,$domain,$tool,'reload');
-        }
-
-        foreach my $crstype ('official','unofficial') {
-            $userenv{'canrequest.'.$crstype} =
-                &Apache::lonnet::usertools_access($username,$domain,$crstype,
-                                                  'reload','requestcourses');
-        }
-
 	$env{'user.environment'} = "$lonids/$cookie.id";
 	
 	if (tie(my %disk_env,'GDBM_File',"$lonids/$cookie.id",
@@ -9807,7 +9864,7 @@ sub _add_to_env {
 # --- Get the symbolic name of a problem and the url
 sub get_symb {
     my ($request,$silent) = @_;
-    (my $url=$env{'form.url'}) =~ s-^https?\://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
     my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') {
         if (!$silent) {
@@ -9834,13 +9891,11 @@ sub get_annotation {
 }
 
 sub clean_symb {
-    my ($symb,$delete_enc) = @_;
+    my ($symb) = @_;
 
     &Apache::lonenc::check_decrypt(\$symb);
     my $enc = $env{'request.enc'};
-    if ($delete_enc) {
-        delete($env{'request.enc'});
-    }
+    delete($env{'request.enc'});
 
     return ($symb,$enc);
 }