friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-07 00:48:55 +00:00
Code Issues Releases Wiki Activity

Database Upgrade routine, and some bugfixes

Browse source
This commit is contained in:
Tobias Hößl 2012-07-28 09:10:48 +00:00
parent 5b83872773
commit 9c757b18ab
7 changed files with 229 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dav/common/calendar.fnk.php
View file

@ -7,6 +7,8 @@ define("DAV_DISPLAYNAME", "{DAV:}displayname");
define("DAV_CALENDARCOLOR", "{http://apple.com/ns/ical/}calendar-color");
class DAVVersionMismatchException extends Exception {}
class vcard_source_data_email
{
@ -357,8 +359,8 @@ function dav_create_empty_vevent($uid = "")
/**
* @param Sabre_VObject_Component_VCalendar $vObject
* @return Sabre_VObject_Component_VEvent|null
* @param Sabre_VObject_Component_VEvent $vObject
* @return Sabre_VObject_Component|null
*/
function dav_get_eventComponent(&$vObject)
{

2
dav/common/dav_caldav_backend_private.inc.php
View file

@ -152,6 +152,7 @@ class Sabre_CalDAV_Backend_Private extends Sabre_CalDAV_Backend_Common
* common one is '{DAV:}displayname'.
*
* @param string $principalUri
* @throws DAVVersionMismatchException
* @return array
*/
public function getCalendarsForUser($principalUri)
@ -162,6 +163,7 @@ class Sabre_CalDAV_Backend_Private extends Sabre_CalDAV_Backend_Common
$cals = q("SELECT * FROM %s%scalendars WHERE `namespace` = %d AND `namespace_id` = %d", CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $this->getNamespace(), IntVal($n["namespace_id"]));
$ret = array();
foreach ($cals as $cal) {
if (!isset($cal["uri"])) throw new DAVVersionMismatchException();
if (in_array($cal["uri"], $GLOBALS["CALDAV_PRIVATE_SYSTEM_CALENDARS"])) continue;
$dat = array(