From 4235b559805d7a8e1136796650e047d8f43960cc Mon Sep 17 00:00:00 2001 From: skeeter Date: Thu, 30 Aug 2001 19:06:24 +0000 Subject: [PATCH] Small changes to allow an ignore of conflicting events. --- calendar/inc/class.bocalendar.inc.php | 8 ++++++-- calendar/inc/class.socalendar.inc.php | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php index 3b79ba4670..f67ed0bd90 100755 --- a/calendar/inc/class.bocalendar.inc.php +++ b/calendar/inc/class.bocalendar.inc.php @@ -389,9 +389,11 @@ $ui = CreateObject('calendar.uicalendar'); - if(isset($HTTP_GET_VARS['readsess'])) + if(isset($GLOBALS['HTTP_GET_VARS']['readsess'])) { $event = $this->restore_from_appsession(); + $event['title'] = stripslashes($event['title']); + $event['description'] = stripslashes($event['description']); $datetime_check = $this->validate_update($event); if($datetime_check) { @@ -523,6 +525,8 @@ $this->so->add_attribute('priority',$l_cal['priority']); $event = $this->get_cached_event(); + $event['title'] = addslashes($event['title']); + $event['description'] = addslashes($event['description']); $this->store_to_appsession($event); $datetime_check = $this->validate_update($event); if($datetime_check) @@ -657,7 +661,7 @@ { $error = 0; // do a little form verifying - if (!$event['participants']) + if (!count($event['participants'])) { $error = 43; } diff --git a/calendar/inc/class.socalendar.inc.php b/calendar/inc/class.socalendar.inc.php index 6b26994fc4..839e8cbc1b 100755 --- a/calendar/inc/class.socalendar.inc.php +++ b/calendar/inc/class.socalendar.inc.php @@ -37,6 +37,8 @@ echo 'SO Filter : '.$this->filter."
\n"; echo 'SO cat_id : '.$this->cat_id."
\n"; } + $this->cal = CreateObject('calendar.socalendar_'); + $this->cal->open('INBOX',intval($this->owner)); } function makeobj()