Available Calendars:';
- foreach ($cals_avail as $cal) {
- $x .= '
@@ -179,166 +230,57 @@ function wdcal_printCalendar($calendars, $calendar_preselected, $data_feed_url,
/**
- * @param string $uri
+ * @param int $calendar_id
+ * @param int $calendarobject_id
* @param string $recurr_uri
* @return string
*/
-function wdcal_getDetailPage($uri, $recurr_uri)
+function wdcal_getDetailPage($calendar_id, $calendarobject_id, $recurr_uri)
{
$a = get_app();
- $details = null;
- $cals = dav_getMyCals($a->user["uid"]);
- foreach ($cals as $c) {
- $cs = wdcal_calendar_factory($a->user["uid"], $c->namespace, $c->namespace_id);
- $p = $cs->getPermissionsItem($a->user["uid"], $uri, $recurr_uri);
- if ($p["read"]) try {
- $redirect = $cs->getItemDetailRedirect($uri);
- if ($redirect !== null) goaway($redirect);
- $details = $cs->getItemByUri($uri);
- } catch (Exception $e) {
- notification(t("Error") . ": " . $e);
- goaway($a->get_baseurl() . "/dav/wdcal/");
- }
- }
+ try {
+ $details = null;
+ $server = dav_create_server(true, true, false);
+ $cal = dav_get_current_user_calendar_by_id($server, $calendar_id, DAV_ACL_READ);
+ $obj = Sabre_CalDAV_Backend_Common::loadCalendarobjectById($calendarobject_id);
+ dav_get_current_user_calendarobject($server, $cal, $obj["uri"], DAV_ACL_READ); // Check permissions
+
+ $calbackend = wdcal_calendar_factory_by_id($calendar_id);
+ $redirect = $calbackend->getItemDetailRedirect($calendar_id, $calendarobject_id);
+ if ($redirect !== null) goaway($a->get_baseurl() . $redirect);
- return $uri . " / " . $recurr_uri . "
" . print_r($details, true);
+ $details = $obj;
+ } catch (Exception $e) {
+ info(t("Error") . ": " . $e);
+ goaway($a->get_baseurl() . "/dav/wdcal/");
+ }
+
+ return print_r($details, true);
}
+
/**
- * @param string $uri
+ * @param int $calendar_id
+ * @param int $uri
* @param string $recurr_uri
* @return string
*/
-function wdcal_getEditPage($uri, $recurr_uri = "")
+function wdcal_getEditPage($calendar_id, $uri, $recurr_uri = "")
{
-
$a = get_app();
$localization = wdcal_local::getInstanceByUser($a->user["uid"]);
- if ($uri != "" && $uri != "new") {
- $o = q("SELECT * FROM %s%sjqcalendar WHERE `uid` = %d AND `ical_uri` = '%s' AND `ical_recurr_uri` = '%s'",
- CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $a->user["uid"], dbesc($uri), dbesc($recurr_uri)
- );
- if (count($o) != 1) return t('Not found');
- $event = $o[0];
-
- $calendarSource = wdcal_calendar_factory($a->user["uid"], $event["namespace"], $event["namespace_id"]);
-
- $permissions = $calendarSource->getPermissionsItem($a->user["uid"], $uri, $recurr_uri, $event);
-
- if (!$permissions["write"]) return t('No access');
-
- $n = q("SELECT * FROM %s%snotifications WHERE `uid` = %d AND `ical_uri` = '%s' AND `ical_recurr_uri` = '%s'",
- CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $a->user["uid"], dbesc($uri), dbesc($recurr_uri)
- );
- if (count($n) > 0) {
- $notification_type = $n[0]["rel_type"];
- $notification_value = -1 * $n[0]["rel_value"];
- $notification = true;
- } else {
- if ($event["IsAllDayEvent"]) {
- $notification_type = "hour";
- $notification_value = 24;
- } else {
- $notification_type = "minute";
- $notification_value = 60;
- }
- $notification = false;
- }
-
-
- } elseif (isset($_REQUEST["start"]) && $_REQUEST["start"] > 0) {
- $event = array(
- "id" => 0,
- "Subject" => $_REQUEST["title"],
- "Location" => "",
- "Description" => "",
- "StartTime" => wdcal_php2MySqlTime($_REQUEST["start"]),
- "EndTime" => wdcal_php2MySqlTime($_REQUEST["end"]),
- "IsAllDayEvent" => $_REQUEST["isallday"],
- "Color" => null,
- "RecurringRule" => null,
- );
- if ($_REQUEST["isallday"]) {
- $notification_type = "hour";
- $notification_value = 24;
- } else {
- $notification_type = "hour";
- $notification_value = 1;
- }
+ return wdcal_getEditPage_str($localization, $a->get_baseurl(), $a->user["uid"], $calendar_id, $uri, $recurr_uri);
+}
- $notification = true;
- } else {
- $event = array(
- "id" => 0,
- "Subject" => "",
- "Location" => "",
- "Description" => "",
- "StartTime" => date("Y-m-d H:i:s"),
- "EndTime" => date("Y-m-d H:i:s", time() + 3600),
- "IsAllDayEvent" => "0",
- "Color" => "#5858ff",
- "RecurringRule" => null,
- );
- $notification_type = "hour";
- $notification_value = 1;
- $notification = true;
- }
+function wdcal_getNewPage()
+{
+ $a = get_app();
+ $localization = wdcal_local::getInstanceByUser($a->user["uid"]);
- $postto = $a->get_baseurl() . "/dav/wdcal/" . ($uri == "new" ? "new/" : $uri . "/edit/");
-
- $out = "
" . t("Go back to the calendar") . "";
- $out .= "
";
-
- return $out;
+ return wdcal_getEditPage_str($localization, $a->get_baseurl(), $a->user["uid"], 0, 0);
}