csolisr/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests 1 Activity

Select only one day by default for weekly recurrence

Browse source
This commit is contained in:
Tobias Hößl 2012-07-28 09:30:39 +00:00
parent 9c757b18ab
commit d75d8b64fc
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 * @param string $uid
* @return Sabre_VObject_Component_VEvent $vObject * @return Sabre_VObject_Component_VCalendar $vObject
*/ */
function dav_create_empty_vevent($uid = "") function dav_create_empty_vevent($uid = "")
{ {
@ -359,8 +359,8 @@ function dav_create_empty_vevent($uid = "")
/** /**
* @param Sabre_VObject_Component_VEvent $vObject * @param Sabre_VObject_Component_VCalendar $vObject
* @return Sabre_VObject_Component|null * @return Sabre_VObject_Component_VEvent|null
*/ */
function dav_get_eventComponent(&$vObject) 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) { if ($recurrence && $recurrence->byDay) {
$byday = $recurrence->byDay; $byday = $recurrence->byDay;
} else { } 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) { if ($localization->getFirstDayOfWeek() == 0) {
$out .= "<label class='plain'><input class='rec_weekly_byday' type='checkbox' name='rec_weekly_byday[]' value='SU' "; $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) { foreach ($prev_alarms as $al) {
/** @var Sabre_VObject_Component_VAlarm $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)) { foreach (array_keys($_REQUEST["noti_type"]) as $key) if (is_numeric($key) || ($key == "new" && $_REQUEST["new_alarm"] == 1)) {