extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to allow an ignore of conflicting events.

Browse Source
This commit is contained in:
skeeter 2001-08-30 19:06:24 +00:00
parent a08d84199c
commit 4235b55980
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.bocalendar.inc.php
View File

@ -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;
}

2
calendar/inc/class.socalendar.inc.php
View File

@ -37,6 +37,8 @@
echo 'SO Filter : '.$this->filter."<br>\n";
echo 'SO cat_id : '.$this->cat_id."<br>\n";
}
$this->cal = CreateObject('calendar.socalendar_');
$this->cal->open('INBOX',intval($this->owner));
}
function makeobj()