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

two patches from Benjamin Donnachie to fix

Browse Source 
- async service
- make calendar notifications working again
This commit is contained in:
Lars Kneschke 2006-01-22 19:24:00 +00:00
parent 785391f71d
commit 1b03623316
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.bocalupdate.inc.php
View File

@ -3,6 +3,10 @@
* eGroupWare - Calendar's buisness-object: access + update * * eGroupWare - Calendar's buisness-object: access + update *
* http://www.egroupware.org * * http://www.egroupware.org *
* Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de> * * Written and (c) 2005 by Ralf Becker <RalfBecker@outdoor-training.de> *
* *
* Modified by Benjamin Donnachie <benjamin@pythagoras.no-ip.org> *
* to remove calendar reminder bug in send_alarm(). *
* Changes Copyright (c) Benjamin Donnachie 2006. *
* -------------------------------------------- * * -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the * * under the terms of the GNU General Public License as published by the *
@ -615,7 +619,7 @@ class bocalupdate extends bocal
//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n"; //echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
$GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner']; $GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
if (!$alarm['enabled'] || !$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id']))) if (/*!$alarm['enabled'] || */!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'])))
{ {
return False; // event not found return False; // event not found
} }

6
phpgwapi/inc/class.vfs_sql2.inc.php
View File

@ -5,6 +5,7 @@
* Jason Wies (Zone) <zone@phpgroupware.org> * * Jason Wies (Zone) <zone@phpgroupware.org> *
* This class handles file/dir access for eGroupWare * * This class handles file/dir access for eGroupWare *
* Copyright (C) 2001 Jason Wies, (C) 2004 Vinicius Cubas Brand * * Copyright (C) 2001 Jason Wies, (C) 2004 Vinicius Cubas Brand *
* and (c) 2006 Benjamin Donnachie *
* -------------------------------------------------------------------------* * -------------------------------------------------------------------------*
* This library is part of the eGroupWare API * * This library is part of the eGroupWare API *
* http://www.egroupware.org/api * * http://www.egroupware.org/api *
@ -39,6 +40,9 @@
#upd viniciuscb 2005-03-11 Deleted some garbage #upd viniciuscb 2005-03-11 Deleted some garbage
#upd Benjamin Donnachie <benjamin@pythagoras.no-ip.org> 2006-01-09
# Fixed function in_docroot so that it works with asyncservices
/** /**
* Class: vfs * Class: vfs
* *
@ -195,7 +199,7 @@
{ {
$len = strlen($docroot); $len = strlen($docroot);
if ($docroot == substr($path,0,$len)) if ($docroot != "" && $docroot == substr($path,0,$len))
{ {
$rest = substr($path,$len); $rest = substr($path,$len);