--- loncom/interface/lonnotify.pm	2006/03/16 20:09:35	1.12
+++ loncom/interface/lonnotify.pm	2006/03/16 20:13:06	1.13
@@ -218,11 +218,8 @@ sub print_display_option_form {
     $output .= &Apache::lonhtmlcommon::row_closure();
     $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
     $output .= &Apache::lonhtmlcommon::end_pick_box();
-    $output .= qq(
-<input type="hidden" name="sortby" value="date" />
-</form>
-</body>
-</html>);
+    $output .= qq(<input type="hidden" name="sortby" value="date" />\n).
+	&end_page();
     $r->print($output);
     return;
 }
@@ -368,10 +365,7 @@ ENDSCRIPT
     $output .= qq(<input type="hidden" name="origin" value="$formname" />\n);
     $output .= qq(<input type="hidden" name="command" />\n);
     $output .= qq(<input type="hidden" name="sortby" value="$curr_sortby" />\n);
-    $output .= qq(
-</form>
-</body
-</html>);
+    $output .= &end_page();
     $r->print($output);
     return;
 }
@@ -465,28 +459,25 @@ function setCourseCat(formname) {
     my $output = &start_page(&add_script($jscript).$cb_jscript,
 			     $bodytag, 'Choose e-mail audience', $formname);
 
-   $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
-   my @roles = ('ow','cc','in','ta','ep','st','cr');
-   my %longtypes = ();
-   my %authtypes = ();
-   &form_elements(\%longtypes,\%authtypes);
-   my $descrip = $lt{'buil'}.' 
+    $output .= &Apache::lonhtmlcommon::start_pick_box($table_width);
+    my @roles = ('ow','cc','in','ta','ep','st','cr');
+    my %longtypes = ();
+    my %authtypes = ();
+    &form_elements(\%longtypes,\%authtypes);
+    my $descrip = $lt{'buil'}.' 
 <ul>
 <li>'.$lt{'kerb'}.'<br />(e.g., MSU.EDU=msu.edu, MSUE.EDU=msue.msu.edu).</li>
 <li>'.$lt{'infs'}.'</li>
 </ul>'."\n";
-   my $submit_text = $lt{'comp'};
-   my $cmd = 'compose';
-   $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,$col_width,$tablecolor,'Roles');
-   $output .= &Apache::lonhtmlcommon::course_select_row($col_width,$tablecolor,'Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
-   $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,$col_width,$tablecolor,&mt('Access status'));
-   $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,$col_width,$tablecolor,&mt('Username -> Email conversion'),$descrip);
-   $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
-   $output .= &Apache::lonhtmlcommon::end_pick_box();
-   $output .= qq(
-</form>
-</body>
-</html>);
+    my $submit_text = $lt{'comp'};
+    my $cmd = 'compose';
+    $output .= &Apache::lonhtmlcommon::role_select_row(\@roles,$col_width,$tablecolor,'Roles');
+    $output .= &Apache::lonhtmlcommon::course_select_row($col_width,$tablecolor,'Courses',$formname,$totcodes,\@codetitles,\%idlist,\%idlist_titles);
+    $output .= &Apache::lonhtmlcommon::status_select_row(\%longtypes,$col_width,$tablecolor,&mt('Access status'));
+    $output .= &Apache::lonhtmlcommon::email_default_row(\%authtypes,$col_width,$tablecolor,&mt('Username -> Email conversion'),$descrip);
+    $output .= &Apache::lonhtmlcommon::submit_row($col_width,$tablecolor,&mt('Submit'),$cmd,$submit_text);
+    $output .= &Apache::lonhtmlcommon::end_pick_box();
+    $output .= &end_page();
     $r->print($output);
     return;
 }
@@ -659,7 +650,7 @@ function goBack(target) {
     }
     $output .= '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
     $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin','subject','message','recipient','sender'],);
-    $output .= '</form></body></html>';
+    $output .= &end_page();
     $r->print($output);
     return;
 }
@@ -728,10 +719,7 @@ ENDSCRIPT
     $output .= '<input type="hidden" name="command" />'."\n".
                '<input type="hidden" name="origin" value="'.$formname.'" />'."\n";
     $output .= &Apache::lonhtmlcommon::echo_form_input(['command','origin']);
-    $output .= '
-</form>
-</body>
-</html>';
+    $output .= &end_page();
     $r->print($output);
     return;
 }