--- loncom/interface/lonnotify.pm	2006/07/07 13:50:26	1.21
+++ loncom/interface/lonnotify.pm	2006/11/01 22:22:31	1.25
@@ -1,3 +1,7 @@
+# The LearningOnline Network with CAPA
+# Sending messages
+#
+# $Id: lonnotify.pm,v 1.25 2006/11/01 22:22:31 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,7 +31,7 @@ package Apache::lonnotify;
 use strict;
 use Apache::lonnet;
 use Apache::loncommon;
-use Apache::lonsupportreq;
+use Apache::courseclassifier;
 use LONCAPA::Enrollment;
 use Apache::Constants qw(:common :http);
 use Apache::lonlocal;
@@ -205,7 +209,7 @@ sub print_display_option_form {
             my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
             unless (grep/^$uname:$udom$/,@domcc) {
                 my %userinfo = &Apache::lonnet::get('environment',['lastname','firstname'],$udom,$uname);
-                $output .= '<input type="checkbox" name="sender" value="'.$uname.':'.$udom.'" />&nbsp;'.$userinfo{firstname}.' '.$userinfo{lastname}.'&nbsp;&nbsp;('.$uname.':'.$udom.')';
+                $output .= '<input type="checkbox" name="sender" value="'.$uname.':'.$udom.'" />&nbsp;'.$userinfo{'firstname'}.' '.$userinfo{'lastname'}.'&nbsp;&nbsp;('.$uname.':'.$udom.')';
                 push (@domcc,$uname.':'.$udom);
             }
         }
@@ -379,13 +383,18 @@ sub print_selection_form {
     &Apache::lonhtmlcommon::add_breadcrumb
           ({text=>"Select Audience"});
 
-    $totcodes = &Apache::lonsupportreq::retrieve_instcodes(\%coursecodes,$cdom,$totcodes);
+    $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$cdom,$totcodes);
     if ($totcodes > 0) {
         $format_reply = &Apache::lonnet::auto_instcode_format($caller,$cdom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
         if ($format_reply eq 'ok') {
             my $numtypes = @codetitles;
-            &Apache::lonsupportreq::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
-            &Apache::lonsupportreq::javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);
+            &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
+            my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
+            my $longtitles_str = join('","',@{$longtitles});
+            my $allidlist = $idlist{$codetitles[0]};
+            $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
+            $jscript .= $scripttext;
+            $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
         }
     }
 
@@ -498,7 +507,8 @@ function goBack(target) {
     my $coursefilter = $env{'form.coursepick'};
     my %courses = ();
     if ($coursefilter eq 'all') {
-        %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.');
+        %courses = &Apache::lonnet::courseiddump($cdom,'.','.','.','.','.',
+                                                 undef,undef,'Course');
     } elsif ($coursefilter eq 'category') {
         my $instcode = '';
         my @cats = ('Semester','Year','Department','Number');
@@ -512,7 +522,8 @@ function goBack(target) {
         if ($instcode eq '') {
             $instcode = '.';
         }
-        %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.');
+        %courses = &Apache::lonnet::courseiddump($cdom,'.','.',$instcode,'.','.',
+                                                 undef,undef,'Course');
     } elsif ($coursefilter eq 'specific') {
         if ($env{'form.coursetotal'} > 1) {
             my @course_ids = split(/&&/,$env{'form.courselist'});
@@ -605,14 +616,14 @@ function goBack(target) {
 	$output .= &Apache::loncommon::start_data_table();
         if (keys(%recipients) > 0) {
 	    $output .= &Apache::loncommon::start_data_table_header_row();
-            $output .= '<th>&nbsp;<th>username:domain</th><th>&nbsp;&nbsp;</th><th>'.$lt{'emad'}.'</th>';
+            $output .= '<th>&nbsp;<th>username:domain</th><th>'.$lt{'emad'}.'</th>';
 	    $output .= &Apache::loncommon::end_data_table_header_row();
         }
         foreach my $username (sort(keys(%recipients))) {
 	    $output .= &Apache::loncommon::start_data_table_row();
             if ($recipients{$username} =~ /\@/) {
                 my $value=&escape($username).':'.&escape($recipients{$username});
-                $output .= '<td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td>&nbsp;&nbsp;</td><td>'.$recipients{$username}.'</td>';
+                $output .= '<td><input type="checkbox" name="recipient" value="'.$value.'" /></td><td>'.$username.'</td><td>'.$recipients{$username}.'</td>';
             }
 	    $output .= &Apache::loncommon::end_data_table_row();
         }
@@ -728,7 +739,7 @@ sub get_user_info {
     my ($user,%email_defaults) = @_;
     my ($uname,$udom) = split(/:/,$user);
     my @emailtypes = ('permanentemail','critnotification','notification');
-    my %userinfo = &Apache::lonnet::get('environment',\@emailtypes,$udom,$uname);
+    my %userinfo = &Apache::loncommon::getemails($uname,$udom);
     my $email = '';
     foreach my $type (@emailtypes) {
         $email = $userinfo{$type};