diff --git a/e107_plugins/calendar_menu/calendar.php b/e107_plugins/calendar_menu/calendar.php
index d8da6e771..43709ea1e 100644
--- a/e107_plugins/calendar_menu/calendar.php
+++ b/e107_plugins/calendar_menu/calendar.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/calendar.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2009-02-01 20:54:08 $
+|     $Revision: 1.4 $
+|     $Date: 2009-04-29 20:27:18 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -146,7 +146,7 @@ $events = array();
 	  else
 	  {  // Its a 'normal' event
 		$tmp	= date('j',$row['event_start']);		// Day of month for start
-		$tmp2	= date('j',$row['event_end']);			// Day of month for end
+		$tmp2	= date('j',$row['event_end']-1);			// Day of month for end - knock off a second to allow for BST and suchlike
 
 		if(($row['event_start']>=$monthstart) && ($row['event_start']<=$monthend))
 		{	// Start within month
diff --git a/e107_plugins/calendar_menu/ecal_class.php b/e107_plugins/calendar_menu/ecal_class.php
index 7cdeab8fe..826e5e932 100644
--- a/e107_plugins/calendar_menu/ecal_class.php
+++ b/e107_plugins/calendar_menu/ecal_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/ecal_class.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-09-28 20:35:05 $
+|     $Revision: 1.9 $
+|     $Date: 2009-04-29 20:27:18 $
 |     $Author: e107steved $
 |
 | Event calendar class:
@@ -501,7 +501,7 @@ if (!defined("EC_DEFAULT_CATEGORY")) { define('EC_DEFAULT_CATEGORY',"Default");
 // Read a list of events between start and end dates
 // If $start_only is TRUE, only searches based on the start date/time
 // Potential option to hook in other routines later
-	function get_events($start_time, $end_time, $start_only=FALSE, $cat_filter='*', $inc_recur=FALSE, $event_fields='*', $cat_fields='*')
+	function get_events($start_time, $end_time, $start_only=FALSE, $cat_filter=0, $inc_recur=FALSE, $event_fields='*', $cat_fields='*')
 	{
 	  global $sql;
 	  
@@ -520,12 +520,12 @@ if (!defined("EC_DEFAULT_CATEGORY")) { define('EC_DEFAULT_CATEGORY',"Default");
 	  }
 
 	  if ($cat_filter && ($cat_filter != '*')) $category_filter = " AND find_in_set(e.event_category, '".$cat_filter."') ";
-	  if ($inc_recur) $extra = " OR (e.event_recurring >'0' AND (e.event_start <= ".intval($end_time)." AND e.event_end >= ".intval($start_time).")) ";
+	  if ($inc_recur) $extra = " OR (e.event_recurring >'0' AND (e.event_start < ".intval($end_time)." AND e.event_end >= ".intval($start_time).")) ";
 	  
 	  $so = $start_only ? 'start' : 'end';
 	  $qry = "SELECT {$event_fields}{$cat_fields} FROM #event as e {$cat_lj}
 		WHERE (
-		(e.event_recurring = '0' AND ((e.event_{$so} >= ".intval($start_time)." AND e.event_start <= ".intval($end_time).")))
+		(e.event_recurring = '0' AND ((e.event_{$so} >= ".intval($start_time)." AND e.event_start < ".intval($end_time).")))
 		{$extra})
 		{$category_filter} 
 		{$this->extra_query} 
diff --git a/e107_plugins/calendar_menu/subs_menu.php b/e107_plugins/calendar_menu/subs_menu.php
index dc2cadc20..d5786d545 100644
--- a/e107_plugins/calendar_menu/subs_menu.php
+++ b/e107_plugins/calendar_menu/subs_menu.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/calendar_menu/subs_menu.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2008-08-11 21:24:42 $
+|     $Revision: 1.4 $
+|     $Date: 2009-04-29 20:27:18 $
 |     $Author: e107steved $
 |
 +----------------------------------------------------------------------------+
@@ -114,7 +114,7 @@ subs_log_a_line("\r\n\r\nMail subscriptions run started at ".date("D j M Y G:i:s
 
 
 // Start with the 'in advance' emails
-$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class != '') and 
+$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class>0) and 
 event_cat_last < " . intval($cal_starttime) . " and 
 event_cat_ahead > 0 and 
 event_start >= (" . intval($cal_starttime) . "+(86400*(event_cat_ahead))) and
@@ -126,7 +126,7 @@ ec_send_mailshot($cal_args, 'Advance',1, $calendar_shortcodes);
 
 
 // then for today
-$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class != '') and 
+$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class>0) and 
 event_cat_today < " . intval($cal_starttime) . " and 
 event_start >= (" . intval($cal_starttime) . ") and
 event_start <  (86400+" . intval($cal_starttime) . ") and
@@ -135,12 +135,23 @@ find_in_set(event_cat_notify,'2,3,6,7')";
 ec_send_mailshot($cal_args, 'today',2, $calendar_shortcodes);
 
 
+if ($ec_debug_level == 0)
+{
 // Finally do 'day before' emails (its an alternative to 'today' emails)
-$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class != '') and 
+$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class>0) and 
 event_cat_today < " . intval($cal_starttime) . " and 
 event_start >= (" . intval($cal_starttime) ." + 86400 ) and
 event_start <  (" . intval($cal_starttime) ." + 172800) and
 find_in_set(event_cat_notify,'4,5,6,7')";
+}
+else
+{
+// Finally do 'day before' emails (its an alternative to 'today' emails)
+$cal_args = "select * from #event left join #event_cat on event_category=event_cat_id where (event_cat_subs>0 OR event_cat_force_class>0) and 
+event_start >= (" . intval($cal_starttime) ." + 86400 ) and
+event_start <  (" . intval($cal_starttime) ." + 172800) and
+find_in_set(event_cat_notify,'4,5,6,7')";
+}
 
 ec_send_mailshot($cal_args, 'tomorrow',2, $calendar_shortcodes);
 
