No OneTemporary
Actions

Size

40 KB

Subscribers

None

View Options

	diff --git a/helper.php b/helper.php
	--- a/helper.php
	+++ b/helper.php
	@@ -1,342 +1,366 @@
	<?php
	/**
	* Helper Class for the tagrevisions plugin
	* This helper does the actual work.
	*
	* Configurable in DokuWiki's configuration
	*/

	// must be run within Dokuwiki
	if(!defined('DOKU_INC')) die();

	class helper_plugin_davcal extends DokuWiki_Plugin {

	protected $sqlite = null;

	/**
	* Constructor to load the configuration
	*/
	public function helper_plugin_davcal() {
	$this->sqlite =& plugin_load('helper', 'sqlite');
	if(!$this->sqlite)
	{
	msg('This plugin requires the sqlite plugin. Please install it.');
	return;
	}

	if(!$this->sqlite->init('davcal', DOKU_PLUGIN.'davcal/db/'))
	{
	return;
	}
	}

	public function setCalendarNameForPage($name, $description, $id = null, $userid = null)
	{
	if(is_null($id))
	{
	global $ID;
	$id = $ID;
	}
	if(is_null($userid))
	$userid = $_SERVER['REMOTE_USER'];
	$calid = $this->getCalendarIdForPage($id);
	if($calid === false)
	return $this->createCalendarForPage($name, $description, $id, $userid);

	// Update the calendar name here

	}

	public function savePersonalSettings($settings, $userid = null)
	{
	if(is_null($userid))
	$userid = $_SERVER['REMOTE_USER'];
	$this->sqlite->query("BEGIN TRANSACTION");

	+ $query = "DELETE FROM calendarsettings WHERE userid=".$this->sqlite->quote_string($userid);
	+ $this->sqlite->query($query);
	+
	foreach($settings as $key => $value)
	{
	- $query = "INSERT OR REPLACE INTO calendarsettings (userid, key, value) VALUES (".
	+ $query = "INSERT INTO calendarsettings (userid, key, value) VALUES (".
	$this->sqlite->quote_string($userid).", ".
	$this->sqlite->quote_string($key).", ".
	$this->sqlite->quote_string($value).")";
	$res = $this->sqlite->query($query);
	if($res === false)
	return false;
	}
	$this->sqlite->query("COMMIT TRANSACTION");
	return true;
	}

	public function getPersonalSettings($userid = null)
	{
	if(is_null($userid))
	$userid = $_SERVER['REMOTE_USER'];
	-
	- $settings = array();
	+ // Some sane default settings
	+ $settings = array(
	+ 'timezone' => 'local',
	+ 'weeknumbers' => '0',
	+ 'workweek' => '0'
	+ );
	$query = "SELECT key, value FROM calendarsettings WHERE userid=".$this->sqlite->quote_string($userid);
	$res = $this->sqlite->query($query);
	$arr = $this->sqlite->res2arr($res);
	foreach($arr as $row)
	{
	$settings[$row['key']] = $row['value'];
	}
	return $settings;
	}

	public function getCalendarIdForPage($id = null)
	{
	if(is_null($id))
	{
	global $ID;
	$id = $ID;
	}

	$query = "SELECT calid FROM pagetocalendarmapping WHERE page=".$this->sqlite->quote_string($id);
	$res = $this->sqlite->query($query);
	$row = $this->sqlite->res2row($res);
	if(isset($row['calid']))
	return $row['calid'];
	else
	return false;
	}

	public function getCalendarIdToPageMapping()
	{
	$query = "SELECT calid, page FROM pagetocalendarmapping";
	$res = $this->sqlite->query($query);
	$arr = $this->sqlite->res2arr($res);
	return $arr;
	}

	public function getCalendarIdsForUser($principalUri)
	{
	$user = explode('/', $principalUri);
	$user = end($user);
	$mapping = $this->getCalendarIdToPageMapping();
	$calids = array();
	foreach($mapping as $row)
	{
	$id = $row['calid'];
	$page = $row['page'];
	$acl = auth_quickaclcheck($page);
	if($acl >= AUTH_READ)
	{
	$write = $acl > AUTH_READ;
	$calids[$id] = array('readonly' => !$write);
	}
	}
	return $calids;
	}

	public function createCalendarForPage($name, $description, $id = null, $userid = null)
	{
	if(is_null($id))
	{
	global $ID;
	$id = $ID;
	}
	if(is_null($userid))
	$userid = $_SERVER['REMOTE_USER'];
	$values = array('principals/'.$userid,
	$name,
	str_replace(array('/', ' ', ':'), '_', $id),
	$description,
	'VEVENT,VTODO',
	0,
	1);
	$query = "INSERT INTO calendars (principaluri, displayname, uri, description, components, transparent, synctoken) VALUES (".$this->sqlite->quote_and_join($values, ',').");";
	$res = $this->sqlite->query($query);
	if($res === false)
	return false;
	$query = "SELECT id FROM calendars WHERE principaluri=".$this->sqlite->quote_string($values[0])." AND ".
	"displayname=".$this->sqlite->quote_string($values[1])." AND ".
	"uri=".$this->sqlite->quote_string($values[2])." AND ".
	"description=".$this->sqlite->quote_string($values[3]);
	$res = $this->sqlite->query($query);
	$row = $this->sqlite->res2row($res);
	if(isset($row['id']))
	{
	$values = array($id, $row['id']);
	$query = "INSERT INTO pagetocalendarmapping (page, calid) VALUES (".$this->sqlite->quote_and_join($values, ',').")";
	$res = $this->sqlite->query($query);
	return ($res !== false);
	}

	return false;
	}

	public function addCalendarEntryToCalendarForPage($id, $user, $params)
	{
	+ $settings = $this->getPersonalSettings($user);
	+ if($settings['timezone'] !== '' && $settings['timezone'] !== 'local')
	+ $timezone = new \DateTimeZone($settings['timezone']);
	+ else
	+ $timezone = new \DateTimeZone('UTC');
	require_once('vendor/autoload.php');
	$vcalendar = new \Sabre\VObject\Component\VCalendar();
	$event = $vcalendar->add('VEVENT');
	$event->summary = $params['eventname'];
	- $dtStart = new \DateTime($params['eventfrom'], new \DateTimeZone('Europe/Vienna')); // FIXME: Timezone
	- $dtEnd = new \DateTime($params['eventto'], new \DateTimeZone('Europe/Vienna')); // FIXME: Timezone
	+ $dtStart = new \DateTime($params['eventfrom'], $timezone);
	+ $dtEnd = new \DateTime($params['eventto'], $timezone);
	$event->DTSTART = $dtStart;
	$event->DTEND = $dtEnd;
	$calid = $this->getCalendarIdForPage($id);
	$uri = uniqid('dokuwiki-').'.ics';
	$now = new DateTime();
	$eventStr = $vcalendar->serialize();

	$values = array($calid,
	$uri,
	$eventStr,
	$now->getTimestamp(),
	'VEVENT',
	$event->DTSTART->getDateTime()->getTimeStamp(),
	$event->DTEND->getDateTime()->getTimeStamp(),
	strlen($eventStr),
	md5($eventStr),
	uniqid()
	);

	$query = "INSERT INTO calendarobjects (calendarid, uri, calendardata, lastmodified, componenttype, firstoccurence, lastoccurence, size, etag, uid) VALUES (".$this->sqlite->quote_and_join($values, ',').")";
	$res = $this->sqlite->query($query);
	if($res !== false)
	{
	$this->updateSyncTokenLog($calid, $uri, 'added');
	return true;
	}
	return false;
	}

	public function getEventsWithinDateRange($id, $user, $startDate, $endDate)
	{
	+ $settings = $this->getPersonalSettings($user);
	+ if($settings['timezone'] !== '' && $settings['timezone'] !== 'local')
	+ $timezone = new \DateTimeZone($settings['timezone']);
	+ else
	+ $timezone = new \DateTimeZone('UTC');
	$data = array();
	require_once('vendor/autoload.php');
	$calid = $this->getCalendarIdForPage($id);
	$startTs = new \DateTime($startDate);
	$endTs = new \DateTime($endDate);
	$query = "SELECT calendardata, componenttype, uid FROM calendarobjects WHERE calendarid=".
	$this->sqlite->quote_string($calid)." AND firstoccurence > ".
	$this->sqlite->quote_string($startTs->getTimestamp())." AND firstoccurence < ".
	$this->sqlite->quote_string($endTs->getTimestamp());
	$res = $this->sqlite->query($query);
	$arr = $this->sqlite->res2arr($res);
	foreach($arr as $row)
	{
	if(isset($row['calendardata']))
	{
	$vcal = \Sabre\VObject\Reader::read($row['calendardata']);
	$start = $vcal->VEVENT->DTSTART->getDateTime();
	$end = $vcal->VEVENT->DTEND->getDateTime();
	+ $start->setTimezone($timezone);
	+ $end->setTimezone($timezone);
	$summary = (string)$vcal->VEVENT->summary;
	- $data[] = array("title" => $summary, "start" => $start->format(\DateTime::W3C),
	- "end" => $end->format(\DateTime::W3C),
	+ $data[] = array("title" => $summary, "start" => $start->format(\DateTime::ATOM),
	+ "end" => $end->format(\DateTime::ATOM),
	"id" => $row['uid']);
	}
	}
	return $data;
	}

	public function getEventWithUid($uid)
	{
	$query = "SELECT calendardata, calendarid, componenttype, uri FROM calendarobjects WHERE uid=".
	$this->sqlite->quote_string($uid);
	$res = $this->sqlite->query($query);
	$row = $this->sqlite->res2row($res);
	return $row;
	}

	public function editCalendarEntryForPage($id, $user, $params)
	{
	+ $settings = $this->getPersonalSettings($user);
	+ if($settings['timezone'] !== '' && $settings['timezone'] !== 'local')
	+ $timezone = new \DateTimeZone($settings['timezone']);
	+ else
	+ $timezone = new \DateTimeZone('UTC');
	$uid = $params['uid'];
	$event = $this->getEventWithUid($uid);
	require_once('vendor/autoload.php');
	if(!isset($event['calendardata']))
	return false;
	$uri = $event['uri'];
	$calid = $event['calendarid'];
	$vcal = \Sabre\VObject\Reader::read($event['calendardata']);
	$vcal->VEVENT->summary = $params['eventname'];
	- $dtStart = new \DateTime($params['eventfrom'], new \DateTimeZone('Europe/Vienna')); // FIXME: Timezone
	- $dtEnd = new \DateTime($params['eventto'], new \DateTimeZone('Europe/Vienna')); // FIXME: Timezone
	+ $dtStart = new \DateTime($params['eventfrom'], $timezone);
	+ $dtEnd = new \DateTime($params['eventto'], $timezone);
	$vcal->VEVENT->DTSTART = $dtStart;
	$vcal->VEVENT->DTEND = $dtEnd;
	$now = new DateTime();
	$eventStr = $vcal->serialize();

	$query = "UPDATE calendarobjects SET calendardata=".$this->sqlite->quote_string($eventStr).
	", lastmodified=".$this->sqlite->quote_string($now->getTimestamp()).
	", firstoccurence=".$this->sqlite->quote_string($dtStart->getTimestamp()).
	", lastoccurence=".$this->sqlite->quote_string($dtEnd->getTimestamp()).
	", size=".strlen($eventStr).
	", etag=".$this->sqlite->quote_string(md5($eventStr)).
	" WHERE uid=".$this->sqlite->quote_string($uid);
	$res = $this->sqlite->query($query);
	if($res !== false)
	{
	$this->updateSyncTokenLog($calid, $uri, 'modified');
	return true;
	}
	return false;
	}

	public function deleteCalendarEntryForPage($id, $params)
	{
	$uid = $params['uid'];
	$event = $this->getEventWithUid($uid);
	$calid = $event['calendarid'];
	$uri = $event['uri'];
	$query = "DELETE FROM calendarobjects WHERE uid=".$this->sqlite->quote_string($uid);
	$res = $this->sqlite->query($query);
	if($res !== false)
	{
	$this->updateSyncTokenLog($calid, $uri, 'deleted');
	}
	return true;
	}

	public function getSyncTokenForCalendar($calid)
	{
	$query = "SELECT synctoken FROM calendars WHERE id=".$this->sqlite->quote_string($calid);
	$res = $this->sqlite->query($query);
	$row = $this->sqlite->res2row($res);
	if(isset($row['synctoken']))
	return $row['synctoken'];
	return false;
	}

	public function operationNameToOperation($operationName)
	{
	switch($operationName)
	{
	case 'added':
	return 1;
	break;
	case 'modified':
	return 2;
	break;
	case 'deleted':
	return 3;
	break;
	}
	return false;
	}

	private function updateSyncTokenLog($calid, $uri, $operation)
	{
	$currentToken = $this->getSyncTokenForCalendar($calid);
	$operationCode = $this->operationNameToOperation($operation);
	if(($operationCode === false) \|\| ($currentToken === false))
	return false;
	$values = array($uri,
	$currentToken,
	$calid,
	$operationCode
	);
	$query = "INSERT INTO calendarchanges (uri, synctoken, calendarid, operation) VALUES(".
	$this->sqlite->quote_and_join($values, ',').")";
	$res = $this->sqlite->query($query);
	if($res === false)
	return false;
	$currentToken++;
	$query = "UPDATE calendars SET synctoken=".$this->sqlite->quote_string($currentToken)." WHERE id=".
	$this->sqlite->quote_string($calid);
	$res = $this->sqlite->query($query);
	return ($res !== false);
	}

	}
	diff --git a/lang/en/lang.php b/lang/en/lang.php
	--- a/lang/en/lang.php
	+++ b/lang/en/lang.php
	@@ -1,31 +1,32 @@
	<?php
	$lang['created_by_davcal'] = 'Created by DAVCal for DokuWiki';
	$lang['unknown_error'] = 'Unknown Error';
	$lang['event_added'] = 'Event added';
	$lang['event_edited'] = 'Event edited';
	$lang['event_deleted'] = 'Event deleted';
	$lang['no_permission'] = 'You don\'t have permission to modify this calendar';
	$lang['settings'] = 'Settings/Sync';
	$lang['settings_saved'] = 'Settings saved successfully';
	$lang['error_saving'] = 'Error saving settings.';
	+$lang['local_time'] = 'Local time (Browser based)';
	$lang['js']['create_new_event'] = 'Create new Event';
	$lang['js']['cancel'] = 'Cancel';
	$lang['js']['create'] = 'Create';
	$lang['js']['save'] = 'Save';
	$lang['js']['settings'] = 'Settings';
	$lang['js']['edit'] = 'Edit';
	$lang['js']['delete'] = 'Delete';
	$lang['js']['edit_event'] = 'Edit Event';
	$lang['js']['allday'] = 'All Day Event';
	$lang['js']['title'] = 'Title';
	$lang['js']['from'] = 'From';
	$lang['js']['to'] = 'To';
	$lang['js']['yes'] = 'Yes';
	$lang['js']['confirmation'] = 'Confirmation';
	$lang['js']['ok'] = 'OK';
	$lang['js']['info'] = 'Info';
	$lang['js']['really_delete_this_event'] = 'Really delete this event?';
	$lang['js']['timezone'] = 'Timezone';
	$lang['js']['weeknumbers'] = 'Week Numbers';
	$lang['js']['use_lang_tz'] = 'Use Timezone from language setting';
	$lang['js']['only_workweek'] = 'Show only Work Week';
	diff --git a/script.js b/script.js
	--- a/script.js
	+++ b/script.js
	@@ -1,498 +1,507 @@
	/* DOKUWIKI:include_once fullcalendar-2.4.0/moment.js */
	/* DOKUWIKI:include_once fullcalendar-2.4.0/fullcalendar.js */
	/* DOKUWIKI:include_once fullcalendar-2.4.0/lang/de.js */
	/* DOKUWIKI:include_once fullcalendar-2.4.0/lang/en.js */
	/* DOKUWIKI:include_once datetimepicker-2.4.5/jquery.datetimepicker.js */

	jQuery(function() {
	// Redefine functions for using moment.js with datetimepicker

	Date.parseDate = function( input, format ){
	return moment(input,format).toDate();
	};
	Date.prototype.dateFormat = function( format ){
	return moment(this).format(format);
	};

	// Attach to event links

	jQuery('div.fullCalendarSettings a').each(function() {
	var $link = jQuery(this);
	var href = $link.attr('href');
	if (!href) return;

	$link.click(
	function(e) {
	dw_davcal__modals.showSettingsDialog();
	e.preventDefault();
	return '';
	}
	);
	}
	);

	var postArray = { };
	jQuery.post(
	DOKU_BASE + 'lib/exe/ajax.php',
	{
	call: 'plugin_davcal',
	id: JSINFO.id,
	action: 'getSettings',
	params: postArray
	},
	function(data)
	{
	var result = data['result'];
	if(result === true)
	{
	dw_davcal__modals.settings = data['settings'];
	var wknum = false;
	var tz = false;
	var we = true;
	if(data['settings']['weeknumbers'] == 1)
	wknum = true;
	- if(data['settings']['timezne'] !== '')
	+ if(data['settings']['timezone'] !== '')
	tz = data['settings']['timezone'];
	if(data['settings']['workweek'] == 1)
	we = false;
	// Initialize the davcal popup
	var res = jQuery('#fullCalendar').fullCalendar({
	dayClick: function(date, jsEvent, view) {
	dw_davcal__modals.showNewEventDialog(date);
	},
	eventClick: function(calEvent, jsEvent, view) {
	dw_davcal__modals.showEditEventDialog(calEvent);
	},
	events: {
	url: DOKU_BASE + 'lib/exe/ajax.php',
	type: 'POST',
	data: {
	call: 'plugin_davcal',
	action: 'getEvents',
	id: JSINFO.id
	},
	error: function() {
	//alert('there was an error retrieving calendar data');
	}
	},
	header: {
	left: 'title',
	center: 'today prev,next',
	right: 'month,agendaWeek,agendaDay'
	},
	lang: JSINFO.plugin.davcal['language'],
	weekNumbers: wknum,
	- timeZone: tz,
	+ timezone: tz,
	weekends: we,
	});
	}
	}
	);
	});

	var dw_davcal__modals = {
	$newEventDialog : null,
	$editEventDialog: null,
	$infoDialog: null,
	$confirmDialog: null,
	$settingsDialog: null,
	msg: null,
	completeCb: null,
	action: null,
	uid: null,
	settings: null,

	showSettingsDialog : function() {
	if(dw_davcal__modals.$settingsDialog)
	return;

	var dialogButtons = {};
	dialogButtons[LANG.plugins.davcal['save']] = function() {
	var postArray = { };
	- jQuery("input[class=dw_davcal__settings]").each(function() {
	+ jQuery("input[class=dw_davcal__settings], select[class=dw_davcal__settings]").each(function() {
	if(jQuery(this).attr('type') == 'checkbox')
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).prop('checked') ? 1 : 0;
	}
	else
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).val();
	}
	});
	jQuery('#dw_davcal__ajaxsettings').html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="" width="16" height="16" />');
	jQuery.post(
	DOKU_BASE + 'lib/exe/ajax.php',
	{
	call: 'plugin_davcal',
	id: JSINFO.id,
	action: 'saveSettings',
	params: postArray
	},
	function(data)
	{
	var result = data['result'];
	var html = data['html'];
	jQuery('#dw_davcal__ajaxsettings').html(html);
	if(result === true)
	{
	location.reload();
	}
	}
	);
	};
	dialogButtons[LANG.plugins.davcal['cancel']] = function () {
	dw_davcal__modals.hideSettingsDialog();
	};

	dw_davcal__modals.$settingsDialog = jQuery(document.createElement('div'))
	.dialog({
	autoOpen: false,
	draggable: true,
	title: LANG.plugins.davcal['settings'],
	resizable: true,
	buttons: dialogButtons,
	})
	.html(
	'<div><table>' +
	- //'<tr><td>' + LANG.plugins.davcal['use_lang_tz'] + '</td><td><input type="checkbox" name="use_lang_tz" id+"dw_davcal__settings_use_lang_tz" class="dw_davcal__settings"></td></tr>' +
	- '<tr><td>' + LANG.plugins.davcal['timezone'] + '</td><td>Timezone Dropdown</td></tr>' +
	+ //'<tr><td>' + LANG.plugins.davcal['use_lang_tz'] + '</td><td><input type="checkbox" name="use_lang_tz" id="dw_davcal__settings_use_lang_tz" class="dw_davcal__settings"></td></tr>' +
	+ '<tr><td>' + LANG.plugins.davcal['timezone'] + '</td><td><select name="timezone" id="dw_davcal__settings_timezone" class="dw_davcal__settings"></select></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['weeknumbers'] + '</td><td><input type="checkbox" name="weeknumbers" id="dw_davcal__settings_weeknumbers" class="dw_davcal__settings"></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['only_workweek'] + '</td><td><input type="checkbox" name="workweek" id="dw_davcal__settings_workweek" class="dw_davcal__settings"></td></tr>' +
	'</table>' +
	'</div>' +
	'<div id="dw_davcal__ajaxsettings"></div>'
	)
	.parent()
	.attr('id','dw_davcal__settings')
	.show()
	.appendTo('.dokuwiki:first');

	// attach event handlers
	jQuery('#dw_davcal__settings .ui-dialog-titlebar-close').click(function(){
	dw_davcal__modals.hideSettingsDialog();
	});
	+
	+ var $tzdropdown = jQuery('#dw_davcal__settings_timezone');
	+ jQuery('#fullCalendarTimezoneList option').each(function() {
	+ jQuery('<option />', {value: jQuery(this).val(),
	+ text: jQuery(this).text()}).appendTo($tzdropdown);
	+ });
	+
	if(dw_davcal__modals.settings)
	{
	+ if(dw_davcal__modals.settings['timezone'] !== '')
	+ jQuery('#dw_davcal__settings_timezone').val(dw_davcal__modals.settings['timezone']);
	if(dw_davcal__modals.settings['weeknumbers'] == 1)
	jQuery('#dw_davcal__settings_weeknumbers').prop('checked', true);
	else
	jQuery('#dw_davcal__settings_weeknumbers').prop('checked', false);

	if(dw_davcal__modals.settings['workweek'] == 1)
	jQuery('#dw_davcal__settings_workweek').prop('checked', true);
	else
	jQuery('#dw_davcal__settings_workweek').prop('checked', false);
	}
	},

	showEditEventDialog : function(calEvent) {
	if(dw_davcal__modals.$editEventDialog)
	return;

	var dialogButtons = {};
	dialogButtons[LANG.plugins.davcal['edit']] = function() {
	var postArray = { };
	jQuery("input[class=dw_davcal__editevent]").each(function() {
	if(jQuery(this).attr('type') == 'checkbox')
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).prop('checked') ? 1 : 0;
	}
	else
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).val();
	}
	});
	jQuery('#dw_davcal__ajaxedit').html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="" width="16" height="16" />');
	jQuery.post(
	DOKU_BASE + 'lib/exe/ajax.php',
	{
	call: 'plugin_davcal',
	id: JSINFO.id,
	action: 'editEvent',
	params: postArray
	},
	function(data)
	{
	var result = data['result'];
	var html = data['html'];
	jQuery('#dw_davcal__ajaxedit').html(html);
	if(result === true)
	{
	jQuery('#fullCalendar').fullCalendar('refetchEvents');
	dw_davcal__modals.hideEditEventDialog();
	}
	}
	);
	};
	dialogButtons[LANG.plugins.davcal['cancel']] = function() {
	dw_davcal__modals.hideEditEventDialog();
	};
	dialogButtons[LANG.plugins.davcal['delete']] = function() {
	dw_davcal__modals.action = 'deleteEvent';
	dw_davcal__modals.msg = LANG.plugins.davcal['really_delete_this_event'];
	dw_davcal__modals.completeCb = function(data) {
	if(data.result == false)
	{
	dw_davcal__modals.msg = data.errmsg;
	dw_davcal__modals.showInfoDialog();
	}
	else
	{
	jQuery('#fullCalendar').fullCalendar('refetchEvents');
	dw_davcal__modals.hideEditEventDialog();
	}
	};
	dw_davcal__modals.showConfirmDialog();
	};
	dw_davcal__modals.uid = calEvent.id;
	dw_davcal__modals.$editEventDialog = jQuery(document.createElement('div'))
	.dialog({
	autoOpen: false,
	draggable: true,
	title: LANG.plugins.davcal['edit_event'],
	resizable: true,
	buttons: dialogButtons,
	})
	.html(
	'<div><table><tr><td>' + LANG.plugins.davcal['title'] + '</td><td><input type="text" id="dw_davcal__eventname_edit" name="eventname" class="dw_davcal__editevent"></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['from'] + '</td><td><input type="text" name="eventfrom" id="dw_davcal__eventfrom_edit" class="dw_davcal__editevent"></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['to'] + '</td><td><input type="text" name="eventto" id="dw_davcal__eventto_edit" class="dw_davcal__editevent"></td></tr>' +
	'<tr><td colspan="2"><input type="checkbox" name="allday" id="dw_davcal__allday_edit" class="dw_davcal__editevent">' + LANG.plugins.davcal['allday'] + '</td></tr>' +
	'</table>' +
	'<input type="hidden" name="uid" id="dw_davcal__uid_edit" class="dw_davcal__editevent">' +
	'</div>' +
	'<div id="dw_davcal__ajaxedit"></div>'
	)
	.parent()
	.attr('id','dw_davcal__edit')
	.show()
	.appendTo('.dokuwiki:first');

	jQuery('#dw_davcal__uid_edit').val(calEvent.id);
	jQuery('#dw_davcal__eventname_edit').val(calEvent.title);
	jQuery('#dw_davcal__eventfrom_edit').val(calEvent.start.format('YYYY-MM-DD HH:mm'));
	jQuery('#dw_davcal__eventto_edit').val(calEvent.end.format('YYYY-MM-DD HH:mm'));
	jQuery('#dw_davcal__allday_edit').prop('checked', calEvent.allDay);

	// attach event handlers
	jQuery('#dw_davcal__edit .ui-dialog-titlebar-close').click(function(){
	dw_davcal__modals.hideEditEventDialog();
	});
	jQuery('#dw_davcal__eventfrom_edit').datetimepicker({format:'YYYY-MM-DD HH:mm',
	formatTime:'HH:mm',
	formatDate:'YYYY-MM-DD',
	step: 15});
	jQuery('#dw_davcal__eventto_edit').datetimepicker({format:'YYYY-MM-DD HH:mm',
	formatTime:'HH:mm',
	formatDate:'YYYY-MM-DD',
	step: 15});
	jQuery('#dw_davcal__allday_edit').change(function() {
	if(jQuery(this).is(":checked"))
	{
	jQuery('#dw_davcal__eventfrom_edit').datetimepicker({timepicker: false});
	jQuery('#dw_davcal__eventto_edit').datetimepicker({timepicker: false});
	}
	else
	{
	jQuery('#dw_davcal__eventfrom_edit').datetimepicker({timepicker: true});
	jQuery('#dw_davcal__eventto_edit').datetimepicker({timepicker: true});
	}
	});
	},

	showNewEventDialog : function(date) {
	if(dw_davcal__modals.$newEventDialog)
	return;
	var dialogButtons = {};
	dialogButtons[LANG.plugins.davcal['create']] = function() {
	var postArray = { };
	jQuery("input[class=dw_davcal__newevent]").each(function() {
	if(jQuery(this).attr('type') == 'checkbox')
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).prop('checked') ? 1 : 0;
	}
	else
	{
	postArray[jQuery(this).prop('name')] = jQuery(this).val();
	}
	});
	jQuery('#dw_davcal__ajaxnew').html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="" width="16" height="16" />');
	jQuery.post(
	DOKU_BASE + 'lib/exe/ajax.php',
	{
	call: 'plugin_davcal',
	id: JSINFO.id,
	action: 'newEvent',
	params: postArray
	},
	function(data)
	{
	var result = data['result'];
	var html = data['html'];
	jQuery('#dw_davcal__ajaxnew').html(html);
	if(result === true)
	{
	jQuery('#fullCalendar').fullCalendar('refetchEvents');
	dw_davcal__modals.hideNewEventDialog();
	}
	}
	);
	};
	dialogButtons[LANG.plugins.davcal['cancel']] = function() {
	dw_davcal__modals.hideNewEventDialog();
	};
	dw_davcal__modals.$newEventDialog = jQuery(document.createElement('div'))
	.dialog({
	autoOpen: false,
	draggable: true,
	title: LANG.plugins.davcal['create_new_event'],
	resizable: true,
	buttons: dialogButtons,
	})
	.html(
	'<div><table><tr><td>' + LANG.plugins.davcal['title'] + '</td><td><input type="text" name="eventname" class="dw_davcal__newevent"></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['from'] + '</td><td><input type="text" value="' + date.format('YYYY-MM-DD') + ' 12:00" name="eventfrom" id="dw_davcal__eventfrom" class="dw_davcal__newevent"></td></tr>' +
	'<tr><td>' + LANG.plugins.davcal['to'] + '</td><td><input type="text" name="eventto" value="' + date.format('YYYY-MM-DD') + ' 12:00" id="dw_davcal__eventto" class="dw_davcal__newevent"></td></tr>' +
	'<tr><td colspan="2"><input type="checkbox" name="allday" id="dw_davcal__allday" class="dw_davcal__newevent">' + LANG.plugins.davcal['allday'] + '</td></tr>' +
	'</table>' +
	'</div>' +
	'<div id="dw_davcal__ajaxnew"></div>'
	)
	.parent()
	.attr('id','dw_davcal__createnew')
	.show()
	.appendTo('.dokuwiki:first');

	// attach event handlers
	jQuery('#dw_davcal__createnew .ui-dialog-titlebar-close').click(function(){
	dw_davcal__modals.hideNewEventDialog();
	});
	jQuery('#dw_davcal__eventfrom').datetimepicker({format:'YYYY-MM-DD HH:mm',
	formatTime:'HH:mm',
	formatDate:'YYYY-MM-DD',
	step: 15});
	jQuery('#dw_davcal__eventto').datetimepicker({format:'YYYY-MM-DD HH:mm',
	formatTime:'HH:mm',
	formatDate:'YYYY-MM-DD',
	step: 15});
	jQuery('#dw_davcal__allday').change(function() {
	if(jQuery(this).is(":checked"))
	{
	jQuery('#dw_davcal__eventfrom').datetimepicker({timepicker: false});
	jQuery('#dw_davcal__eventto').datetimepicker({timepicker: false});
	}
	else
	{
	jQuery('#dw_davcal__eventfrom').datetimepicker({timepicker: true});
	jQuery('#dw_davcal__eventto').datetimepicker({timepicker: true});
	}
	});
	},

	showConfirmDialog : function()
	{
	if(dw_davcal__modals.$confirmDialog)
	return;
	var dialogButtons = {};
	dialogButtons[LANG.plugins.davcal['yes']] = function() {
	jQuery.post(
	DOKU_BASE + 'lib/exe/ajax.php',
	{
	call: 'plugin_davcal',
	id: JSINFO.id,
	action: dw_davcal__modals.action,
	params: {
	uid: dw_davcal__modals.uid
	}
	},
	function(data)
	{
	dw_davcal__modals.completeCb(data);
	}
	);
	dw_davcal__modals.hideConfirmDialog();
	};
	dialogButtons[LANG.plugins.tagrevisions['cancel']] = function() {
	dw_davcal__modals.hideConfirmDialog();
	};
	dw_davcal__modals.$confirmDialog = jQuery(document.createElement('div'))
	.dialog({
	autoOpen: false,
	draggable: true,
	title: LANG.plugins.tagrevisions['confirmation'],
	resizable: true,
	buttons: dialogButtons,
	})
	.html(
	'<div>' + dw_davcal__modals.msg + '</div>'
	)
	.parent()
	.attr('id','dw_davcal__confirm')
	.show()
	.appendTo('.dokuwiki:first');

	// attach event handlers
	jQuery('#dw_davcal__confirm .ui-dialog-titlebar-close').click(function(){
	dw_davcal__modals.hideConfirmDialog();
	});
	},

	showInfoDialog : function() {
	if(dw_davcal__modal.$infoDialog)
	return;
	var dialogButtons = {};
	dialogButtons[LANG.plugins.davcal['ok']] = function() {
	dw_davcal__modals.hideInfoDialog();
	};
	dw_davcal__modals.$infoDialog = jQuery(document.createElement('div'))
	.dialog({
	autoOpen: false,
	draggable: true,
	title: LANG.plugins.davcal['info'],
	resizable: true,
	buttons: dialogButtons,
	})
	.html(
	'<div>' + dw_davcal__modals.msg + '</div>'
	)
	.parent()
	.attr('id','dw_davcal__info')
	.show()
	.appendTo('.dokuwiki:first');

	// attach event handlers
	jQuery('#dw_davcal__info .ui-dialog-titlebar-close').click(function(){
	dw_davcal__modals.hideInfoDialog();
	});
	},

	hideNewEventDialog : function() {
	dw_davcal__modals.$newEventDialog.empty();
	dw_davcal__modals.$newEventDialog.remove();
	dw_davcal__modals.$newEventDialog = null;
	},

	hideEditEventDialog : function() {
	dw_davcal__modals.$editEventDialog.empty();
	dw_davcal__modals.$editEventDialog.remove();
	dw_davcal__modals.$editEventDialog = null;
	},

	hideInfoDialog : function() {
	dw_davcal__modals.$infoDialog.empty();
	dw_davcal__modals.$infoDialog.remove();
	dw_davcal__modals.$infoDialog = null;
	},

	hideConfirmDialog: function() {
	dw_davcal__modals.$confirmDialog.empty();
	dw_davcal__modals.$confirmDialog.remove();
	dw_davcal__modals.$confirmDialog = null;
	},

	hideSettingsDialog: function() {
	dw_davcal__modals.$settingsDialog.empty();
	dw_davcal__modals.$settingsDialog.remove();
	dw_davcal__modals.$settingsDialog = null;
	}
	};
	diff --git a/style.css b/style.css
	--- a/style.css
	+++ b/style.css
	@@ -1,38 +1,46 @@
	@import "fullcalendar-2.4.0/fullcalendar.less";
	@import "datetimepicker-2.4.5/jquery.datetimepicker.less";


	/* modal windows */
	#dw_davcal__createnew,
	#dw_davcal__edit,
	#dw_davcal__info,
	#dw_davcal__settings,
	#dw_davcal__confirm {
	position: absolute;
	background-color: #fff;
	color: #000;
	z-index: 20;
	overflow: hidden;
	}

	#dw_davcal__edit .ui-dialog-content,
	#dw_davcal__info .ui-dialog-content,
	#dw_davcal__confirm .ui-dialog-content,
	#dw_davcal__settings .ui-dialog-content,
	#dw_davcal__createnew .ui-dialog-content {
	padding-left: 0;
	padding-right: 0;
	}

	#dw_davcal__confirm,
	#dw_davcal__info,
	#dw_davcal__edit,
	-#dw_davcal__settings,
	#dw_davcal__createnew {
	position: absolute;
	top: 50%;
	left: 50%;
	width: 300px;
	height: 260px;
	margin:-130px 0 0 -150px;
	-}
	\ No newline at end of file
	+}
	+
	+#dw_davcal__settings {
	+ position: absolute;
	+ top: 50%;
	+ left: 50%;
	+ width: 350px;
	+ height: 280px;
	+ margin:-140px 0 0 -175px;
	+}
	diff --git a/syntax.php b/syntax.php
	--- a/syntax.php
	+++ b/syntax.php
	@@ -1,89 +1,98 @@
	<?php
	/**
	* DokuWiki Plugin tagrevisions (Syntax Component)
	*
	* @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
	* @author Andreas Böhler <dev@aboehler.at>
	*/

	// must be run within Dokuwiki
	if(!defined('DOKU_INC')) die();

	if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
	require_once(DOKU_PLUGIN.'syntax.php');

	class syntax_plugin_davcal extends DokuWiki_Syntax_Plugin {

	protected $hlp = null;

	// Load the helper plugin
	public function syntax_plugin_davcal() {
	$this->hlp =& plugin_load('helper', 'davcal');
	}


	/**
	* What kind of syntax are we?
	*/
	function getType(){
	return 'substition';
	}

	/**
	* What about paragraphs?
	*/
	function getPType(){
	return 'normal';
	}

	/**
	* Where to sort in?
	*/
	function getSort(){
	return 165;
	}

	/**
	* Connect pattern to lexer
	*/
	function connectTo($mode) {
	$this->Lexer->addSpecialPattern('\{\{davcal>[^}]*\}\}',$mode,'plugin_davcal');
	}

	/**
	* Handle the match
	*/
	function handle($match, $state, $pos, &$handler){
	global $ID;
	$options = trim(substr($match,9,-2));
	$options = explode(',', $options);
	$data = array('name' => '',
	'description' => $this->getLang('created_by_davcal'));
	foreach($options as $option)
	{
	list($key, $val) = explode('=', $option);
	$key = strtolower(trim($key));
	$val = trim($val);
	$data[$key] = $val;
	}
	$this->hlp->setCalendarNameForPage($data['name'], $data['description'], $ID, $_SERVER['REMOTE_USER']);

	return array($data);
	}

	/**
	* Create output
	*/
	function render($format, &$R, $data) {
	if($format != 'xhtml') return false;
	+ $tzlist = \DateTimeZone::listIdentifiers(DateTimeZone::ALL);

	$R->doc .= '<div id="fullCalendar"></div>';
	+ $R->doc .= '<div id="fullCalendarTimezoneList" class="fullCalendarTimezoneList" style="display:none">';
	+ $R->doc .= '<select id="fullCalendarTimezoneDropdown">';
	+ $R->doc .= '<option value="local">'.$this->getLang('local_time').'</option>';
	+ foreach($tzlist as $tz)
	+ {
	+ $R->doc .= '<option value="'.$tz.'">'.$tz.'</option>';
	+ }
	+ $R->doc .= '</select></div>';
	$R->doc .= '<div class="fullCalendarSettings"><a href="#" class="fullCalendarSettings"><img src="'.DOKU_URL.'lib/plugins/davcal/images/settings.png'.'">'.$this->getLang('settings').'</a></div>';

	}



	}

	// vim:ts=4:sw=4:et:enc=utf-8:

File Metadata

Mime Type: text/x-diff
Expires: Fri, Jan 24, 4:18 AM (1 d, 20 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 554461
Default Alt Text: (40 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions