aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-27 18:01:20 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-27 18:01:20 -0700
commit3269d4632f180887d5eca96fcfaa03370bbae2a3 (patch)
tree8f67725e77b4565a2cbac7e67de7ff952db01ee9 /include
parent70a5a7b717955138279f2dd8f2a1de16aa76bd53 (diff)
parent0b232a610cdcbb701dacf8dd661b86b64bb582fc (diff)
downloadvolse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.gz
volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.tar.bz2
volse-hubzilla-3269d4632f180887d5eca96fcfaa03370bbae2a3.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: util/messages.po
Diffstat (limited to 'include')
-rw-r--r--include/event.php86
-rwxr-xr-xinclude/items.php7
2 files changed, 88 insertions, 5 deletions
diff --git a/include/event.php b/include/event.php
index d2ae617f8..659b7e6cc 100644
--- a/include/event.php
+++ b/include/event.php
@@ -90,6 +90,7 @@ function format_event_ical($ev) {
$o .= "\nLOCATION:" . format_ical_text($ev['location']);
if($ev['description'])
$o .= "\nDESCRIPTION:" . format_ical_text($ev['description']);
+ $o .= "\nUID:" . $ev['event_hash'] ;
$o .= "\nEND:VEVENT\n";
return $o;
@@ -208,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']) {
@@ -275,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)
@@ -364,6 +370,84 @@ function event_addtocal($item_id, $uid) {
}
+function parse_ical_file($f,$uid) {
+ require_once('library/ical.php');
+ $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);
+ }
+ }
+ return true;
+ }
+ return false;
+}
+
+
+
+function event_import_ical($ical, $uid) {
+
+ $c = q("select * from channel where channel_id = %d limit 1",
+ intval($uid)
+ );
+
+ if(! $c)
+ return false;
+
+ $channel = $c[0];
+ $ev = array();
+
+ if($ical['CREATED'])
+ $ev['created'] = datetime_convert('UTC','UTC',$ical['CREATED']);
+ if($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
+ $ev['nofinish'] = 1;
+ $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'];
+ $ev['uid'] = $channel['channel_id'];
+ $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;
+ }
+ }
+
+ return false;
+
+}
+
+
function event_store_item($arr, $event) {
require_once('include/datetime.php');
diff --git a/include/items.php b/include/items.php
index 7dd5a01d7..5d85e875e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3376,19 +3376,18 @@ function post_is_importable($item,$abook) {
if(! $item)
return false;
- if((! $abook['abook_incl']) && (! $abook['abook_excl']))
+ if(! ($abook['abook_incl'] || $abook['abook_excl']))
return true;
-
require_once('include/html2plain.php');
$text = prepare_text($item['body'],$item['mimetype']);
$text = html2plain($text);
$lang = null;
- if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false))
+ if((strpos($abook['abook_incl'],'lang=') !== false) || (strpos($abook['abook_excl'],'lang=') !== false)) {
$lang = detect_language($text);
-
+ }
$tags = ((count($item['term'])) ? $item['term'] : false);
// exclude always has priority