From 6fb2941327c3471218ec5b6a6dab1d3980387281 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Sat, 14 Apr 2001 02:57:51 +0000
Subject: [PATCH] Fix for bug #413848, #414865 - Repeating Weekly events

---
 calendar/edit_entry_handler.php         |  2 ++
 calendar/inc/class.calendar.inc.php     | 14 +++++++-------
 calendar/inc/class.calendar_sql.inc.php |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index c5a18b2dce..c57344225e 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -128,6 +128,8 @@
 			$recur_enddate[mday] = 0;
 		}
 
+		$recur_data = $cal[rpt_sun] + $cal[rpt_mon] + $cal[rpt_tue] + $cal[rpt_wed] + $cal[rpt_thu] + $cal[rpt_fri] + $cal[rpt_sat];
+		
 		switch($recur_type)
 		{
 			case RECUR_NONE:
diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php
index b16d88ddd2..43037ede83 100755
--- a/calendar/inc/class.calendar.inc.php
+++ b/calendar/inc/class.calendar.inc.php
@@ -1620,31 +1620,31 @@ class calendar extends calendar_
 			if($event->recur_type == RECUR_WEEKLY || $event->recur_type == RECUR_DAILY)
 			{
 				$repeat_days = '';
-				if ($event->recur_data & M_SUNDAY)
+				if (!!($event->recur_data & M_SUNDAY) == True)
 				{
 					$this->view_add_day(lang('Sunday '),$repeat_days);
 				}
-				if ($event->recur_data & M_MONDAY)
+				if (!!($event->recur_data & M_MONDAY) == True)
 				{
 					$this->view_add_day(lang('Monday '),$repeat_days);
 				}
-				if ($event->recur_data & M_TUESDAY)
+				if (!!($event->recur_data & M_TUESDAY) == True)
 				{
 					$this->view_add_day(lang('Tuesay '),$repeat_days);
 				}
-				if ($event->recur_data & M_WEDNESDAY)
+				if (!!($event->recur_data & M_WEDNESDAY) == True)
 				{
 					$this->view_add_day(lang('Wednesday '),$repeat_days);
 				}
-				if ($event->recur_data & M_THURSDAY)
+				if (!!($event->recur_data & M_THURSDAY) == True)
 				{
 					$this->view_add_day(lang('Thursday '),$repeat_days);
 				}
-				if ($event->recur_data & M_FRIDAY)
+				if (!!($event->recur_data & M_FRIDAY) == True)
 				{
 					$this->view_add_day(lang('Friday '),$repeat_days);
 				}
-				if ($event->recur_data & M_SATURDAY)
+				if (!!($event->recur_data & M_SATURDAY) == True)
 				{
 					$this->view_add_day(lang('Saturday '),$repeat_days);
 				}
diff --git a/calendar/inc/class.calendar_sql.inc.php b/calendar/inc/class.calendar_sql.inc.php
index eaeee68097..3e11855226 100755
--- a/calendar/inc/class.calendar_sql.inc.php
+++ b/calendar/inc/class.calendar_sql.inc.php
@@ -339,7 +339,7 @@ class calendar_ extends calendar__
 				//$this->event->recur_data = $this->stream->f('recur_data');
 				// But until then, do it this way...
 		//Legacy Support
-				$rpt_days = strtoupper($this->stream->f('cal_rpt_days'));
+				$rpt_days = strtoupper($this->stream->f('cal_days'));
 				$this->event->rpt_days = $rpt_days;
 				$this->event->rpt_sun = (substr($rpt_days,0,1)=='Y'?1:0);
 				$this->event->rpt_mon = (substr($rpt_days,1,1)=='Y'?1:0);
@@ -350,7 +350,7 @@ class calendar_ extends calendar__
 				$this->event->rpt_sat = (substr($rpt_days,6,1)=='Y'?1:0);
 
 		//Legacy Support (New)
-				$rpt_days = strtoupper($this->stream->f('cal_rpt_days'));
+				$rpt_days = strtoupper($this->stream->f('cal_days'));
 				$this->event->recur_data = 0;
 				$this->event->recur_data += (substr($rpt_days,0,1)=='Y'?M_SUNDAY:0);
 				$this->event->recur_data += (substr($rpt_days,1,1)=='Y'?M_MONDAY:0);