aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/event.php31
-rwxr-xr-xmod/events.php18
-rwxr-xr-xview/tpl/events-js.tpl13
3 files changed, 54 insertions, 8 deletions
diff --git a/include/event.php b/include/event.php
index 8e9492690..a5cd93215 100644
--- a/include/event.php
+++ b/include/event.php
@@ -209,6 +209,7 @@ function event_store_event($arr) {
$arr['type'] = (($arr['type']) ? $arr['type'] : 'event' );
$arr['event_xchan'] = (($arr['event_xchan']) ? $arr['event_xchan'] : '');
+
// Existing event being modified
if($arr['id'] || $arr['event_hash']) {
@@ -276,7 +277,11 @@ function event_store_event($arr) {
// New event. Store it.
- $hash = random_string();
+
+ if(array_key_exists('external_id',$arr))
+ $hash = $arr['external_id'];
+ else
+ $hash = random_string();
$r = q("INSERT INTO event ( uid,aid,event_xchan,event_hash,created,edited,start,finish,summary,description,location,type,
adjust,nofinish,allow_cid,allow_gid,deny_cid,deny_gid)
@@ -367,11 +372,12 @@ function event_addtocal($item_id, $uid) {
function parse_ical_file($f,$uid) {
require_once('library/ical.php');
- $ical = new ICAL($f);
+ $ical = new ICal($f);
if($ical) {
$events = $ical->events();
if($events) {
foreach($events as $ev) {
+ logger('event parsed: ' . print_r($ev,true), LOGGER_ALL);
event_import_ical($ev,$uid);
}
}
@@ -394,16 +400,16 @@ function event_import_ical($ical, $uid) {
$channel = $c[0];
$ev = array();
- if($ical['UID'])
- $ev['event_hash'] = $ical['UID'];
if($ical['CREATED'])
- $ev['created'] = $ical['CREATED'];
+ $ev['created'] = datetime_convert('UTC','UTC',$ical['CREATED']);
if($ical['LAST-MODIFIED'])
- $ev['edited'] = $ical['LAST-MODIFIED'];
+ $ev['edited'] = datetime_convert('UTC','UTC',$ical['LAST-MODIFIED']);
if($ical['LOCATION'])
$ev['location'] = $ical['LOCATION'];
if($ical['DESCRIPTION'])
$ev['description'] = $ical['DESCRIPTION'];
+ if($ical['SUMMARY'])
+ $ev['summary'] = $ical['SUMMARY'];
if($ical['DTEND'])
$ev['finish'] = datetime_convert('UTC','UTC', $ical['DTEND']);
else
@@ -411,6 +417,17 @@ function event_import_ical($ical, $uid) {
$ev['start'] = datetime_convert('UTC','UTC',$ical['DTSTART']);
if(substr($ical['DTSTART'],-1) === 'Z')
$ev['adjust'] = 1;
+
+ if($ical['UID']) {
+ $r = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
+ dbesc($ical['UID']),
+ intval($arr['uid'])
+ );
+ if($r)
+ $ev['event_hash'] = $ical['UID'];
+ else
+ $ev['external_id'] = $ical['UID'];
+ }
if($ical['SUMMARY'] && $ical['DTSTART']) {
$ev['event_xchan'] = $channel['channel_hash'];
@@ -418,8 +435,10 @@ function event_import_ical($ical, $uid) {
$ev['account'] = $channel['channel_account_id'];
$ev['private'] = 1;
+ logger('storing event: ' . print_r($ev,true), LOGGER_ALL);
$event = event_store_event($ev);
if($event) {
+ $item_id = event_store_item($ev,$event);
return true;
}
}
diff --git a/mod/events.php b/mod/events.php
index a3540ab0a..7fc4b26f2 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -13,6 +13,20 @@ function events_post(&$a) {
if(! local_channel())
return;
+ if(($_FILES) && array_key_exists('userfile',$_FILES) && intval($_FILES['userfile']['size'])) {
+ $src = $_FILES['userfile']['tmp_name'];
+ if($src) {
+ $result = parse_ical_file($src,local_channel());
+ if($result)
+ info( t('Calendar entries imported.') . EOL);
+ else
+ notice( t('No calendar entries found.') . EOL);
+ @unlink($src);
+ }
+ goaway(z_root() . '/events');
+ }
+
+
$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
@@ -476,8 +490,8 @@ function events_content(&$a) {
'$export' => array($a->get_baseurl()."/events/$y/$m/export",t('Export'),'',''),
'$calendar' => cal($y,$m,$links, ' eventcal'),
'$events' => $events,
-
-
+ '$upload' => t('Upload'),
+ '$submit' => t('Submit')
));
if (x($_GET,'id')){ echo $o; killme(); }
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 9812291bf..7ecf2e753 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -3,6 +3,19 @@
<h2>{{$title}}</h2>
+<button class="btn btn-xs btn-success btn-xs pull-right" title="{{$usage}}" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+
+<div id="event-upload-form" style="display:none;">
+ <div class="section-content-tools-wrapper">
+ <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+ <div class="form-group">
+ <input id="event-upload-choose" type="file" name="userfile" />
+ </div>
+ <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
+ </form>
+ </div>
+</div>
+
<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div>
<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div>