<?php
/**
- * @file include/diaspora.php
+ * @file src/Protocol/diaspora.php
* @brief The implementation of the diaspora protocol
*
* The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html
use Friendica\Core\PConfig;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
-use Friendica\Model\GlobalContact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
use Friendica\Network\Probe;
-use Friendica\Object\Contact;
-use Friendica\Object\Profile;
+use Friendica\Util\Crypto;
use Friendica\Util\XML;
use dba;
use SimpleXMLElement;
+require_once 'include/dba.php';
require_once 'include/items.php';
require_once 'include/bb2diaspora.php';
-require_once 'include/Photo.php';
-require_once 'include/group.php';
require_once 'include/datetime.php';
require_once 'include/queue_fn.php';
*/
class Diaspora
{
-
/**
* @brief Return a list of relay servers
*
{
$serverdata = Config::get("system", "relay_server");
if ($serverdata == "") {
- return array();
+ return [];
}
- $relay = array();
+ $relay = [];
$servers = explode(",", $serverdata);
return $relay;
}
+ /**
+ * @brief Return a list of participating contacts for a thread
+ *
+ * This is used for the participation feature.
+ * One of the parameters is a contact array.
+ * This is done to avoid duplicates.
+ *
+ * @param integer $thread The id of the thread
+ * @param array $contacts The previously fetched contacts
+ *
+ * @return array of relay servers
+ */
+ public static function participantsForThread($thread, $contacts)
+ {
+ $r = dba::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+ `fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
+ INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
+ INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
+ WHERE `participation`.`iid` = ?", $thread);
+
+ while ($contact = dba::fetch($r)) {
+ if (!empty($contact['fnetwork'])) {
+ $contact['network'] = $contact['fnetwork'];
+ }
+ unset($contact['fnetwork']);
+
+ if (empty($contact['batch']) && !empty($contact['fbatch'])) {
+ $contact['batch'] = $contact['fbatch'];
+ }
+ unset($contact['fbatch']);
+
+ $exists = false;
+ foreach ($contacts as $entry) {
+ if ($entry['batch'] == $contact['batch']) {
+ $exists = true;
+ }
+ }
+
+ if (!$exists) {
+ $contacts[] = $contact;
+ }
+ }
+ dba::close($r);
+
+ return $contacts;
+ }
+
/**
* @brief repairs a signature that was double encoded
*
}
$b64url_data = base64url_encode($data);
- $msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+ $msg = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
$signable_data = $msg.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
$key = self::key($handle);
- $verify = rsa_verify($signable_data, $sig, $key);
+ $verify = Crypto::rsaVerify($signable_data, $sig, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
return false;
$base = $basedom->children(NAMESPACE_SALMON_ME);
// Not sure if this cleaning is needed
- $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+ $data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
// Build the signed data
$type = $base->data[0]->attributes()->type[0];
$author_addr = base64_decode($key_id);
$key = self::key($author_addr);
- $verify = rsa_verify($signed_data, $signature, $key);
+ $verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
http_status_exit(400);
}
- return array('message' => (string)base64url_decode($base->data),
+ return ['message' => (string)base64url_decode($base->data),
'author' => unxmlify($author_addr),
- 'key' => (string)$key);
+ 'key' => (string)$key];
}
/**
// unpack the data
// strip whitespace so our data element will return to one big base64 blob
- $data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
+ $data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
// stash away some other stuff for later
http_status_exit(400);
}
- $verify = rsa_verify($signed_data, $signature, $key);
+ $verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
logger('Message did not verify. Discarding.');
logger('Message verified.');
- return array('message' => (string)$inner_decrypted,
+ return ['message' => (string)$inner_decrypted,
'author' => unxmlify($author_link),
- 'key' => (string)$key);
+ 'key' => (string)$key];
}
// Process item retractions. This has to be done separated from the other stuff,
// since retractions for comments could come even from non followers.
- if (!empty($fields) && in_array($fields->getName(), array('retraction'))) {
+ if (!empty($fields) && in_array($fields->getName(), ['retraction'])) {
$target = notags(unxmlify($fields->target_type));
- if (in_array($target, array("Comment", "Like", "Post", "Reshare", "StatusMessage"))) {
+ if (in_array($target, ["Comment", "Like", "Post", "Reshare", "StatusMessage"])) {
logger('processing retraction for '.$target, LOGGER_DEBUG);
- $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+ $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
$message_id = self::dispatch($importer, $msg, $fields);
return $message_id;
}
logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
} else {
// Use a dummy importer to import the data for the public copy
- $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE);
+ $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
$message_id = self::dispatch($importer, $msg, $fields);
}
case "message":
return self::receiveMessage($importer, $fields);
- case "participation": // Not implemented
+ case "participation":
return self::receiveParticipation($importer, $fields);
case "photo": // Not implemented
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
- if (in_array($type, array("signed_retraction", "relayable_retraction")))
+ if (in_array($type, ["signed_retraction", "relayable_retraction"]))
$type = "retraction";
if ($type == "request") {
if ($fieldname == "participant_handles") {
$fieldname = "participants";
}
- if (in_array($type, array("like", "participation"))) {
+ if (in_array($type, ["like", "participation"])) {
if ($fieldname == "target_type") {
$fieldname = "parent_type";
}
$author_signature = base64_decode($entry);
} elseif (($fieldname == "parent_author_signature") && ($entry != "")) {
$parent_author_signature = base64_decode($entry);
- } elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
+ } elseif (!in_array($fieldname, ["author_signature", "parent_author_signature", "target_author_signature"])) {
if ($signed_data != "") {
$signed_data .= ";";
- $signed_data_parent .= ";";
}
$signed_data .= $entry;
}
- if (!in_array($fieldname, array("parent_author_signature", "target_author_signature"))
+ if (!in_array($fieldname, ["parent_author_signature", "target_author_signature"])
|| ($orig_type == "relayable_retraction")
) {
XML::copy($entry, $fields, $fieldname);
}
// This is something that shouldn't happen at all.
- if (in_array($type, array("status_message", "reshare", "profile"))) {
+ if (in_array($type, ["status_message", "reshare", "profile"])) {
if ($msg["author"] != $fields->author) {
logger("Message handle is not the same as envelope sender. Quitting this message.");
return false;
}
// Only some message types have signatures. So we quit here for the other types.
- if (!in_array($type, array("comment", "like"))) {
- return array("fields" => $fields, "relayed" => false);
+ if (!in_array($type, ["comment", "like"])) {
+ return ["fields" => $fields, "relayed" => false];
}
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
$key = self::key($msg["author"]);
- if (!rsa_verify($signed_data, $parent_author_signature, $key, "sha256")) {
+ if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
return false;
}
$key = self::key($fields->author);
- if (!rsa_verify($signed_data, $author_signature, $key, "sha256")) {
+ if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
return false;
} else {
- return array("fields" => $fields, "relayed" => $relayed);
+ return ["fields" => $fields, "relayed" => $relayed];
}
}
/**
* @brief Get a contact id for a given handle
*
+ * @todo Move to Friendica\Model\Contact
+ *
* @param int $uid The user id
* @param string $handle The handle in the format user@domain.tld
*
- * @return The contact id
+ * @return int Contact id
*/
private static function contactByHandle($uid, $handle)
{
* That makes us friends.
* Normally this should have handled by getting a request - but this could get lost
*/
- if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
- dba::update(
- 'contact',
- array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
- array('id' => $contact["id"], 'uid' => $contact["uid"])
- );
-
- $contact["rel"] = CONTACT_IS_FRIEND;
- logger("defining user ".$contact["nick"]." as friend");
- }
+ // It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
+ // It is not removed by now. Possibly the code is needed?
+ //if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
+ // dba::update(
+ // 'contact',
+ // array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+ // array('id' => $contact["id"], 'uid' => $contact["uid"])
+ // );
+ //
+ // $contact["rel"] = CONTACT_IS_FRIEND;
+ // logger("defining user ".$contact["nick"]." as friend");
+ //}
// We don't seem to like that person
if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) {
preg_replace_callback(
$expression,
function ($match) use ($item) {
- return self::fetchGuidSub($match, $item);
+ self::fetchGuidSub($match, $item);
},
$item["body"]
);
preg_replace_callback(
"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item) {
- return self::fetchGuidSub($match, $item);
+ self::fetchGuidSub($match, $item);
},
$item["body"]
);
* @param string $body The item body to replace links from
* @param string $author_link The author link for missing local contact fallback
*
- * @return the replaced string
+ * @return string the replaced string
*/
public static function replacePeopleGuid($body, $author_link)
{
return false;
}
- $msg = array("message" => $x, "author" => $author);
+ $msg = ["message" => $x, "author" => $author];
$msg["key"] = self::key($msg["author"]);
if ($r) {
$cid = $r[0]["id"];
$network = $r[0]["network"];
-
- // We are receiving content from a user that possibly is about to be terminated
- // This means the user is vital, so we remove a possible termination date.
- Contact::unmarkForArchival($r[0]);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
}
- return array("cid" => $cid, "network" => $network);
+ return ["cid" => $cid, "network" => $network];
}
/**
// Check signature
$signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle;
$key = self::key($old_handle);
- if (!rsa_verify($signed_text, $signature, $key, "sha256")) {
+ if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
logger('No valid signature for migration.');
return false;
}
return false;
}
- $fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']),
+ $fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
'name' => $data['name'], 'nick' => $data['nick'],
'addr' => $data['addr'], 'batch' => $data['batch'],
'notify' => $data['notify'], 'poll' => $data['poll'],
- 'network' => $data['network']);
+ 'network' => $data['network']];
- dba::update('contact', $fields, array('addr' => $old_handle));
+ dba::update('contact', $fields, ['addr' => $old_handle]);
- $fields = array('url' => $data['url'], 'nurl' => normalise_link($data['url']),
+ $fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
'name' => $data['name'], 'nick' => $data['nick'],
'addr' => $data['addr'], 'connect' => $data['addr'],
'notify' => $data['notify'], 'photo' => $data['photo'],
- 'server_url' => $data['baseurl'], 'network' => $data['network']);
+ 'server_url' => $data['baseurl'], 'network' => $data['network']];
- dba::update('gcontact', $fields, array('addr' => $old_handle));
+ dba::update('gcontact', $fields, ['addr' => $old_handle]);
logger('Contacts are updated.');
// update items
/// @todo This is an extreme performance killer
- $fields = array(
- 'owner-link' => array($contact["url"], $data["url"]),
- 'author-link' => array($contact["url"], $data["url"]),
- );
+ $fields = [
+ 'owner-link' => [$contact["url"], $data["url"]],
+ 'author-link' => [$contact["url"], $data["url"]],
+ ];
foreach ($fields as $n => $f) {
$r = q(
"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
// Fetch the contact id - if we know this contact
$author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
- $datarray = array();
+ $datarray = [];
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $author_contact["cid"];
if ($message_id && $parent_item["origin"]) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
- dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
+ dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
// notify others
Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
dba::unlock();
- dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
+ dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
notification(
- array(
+ [
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
"to_name" => $importer["username"],
"to_email" => $importer["email"],
"uid" =>$importer["uid"],
- "item" => array("subject" => $subject, "body" => $body),
+ "item" => ["subject" => $subject, "body" => $body],
"source_name" => $person["name"],
"source_link" => $person["url"],
"source_photo" => $person["thumb"],
"verb" => ACTIVITY_POST,
- "otype" => "mail")
+ "otype" => "mail"]
);
return true;
}
$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
$parent_body = $parent_item["body"];
- $xmldata = array("object" => array("type" => $objtype,
+ $xmldata = ["object" => ["type" => $objtype,
"local" => "1",
"id" => $parent_item["uri"],
"link" => $link,
"title" => "",
- "content" => $parent_body));
+ "content" => $parent_body]];
return XML::fromArray($xmldata, $xml, true);
}
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
- if (!in_array($parent_type, array("Post", "Comment"))) {
+ if (!in_array($parent_type, ["Post", "Comment"])) {
return false;
}
$verb = ACTIVITY_DISLIKE;
}
- $datarray = array();
+ $datarray = [];
$datarray["protocol"] = PROTOCOL_DIASPORA;
// like on comments have the comment as parent. So we need to fetch the toplevel parent
if ($parent_item["id"] != $parent_item["parent"]) {
- $toplevel = dba::select('item', array('origin'), array('id' => $parent_item["parent"]), array('limit' => 1));
+ $toplevel = dba::selectFirst('item', ['origin'], ['id' => $parent_item["parent"]]);
$origin = $toplevel["origin"];
} else {
$origin = $parent_item["origin"];
if ($message_id && $origin) {
// Formerly we stored the signed text, the signature and the author in different fields.
// We now store the raw data so that we are more flexible.
- dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
+ dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
// notify others
Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
dba::unlock();
- dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
+ dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
return true;
}
*/
private static function receiveParticipation($importer, $data)
{
- // I'm not sure if we can fully support this message type
+ $author = strtolower(notags(unxmlify($data->author)));
+ $parent_guid = notags(unxmlify($data->parent_guid));
+
+ $contact_id = Contact::getIdForURL($author);
+ if (!$contact_id) {
+ logger('Contact not found: '.$author);
+ return false;
+ }
+
+ $person = self::personByHandle($author);
+ if (!is_array($person)) {
+ logger("Person not found: ".$author);
+ return false;
+ }
+
+ $item = dba::selectFirst('item', ['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
+ if (!DBM::is_result($item)) {
+ logger('Item not found, no origin or private: '.$parent_guid);
+ return false;
+ }
+
+ $author_parts = explode('@', $author);
+ if (isset($author_parts[1])) {
+ $server = $author_parts[1];
+ } else {
+ // Should never happen
+ $server = $author;
+ }
+
+ logger('Received participation for ID: '.$item['id'].' - Contact: '.$contact_id.' - Server: '.$server, LOGGER_DEBUG);
+ dba::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
+
+ // Send all existing comments and likes to the requesting server
+ $comments = dba::p("SELECT `item`.`id`, `item`.`verb`, `contact`.`self`
+ FROM `item`
+ INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+ WHERE `item`.`parent` = ? AND `item`.`id` != `item`.`parent`", $item['id']);
+ while ($comment = dba::fetch($comments)) {
+ if ($comment['verb'] == ACTIVITY_POST) {
+ $cmd = $comment['self'] ? 'comment-new' : 'comment-import';
+ } else {
+ $cmd = $comment['self'] ? 'like' : 'comment-import';
+ }
+ logger("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, LOGGER_DEBUG);
+ Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
+ }
+ dba::close($comments);
+
return true;
}
$tags = explode("#", $tags);
- $keywords = array();
+ $keywords = [];
foreach ($tags as $tag) {
$tag = trim(strtolower($tag));
if ($tag != "") {
$image_url = "http://".$handle_parts[1].$image_url;
}
- update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
+ Contact::updateAvatar($image_url, $importer["uid"], $contact["id"]);
// Generic birthday. We don't know the timezone. The year is irrelevant.
intval($importer["uid"])
);
- $gcontact = array("url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
+ $gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location,
"about" => $about, "birthday" => $birthday, "gender" => $gender,
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
- "hide" => !$searchable, "nsfw" => $nsfw);
+ "hide" => !$searchable, "nsfw" => $nsfw];
- $gcid = GlobalContact::update($gcontact);
+ $gcid = GContact::update($gcontact);
- GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
+ GContact::link($gcid, $importer["uid"], $contact["id"]);
logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
if ($contact["rel"] == CONTACT_IS_SHARING) {
dba::update(
'contact',
- array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
- array('id' => $contact["id"], 'uid' => $importer["uid"])
+ ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+ ['id' => $contact["id"], 'uid' => $importer["uid"]]
);
}
// send notification
// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
- $arr = array();
+ $arr = [];
$arr["protocol"] = PROTOCOL_DIASPORA;
$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
$arr["uid"] = $importer["uid"];
$A = "[url=".$self[0]["url"]."]".$self[0]["name"]."[/url]";
$B = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
$BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
- $arr["body"] = sprintf(t("%1$s is now friends with %2$s"), $A, $B)."\n\n\n".$Bphoto;
+ $arr["body"] = sprintf(t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
$arr["object"] = self::constructNewFriendObject($contact);
$arr["last-child"] = 1;
- $arr["allow_cid"] = $user[0]["allow_cid"];
- $arr["allow_gid"] = $user[0]["allow_gid"];
- $arr["deny_cid"] = $user[0]["deny_cid"];
- $arr["deny_gid"] = $user[0]["deny_gid"];
+ $user = dba::selectFirst('user', ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['uid' => $importer["uid"]]);
+
+ $arr["allow_cid"] = $user["allow_cid"];
+ $arr["allow_gid"] = $user["allow_gid"];
+ $arr["deny_cid"] = $user["deny_cid"];
+ $arr["deny_gid"] = $user["deny_gid"];
$i = item_store($arr);
if ($i) {
$link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
'<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
- $xmldata = array("object" => array("type" => $objtype,
+ $xmldata = ["object" => ["type" => $objtype,
"title" => $contact["name"],
"id" => $contact["url"]."/".$contact["name"],
- "link" => $link));
+ "link" => $link]];
return XML::fromArray($xmldata, $xml, true);
}
// If we are now friends, we are sending a share message.
// Normally we needn't to do so, but the first message could have been vanished.
- if (in_array($contact["rel"], array(CONTACT_IS_FRIEND))) {
+ if (in_array($contact["rel"], [CONTACT_IS_FRIEND])) {
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if ($u) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
}
}
- if (!$following && $sharing && in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) {
+ if (!$following && $sharing && in_array($importer["page-flags"], [PAGE_SOAPBOX, PAGE_NORMAL])) {
logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
return false;
} elseif (!$following && !$sharing) {
logger("Author ".$author." was added as contact number ".$contact_record["id"].".", LOGGER_DEBUG);
- $def_gid = get_default_group($importer['uid'], $ret["network"]);
-
- if (intval($def_gid)) {
- group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
- }
+ Group::addMember(User::getDefaultGroup($importer['uid'], $ret["network"]), $contact_record['id']);
- update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
+ Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
if ($importer["page-flags"] == PAGE_NORMAL) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
- update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
+ Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
// technically they are sharing with us (CONTACT_IS_SHARING),
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
$ret = self::sendShare($u[0], $contact_record);
// Send the profile data, maybe it weren't transmitted before
- self::sendProfile($importer["uid"], array($contact_record));
+ self::sendProfile($importer["uid"], [$contact_record]);
}
}
// Then refetch the content, if it is a reshare from a reshare.
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::isReshare($r[0]["body"], true)) {
- $r = array();
+ $r = [];
} elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
$orig_url = System::baseUrl()."/display/".$original_item["guid"];
- $datarray = array();
+ $datarray = [];
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
self::fetchGuid($datarray);
$message_id = item_store($datarray);
+ self::sendParticipation($contact, $datarray);
+
if ($message_id) {
logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
return true;
}
// Fetch items that are about to be deleted
- $fields = array('uid', 'id', 'parent', 'parent-uri', 'author-link');
+ $fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link'];
// When we receive a public retraction, we delete every item that we find.
if ($importer['uid'] == 0) {
- $condition = array("`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid);
+ $condition = ["`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid];
} else {
- $condition = array("`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']);
+ $condition = ["`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']];
}
$r = dba::select('item', $fields, $condition);
if (!DBM::is_result($r)) {
while ($item = dba::fetch($r)) {
// Fetch the parent item
- $parent = dba::select('item', array('author-link', 'origin'), array('id' => $item["parent"]), array('limit' => 1));
+ $parent = dba::selectFirst('item', ['author-link', 'origin'], ['id' => $item["parent"]]);
// Only delete it if the parent author really fits
if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
// The function "item_drop" doesn't work for that case
dba::update(
'item',
- array(
+ [
'deleted' => true,
'title' => '',
'body' => '',
'edited' => datetime_convert(),
- 'changed' => datetime_convert()),
- array('id' => $item["id"])
+ 'changed' => datetime_convert()],
+ ['id' => $item["id"]]
);
// Delete the thread - if it is a starting post and not a comment
$target_type = notags(unxmlify($data->target_type));
$contact = self::contactByHandle($importer["uid"], $sender);
- if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
+ if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
return true;
}
- $address = array();
+ $address = [];
if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(unxmlify($data));
$body = diaspora2bb($text);
- $datarray = array();
+ $datarray = [];
// Attach embedded pictures to the body
if ($data->photo) {
self::fetchGuid($datarray);
$message_id = item_store($datarray);
+ self::sendParticipation($contact, $datarray);
+
if ($message_id) {
logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
return true;
$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
- $json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key));
+ $json = json_encode(["iv" => $b_iv, "key" => $b_aes_key]);
$encrypted_key_bundle = "";
openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
$json_object = json_encode(
- array("aes_key" => base64_encode($encrypted_key_bundle),
- "encrypted_magic_envelope" => base64_encode($ciphertext))
+ ["aes_key" => base64_encode($encrypted_key_bundle),
+ "encrypted_magic_envelope" => base64_encode($ciphertext)]
);
return $json_object;
public static function buildMagicEnvelope($msg, $user)
{
$b64url_data = base64url_encode($msg);
- $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
+ $data = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
$key_id = base64url_encode(self::myHandle($user));
$type = "application/xml";
$user['uprvkey'] = $user['prvkey'];
}
- $signature = rsa_sign($signable_data, $user["uprvkey"]);
+ $signature = Crypto::rsaSign($signable_data, $user["uprvkey"]);
$sig = base64url_encode($signature);
- $xmldata = array("me:env" => array("me:data" => $data,
- "@attributes" => array("type" => $type),
+ $xmldata = ["me:env" => ["me:data" => $data,
+ "@attributes" => ["type" => $type],
"me:encoding" => $encoding,
"me:alg" => $alg,
"me:sig" => $sig,
- "@attributes2" => array("key_id" => $key_id)));
+ "@attributes2" => ["key_id" => $key_id]]];
- $namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
+ $namespaces = ["me" => "http://salmon-protocol.org/ns/magic-env"];
return XML::fromArray($xmldata, $xml, false, $namespaces);
}
$signed_text = implode(";", $sigmsg);
- return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ return base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
}
/**
}
$logid = random_string(4);
- $dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
+ $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
+
+ // Fetch the fcontact entry when there is missing data
+ // Will possibly happen when data is transmitted to a DFRN contact
+ if (empty($dest_url) && !empty($contact['addr'])) {
+ $fcontact = self::personByHandle($contact['addr']);
+ $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
+ }
+
if (!$dest_url) {
logger("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
return 0;
if (!intval(Config::get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));
+ post_url($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
$return_code = $a->get_curl_code();
} else {
logger("test_mode");
*/
public static function buildPostXml($type, $message)
{
- $data = array($type => $message);
+ $data = [$type => $message];
return XML::fromArray($data, $xml);
}
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
}
- logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
+ logger("guid: ".$guid." result ".$return_code, LOGGER_DEBUG);
return $return_code;
}
+ /**
+ * @brief sends a participation (Used to get all further updates)
+ *
+ * @param array $contact Target of the communication
+ * @param array $item Item array
+ *
+ * @return int The result of the transmission
+ */
+ private static function sendParticipation($contact, $item)
+ {
+ // Don't send notifications for private postings
+ if ($item['private']) {
+ return;
+ }
+
+ $cachekey = "diaspora:sendParticipation:".$item['guid'];
+
+ $result = Cache::get($cachekey);
+ if (!is_null($result)) {
+ return;
+ }
+
+ // Fetch some user id to have a valid handle to transmit the participation.
+ // In fact it doesn't matter which user sends this - but it is needed by the protocol.
+ // If the item belongs to a user, we take this user id.
+ if ($item['uid'] == 0) {
+ $condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
+ $first_user = dba::selectFirst('user', ['uid'], $condition);
+ $owner = User::getOwnerDataById($first_user['uid']);
+ } else {
+ $owner = User::getOwnerDataById($item['uid']);
+ }
+
+ $author = self::myHandle($owner);
+
+ $message = ["author" => $author,
+ "guid" => get_guid(32),
+ "parent_type" => "Post",
+ "parent_guid" => $item["guid"]];
+
+ logger("Send participation for ".$item["guid"]." by ".$author, LOGGER_DEBUG);
+
+ // It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
+ Cache::set($cachekey, $item["guid"], CACHE_QUARTER_HOUR);
+
+ return self::buildAndTransmit($owner, $contact, "participation", $message);
+ }
+
/**
* @brief sends an account migration
*
$profile = self::createProfileData($uid);
$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
- $signature = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ $signature = base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
- $message = array("author" => $old_handle,
+ $message = ["author" => $old_handle,
"profile" => $profile,
- "signature" => $signature);
+ "signature" => $signature];
logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
}
*/
- $message = array("author" => self::myHandle($owner),
+ $message = ["author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "true",
- "sharing" => "true");
+ "sharing" => "true"];
logger("Send share ".print_r($message, true), LOGGER_DEBUG);
*/
public static function sendUnshare($owner, $contact)
{
- $message = array("author" => self::myHandle($owner),
+ $message = ["author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "false",
- "sharing" => "false");
+ "sharing" => "false"];
logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
NETWORK_DIASPORA
);
if ($r) {
- $ret= array();
+ $ret= [];
$ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]);
$ret["root_guid"] = $guid;
return($ret);
$profile = $matches[1];
}
- $ret= array();
+ $ret= [];
$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
{
$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
if (!DBM::is_result($r)) {
- return array();
+ return [];
}
$event = $r[0];
- $eventdata = array();
+ $eventdata = [];
$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
if (!DBM::is_result($r)) {
- return array();
+ return [];
}
$user = $r[0];
$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
if (!DBM::is_result($r)) {
- return array();
+ return [];
}
$owner = $r[0];
$eventdata['description'] = html_entity_decode(bb2diaspora($event['desc']));
}
if ($event['location']) {
- $location = array();
+ $location = [];
$location["address"] = html_entity_decode(bb2diaspora($event['location']));
$location["lat"] = 0;
$location["lng"] = 0;
// Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
- $message = array("author" => $myaddr,
+ $message = ["author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
"root_author" => $ret["root_handle"],
"root_guid" => $ret["root_guid"],
"provider_display_name" => $item["app"],
- "public" => $public);
+ "public" => $public];
$type = "reshare";
} else {
}
}
- $location = array();
+ $location = [];
if ($item["location"] != "")
$location["address"] = $item["location"];
$location["lng"] = $coord[1];
}
- $message = array("author" => $myaddr,
+ $message = ["author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
"public" => $public,
"text" => $body,
"provider_display_name" => $item["app"],
- "location" => $location);
+ "location" => $location];
// Diaspora rejects messages when they contain a location without "lat" or "lng"
if (!isset($location["lat"]) || !isset($location["lng"])) {
$type = "status_message";
}
- $msg = array("type" => $type, "message" => $message);
+ $msg = ["type" => $type, "message" => $message];
Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
$positive = "false";
}
- return(array("author" => self::myHandle($owner),
+ return(["author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"parent_type" => $target_type,
"positive" => $positive,
- "author_signature" => ""));
+ "author_signature" => ""]);
}
/**
return false;
}
- return(array("author" => self::myHandle($owner),
+ return(["author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"status" => $attend_answer,
- "author_signature" => ""));
+ "author_signature" => ""]);
}
/**
$text = html_entity_decode(bb2diaspora($item["body"]));
$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
- $comment = array("author" => self::myHandle($owner),
+ $comment = ["author" => self::myHandle($owner),
"guid" => $item["guid"],
"created_at" => $created,
"parent_guid" => $parent["guid"],
"text" => $text,
- "author_signature" => "");
+ "author_signature" => ""];
// Send the thread parent guid only if it is a threaded comment
if ($item['thr-parent'] != $item['parent-uri']) {
*/
public static function sendFollowup($item, $owner, $contact, $public_batch = false)
{
- if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
+ if (in_array($item['verb'], [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE])) {
$message = self::constructAttend($item, $owner);
$type = "event_participation";
- } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$message = self::constructLike($item, $owner);
$type = "like";
} else {
$signed_parts = explode(";", $signature['signed_text']);
if ($item["deleted"]) {
- $message = array("author" => $signature['signer'],
+ $message = ["author" => $signature['signer'],
"target_guid" => $signed_parts[0],
- "target_type" => $signed_parts[1]);
- } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
- $message = array("author" => $signed_parts[4],
+ "target_type" => $signed_parts[1]];
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+ $message = ["author" => $signed_parts[4],
"guid" => $signed_parts[1],
"parent_guid" => $signed_parts[3],
"parent_type" => $signed_parts[2],
"positive" => $signed_parts[0],
"author_signature" => $signature['signature'],
- "parent_author_signature" => "");
+ "parent_author_signature" => ""];
} else {
// Remove the comment guid
$guid = array_shift($signed_parts);
// Glue the parts together
$text = implode(";", $signed_parts);
- $message = array("author" => $handle,
+ $message = ["author" => $handle,
"guid" => $guid,
"parent_guid" => $parent_guid,
"text" => implode(";", $signed_parts),
"author_signature" => $signature['signature'],
- "parent_author_signature" => "");
+ "parent_author_signature" => ""];
}
return $message;
}
{
if ($item["deleted"]) {
return self::sendRetraction($item, $owner, $contact, $public_batch, true);
- } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$type = "like";
} else {
$type = "comment";
} else {// New way
$msg = json_decode($signature['signed_text'], true);
- $message = array();
+ $message = [];
if (is_array($msg)) {
foreach ($msg as $field => $data) {
if (!$item["deleted"]) {
if ($item['id'] == $item['parent']) {
$target_type = "Post";
- } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$target_type = "Like";
} else {
$target_type = "Comment";
}
- $message = array("author" => $itemaddr,
+ $message = ["author" => $itemaddr,
"target_guid" => $item['guid'],
- "target_type" => $target_type);
+ "target_type" => $target_type];
logger("Got message ".print_r($message, true), LOGGER_DEBUG);
}
$cnv = $r[0];
- $conv = array(
+ $conv = [
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
"participants" => $cnv["recips"]
- );
+ ];
$body = bb2diaspora($item["body"]);
$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
- $msg = array(
+ $msg = [
"author" => $myaddr,
"guid" => $item["guid"],
"conversation_guid" => $cnv["guid"],
"text" => $body,
"created_at" => $created,
- );
+ ];
if ($item["reply"]) {
$message = $msg;
$type = "message";
} else {
- $message = array(
+ $message = [
"author" => $cnv["creator"],
"guid" => $cnv["guid"],
"subject" => $cnv["subject"],
"created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'),
"participants" => $cnv["recips"],
- "message" => $msg);
+ "message" => $msg];
$type = "conversation";
}
return self::buildAndTransmit($owner, $contact, $type, $message, false, $item["guid"]);
}
+ /**
+ * @brief Split a name into first name and last name
+ *
+ * @param string $name The name
+ *
+ * @return array The array with "first" and "last"
+ */
+ public static function splitName($name) {
+ $name = trim($name);
+
+ // Is the name longer than 64 characters? Then cut the rest of it.
+ if (strlen($name) > 64) {
+ if ((strpos($name, ' ') <= 64) && (strpos($name, ' ') !== false)) {
+ $name = trim(substr($name, 0, strrpos(substr($name, 0, 65), ' ')));
+ } else {
+ $name = substr($name, 0, 64);
+ }
+ }
+
+ // Take the first word as first name
+ $first = ((strpos($name, ' ') ? trim(substr($name, 0, strpos($name, ' '))) : $name));
+ $last = (($first === $name) ? '' : trim(substr($name, strlen($first))));
+ if ((strlen($first) < 32) && (strlen($last) < 32)) {
+ return ['first' => $first, 'last' => $last];
+ }
+
+ // Take the last word as last name
+ $first = ((strrpos($name, ' ') ? trim(substr($name, 0, strrpos($name, ' '))) : $name));
+ $last = (($first === $name) ? '' : trim(substr($name, strlen($first))));
+
+ if ((strlen($first) < 32) && (strlen($last) < 32)) {
+ return ['first' => $first, 'last' => $last];
+ }
+
+ // Take the first 32 characters if there is no space in the first 32 characters
+ if ((strpos($name, ' ') > 32) || (strpos($name, ' ') === false)) {
+ $first = substr($name, 0, 32);
+ $last = substr($name, 32);
+ return ['first' => $first, 'last' => $last];
+ }
+
+ $first = trim(substr($name, 0, strrpos(substr($name, 0, 33), ' ')));
+ $last = (($first === $name) ? '' : trim(substr($name, strlen($first))));
+
+ // Check if the last name is longer than 32 characters
+ if (strlen($last) > 32) {
+ if (strpos($last, ' ') <= 32) {
+ $last = trim(substr($last, 0, strrpos(substr($last, 0, 33), ' ')));
+ } else {
+ $last = substr($last, 0, 32);
+ }
+ }
+
+ return ['first' => $first, 'last' => $last];
+ }
+
/**
* @brief Create profile data
*
);
if (!$r) {
- return array();
+ return [];
}
$profile = $r[0];
-
$handle = $profile["addr"];
- $first = ((strpos($profile['name'], ' ')
- ? trim(substr($profile['name'], 0, strpos($profile['name'], ' '))) : $profile['name']));
- $last = (($first === $profile['name']) ? '' : trim(substr($profile['name'], strlen($first))));
+
+ $split_name = self::splitName($profile['name']);
+ $first = $split_name['first'];
+ $last = $split_name['last'];
+
$large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
$medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
$small = System::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
$tags = trim($tags);
}
- return array("author" => $handle,
+ return ["author" => $handle,
"first_name" => $first,
"last_name" => $last,
"image_url" => $large,
"location" => $location,
"searchable" => $searchable,
"nsfw" => "false",
- "tag_string" => $tags);
+ "tag_string" => $tags];
}
/**
return;
}
+ $owner = User::getOwnerDataById($uid);
+ if (!$owner) {
+ return;
+ }
+
if (!$recips) {
$recips = q(
"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
foreach ($recips as $recip) {
logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
- self::buildAndTransmit($profile, $recip, "profile", $message, false, "", true);
+ self::buildAndTransmit($owner, $recip, "profile", $message, false, "", true);
}
}
return false;
}
- if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+ if (!in_array($r[0]["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
return false;
}
$message = self::constructLike($r[0], $contact);
+ if ($message === false) {
+ return false;
+ }
+
$message["author_signature"] = self::signature($contact, $message);
/*
* Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
- dba::insert('sign', array('iid' => $post_id, 'signed_text' => json_encode($message)));
+ dba::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
logger('Stored diaspora like signature');
return true;
$contact["uprvkey"] = $uprvkey;
$message = self::constructComment($item, $contact);
+ if ($message === false) {
+ return false;
+ }
+
$message["author_signature"] = self::signature($contact, $message);
/*
* Now store the signature more flexible to dynamically support new fields.
* This will break Diaspora compatibility with Friendica versions prior to 3.5.
*/
- dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($message)));
+ dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
logger('Stored diaspora comment signature');
return true;
projects / friendica.git / blobdiff