Index: lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v
retrieving revision 1.277.2.27
diff -u -r1.277.2.27 lib.php
--- lib.php	14 Feb 2008 07:25:11 -0000	1.277.2.27
+++ lib.php	20 Feb 2008 10:48:28 -0000
@@ -564,7 +564,11 @@
                     }
 
                     $submission->teacher    = $USER->id;
-                    $submission->mailed     = $updatedb?0:$submission->mailed;//only change if it's an update
+                    if (optional_param('mailed', 1, PARAM_INTEGER)){
+                       $submission->mailed = 1;
+                    } else {
+                        $submission->mailed     = $updatedb?0:$submission->mailed;//only change if it's an update
+                    }
                     $submission->timemarked = time();
 
                     //if it is not an update, we don't change the last modified time etc.
@@ -922,6 +926,7 @@
         }
 
         ///Print Buttons in Single View
+        echo '<p align="left"><input type="checkbox" name="mailed" value="0" />'.get_string('emailnotification','assignment').'</p>';
         echo '<div class="buttons">';
         echo '<input type="submit" name="submit" value="'.get_string('savechanges').'" onclick = "document.getElementById(\'submitform\').menuindex.value = document.getElementById(\'submitform\').grade.selectedIndex" />';
         echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />';
@@ -1273,7 +1278,7 @@
                     }
                 }
 
-				$userlink = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $auser->id . '&amp;course=' . $course->id . '">' . fullname($auser) . '</a>';
+                                $userlink = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $auser->id . '&amp;course=' . $course->id . '">' . fullname($auser) . '</a>';
                 $row = array($picture, $userlink, $grade, $comment, $studentmodified, $teachermodified, $status, $finalgrade);
                 if ($uses_outcomes) {
                     $row[] = $outcomes;
@@ -1295,6 +1300,7 @@
         }
 
         $table->print_html();  /// Print the whole table
+        echo '<p align="center">'.get_string('emailnotification', 'assignment').'<input type="checkbox" name="mailed" value="0" /></p>';
 
         if ($quickgrade){
             echo '<div style="text-align:center"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
@@ -1377,7 +1383,11 @@
             $submission->submissioncomment    = $feedback->submissioncomment;
             $submission->format     = $feedback->format;
             $submission->teacher    = $USER->id;
-            $submission->mailed     = 0;       // Make sure mail goes out (again, even)
+            if (optional_param('mailed', 1, PARAM_INTEGER)){
+              $submission->mailed = 1;
+            } else {
+              $submission->mailed     = 0;       // Make sure mail goes out (again, even)
+            }
             $submission->timemarked = time();
 
             unset($submission->data1);  // Don't need to update this.