X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=9d42d32124df925e5f235fec046290d9c4d7815e;hb=4fb24d4ebba267309dc76f3107bd7cc891af6c17;hp=ccd1ec594b6ce518914cf6063b5927e1ff082478;hpb=1a60401d69e7d340e135c258eb058e88419151e9;p=friendica.git
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index ccd1ec594b..9d42d32124 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1,11 +1,11 @@
author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
- public static function decode_raw($importer, $raw)
+ public static function decodeRaw($importer, $raw)
{
$data = json_decode($raw);
@@ -242,7 +290,7 @@ class Diaspora
$outer_iv = base64_decode($j_outer_key_bundle->iv);
$outer_key = base64_decode($j_outer_key_bundle->key);
- $xml = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+ $xml = self::aesDecrypt($outer_key, $outer_iv, $ciphertext);
} else {
$xml = $raw;
}
@@ -257,7 +305,7 @@ class Diaspora
$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];
@@ -273,15 +321,15 @@ class Diaspora
$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];
}
/**
@@ -329,7 +377,7 @@ class Diaspora
$outer_iv = base64_decode($j_outer_key_bundle->iv);
$outer_key = base64_decode($j_outer_key_bundle->key);
- $decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+ $decrypted = self::aesDecrypt($outer_key, $outer_iv, $ciphertext);
logger('decrypted: '.$decrypted, LOGGER_DEBUG);
$idom = parse_xml_string($decrypted);
@@ -364,7 +412,7 @@ class Diaspora
// 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
@@ -387,7 +435,7 @@ class Diaspora
} else {
// Decode the encrypted blob
$inner_encrypted = base64_decode($data);
- $inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
+ $inner_decrypted = self::aesDecrypt($inner_aes_key, $inner_iv, $inner_encrypted);
}
if (!$author_link) {
@@ -406,7 +454,7 @@ class Diaspora
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.');
@@ -415,9 +463,9 @@ class Diaspora
logger('Message verified.');
- return array('message' => (string)$inner_decrypted,
+ return ['message' => (string)$inner_decrypted,
'author' => unxmlify($author_link),
- 'key' => (string)$key);
+ 'key' => (string)$key];
}
@@ -428,7 +476,7 @@ class Diaspora
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
- public static function dispatch_public($msg)
+ public static function dispatchPublic($msg)
{
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
@@ -436,7 +484,7 @@ class Diaspora
return false;
}
- if (!($postdata = self::valid_posting($msg))) {
+ if (!($postdata = self::validPosting($msg))) {
logger("Invalid posting");
return false;
}
@@ -446,7 +494,7 @@ class Diaspora
// Is it a an action (comment, like, ...) for our own post?
if (isset($fields->parent_guid) && !$postdata["relayed"]) {
$guid = notags(unxmlify($fields->parent_guid));
- $importer = self::importer_for_guid($guid);
+ $importer = self::importerForGuid($guid);
if (is_array($importer)) {
logger("delivering to origin: ".$importer["name"]);
$message_id = self::dispatch($importer, $msg, $fields);
@@ -456,11 +504,11 @@ class Diaspora
// 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;
}
@@ -484,7 +532,7 @@ class Diaspora
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);
}
@@ -508,7 +556,7 @@ class Diaspora
// This is only needed for private postings since this is already done for public ones before
if (is_null($fields)) {
- if (!($postdata = self::valid_posting($msg))) {
+ if (!($postdata = self::validPosting($msg))) {
logger("Invalid posting");
return false;
}
@@ -524,43 +572,43 @@ class Diaspora
return self::receiveAccountMigration($importer, $fields);
case "account_deletion":
- return self::receive_account_deletion($importer, $fields);
+ return self::receiveAccountDeletion($importer, $fields);
case "comment":
- return self::receive_comment($importer, $sender, $fields, $msg["message"]);
+ return self::receiveComment($importer, $sender, $fields, $msg["message"]);
case "contact":
- return self::receive_contact_request($importer, $fields);
+ return self::receiveContactRequest($importer, $fields);
case "conversation":
- return self::receive_conversation($importer, $msg, $fields);
+ return self::receiveConversation($importer, $msg, $fields);
case "like":
- return self::receive_like($importer, $sender, $fields);
+ return self::receiveLike($importer, $sender, $fields);
case "message":
- return self::receive_message($importer, $fields);
+ return self::receiveMessage($importer, $fields);
- case "participation": // Not implemented
- return self::receive_participation($importer, $fields);
+ case "participation":
+ return self::receiveParticipation($importer, $fields);
case "photo": // Not implemented
- return self::receive_photo($importer, $fields);
+ return self::receivePhoto($importer, $fields);
case "poll_participation": // Not implemented
- return self::receive_poll_participation($importer, $fields);
+ return self::receivePollParticipation($importer, $fields);
case "profile":
- return self::receive_profile($importer, $fields);
+ return self::receiveProfile($importer, $fields);
case "reshare":
- return self::receive_reshare($importer, $fields, $msg["message"]);
+ return self::receiveReshare($importer, $fields, $msg["message"]);
case "retraction":
- return self::receive_retraction($importer, $sender, $fields);
+ return self::receiveRetraction($importer, $sender, $fields);
case "status_message":
- return self::receive_status_message($importer, $fields, $msg["message"]);
+ return self::receiveStatusMessage($importer, $fields, $msg["message"]);
default:
logger("Unknown message type ".$type);
@@ -580,7 +628,7 @@ class Diaspora
*
* @return bool|array If the posting is valid then an array with an SimpleXML object is returned
*/
- private static function valid_posting($msg)
+ private static function validPosting($msg)
{
$data = parse_xml_string($msg["message"]);
@@ -609,7 +657,7 @@ class Diaspora
// 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") {
@@ -629,7 +677,7 @@ class Diaspora
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";
}
@@ -662,15 +710,14 @@ class Diaspora
$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);
@@ -678,7 +725,7 @@ class Diaspora
}
// 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;
@@ -686,8 +733,8 @@ class Diaspora
}
// 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)) {
@@ -700,7 +747,7 @@ class Diaspora
$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;
}
@@ -710,11 +757,11 @@ class Diaspora
$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];
}
}
@@ -731,7 +778,7 @@ class Diaspora
logger("Fetching diaspora key for: ".$handle);
- $r = self::person_by_handle($handle);
+ $r = self::personByHandle($handle);
if ($r) {
return $r["pubkey"];
}
@@ -746,7 +793,7 @@ class Diaspora
*
* @return array the queried data
*/
- public static function person_by_handle($handle)
+ public static function personByHandle($handle)
{
$r = q(
"SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
@@ -775,7 +822,7 @@ class Diaspora
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
if ($r && ($r["network"] === NETWORK_DIASPORA)) {
- self::add_fcontact($r, $update);
+ self::addFContact($r, $update);
$person = $r;
}
}
@@ -790,7 +837,7 @@ class Diaspora
*
* @return string The id of the fcontact entry
*/
- private static function add_fcontact($arr, $update = false)
+ private static function addFContact($arr, $update = false)
{
if ($update) {
$r = q(
@@ -859,7 +906,7 @@ class Diaspora
*
* @return string the handle
*/
- public static function handle_from_contact($contact_id, $gcontact_id = 0)
+ public static function handleFromContact($contact_id, $gcontact_id = 0)
{
$handle = false;
@@ -908,7 +955,7 @@ class Diaspora
*
* @return string the contact url or null
*/
- public static function url_from_contact_guid($fcontact_guid)
+ public static function urlFromContactGuid($fcontact_guid)
{
logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
@@ -928,12 +975,14 @@ class Diaspora
/**
* @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 contact_by_handle($uid, $handle)
+ private static function contactByHandle($uid, $handle)
{
// First do a direct search on the contact table
$r = q(
@@ -986,37 +1035,39 @@ class Diaspora
*
* @return bool is the contact allowed to post?
*/
- private static function post_allow($importer, $contact, $is_comment = false) {
-
+ private static function postAllow($importer, $contact, $is_comment = false)
+ {
/*
* Perhaps we were already sharing with this person. Now they're sharing with us.
* 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"]) {
// Maybe blocked, don't accept.
return false;
- // We are following this person?
+ // We are following this person?
} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
// Yes, then it is fine.
return true;
- // Is it a post to a community?
+ // Is it a post to a community?
} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
// That's good
return true;
- // Is the message a global user or a comment?
+ // Is the message a global user or a comment?
} elseif (($importer["uid"] == 0) || $is_comment) {
// Messages for the global users and comments are always accepted
return true;
@@ -1034,9 +1085,9 @@ class Diaspora
*
* @return array The contact data
*/
- private static function allowed_contact_by_handle($importer, $handle, $is_comment = false)
+ private static function allowedContactByHandle($importer, $handle, $is_comment = false)
{
- $contact = self::contact_by_handle($importer["uid"], $handle);
+ $contact = self::contactByHandle($importer["uid"], $handle);
if (!$contact) {
logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
// If a contact isn't found, we accept it anyway if it is a comment
@@ -1047,7 +1098,7 @@ class Diaspora
}
}
- if (!self::post_allow($importer, $contact, $is_comment)) {
+ if (!self::postAllow($importer, $contact, $is_comment)) {
logger("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
return false;
}
@@ -1062,7 +1113,7 @@ class Diaspora
*
* @return int|bool message id if the message already was stored into the system - or false.
*/
- private static function message_exists($uid, $guid)
+ private static function messageExists($uid, $guid)
{
$r = q(
"SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
@@ -1082,14 +1133,15 @@ class Diaspora
* @brief Checks for links to posts in a message
*
* @param array $item The item array
+ * @return void
*/
- private static function fetch_guid($item)
+ private static function fetchGuid($item)
{
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
preg_replace_callback(
$expression,
function ($match) use ($item) {
- return self::fetch_guid_sub($match, $item);
+ self::fetchGuidSub($match, $item);
},
$item["body"]
);
@@ -1097,7 +1149,7 @@ class Diaspora
preg_replace_callback(
"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item) {
- return self::fetch_guid_sub($match, $item);
+ self::fetchGuidSub($match, $item);
},
$item["body"]
);
@@ -1110,9 +1162,9 @@ class Diaspora
* @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 replace_people_guid($body, $author_link)
+ public static function replacePeopleGuid($body, $author_link)
{
$return = preg_replace_callback(
"&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
@@ -1121,7 +1173,7 @@ class Diaspora
// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
// 1 => '0123456789abcdef'
// 2 => 'Foo Bar'
- $handle = self::url_from_contact_guid($match[1]);
+ $handle = self::urlFromContactGuid($match[1]);
if ($handle) {
$return = '@[url='.$handle.']'.$match[2].'[/url]';
@@ -1140,15 +1192,16 @@ class Diaspora
}
/**
- * @brief sub function of "fetch_guid" which checks for links in messages
+ * @brief sub function of "fetchGuid" which checks for links in messages
*
* @param array $match array containing a link that has to be checked for a message link
* @param array $item The item array
+ * @return void
*/
- private static function fetch_guid_sub($match, $item)
+ private static function fetchGuidSub($match, $item)
{
- if (!self::store_by_guid($match[1], $item["author-link"])) {
- self::store_by_guid($match[1], $item["owner-link"]);
+ if (!self::storeByGuid($match[1], $item["author-link"])) {
+ self::storeByGuid($match[1], $item["owner-link"]);
}
}
@@ -1161,7 +1214,7 @@ class Diaspora
*
* @return int the message id of the stored message or false
*/
- private static function store_by_guid($guid, $server, $uid = 0)
+ private static function storeByGuid($guid, $server, $uid = 0)
{
$serverparts = parse_url($server);
$server = $serverparts["scheme"]."://".$serverparts["host"];
@@ -1177,7 +1230,7 @@ class Diaspora
logger("Successfully fetched item ".$guid." from ".$server, LOGGER_DEBUG);
// Now call the dispatcher
- return self::dispatch_public($msg);
+ return self::dispatchPublic($msg);
}
/**
@@ -1206,7 +1259,7 @@ class Diaspora
$envelope = fetch_url($source_url);
if ($envelope) {
logger("Envelope was fetched.", LOGGER_DEBUG);
- $x = self::verify_magic_envelope($envelope);
+ $x = self::verifyMagicEnvelope($envelope);
if (!$x) {
logger("Envelope could not be verified.", LOGGER_DEBUG);
} else {
@@ -1258,7 +1311,7 @@ class Diaspora
return false;
}
- $msg = array("message" => $x, "author" => $author);
+ $msg = ["message" => $x, "author" => $author];
$msg["key"] = self::key($msg["author"]);
@@ -1275,7 +1328,7 @@ class Diaspora
*
* @return array the item record
*/
- private static function parent_item($uid, $guid, $author, $contact)
+ private static function parentItem($uid, $guid, $author, $contact)
{
$r = q(
"SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
@@ -1287,11 +1340,11 @@ class Diaspora
);
if (!$r) {
- $result = self::store_by_guid($guid, $contact["url"], $uid);
+ $result = self::storeByGuid($guid, $contact["url"], $uid);
if (!$result) {
- $person = self::person_by_handle($author);
- $result = self::store_by_guid($guid, $person["url"], $uid);
+ $person = self::personByHandle($author);
+ $result = self::storeByGuid($guid, $person["url"], $uid);
}
if ($result) {
@@ -1328,7 +1381,7 @@ class Diaspora
* 'cid' => contact id
* 'network' => network type
*/
- private static function author_contact_by_url($contact, $person, $uid)
+ private static function authorContactByUrl($contact, $person, $uid)
{
$r = q(
"SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
@@ -1338,16 +1391,12 @@ class Diaspora
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];
}
/**
@@ -1357,7 +1406,7 @@ class Diaspora
*
* @return bool is it a hubzilla server?
*/
- public static function is_redmatrix($url)
+ public static function isRedmatrix($url)
{
return(strstr($url, "/channel/"));
}
@@ -1395,7 +1444,7 @@ class Diaspora
return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
}
- if (self::is_redmatrix($r[0]["url"])) {
+ if (self::isRedmatrix($r[0]["url"])) {
return $r[0]["url"]."/?f=&mid=".$guid;
}
@@ -1420,7 +1469,7 @@ class Diaspora
$new_handle = notags(unxmlify($data->profile->author));
$signature = notags(unxmlify($data->signature));
- $contact = self::contact_by_handle($importer["uid"], $old_handle);
+ $contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) {
logger("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
return false;
@@ -1431,13 +1480,13 @@ class Diaspora
// 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;
}
// Update the profile
- self::receive_profile($importer, $data->profile);
+ self::receiveProfile($importer, $data->profile);
// change the technical stuff in contact and gcontact
$data = Probe::uri($new_handle);
@@ -1446,30 +1495,30 @@ class Diaspora
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",
@@ -1507,13 +1556,13 @@ class Diaspora
*
* @return bool Success
*/
- private static function receive_account_deletion($importer, $data)
+ private static function receiveAccountDeletion($importer, $data)
{
/// @todo Account deletion should remove the contact from the global contacts as well
$author = notags(unxmlify($data->author));
- $contact = self::contact_by_handle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) {
logger("cannot find contact for author: ".$author);
return false;
@@ -1533,7 +1582,7 @@ class Diaspora
*
* @return string The constructed uri or the one from our database
*/
- private static function get_uri_from_guid($author, $guid, $onlyfound = false)
+ private static function getUriFromGuid($author, $guid, $onlyfound = false)
{
$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
if (DBM::is_result($r)) {
@@ -1553,7 +1602,7 @@ class Diaspora
*
* @return string The post guid
*/
- private static function get_guid_from_uri($uri, $uid)
+ private static function getGuidFromUri($uri, $uid)
{
$r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
if (DBM::is_result($r)) {
@@ -1570,7 +1619,7 @@ class Diaspora
*
* @return array|boolean the origin owner of that post - or false
*/
- private static function importer_for_guid($guid)
+ private static function importerForGuid($guid)
{
$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
@@ -1594,7 +1643,7 @@ class Diaspora
*
* @return int The message id of the generated comment or "false" if there was an error
*/
- private static function receive_comment($importer, $sender, $data, $xml)
+ private static function receiveComment($importer, $sender, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -1609,36 +1658,36 @@ class Diaspora
if (isset($data->thread_parent_guid)) {
$thread_parent_guid = notags(unxmlify($data->thread_parent_guid));
- $thr_uri = self::get_uri_from_guid("", $thread_parent_guid, true);
+ $thr_uri = self::getUriFromGuid("", $thread_parent_guid, true);
} else {
$thr_uri = "";
}
- $contact = self::allowed_contact_by_handle($importer, $sender, true);
+ $contact = self::allowedContactByHandle($importer, $sender, true);
if (!$contact) {
return false;
}
- $message_id = self::message_exists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
}
- $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
+ $parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item) {
return false;
}
- $person = self::person_by_handle($author);
+ $person = self::personByHandle($author);
if (!is_array($person)) {
logger("unable to find author details");
return false;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::author_contact_by_url($contact, $person, $importer["uid"]);
+ $author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
- $datarray = array();
+ $datarray = [];
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $author_contact["cid"];
@@ -1653,7 +1702,7 @@ class Diaspora
$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["guid"] = $guid;
- $datarray["uri"] = self::get_uri_from_guid($author, $guid);
+ $datarray["uri"] = self::getUriFromGuid($author, $guid);
$datarray["type"] = "remote-comment";
$datarray["verb"] = ACTIVITY_POST;
@@ -1676,9 +1725,9 @@ class Diaspora
$body = diaspora2bb($text);
- $datarray["body"] = self::replace_people_guid($body, $person["url"]);
+ $datarray["body"] = self::replacePeopleGuid($body, $person["url"]);
- self::fetch_guid($datarray);
+ self::fetchGuid($datarray);
$message_id = item_store($datarray);
@@ -1694,7 +1743,7 @@ class Diaspora
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);
@@ -1715,7 +1764,7 @@ class Diaspora
*
* @return bool "true" if it was successful
*/
- private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation)
+ private static function receiveConversationMessage($importer, $contact, $data, $msg, $mesg, $conversation)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -1744,7 +1793,7 @@ class Diaspora
$body = diaspora2bb($msg_text);
$message_uri = $msg_author.":".$msg_guid;
- $person = self::person_by_handle($msg_author);
+ $person = self::personByHandle($msg_author);
dba::lock('mail');
@@ -1779,23 +1828,23 @@ class Diaspora
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;
}
@@ -1808,7 +1857,7 @@ class Diaspora
*
* @return bool Success
*/
- private static function receive_conversation($importer, $msg, $data)
+ private static function receiveConversation($importer, $msg, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -1823,7 +1872,7 @@ class Diaspora
return false;
}
- $contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
+ $contact = self::allowedContactByHandle($importer, $msg["author"], true);
if (!$contact) {
return false;
}
@@ -1867,7 +1916,7 @@ class Diaspora
}
foreach ($messages as $mesg) {
- self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
+ self::receiveConversationMessage($importer, $contact, $data, $msg, $mesg, $conversation);
}
return true;
@@ -1882,7 +1931,8 @@ class Diaspora
*
* @return string the body
*/
- private static function construct_like_body($contact, $parent_item, $guid) {
+ private static function constructLikeBody($contact, $parent_item, $guid)
+ {
$bodyverb = t('%1$s likes %2$s\'s %3$s');
$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
@@ -1900,20 +1950,20 @@ class Diaspora
*
* @return string The XML
*/
- private static function construct_like_object($importer, $parent_item)
+ private static function constructLikeObject($importer, $parent_item)
{
$objtype = ACTIVITY_OBJ_NOTE;
$link = '';
$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::from_array($xmldata, $xml, true);
+ return XML::fromArray($xmldata, $xml, true);
}
/**
@@ -1925,7 +1975,7 @@ class Diaspora
*
* @return int The message id of the generated like or "false" if there was an error
*/
- private static function receive_like($importer, $sender, $data)
+ private static function receiveLike($importer, $sender, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -1935,33 +1985,33 @@ class Diaspora
// 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;
}
- $contact = self::allowed_contact_by_handle($importer, $sender, true);
+ $contact = self::allowedContactByHandle($importer, $sender, true);
if (!$contact) {
return false;
}
- $message_id = self::message_exists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
}
- $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
+ $parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
if (!$parent_item) {
return false;
}
- $person = self::person_by_handle($author);
+ $person = self::personByHandle($author);
if (!is_array($person)) {
logger("unable to find author details");
return false;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::author_contact_by_url($contact, $person, $importer["uid"]);
+ $author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
@@ -1971,7 +2021,7 @@ class Diaspora
$verb = ACTIVITY_DISLIKE;
}
- $datarray = array();
+ $datarray = [];
$datarray["protocol"] = PROTOCOL_DIASPORA;
@@ -1988,7 +2038,7 @@ class Diaspora
$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["guid"] = $guid;
- $datarray["uri"] = self::get_uri_from_guid($author, $guid);
+ $datarray["uri"] = self::getUriFromGuid($author, $guid);
$datarray["type"] = "activity";
$datarray["verb"] = $verb;
@@ -1996,9 +2046,9 @@ class Diaspora
$datarray["parent-uri"] = $parent_item["uri"];
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
- $datarray["object"] = self::construct_like_object($importer, $parent_item);
+ $datarray["object"] = self::constructLikeObject($importer, $parent_item);
- $datarray["body"] = self::construct_like_body($contact, $parent_item, $guid);
+ $datarray["body"] = self::constructLikeBody($contact, $parent_item, $guid);
$message_id = item_store($datarray);
@@ -2012,7 +2062,7 @@ class 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"];
@@ -2022,7 +2072,7 @@ class Diaspora
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);
@@ -2039,7 +2089,7 @@ class Diaspora
*
* @return bool Success?
*/
- private static function receive_message($importer, $data)
+ private static function receiveMessage($importer, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -2047,7 +2097,7 @@ class Diaspora
$text = unxmlify($data->text);
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
- $contact = self::allowed_contact_by_handle($importer, $author, true);
+ $contact = self::allowedContactByHandle($importer, $author, true);
if (!$contact) {
return false;
}
@@ -2068,7 +2118,7 @@ class Diaspora
$message_uri = $author.":".$guid;
- $person = self::person_by_handle($author);
+ $person = self::personByHandle($author);
if (!$person) {
logger("unable to find author details");
return false;
@@ -2076,7 +2126,7 @@ class Diaspora
$body = diaspora2bb($text);
- $body = self::replace_people_guid($body, $person["url"]);
+ $body = self::replacePeopleGuid($body, $person["url"]);
dba::lock('mail');
@@ -2111,7 +2161,7 @@ class Diaspora
dba::unlock();
- dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
+ dba::update('conv', ['updated' => datetime_convert()], ['id' => $conversation["id"]]);
return true;
}
@@ -2123,9 +2173,56 @@ class Diaspora
*
* @return bool always true
*/
- private static function receive_participation($importer, $data)
+ 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;
}
@@ -2137,7 +2234,7 @@ class Diaspora
*
* @return bool always true
*/
- private static function receive_photo($importer, $data)
+ private static function receivePhoto($importer, $data)
{
// There doesn't seem to be a reason for this function,
// since the photo data is transmitted in the status message as well
@@ -2152,7 +2249,7 @@ class Diaspora
*
* @return bool always true
*/
- private static function receive_poll_participation($importer, $data)
+ private static function receivePollParticipation($importer, $data)
{
// We don't support polls by now
return true;
@@ -2166,11 +2263,11 @@ class Diaspora
*
* @return bool Success
*/
- private static function receive_profile($importer, $data)
+ private static function receiveProfile($importer, $data)
{
$author = strtolower(notags(unxmlify($data->author)));
- $contact = self::contact_by_handle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer["uid"], $author);
if (!$contact) {
return false;
}
@@ -2187,7 +2284,7 @@ class Diaspora
$tags = explode("#", $tags);
- $keywords = array();
+ $keywords = [];
foreach ($tags as $tag) {
$tag = trim(strtolower($tag));
if ($tag != "") {
@@ -2208,7 +2305,7 @@ class Diaspora
$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.
@@ -2241,15 +2338,15 @@ class Diaspora
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);
@@ -2261,16 +2358,17 @@ class Diaspora
*
* @param array $importer Array of the importer user
* @param array $contact The contact that send the request
+ * @return void
*/
- private static function receive_request_make_friend($importer, $contact)
+ private static function receiveRequestMakeFriend($importer, $contact)
{
$a = get_app();
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
@@ -2281,7 +2379,6 @@ class Diaspora
);
if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
-
$self = q(
"SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
@@ -2290,7 +2387,7 @@ class Diaspora
// 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"];
@@ -2308,16 +2405,16 @@ class Diaspora
$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::construct_new_friend_object($contact);
+ $arr["object"] = self::constructNewFriendObject($contact);
- $arr["last-child"] = 1;
+ $user = dba::selectFirst('user', ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['uid' => $importer["uid"]]);
- $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"];
+ $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) {
@@ -2334,18 +2431,18 @@ class Diaspora
*
* @return string The XML
*/
- private static function construct_new_friend_object($contact)
+ private static function constructNewFriendObject($contact)
{
$objtype = ACTIVITY_OBJ_PERSON;
$link = ''."\n".
''."\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::from_array($xmldata, $xml, true);
+ return XML::fromArray($xmldata, $xml, true);
}
/**
@@ -2356,7 +2453,7 @@ class Diaspora
*
* @return bool Success
*/
- private static function receive_contact_request($importer, $data)
+ private static function receiveContactRequest($importer, $data)
{
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
@@ -2379,25 +2476,25 @@ class Diaspora
$sharing = true;
}
- $contact = self::contact_by_handle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer["uid"], $author);
// perhaps we were already sharing with this person. Now they're sharing with us.
// That makes us friends.
if ($contact) {
if ($following) {
logger("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", LOGGER_DEBUG);
- self::receive_request_make_friend($importer, $contact);
+ self::receiveRequestMakeFriend($importer, $contact);
// refetch the contact array
- $contact = self::contact_by_handle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer["uid"], $author);
// 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);
- $ret = self::send_share($u[0], $contact);
+ $ret = self::sendShare($u[0], $contact);
}
}
return true;
@@ -2408,7 +2505,7 @@ class Diaspora
}
}
- 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) {
@@ -2422,7 +2519,7 @@ class Diaspora
logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
}
- $ret = self::person_by_handle($author);
+ $ret = self::personByHandle($author);
if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
@@ -2453,7 +2550,7 @@ class Diaspora
// find the contact record we just created
- $contact_record = self::contact_by_handle($importer["uid"], $author);
+ $contact_record = self::contactByHandle($importer["uid"], $author);
if (!$contact_record) {
logger("unable to locate newly created contact record.");
@@ -2462,13 +2559,9 @@ class Diaspora
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);
@@ -2491,7 +2584,7 @@ class Diaspora
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
@@ -2523,10 +2616,10 @@ class Diaspora
$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
if ($u) {
logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
- $ret = self::send_share($u[0], $contact_record);
+ $ret = self::sendShare($u[0], $contact_record);
// Send the profile data, maybe it weren't transmitted before
- self::send_profile($importer["uid"], array($contact_record));
+ self::sendProfile($importer["uid"], [$contact_record]);
}
}
@@ -2542,7 +2635,7 @@ class Diaspora
*
* @return array The fetched item
*/
- private static function original_item($guid, $orig_author, $author)
+ private static function originalItem($guid, $orig_author, $author)
{
// Do we already have this item?
$r = q(
@@ -2558,12 +2651,12 @@ class Diaspora
// Maybe it is already a reshared item?
// 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::is_reshare($r[0]["body"], true)) {
- $r = array();
- } elseif (self::is_reshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
+ if (self::isReshare($r[0]["body"], true)) {
+ $r = [];
+ } elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
- $r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+ $r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
// Add OEmbed and other information to the body
$r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true);
@@ -2577,12 +2670,12 @@ class Diaspora
if (!DBM::is_result($r)) {
$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
- $item_id = self::store_by_guid($guid, $server);
+ $item_id = self::storeByGuid($guid, $server);
if (!$item_id) {
$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
logger("2nd try: reshared message ".$guid." will be fetched without SLL from the server ".$server);
- $item_id = self::store_by_guid($guid, $server);
+ $item_id = self::storeByGuid($guid, $server);
}
if ($item_id) {
@@ -2595,9 +2688,9 @@ class Diaspora
if (DBM::is_result($r)) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
- if (self::is_reshare($r[0]["body"], false)) {
+ if (self::isReshare($r[0]["body"], false)) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
- $r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
+ $r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
}
return $r[0];
@@ -2616,7 +2709,7 @@ class Diaspora
*
* @return int the message id
*/
- private static function receive_reshare($importer, $data, $xml)
+ private static function receiveReshare($importer, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -2626,24 +2719,24 @@ class Diaspora
/// @todo handle unprocessed property "provider_display_name"
$public = notags(unxmlify($data->public));
- $contact = self::allowed_contact_by_handle($importer, $author, false);
+ $contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
return false;
}
- $message_id = self::message_exists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
}
- $original_item = self::original_item($root_guid, $root_author, $author);
+ $original_item = self::originalItem($root_guid, $root_author, $author);
if (!$original_item) {
return false;
}
$orig_url = System::baseUrl()."/display/".$original_item["guid"];
- $datarray = array();
+ $datarray = [];
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
@@ -2658,7 +2751,7 @@ class Diaspora
$datarray["owner-avatar"] = $datarray["author-avatar"];
$datarray["guid"] = $guid;
- $datarray["uri"] = $datarray["parent-uri"] = self::get_uri_from_guid($author, $guid);
+ $datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
@@ -2685,9 +2778,11 @@ class Diaspora
$datarray["object-type"] = $original_item["object-type"];
- self::fetch_guid($datarray);
+ 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;
@@ -2705,13 +2800,13 @@ class Diaspora
*
* @return bool success
*/
- private static function item_retraction($importer, $contact, $data)
+ private static function itemRetraction($importer, $contact, $data)
{
$author = notags(unxmlify($data->author));
$target_guid = notags(unxmlify($data->target_guid));
$target_type = notags(unxmlify($data->target_type));
- $person = self::person_by_handle($author);
+ $person = self::personByHandle($author);
if (!is_array($person)) {
logger("unable to find author detail for ".$author);
return false;
@@ -2722,13 +2817,13 @@ class Diaspora
}
// 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)) {
@@ -2738,7 +2833,7 @@ class Diaspora
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"])) {
@@ -2750,13 +2845,13 @@ class Diaspora
// 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
@@ -2785,12 +2880,12 @@ class Diaspora
*
* @return bool Success
*/
- private static function receive_retraction($importer, $sender, $data)
+ private static function receiveRetraction($importer, $sender, $data)
{
$target_type = notags(unxmlify($data->target_type));
- $contact = self::contact_by_handle($importer["uid"], $sender);
- if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
+ $contact = self::contactByHandle($importer["uid"], $sender);
+ if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
@@ -2803,7 +2898,7 @@ class Diaspora
case "Post":
case "Reshare":
case "StatusMessage":
- return self::item_retraction($importer, $contact, $data);
+ return self::itemRetraction($importer, $contact, $data);
case "Contact":
case "Person":
@@ -2828,7 +2923,7 @@ class Diaspora
*
* @return int The message id of the newly created item
*/
- private static function receive_status_message($importer, $data, $xml)
+ private static function receiveStatusMessage($importer, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
@@ -2837,17 +2932,17 @@ class Diaspora
$text = unxmlify($data->text);
$provider_display_name = notags(unxmlify($data->provider_display_name));
- $contact = self::allowed_contact_by_handle($importer, $author, false);
+ $contact = self::allowedContactByHandle($importer, $author, false);
if (!$contact) {
return false;
}
- $message_id = self::message_exists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
}
- $address = array();
+ $address = [];
if ($data->location) {
foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(unxmlify($data));
@@ -2856,7 +2951,7 @@ class Diaspora
$body = diaspora2bb($text);
- $datarray = array();
+ $datarray = [];
// Attach embedded pictures to the body
if ($data->photo) {
@@ -2870,7 +2965,7 @@ class Diaspora
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
// Add OEmbed and other information to the body
- if (!self::is_redmatrix($contact["url"])) {
+ if (!self::isRedmatrix($contact["url"])) {
$body = add_page_info_to_body($body, false, true);
}
}
@@ -2897,7 +2992,7 @@ class Diaspora
$datarray["owner-avatar"] = $datarray["author-avatar"];
$datarray["guid"] = $guid;
- $datarray["uri"] = $datarray["parent-uri"] = self::get_uri_from_guid($author, $guid);
+ $datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
@@ -2905,7 +3000,7 @@ class Diaspora
$datarray["protocol"] = PROTOCOL_DIASPORA;
$datarray["source"] = $xml;
- $datarray["body"] = self::replace_people_guid($body, $contact["url"]);
+ $datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
if ($provider_display_name != "") {
$datarray["app"] = $provider_display_name;
@@ -2923,9 +3018,11 @@ class Diaspora
$datarray["coord"] = $address["lat"]." ".$address["lng"];
}
- self::fetch_guid($datarray);
+ 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;
@@ -2945,7 +3042,7 @@ class Diaspora
*
* @return string the handle in the format user@domain.tld
*/
- private static function my_handle($contact)
+ private static function myHandle($contact)
{
if ($contact["addr"] != "") {
return $contact["addr"];
@@ -2974,7 +3071,7 @@ class Diaspora
*
* @return string The encrypted data
*/
- public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey)
+ public static function encodePrivateData($msg, $user, $contact, $prvkey, $pubkey)
{
logger("Message: ".$msg, LOGGER_DATA);
@@ -2989,16 +3086,16 @@ class Diaspora
$iv = openssl_random_pseudo_bytes(16);
$b_iv = base64_encode($iv);
- $ciphertext = self::aes_encrypt($aes_key, $iv, $msg);
+ $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;
@@ -3012,12 +3109,12 @@ class Diaspora
*
* @return string The envelope
*/
- public static function build_magic_envelope($msg, $user)
+ 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::my_handle($user));
+ $key_id = base64url_encode(self::myHandle($user));
$type = "application/xml";
$encoding = "base64url";
$alg = "RSA-SHA256";
@@ -3028,19 +3125,19 @@ class Diaspora
$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::from_array($xmldata, $xml, false, $namespaces);
+ return XML::fromArray($xmldata, $xml, false, $namespaces);
}
/**
@@ -3055,14 +3152,14 @@ class Diaspora
*
* @return string The message that will be transmitted to other servers
*/
- private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false)
+ private static function buildMessage($msg, $user, $contact, $prvkey, $pubkey, $public = false)
{
// The message is put into an envelope with the sender's signature
- $envelope = self::build_magic_envelope($msg, $user);
+ $envelope = self::buildMagicEnvelope($msg, $user);
// Private messages are put into a second envelope, encrypted with the receivers public key
if (!$public) {
- $envelope = self::encode_private_data($envelope, $user, $contact, $prvkey, $pubkey);
+ $envelope = self::encodePrivateData($envelope, $user, $contact, $prvkey, $pubkey);
}
return $envelope;
@@ -3084,7 +3181,7 @@ class Diaspora
$signed_text = implode(";", $sigmsg);
- return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ return base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
}
/**
@@ -3109,7 +3206,15 @@ class Diaspora
}
$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;
@@ -3117,13 +3222,13 @@ class Diaspora
logger("transmit: ".$logid."-".$guid." ".$dest_url);
- if (!$queue_run && was_recently_delayed($contact["id"])) {
+ if (!$queue_run && Queue::wasDelayed($contact["id"])) {
$return_code = 0;
} else {
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");
@@ -3147,7 +3252,7 @@ class Diaspora
logger("add_to_queue ignored - identical item already in queue");
} else {
// queue message for redelivery
- add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
+ Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
// The message could not be delivered. We mark the contact as "dead"
Contact::markForArchival($contact);
@@ -3169,11 +3274,11 @@ class Diaspora
*
* @return string The post XML
*/
- public static function build_post_xml($type, $message)
+ public static function buildPostXml($type, $message)
{
- $data = array($type => $message);
+ $data = [$type => $message];
- return XML::from_array($data, $xml);
+ return XML::fromArray($data, $xml);
}
/**
@@ -3189,9 +3294,9 @@ class Diaspora
*
* @return int Result of the transmission
*/
- private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+ private static function buildAndTransmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
{
- $msg = self::build_post_xml($type, $message);
+ $msg = self::buildPostXml($type, $message);
logger('message: '.$msg, LOGGER_DATA);
logger('send guid '.$guid, LOGGER_DEBUG);
@@ -3201,20 +3306,68 @@ class Diaspora
$owner['uprvkey'] = $owner['prvkey'];
}
- $envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
+ $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
- add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
+ Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
return true;
} else {
$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
*
@@ -3230,15 +3383,15 @@ class Diaspora
$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);
- return self::build_and_transmit($owner, $contact, "account_migration", $message);
+ return self::buildAndTransmit($owner, $contact, "account_migration", $message);
}
/**
@@ -3249,13 +3402,13 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_share($owner, $contact)
+ public static function sendShare($owner, $contact)
{
/**
* @todo support the different possible combinations of "following" and "sharing"
* Currently, Diaspora only interprets the "sharing" field
*
- * Before switching this code productive, we have to check all "send_share" calls if "rel" is set correctly
+ * Before switching this code productive, we have to check all "sendShare" calls if "rel" is set correctly
*/
/*
@@ -3272,14 +3425,14 @@ class Diaspora
}
*/
- $message = array("author" => self::my_handle($owner),
+ $message = ["author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "true",
- "sharing" => "true");
+ "sharing" => "true"];
logger("Send share ".print_r($message, true), LOGGER_DEBUG);
- return self::build_and_transmit($owner, $contact, "contact", $message);
+ return self::buildAndTransmit($owner, $contact, "contact", $message);
}
/**
@@ -3292,14 +3445,14 @@ class Diaspora
*/
public static function sendUnshare($owner, $contact)
{
- $message = array("author" => self::my_handle($owner),
+ $message = ["author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "false",
- "sharing" => "false");
+ "sharing" => "false"];
logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
- return self::build_and_transmit($owner, $contact, "contact", $message);
+ return self::buildAndTransmit($owner, $contact, "contact", $message);
}
/**
@@ -3310,7 +3463,7 @@ class Diaspora
*
* @return array|bool Reshare details or "false" if no reshare
*/
- public static function is_reshare($body, $complete = true)
+ public static function isReshare($body, $complete = true)
{
$body = trim($body);
@@ -3355,8 +3508,8 @@ class Diaspora
NETWORK_DIASPORA
);
if ($r) {
- $ret= array();
- $ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
+ $ret= [];
+ $ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]);
$ret["root_guid"] = $guid;
return($ret);
}
@@ -3373,7 +3526,7 @@ class Diaspora
$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"] == "")) {
@@ -3406,32 +3559,32 @@ class Diaspora
*
* @return array with event data
*/
- private static function build_event($event_id)
+ private static function buildEvent($event_id)
{
$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['author'] = self::my_handle($owner);
+ $eventdata['author'] = self::myHandle($owner);
if ($event['guid']) {
$eventdata['guid'] = $event['guid'];
@@ -3463,7 +3616,7 @@ class Diaspora
$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;
@@ -3483,30 +3636,30 @@ class Diaspora
* 'type' -> Message type ("status_message" or "reshare")
* 'message' -> Array of XML elements of the status
*/
- public static function build_status($item, $owner)
+ public static function buildStatus($item, $owner)
{
- $cachekey = "diaspora:build_status:".$item['guid'];
+ $cachekey = "diaspora:buildStatus:".$item['guid'];
$result = Cache::get($cachekey);
if (!is_null($result)) {
return $result;
}
- $myaddr = self::my_handle($owner);
+ $myaddr = self::myHandle($owner);
$public = (($item["private"]) ? "false" : "true");
$created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z');
// Detect a share element and do a reshare
- if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) {
- $message = array("author" => $myaddr,
+ if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
+ $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 {
@@ -3531,7 +3684,7 @@ class Diaspora
}
}
- $location = array();
+ $location = [];
if ($item["location"] != "")
$location["address"] = $item["location"];
@@ -3542,13 +3695,13 @@ class Diaspora
$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"])) {
@@ -3556,7 +3709,7 @@ class Diaspora
}
if ($item['event-id'] > 0) {
- $event = self::build_event($item['event-id']);
+ $event = self::buildEvent($item['event-id']);
if (count($event)) {
$message['event'] = $event;
@@ -3568,7 +3721,7 @@ class Diaspora
$type = "status_message";
}
- $msg = array("type" => $type, "message" => $message);
+ $msg = ["type" => $type, "message" => $message];
Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
@@ -3585,11 +3738,11 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_status($item, $owner, $contact, $public_batch = false)
+ public static function sendStatus($item, $owner, $contact, $public_batch = false)
{
- $status = self::build_status($item, $owner);
+ $status = self::buildStatus($item, $owner);
- return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
}
/**
@@ -3600,7 +3753,7 @@ class Diaspora
*
* @return array The data for a "like"
*/
- private static function construct_like($item, $owner)
+ private static function constructLike($item, $owner)
{
$p = q(
"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
@@ -3619,12 +3772,12 @@ class Diaspora
$positive = "false";
}
- return(array("author" => self::my_handle($owner),
+ return(["author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"parent_type" => $target_type,
"positive" => $positive,
- "author_signature" => ""));
+ "author_signature" => ""]);
}
/**
@@ -3635,8 +3788,8 @@ class Diaspora
*
* @return array The data for an "EventParticipation"
*/
- private static function construct_attend($item, $owner) {
-
+ private static function constructAttend($item, $owner)
+ {
$p = q(
"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"])
@@ -3662,11 +3815,11 @@ class Diaspora
return false;
}
- return(array("author" => self::my_handle($owner),
+ return(["author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"status" => $attend_answer,
- "author_signature" => ""));
+ "author_signature" => ""]);
}
/**
@@ -3677,9 +3830,9 @@ class Diaspora
*
* @return array The data for a comment
*/
- private static function construct_comment($item, $owner)
+ private static function constructComment($item, $owner)
{
- $cachekey = "diaspora:construct_comment:".$item['guid'];
+ $cachekey = "diaspora:constructComment:".$item['guid'];
$result = Cache::get($cachekey);
if (!is_null($result)) {
@@ -3701,16 +3854,16 @@ class Diaspora
$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::my_handle($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']) {
- $comment['thread_parent_guid'] = self::get_guid_from_uri($item['thr-parent'], $item['uid']);
+ $comment['thread_parent_guid'] = self::getGuidFromUri($item['thr-parent'], $item['uid']);
}
Cache::set($cachekey, $comment, CACHE_QUARTER_HOUR);
@@ -3728,16 +3881,16 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_followup($item, $owner, $contact, $public_batch = false)
+ public static function sendFollowup($item, $owner, $contact, $public_batch = false)
{
- if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
- $message = self::construct_attend($item, $owner);
+ 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))) {
- $message = self::construct_like($item, $owner);
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+ $message = self::constructLike($item, $owner);
$type = "like";
} else {
- $message = self::construct_comment($item, $owner);
+ $message = self::constructComment($item, $owner);
$type = "comment";
}
@@ -3747,7 +3900,7 @@ class Diaspora
$message["author_signature"] = self::signature($owner, $message);
- return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
/**
@@ -3758,23 +3911,23 @@ class Diaspora
*
* @return string The message
*/
- private static function message_from_signature($item, $signature)
+ private static function messageFromSignature($item, $signature)
{
// Split the signed text
$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);
@@ -3788,12 +3941,12 @@ class Diaspora
// 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;
}
@@ -3808,11 +3961,11 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_relay($item, $owner, $contact, $public_batch = false)
+ public static function sendRelay($item, $owner, $contact, $public_batch = false)
{
if ($item["deleted"]) {
- return self::send_retraction($item, $owner, $contact, $public_batch, true);
- } elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
+ return self::sendRetraction($item, $owner, $contact, $public_batch, true);
+ } elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$type = "like";
} else {
$type = "comment";
@@ -3837,13 +3990,13 @@ class Diaspora
// Old way - is used by the internal Friendica functions
/// @todo Change all signatur storing functions to the new format
if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
- $message = self::message_from_signature($item, $signature);
+ $message = self::messageFromSignature($item, $signature);
} else {// New way
$msg = json_decode($signature['signed_text'], true);
- $message = array();
+ $message = [];
if (is_array($msg)) {
- foreach ($msg AS $field => $data) {
+ foreach ($msg as $field => $data) {
if (!$item["deleted"]) {
if ($field == "diaspora_handle") {
$field = "author";
@@ -3864,7 +4017,7 @@ class Diaspora
logger("Relayed data ".print_r($message, true), LOGGER_DEBUG);
- return self::build_and_transmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
/**
@@ -3878,27 +4031,27 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false)
+ public static function sendRetraction($item, $owner, $contact, $public_batch = false, $relay = false)
{
- $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
+ $itemaddr = self::handleFromContact($item["contact-id"], $item["gcontact-id"]);
$msg_type = "retraction";
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);
- return self::build_and_transmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
}
/**
@@ -3910,9 +4063,9 @@ class Diaspora
*
* @return int The result of the transmission
*/
- public static function send_mail($item, $owner, $contact)
+ public static function sendMail($item, $owner, $contact)
{
- $myaddr = self::my_handle($owner);
+ $myaddr = self::myHandle($owner);
$r = q(
"SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -3926,41 +4079,97 @@ class Diaspora
}
$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::build_and_transmit($owner, $contact, $type, $message, false, $item["guid"]);
+ 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];
}
/**
@@ -3982,15 +4191,16 @@ class Diaspora
);
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';
@@ -4023,7 +4233,7 @@ class Diaspora
$tags = trim($tags);
}
- return array("author" => $handle,
+ return ["author" => $handle,
"first_name" => $first,
"last_name" => $last,
"image_url" => $large,
@@ -4035,20 +4245,27 @@ class Diaspora
"location" => $location,
"searchable" => $searchable,
"nsfw" => "false",
- "tag_string" => $tags);
+ "tag_string" => $tags];
}
/**
* @brief Sends profile data
*
- * @param int $uid The user id
+ * @param int $uid The user id
+ * @param bool $recips optional, default false
+ * @return void
*/
- public static function send_profile($uid, $recips = false)
+ public static function sendProfile($uid, $recips = false)
{
if (!$uid) {
return;
}
+ $owner = User::getOwnerDataById($uid);
+ if (!$owner) {
+ return;
+ }
+
if (!$recips) {
$recips = q(
"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
@@ -4067,7 +4284,7 @@ class Diaspora
foreach ($recips as $recip) {
logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
- self::build_and_transmit($profile, $recip, "profile", $message, false, "", true);
+ self::buildAndTransmit($owner, $recip, "profile", $message, false, "", true);
}
}
@@ -4079,7 +4296,7 @@ class Diaspora
*
* @return bool Success
*/
- public static function store_like_signature($contact, $post_id)
+ public static function storeLikeSignature($contact, $post_id)
{
// Is the contact the owner? Then fetch the private key
if (!$contact['self'] || ($contact['uid'] == 0)) {
@@ -4099,18 +4316,22 @@ class Diaspora
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 = self::construct_like($r[0], $contact);
$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;
@@ -4126,7 +4347,7 @@ class Diaspora
*
* @return bool Success
*/
- public static function store_comment_signature($item, $contact, $uprvkey, $message_id)
+ public static function storeCommentSignature($item, $contact, $uprvkey, $message_id)
{
if ($uprvkey == "") {
logger('No private key, so not storing comment signature', LOGGER_DEBUG);
@@ -4135,14 +4356,18 @@ class Diaspora
$contact["uprvkey"] = $uprvkey;
- $message = self::construct_comment($item, $contact);
+ $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;