harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-09-07 20:29:13 -07:00
commit 508969a183
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/event.php
View File

@ -446,6 +446,20 @@ function event_addtocal($item_id, $uid) {
intval($channel['channel_id']) intval($channel['channel_id'])
); );
$item['resource_id'] = $event['event_hash'];
$item['resource_type'] = 'event';
$i = array($item);
xchan_query($i);
$sync_item = fetch_post_tags($i);
$z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
dbesc($event['event_hash']),
intval($channel['channel_id'])
);
if($z) {
build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
}
return true; return true;
} }
} }
@ -959,4 +973,4 @@ function tasks_fetch($arr) {
return $ret; return $ret;
} }

19
mod/events.php
View File

@ -205,6 +205,19 @@ function events_post(&$a) {
$item_id = event_store_item($datarray,$event); $item_id = event_store_item($datarray,$event);
if($r) {
xchan_query($r);
$sync_item = fetch_post_tags($r);
$z = q("select * from event where event_hash = '%s' and uid = %d limit 1",
dbesc($r[0]['resource_id']),
intval($channel['channel_id'])
);
if($z) {
build_sync_packet($channel['channel_id'],array('event_item' => array(encode_item($sync_item[0],true)),'event' => $z));
}
}
if($share) if($share)
proc_run('php',"include/notifier.php","event","$item_id"); proc_run('php',"include/notifier.php","event","$item_id");
@ -528,6 +541,9 @@ function events_content(&$a) {
dbesc($event_id), dbesc($event_id),
intval(local_channel()) intval(local_channel())
); );
$sync_event = $r[0];
if($r) { if($r) {
$r = q("delete from event where event_hash = '%s' and uid = %d limit 1", $r = q("delete from event where event_hash = '%s' and uid = %d limit 1",
dbesc($event_id), dbesc($event_id),
@ -538,6 +554,9 @@ function events_content(&$a) {
dbesc($event_id), dbesc($event_id),
intval(local_channel()) intval(local_channel())
); );
$sync_event['event_deleted'] = 1;
build_sync_packet(0,array('event' => array($sync_event)));
info( t('Event removed') . EOL); info( t('Event removed') . EOL);
} }
else { else {