friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 6 Releases 16 Wiki Activity

CalDAV Calendar: version 0.2 #73

Merged
CatoTH merged 16 commits from master into master 2012-07-29 01:12:37 +02:00
Conversation 0 Commits 16 Files changed 124 +6 -4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d75d8b64fc - Show all commits

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

@ -347,7 +347,7 @@ function dav_get_current_user_calendar_by_id(&$server, $id, $with_privilege = ""
/**
* @param string $uid
* @return Sabre_VObject_Component_VEvent $vObject
* @return Sabre_VObject_Component_VCalendar $vObject
*/
function dav_create_empty_vevent($uid = "")
{
@ -359,8 +359,8 @@ function dav_create_empty_vevent($uid = "")
/**
* @param Sabre_VObject_Component_VEvent $vObject
* @return Sabre_VObject_Component|null
* @param Sabre_VObject_Component_VCalendar $vObject
* @return Sabre_VObject_Component_VEvent|null
*/
function dav_get_eventComponent(&$vObject)
{

4
dav/common/wdcal_edit.inc.php
View file

@ -261,7 +261,8 @@ function wdcal_getEditPage_str(&$localization, $baseurl, $calendar_id, $uri)
if ($recurrence && $recurrence->byDay) {
$byday = $recurrence->byDay;
} else {
$byday = array("MO", "TU", "WE", "TH", "FR", "SA", "SU");
$days = array("MO", "TU", "WE", "TH", "FR", "SA", "SU");
$byday = array($days[date("N", $event["StartTime"]) - 1]);
}
if ($localization->getFirstDayOfWeek() == 0) {
$out .= "<label class='plain'><input class='rec_weekly_byday' type='checkbox' name='rec_weekly_byday[]' value='SU' ";
@ -671,6 +672,7 @@ function wdcal_set_component_alerts(&$component, &$localization, $summary, $dtst
foreach ($prev_alarms as $al) {
/** @var Sabre_VObject_Component_VAlarm $al */
// @TODO Parse notifications that have been there before; e.g. from Lightning
}
foreach (array_keys($_REQUEST["noti_type"]) as $key) if (is_numeric($key) || ($key == "new" && $_REQUEST["new_alarm"] == 1)) {