require_once('include/diaspora.php');
require_once('include/Contact.php');
-function item_post(&$a) {
+function item_post(App &$a) {
if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
return;
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
intval($parent)
);
- }
- elseif ($parent_uri && local_user()) {
+ } elseif ($parent_uri && local_user()) {
// This is coming from an API source, and we are logged in
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent_uri),
// If the contact id doesn't fit with the contact, then set the contact to null
$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
- if (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
+ if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
- $parent_contact = null;
-
- $r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
- dbesc(normalise_link($thrparent[0]["author-link"])));
- if (dbm::is_result($r)) {
- $parent_contact = $r[0];
- $parent_contact["thumb"] = $parent_contact["photo"];
- $parent_contact["micro"] = $parent_contact["photo"];
- unset($parent_contact["id"]);
- }
+ $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) {
require_once("include/Scrape.php");
intval($profile_uid),
intval($post_id)
);
- if(! count($i))
+ if (! dbm::is_result($i)) {
killme();
+ }
$orig_post = $i[0];
}
* add a statusnet style reply tag if the original post was from there
* and we are replying, and there isn't one already
*/
-
- if($parent AND ($parent_contact['network'] === NETWORK_OSTATUS)) {
- if ($parent_contact['id'] != "")
- $contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
- else
- $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
+ if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) {
+ $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
if (!in_array($contact,$tags)) {
$body = $contact.' '.$body;
continue;
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag, $network);
- if($success['replaced'])
+ if ($success['replaced']) {
$tagged[] = $tag;
- if(is_array($success['contact']) && intval($success['contact']['prv'])) {
+ }
+ if (is_array($success['contact']) && intval($success['contact']['prv'])) {
$private_forum = true;
$private_id = $success['contact']['id'];
}
}
}
- if(($private_forum) && (! $parent) && (! $private)) {
+ if (($private_forum) && (! $parent) && (! $private)) {
// we tagged a private forum in a top level post and the message was public.
// Restrict it.
$private = 1;
$attachments = '';
$match = false;
- if(preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
- foreach($match[2] as $mtch) {
+ if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
+ foreach ($match[2] as $mtch) {
$r = q("SELECT `id`,`filename`,`filesize`,`filetype` FROM `attach` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval($profile_uid),
intval($mtch)
);
if (dbm::is_result($r)) {
- if(strlen($attachments))
+ if (strlen($attachments)) {
$attachments .= ',';
+ }
$attachments .= '[attach]href="' . App::get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
}
$body = str_replace($match[1],'',$body);
$wall = 0;
- if($post_type === 'wall' || $post_type === 'wall-comment')
+ if ($post_type === 'wall' || $post_type === 'wall-comment') {
$wall = 1;
+ }
- if(! strlen($verb))
+ if (! strlen($verb)) {
$verb = ACTIVITY_POST ;
+ }
- if ($network == "")
+ if ($network == "") {
$network = NETWORK_DFRN;
+ }
$gravity = (($parent) ? 6 : 0 );
$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid));
// Fallback so that we alway have a thr-parent
- if(!$thr_parent)
+ if (!$thr_parent) {
$thr_parent = $uri;
+ }
$datarray = array();
$datarray['uid'] = $profile_uid;
// Store the comment signature information in case we need to relay to Diaspora
- diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
+ Diaspora::store_comment_signature($datarray, $author, ($self ? $user['prvkey'] : false), $post_id);
} else {
$parent = $post_id;
-function item_content(&$a) {
+function item_content(App &$a) {
if ((! local_user()) && (! remote_user())) {
return;