<?php
-function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
+function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update) {
+
+ require_once('bbcode.php');
// default permissions - anonymous user
- $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
+ $sql_extra = "
+ AND `allow_cid` = ''
+ AND `allow_gid` = ''
+ AND `deny_cid` = ''
+ AND `deny_gid` = ''
+ ";
if(strlen($owner_id) && ! intval($owner_id)) {
- $r = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+ $r = q("SELECT `uid`, `nickname` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
dbesc($owner_id)
);
- if(count($r))
+ if(count($r)) {
$owner_id = $r[0]['uid'];
+ $owner_nick = $r[0]['nickname'];
+ }
}
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
if($dfrn_id != '*') {
- $r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
- dbesc($dfrn_id)
+ $r = q("SELECT * FROM `contact` WHERE ( `issued-id` = '%s' OR ( `duplex` = 1 AND `dfrn-id` = '%s' )) AND `uid` = %d LIMIT 1",
+ dbesc($dfrn_id),
+ dbesc($dfrn_id),
+ intval($owner_id)
);
if(! count($r))
return false;
else
$gs = '<<>>' ; // Impossible to match
- $sql_extra = sprintf(
- " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
- AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
- AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
- AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
-
+ $sql_extra = sprintf("
+ AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
+ AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
+ AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
+ AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s')
+ ",
intval($contact['id']),
intval($contact['id']),
dbesc($gs),
);
}
+ if($dfrn_id == '' || $dfrn_id == '*')
+ $sort = 'DESC';
+ else
+ $sort = 'ASC';
+
if(! strlen($last_update))
$last_update = 'now - 30 days';
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
AND NOT `item`.`type` IN ( 'remote', 'net-comment' ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`edited` > '%s'
+ AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
$sql_extra
- ORDER BY `parent` ASC, `created` ASC LIMIT 0, 300",
+ ORDER BY `parent` %s, `created` ASC LIMIT 0, 300",
intval($owner_id),
- dbesc($check_date)
+ dbesc($check_date),
+ dbesc($check_date),
+ dbesc($sort)
);
if(! count($r))
killme();
$atom .= replace_macros($feed_template, array(
- '$feed_id' => xmlify($a->get_baseurl()),
- '$feed_title' => xmlify($owner['name']),
- '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
- '$name' => xmlify($owner['name']),
+ '$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner_nick),
+ '$feed_title' => xmlify($owner['name']),
+ '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
+ '$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']),
- '$photo' => xmlify($owner['photo']),
- '$thumb' => xmlify($owner['thumb']),
- '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
- '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
- '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z'))
-
+ '$photo' => xmlify($owner['photo']),
+ '$thumb' => xmlify($owner['thumb']),
+ '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
+ '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
+ '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME))
));
+
foreach($items as $item) {
+
+ // public feeds get html, our own nodes use bbcode
+
+ if($dfrn_id == '*') {
+ $item['body'] = bbcode($item['body']);
+ $type = 'html';
+ }
+ else {
+ $type = 'text';
+ }
+
if($item['deleted']) {
$atom .= replace_macros($tomb_template, array(
- '$id' => xmlify($item['uri']),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z'))
+ '$id' => xmlify($item['uri']),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME))
));
}
else {
+ $verb = construct_verb($item);
+ $actobj = construct_activity($item);
+
if($item['parent'] == $item['id']) {
$atom .= replace_macros($item_template, array(
- '$name' => xmlify($item['name']),
- '$profile_page' => xmlify($item['url']),
- '$thumb' => xmlify($item['thumb']),
- '$owner_name' => xmlify($item['owner-name']),
+ '$name' => xmlify($item['name']),
+ '$profile_page' => xmlify($item['url']),
+ '$thumb' => xmlify($item['thumb']),
+ '$owner_name' => xmlify($item['owner-name']),
'$owner_profile_page' => xmlify($item['owner-link']),
- '$owner_thumb' => xmlify($item['owner-avatar']),
- '$item_id' => xmlify($item['uri']),
- '$title' => xmlify($item['title']),
- '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
- '$content' =>xmlify($item['body']),
- '$comment_allow' => (($item['last-child'] && strlen($contact['dfrn-id'])) ? 1 : 0)
+ '$owner_thumb' => xmlify($item['owner-avatar']),
+ '$item_id' => xmlify($item['uri']),
+ '$title' => xmlify($item['title']),
+ '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
+ '$location' => xmlify($item['location']),
+ '$type' => $type,
+ '$content' => xmlify($item['body']),
+ '$verb' => xmlify($verb),
+ '$actobj' => $actobj, // do not xmlify
+ '$comment_allow' => ((($item['last-child']) && ($contact['rel']) && ($contact['rel'] != REL_FAN)) ? 1 : 0)
));
}
else {
$atom .= replace_macros($cmnt_template, array(
- '$name' => xmlify($item['name']),
- '$profile_page' => xmlify($item['url']),
- '$thumb' => xmlify($item['thumb']),
- '$item_id' => xmlify($item['uri']),
- '$title' => xmlify($item['title']),
- '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
- '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),
- '$content' =>xmlify($item['body']),
- '$parent_id' => xmlify($item['parent-uri']),
+ '$name' => xmlify($item['name']),
+ '$profile_page' => xmlify($item['url']),
+ '$thumb' => xmlify($item['thumb']),
+ '$item_id' => xmlify($item['uri']),
+ '$title' => xmlify($item['title']),
+ '$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
+ '$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
+ '$type' => $type,
+ '$content' => xmlify($item['body']),
+ '$verb' => xmlify($verb),
+ '$actobj' => $actobj, // do not xmlify
+ '$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => (($item['last-child']) ? 1 : 0)
));
}
$atom .= '</feed>' . "\r\n";
return $atom;
+}
+
+
+function construct_verb($item) {
+ if($item['verb'])
+ return $item['verb'];
+ return ACTIVITY_POST;
+}
+
+function construct_activity($item) {
+
+ if($item['type'] == 'activity') {
+
+
+ }
+ return '';
}
function get_atom_elements($item) {
+ require_once('library/HTMLPurifier.auto.php');
+ require_once('include/html2bbcode.php');
+
$res = array();
+ $raw_author = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
+ if($raw_author) {
+ if($raw_author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['rel'] == 'photo')
+ $res['author-avatar'] = unxmlify($raw_author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['href']);
+ }
+
$author = $item->get_author();
$res['author-name'] = unxmlify($author->get_name());
$res['author-link'] = unxmlify($author->get_link());
- $res['author-avatar'] = unxmlify($author->get_avatar());
+ if(! $res['author-avatar'])
+ $res['author-avatar'] = unxmlify($author->get_avatar());
$res['uri'] = unxmlify($item->get_id());
$res['title'] = unxmlify($item->get_title());
$res['body'] = unxmlify($item->get_content());
if($maxlen && (strlen($res['body']) > $maxlen))
$res['body'] = substr($res['body'],0, $maxlen);
+ // It isn't certain at this point whether our content is plaintext or html and we'd be foolish to trust
+ // the content type. Our own network only emits text normally, though it might have been converted to
+ // html if we used a pubsubhubbub transport. But if we see even one html open tag in our text, we will
+ // have to assume it is all html and needs to be purified.
+
+ // It doesn't matter all that much security wise - because before this content is used anywhere, we are
+ // going to escape any tags we find regardless, but this lets us import a limited subset of html from
+ // the wild, by sanitising it and converting supported tags to bbcode before we rip out any remaining
+ // html.
+
+
+ if(strpos($res['body'],'<')) {
+
+ $res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
+ '[youtube]$1[/youtube]', $res['body']);
+
+ $config = HTMLPurifier_Config::createDefault();
+ $config->set('Core.DefinitionCache', null);
+
+ // we shouldn't need a whitelist, because the bbcode converter
+ // will strip out any unsupported tags.
+ // $config->set('HTML.Allowed', 'p,b,a[href],i');
+
+ $purifier = new HTMLPurifier($config);
+ $res['body'] = $purifier->purify($res['body']);
+ }
+
+
+ $res['body'] = html2bbcode($res['body']);
+
+
$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
if($allow && $allow[0]['data'] == 1)
$res['last-child'] = 1;
if($rawcreated)
$res['created'] = unxmlify($rawcreated[0]['data']);
+ $rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
+ if($rawlocation)
+ $res['location'] = unxmlify($rawlocation[0]['data']);
+
+
$rawedited = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'updated');
if($rawedited)
$res['edited'] = unxmlify($rawcreated[0]['data']);
$rawowner = $item->get_item_tags(NAMESPACE_DFRN, 'owner');
- if($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data'])
+ if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])
+ $res['owner-name'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']);
+ elseif($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data'])
$res['owner-name'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['name'][0]['data']);
- if($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
+ if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])
+ $res['owner-link'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']);
+ elseif($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data'])
$res['owner-link'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['uri'][0]['data']);
- if($rawowner[0]['child'][NAMESPACE_DFRN]['avatar'][0]['data'])
+
+ if($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['rel'] == 'photo')
+ $res['owner-avatar'] = unxmlify($rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'][0]['attribs']['']['href']);
+ elseif($rawowner[0]['child'][NAMESPACE_DFRN]['avatar'][0]['data'])
$res['owner-avatar'] = unxmlify($rawowner[0]['child'][NAMESPACE_DFRN]['avatar'][0]['data']);
+ $rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
+ // select between supported verbs
+ if($rawverb)
+ $res['verb'] = unxmlify($rawverb[0]['data']);
+
+ $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
+ if($rawobj) {
+ $res['object-type'] = $rawobj[0]['object-type'][0]['data'];
+ $res['object'] = $rawobj[0];
+ }
+
return $res;
}
-function post_remote($a,$arr) {
+function item_store($arr) {
+//print_r($arr);
+
+
+ if($arr['gravity'])
+ $arr['gravity'] = intval($arr['gravity']);
+ elseif($arr['parent-uri'] == $arr['uri'])
+ $arr['gravity'] = 0;
+ elseif($arr['verb'] == ACTIVITY_POST)
+ $arr['gravity'] = 6;
if(! x($arr,'type'))
$arr['type'] = 'remote';
+ $arr['wall'] = ((intval($arr['wall'])) ? 1 : 0);
$arr['uri'] = notags(trim($arr['uri']));
$arr['author-name'] = notags(trim($arr['author-name']));
$arr['author-link'] = notags(trim($arr['author-link']));
$arr['owner-name'] = notags(trim($arr['owner-name']));
$arr['owner-link'] = notags(trim($arr['owner-link']));
$arr['owner-avatar'] = notags(trim($arr['owner-avatar']));
- $arr['created'] = datetime_convert('UTC','UTC',$arr['created'],'Y-m-d H:i:s');
- $arr['edited'] = datetime_convert('UTC','UTC',$arr['edited'],'Y-m-d H:i:s');
+ $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert());
+ $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert());
+ $arr['changed'] = datetime_convert();
$arr['title'] = notags(trim($arr['title']));
+ $arr['location'] = notags(trim($arr['location']));
$arr['body'] = escape_tags(trim($arr['body']));
$arr['last-child'] = intval($arr['last-child']);
- $arr['visible'] = 1;
+ $arr['visible'] = ((x($arr,'visible') !== false) ? intval($arr['visible']) : 1);
$arr['deleted'] = 0;
$arr['parent-uri'] = notags(trim($arr['parent-uri']));
+ $arr['verb'] = notags(trim($arr['verb']));
+ $arr['object-type'] = notags(trim($arr['object-type']));
+ $arr['object'] = trim($arr['object']);
$parent_id = 0;
+ $parent_missing = false;
dbesc_array($arr);
-//dbg(3);
+
$r = q("INSERT INTO `item` (`"
. implode("`, `", array_keys($arr))
. "`) VALUES ('"
if(count($r))
$parent_id = $r[0]['id'];
else {
- // if parent is missing, what do we do?
+ $parent_missing = true;
}
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
- $arr['uri'],
+ $arr['uri'], // already dbesc'd
intval($arr['uid'])
);
if(count($r))
$current_post = $r[0]['id'];
+ else
+ return 0;
+
+ if($parent_missing) {
+
+ // perhaps the parent was deleted, but in any case, this thread is dead
+ // and unfortunately our brand new item now has to be destroyed
+
+ q("DELETE FROM `item` WHERE `id` = %d LIMIT 1",
+ intval($current_post)
+ );
+ return 0;
+ }
$r = q("UPDATE `item` SET `parent` = %d WHERE `id` = %d LIMIT 1",
intval($parent_id),
projects / friendica.git / blobdiff