@@ -234,52 +245,53 @@ function ec_send_mailshot($cal_query, $shot_type, $msg_num, $calendar_shortcodes
 	  // Best to strip entities here rather than at entry - handles old events as well
 	  $cal_title = html_entity_decode($tp -> parseTemplate($pref['eventpost_mailsubject'], FALSE, $calendar_shortcodes),ENT_QUOTES,CHARSET);
 	  $cal_msg = html_entity_decode($tp -> parseTemplate($cal_msg, FALSE, $calendar_shortcodes),ENT_QUOTES,CHARSET);
-//	  $cal_msg = str_replace("\r","\n",$cal_msg);
+		//	  $cal_msg = str_replace("\r","\n",$cal_msg);
 	  
-// Four cases for the query:
-//	1. No forced mailshots - based on event_subs table only									Need INNER JOIN
-//	2. Forced mailshot to members - send to all users (don't care about subscriptions)		Don't need JOIN
-// 	3. Forced mailshot to group of members - based on user table only						Don't need JOIN
-//	4. Forced mailshot to group, plus optional subscriptions - use the lot!    				Need LEFT JOIN
-// (Always block sent to banned members)
+			// Four cases for the query:
+			//	1. No forced mailshots - based on event_subs table only									Need INNER JOIN
+			//	2. Forced mailshot to members - send to all users (don't care about subscriptions)		Don't need JOIN
+			// 	3. Forced mailshot to group of members - based on user table only						Don't need JOIN
+			//	4. Forced mailshot to group, plus optional subscriptions - use the lot!    				Need LEFT JOIN
+			// (Always block sent to banned members)
 	  $manual_subs = (isset($pref['eventpost_asubs']) && ($pref['eventpost_asubs'] == '1'));
 	  $subs_fields = '';
 	  $subs_join = '';
-	  $where_clause = '';
+			$whereClause = '';
 	  $group_clause = '';
 	  
-	  
 	  if ($event_cat_force_class != e_UC_MEMBER)
 	  {  // Cases 1, 3, 4 (basic query does for case 2)
-	  
 	    if ((!$event_cat_force_class) || ($manual_subs))
 	    {  // Cases 1 & 4 - need to join with event_subs database
 	      $subs_fields = ", es.* ";
 		  if ($event_cat_force_class) $subs_join = "LEFT"; else $subs_join = "INNER";
 	      $subs_join   .= " join #event_subs AS es on u.user_id=es.event_userid ";
-		  $where_clause = " es.event_cat='".intval($event_category)."' ";
+					$whereClause = " es.event_cat='".intval($event_category)."' ";
 		  $group_clause = " GROUP BY u.user_id";
 	    }
 
 	    if ($event_cat_force_class)
 		{  // cases 3 and 4 - ... and check for involuntary subscribers
-		    if ($where_clause) $where_clause .= " OR ";
+					if ($whereClause) $whereClause .= " OR ";
 		    if ($event_cat_force_class == e_UC_ADMIN)
 		    {
-		      $where_clause .= "(u.user_admin = '1' )";
+						$whereClause .= "(u.user_admin = 1 )";
 		    }
 		    else
 		    {
-	          $where_clause .= "find_in_set('".intval($event_cat_force_class)."', u.user_class)";
+						$whereClause .= "find_in_set('".intval($event_cat_force_class)."', u.user_class)";
+//						$forced_regexp = "'(^|,)(".intval($event_cat_force_class).")(,|$)'";
+//						$whereClause .= " (u.user_class REGEXP '".$forced_regexp."') ";
+						$group_clause = " GROUP BY u.user_id";
 		    }
 		}
 
-	    if ($where_clause) $where_clause = ' AND ('.$where_clause.' ) ';
+				if ($whereClause) $whereClause = ' AND ('.$whereClause.' ) ';
 	  }   // End of cases 1, 3, 4
 	  
 	  $cal_emilargs = "SELECT u.user_id, u.user_class, u.user_email, u.user_name, u.user_ban, u.user_admin{$subs_fields}
 		  from #user AS u {$subs_join}
-		  WHERE u.user_ban = '0' {$where_clause} {$group_clause}";
+			  WHERE u.user_ban = '0' {$whereClause} {$group_clause}";
 		  
 
         if ($ec_debug_level >= 2)
@@ -299,7 +311,7 @@ function ec_send_mailshot($cal_query, $shot_type, $msg_num, $calendar_shortcodes
 			    $send_result = " **DEBUG**";
 			  if ($ec_log_requirement > 1)
 			  {
-			    subs_log_a_line("      Send to: ".$user_email." Name: ".$user_name." Result = ".$send_result."\r\n",FALSE,TRUE);
+						subs_log_a_line("      Send to ".$user_id.':'.$user_email." Name: ".$user_name." Result = ".$send_result."\r\n",FALSE,TRUE);
 			  }
             } 
         }