### Eclipse Workspace Patch 1.0
#P facetoface
Index: lib.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/facetoface/lib.php,v
retrieving revision 1.42
diff -u -r1.42 lib.php
--- lib.php	21 May 2009 05:56:44 -0000	1.42
+++ lib.php	26 Aug 2009 22:44:17 -0000
@@ -417,7 +417,7 @@
                                              timecancelled = 0");
     if ($signedupusers and count($signedupusers) > 0) {
         foreach ($signedupusers as $user) {
-            if (facetoface_user_cancel($session, $user->userid)) {
+            if (facetoface_user_cancel($session, $user->userid, true)) {
                 facetoface_send_cancellation_notice($facetoface, $session, $user->userid);
             }
             else {
@@ -1275,19 +1275,33 @@
  *
  * @param class $session record from the facetoface_sessions table
  * @param integer $userid ID of the user to remove from the session
+ * @param bool $forcecancel Forces cancellation of sessions that have already occurred
+ * @param string $errorstr Passed by reference. For setting error string in calling function
  */
-function facetoface_user_cancel($session, $userid=false) {
+function facetoface_user_cancel($session, $userid=false, $forcecancel=false, &$errorstr=null) {
 
     if (!$userid) {
         global $USER;
         $userid = $USER->id;
     }
 
+    // if $forcecancel is set, cancel session even if already occurred
+    // used by facetotoface_delete_session()
+    if (!$forcecancel) {
+        $timenow = time();
+        // don't allow user to cancel a session that has already occurred
+        if (facetoface_has_session_started($session, $timenow)) {
+            $errorstr = get_string('error:eventoccurred', 'facetoface');
+            return false;
+        }
+    }
+    
     if (facetoface_user_cancel_submission($session->id, $userid)) {
         facetoface_remove_bookings_from_user_calendar($session, $userid);
         return true;
     }
 
+    $errorstr = get_string('error:cancelbooking', 'facetoface');
     return false;
 }
 
@@ -1776,6 +1790,13 @@
 
                     }
 
+                    // don't include the link to cancel a session if it has already occurred
+                    if (!facetoface_has_session_started($session, $timenow)) {
+                        $cancellink = '<tr><td><span style="font-size: 11px; font-weight: bold; line-height: 14px;"><a href="'.$CFG->wwwroot.'/mod/facetoface/signup.php?s='.$session->id.'&amp;cancelbooking=1" alt="'.get_string('cancelbooking', 'facetoface').'" title="'.get_string('cancelbooking', 'facetoface').'">'.get_string('cancelbooking', 'facetoface').'</a></span></td></tr>';
+                    } else {
+                        $cancellink = '';
+                    }
+
                     $table = '<table border="0" cellpadding="1" cellspacing="0" width="90%">'
                             .'<tr>'
                             .'<td colspan="4"><span style="font-size: 11px; font-weight: bold; line-height: 14px;">'.get_string('bookingstatus', 'facetoface').':</span></td>'
@@ -1791,9 +1812,7 @@
                             .'<tr>'
                             .'<td><span style="font-size: 11px; font-weight: bold; line-height: 14px;"><a href="'.$CFG->wwwroot.'/mod/facetoface/attendees.php?s='.$session->id.'" alt="'.get_string('seeattendees', 'facetoface').'" title="'.get_string('seeattendees', 'facetoface').'">'.get_string('seeattendees', 'facetoface').'</a></span></td>'
                             .'</tr>'
-                            .'<tr>'
-                            .'<td><span style="font-size: 11px; font-weight: bold; line-height: 14px;"><a href="'.$CFG->wwwroot.'/mod/facetoface/signup.php?s='.$session->id.'&amp;cancelbooking=1" alt="'.get_string('cancelbooking', 'facetoface').'" title="'.get_string('cancelbooking', 'facetoface').'">'.get_string('cancelbooking', 'facetoface').'</a></span></td>'
-                            .'</tr>'
+                            .$cancellink
                             .'<tr>'
                             .'<td><span style="font-size: 11px; font-weight: bold; line-height: 14px"><a href="'.$CFG->wwwroot.'/mod/facetoface/view.php?f='.$facetofaceid.'" alt="'.get_string('viewallsessions', 'facetoface').'" title="'.get_string('viewallsessions', 'facetoface').'">'.get_string('viewallsessions', 'facetoface').'</a></span></td>'
                             .'</tr>'
Index: signup.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/facetoface/signup.php,v
retrieving revision 1.16
diff -u -r1.16 signup.php
--- signup.php	7 Aug 2009 02:51:23 -0000	1.16
+++ signup.php	26 Aug 2009 22:44:18 -0000
@@ -82,7 +82,7 @@
 
         } else if ($cancelbooking) {
 
-            if (facetoface_user_cancel($session)) {
+            if (facetoface_user_cancel($session, false, false, $errorstr)) {
 
                 add_to_log($course->id, 'facetoface', 'cancel booking', "signup.php?id=$cm->id", $facetoface->id, $cm->id);
 
@@ -114,9 +114,16 @@
                 redirect($url, $message, $timemessage);
 
             } else {
-                add_to_log($course->id, 'facetoface', 'cancel booking (FAILED)', "signup.php?id=$cm->id", $facetoface->id, $cm->id);
-
-                $errorstr = get_string('error:cancelbooking', 'facetoface');
+                // $errorstr now set by reference in facetoface_user_cancel()
+                //$errorstr = get_string('error:cancelbooking', 'facetoface');
+                
+                if ($errorstr === get_string('error:eventoccurred', 'facetoface')) {
+                    $reason='Too late to cancel';
+                } else {
+                    $reason='FAILED';
+                }
+                add_to_log($course->id, 'facetoface', "cancel booking ($reason)", "signup.php?id=$cm->id", $facetoface->id, $cm->id);
+                
             }
 
         } elseif (!empty($addmanager)) {
Index: signup.html
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/facetoface/signup.html,v
retrieving revision 1.8
diff -u -r1.8 signup.html
--- signup.html	21 May 2009 05:53:53 -0000	1.8
+++ signup.html	26 Aug 2009 22:44:18 -0000
@@ -151,8 +151,17 @@
     <td align="right" valign="top"><b><?php print_string('options', 'facetoface') ?>:</b></td>
     <td>
 <a href="<?php echo $CFG->wwwroot.'/mod/facetoface/attendees.php?s='.$session->id.'&amp;backtoallsessions='.$backtoallsessions; ?>" alt="<?php echo get_string('seeattendees', 'facetoface'); ?>" title="<?php echo get_string('seeattendees', 'facetoface'); ?>"><?php echo get_string('seeattendees', 'facetoface'); ?></a>
+<?php
+        $timenow=time();
+        // Only show cancel link if session has not yet started
+        if (!facetoface_has_session_started($session, $timenow)) {
+?>
 <br />
-<a href="<?php echo $CFG->wwwroot.'/mod/facetoface/signup.php?s='.$session->id.'&amp;cancelbooking=1&amp;backtoallsessions='.$backtoallsessions; ?>" alt="<?php echo get_string('cancelbooking', 'facetoface'); ?>" title="<?php echo get_string('cancelbooking','facetoface'); ?>"><?php echo get_string('cancelbooking', 'facetoface'); ?></a></td>
+<a href="<?php echo $CFG->wwwroot.'/mod/facetoface/signup.php?s='.$session->id.'&amp;cancelbooking=1&amp;backtoallsessions='.$backtoallsessions; ?>" alt="<?php echo get_string('cancelbooking', 'facetoface'); ?>" title="<?php echo get_string('cancelbooking','facetoface'); ?>"><?php echo get_string('cancelbooking', 'facetoface'); ?></a>
+<?php
+        }
+?>
+</td>
 </tr>
 <?php
     } // end of $cancelbooking
Index: editattendees.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/facetoface/editattendees.php,v
retrieving revision 1.6
diff -u -r1.6 editattendees.php
--- editattendees.php	22 Mar 2009 22:26:44 -0000	1.6
+++ editattendees.php	26 Aug 2009 22:44:17 -0000
@@ -83,7 +83,7 @@
                 continue; // invalid userid
             }
 
-            if (facetoface_user_cancel($session, $removeuser)) {
+            if (facetoface_user_cancel($session, $removeuser, true, $cancelerr)) {
                 // Notify the user of the cancellation if the session hasn't started yet
                 $timenow = time();
                 if (!$suppressemail and !facetoface_has_session_started($session, $timenow)) {
@@ -91,6 +91,7 @@
                 }
             }
             else {
+                $errors[] = $cancelerr;
                 $erruser = get_record('user', 'id', $removeuser, '','','','', 'id, firstname, lastname');
                 $errors[] = get_string('error:removeattendee', 'facetoface', fullname($erruser));
             }
Index: lang/en_utf8/facetoface.php
===================================================================
RCS file: /cvsroot/moodle/contrib/plugins/mod/facetoface/lang/en_utf8/facetoface.php,v
retrieving revision 1.19
diff -u -r1.19 facetoface.php
--- lang/en_utf8/facetoface.php	7 Aug 2009 02:51:24 -0000	1.19
+++ lang/en_utf8/facetoface.php	26 Aug 2009 22:44:18 -0000
@@ -94,6 +94,7 @@
 $string['error:emptylocation'] = 'Location was empty.';
 $string['error:emptyvenue'] = 'Venue was empty.';
 $string['error:enrolmentfailed'] = 'Could not enrol $a into the course.';
+$string['error:eventoccurred'] = 'You cannot cancel an event that has already occurred.';
 $string['error:incorrectcoursemodule'] = 'Course module is incorrect';
 $string['error:incorrectcoursemoduleid'] = 'Course Module ID was incorrect';
 $string['error:incorrectcoursemodulesession'] = 'Course Module Face-to-face Session was incorrect';