--- loncom/interface/loncommon.pm	2013/08/08 02:12:52	1.1075.2.43
+++ loncom/interface/loncommon.pm	2013/08/18 17:32:57	1.1075.2.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.43 2013/08/08 02:12:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.46 2013/08/18 17:32:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -13095,18 +13095,22 @@ sub restore_settings {
 
 =item * &build_recipient_list()
 
-Build recipient lists for five types of e-mail:
+Build recipient lists for following types of e-mail:
 (a) Error Reports, (b) Package Updates, (c) lonstatus warnings/errors
-(d) Help requests, (e) Course requests needing approval,  generated by
-lonerrorhandler.pm, CHECKRPMS, loncron, lonsupportreq.pm and
-loncoursequeueadmin.pm respectively.
+(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.
 
 Inputs:
-defmail (scalar - email address of default recipient), 
-mailing type (scalar - errormail, packagesmail, or helpdeskmail), 
+defmail (scalar - email address of default recipient),
+mailing type (scalar: errormail, packagesmail, helpdeskmail,
+requestsmail, updatesmail, or idconflictsmail).
+
 defdom (domain for which to retrieve configuration settings),
-origmail (scalar - email address of recipient from loncapa.conf, 
-i.e., predates configuration by DC via domainprefs.pm 
+
+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.
 
@@ -13482,7 +13486,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_datatable">';
+                $text .= '<td><table class="LC_data_table">';
                 for (my $j=0; $j<$numchildren; $j++) {
                     $name = $cats->[$depth]{$parent}[$j];
                     $item = &escape($name).':'.&escape($parent).':'.$depth;
@@ -14576,8 +14580,8 @@ sub recurse_supplemental {
                 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 = &recurse_supplemental($cnum,$cdom,$1,$numfiles);
+                        if ($src =~ m{^\Q/uploaded/$cdom/$cnum/\E(supplemental_\d+\.sequence)$}) {
+                            ($numfiles,$errors) = &recurse_supplemental($cnum,$cdom,$1,$numfiles,$errors);
                         } else {
                             $numfiles ++;
                         }
@@ -14618,7 +14622,7 @@ sub symb_to_docspath {
                     my $thistitle = $res->title();
                     $path .= '&'.
                              &Apache::lonhtmlcommon::entity_encode($thisurl).'&'.
-                             &Apache::lonhtmlcommon::entity_encode($thistitle).
+                             &escape($thistitle).
                              ':'.$res->randompick().
                              ':'.$res->randomout().
                              ':'.$res->encrypted().
@@ -14634,7 +14638,7 @@ sub symb_to_docspath {
         }
         $path .= (($path ne '')? '&' : '').
                  &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                 &Apache::lonhtmlcommon::entity_encode($maptitle).
+                 &escape($maptitle).
                  ':'.$mapresobj->randompick().
                  ':'.$mapresobj->randomout().
                  ':'.$mapresobj->encrypted().
@@ -14647,11 +14651,11 @@ sub symb_to_docspath {
             $maptitle = 'Main Content';
         }
         $path = &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
-                &Apache::lonhtmlcommon::entity_encode($maptitle).':::::'.$ispage;
+                &escape($maptitle).':::::'.$ispage;
     }
     unless ($mapurl eq 'default') {
         $path = 'default&'.
-                &Apache::lonhtmlcommon::entity_encode('Main Content').
+                &escape('Main Content').
                 ':::::&'.$path;
     }
     return $path;