X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=7eae2373a32646e1788f15fa3948b5fb5dddf7c5;hb=da60893590a302bf94dfd86f5586f26509160d34;hp=c4ac5d924e005400eba8826b31cdbec8b0c02473;hpb=a307991ee5a5a8cfd83eaf1b8a10196169d70d1c;p=friendica.git
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index c4ac5d924e..7eae2373a3 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1,43 +1,45 @@
sig);
$key_id = $children->sig->attributes()->key_id[0];
- if ($key_id != "")
+ if ($key_id != "") {
$handle = base64url_decode($key_id);
+ }
$b64url_data = base64url_encode($data);
$msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
@@ -161,7 +174,7 @@ class Diaspora {
$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;
@@ -173,41 +186,44 @@ class Diaspora {
/**
* @brief encrypts data via AES
*
- * @param string $key The AES key
- * @param string $iv The IV (is used for CBC encoding)
+ * @param string $key The AES key
+ * @param string $iv The IV (is used for CBC encoding)
* @param string $data The data that is to be encrypted
*
* @return string encrypted data
*/
- private static function aes_encrypt($key, $iv, $data) {
+ private static function aesEncrypt($key, $iv, $data)
+ {
return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
/**
* @brief decrypts data via AES
*
- * @param string $key The AES key
- * @param string $iv The IV (is used for CBC encoding)
+ * @param string $key The AES key
+ * @param string $iv The IV (is used for CBC encoding)
* @param string $encrypted The encrypted data
*
* @return string decrypted data
*/
- private static function aes_decrypt($key, $iv, $encrypted) {
- return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
+ private static function aesDecrypt($key, $iv, $encrypted)
+ {
+ return openssl_decrypt($encrypted, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
/**
* @brief: Decodes incoming Diaspora message in the new format
*
- * @param array $importer Array of the importer user
- * @param string $raw raw post message
+ * @param array $importer Array of the importer user
+ * @param string $raw raw post message
*
* @return array
* 'message' -> decoded Diaspora XML message
* 'author' -> 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);
// Is it a private post? Then decrypt the outer Salmon
@@ -227,7 +243,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;
}
@@ -258,7 +274,7 @@ 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);
@@ -272,16 +288,16 @@ class Diaspora {
/**
* @brief: Decodes incoming Diaspora message in the deprecated format
*
- * @param array $importer Array of the importer user
- * @param string $xml urldecoded Diaspora salmon
+ * @param array $importer Array of the importer user
+ * @param string $xml urldecoded Diaspora salmon
*
* @return array
* 'message' -> decoded Diaspora XML message
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
- public static function decode($importer, $xml) {
-
+ public static function decode($importer, $xml)
+ {
$public = false;
$basedom = parse_xml_string($xml);
@@ -293,7 +309,7 @@ class Diaspora {
if ($children->header) {
$public = true;
- $author_link = str_replace('acct:','',$children->header->author_id);
+ $author_link = str_replace('acct:', '', $children->header->author_id);
} else {
// This happens with posts from a relais
if (!$importer) {
@@ -307,14 +323,14 @@ class Diaspora {
$ciphertext = base64_decode($encrypted_header->ciphertext);
$outer_key_bundle = '';
- openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
+ openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
$j_outer_key_bundle = json_decode($outer_key_bundle);
$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);
@@ -322,19 +338,20 @@ class Diaspora {
$inner_iv = base64_decode($idom->iv);
$inner_aes_key = base64_decode($idom->aes_key);
- $author_link = str_replace('acct:','',$idom->author_id);
+ $author_link = str_replace('acct:', '', $idom->author_id);
}
$dom = $basedom->children(NAMESPACE_SALMON_ME);
// figure out where in the DOM tree our data is hiding
- if ($dom->provenance->data)
+ if ($dom->provenance->data) {
$base = $dom->provenance;
- elseif ($dom->env->data)
+ } elseif ($dom->env->data) {
$base = $dom->env;
- elseif ($dom->data)
+ } elseif ($dom->data) {
$base = $dom;
+ }
if (!$base) {
logger('unable to locate salmon data in xml');
@@ -348,7 +365,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(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
// stash away some other stuff for later
@@ -366,14 +383,12 @@ class Diaspora {
$data = base64url_decode($data);
- if ($public)
+ if ($public) {
$inner_decrypted = $data;
- else {
-
+ } 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) {
@@ -392,7 +407,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.');
@@ -414,15 +429,15 @@ 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) {
logger("diaspora is disabled");
return false;
}
- if (!($postdata = self::valid_posting($msg))) {
+ if (!($postdata = self::validPosting($msg))) {
logger("Invalid posting");
return false;
}
@@ -432,7 +447,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);
@@ -453,7 +468,8 @@ class Diaspora {
}
// Now distribute it to the followers
- $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
+ $r = q(
+ "SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
AND NOT `account_expired` AND NOT `account_removed`",
dbesc(NETWORK_DIASPORA),
@@ -479,21 +495,21 @@ class Diaspora {
/**
* @brief Dispatches the different message types to the different functions
*
- * @param array $importer Array of the importer user
- * @param array $msg The post that will be dispatched
- * @param object $fields SimpleXML object that contains the message
+ * @param array $importer Array of the importer user
+ * @param array $msg The post that will be dispatched
+ * @param object $fields SimpleXML object that contains the message
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
- public static function dispatch($importer, $msg, $fields = null) {
-
+ public static function dispatch($importer, $msg, $fields = null)
+ {
// The sender is the handle of the contact that sent the message.
// This will often be different with relayed messages (for example "like" and "comment")
$sender = $msg["author"];
// 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;
}
@@ -509,43 +525,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);
+ 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);
@@ -565,8 +581,8 @@ 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"]);
if (!is_object($data)) {
@@ -579,8 +595,9 @@ class Diaspora {
// Is this the new or the old version?
if ($data->getName() == "XML") {
$oldXML = true;
- foreach ($data->post->children() as $child)
+ foreach ($data->post->children() as $child) {
$element = $child;
+ }
} else {
$oldXML = false;
$element = $data;
@@ -596,14 +613,15 @@ class Diaspora {
if (in_array($type, array("signed_retraction", "relayable_retraction")))
$type = "retraction";
- if ($type == "request")
+ if ($type == "request") {
$type = "contact";
+ }
$fields = new SimpleXMLElement("<".$type."/>");
$signed_data = "";
- foreach ($element->children() AS $fieldname => $entry) {
+ foreach ($element->children() as $fieldname => $entry) {
if ($oldXML) {
// Translation for the old XML structure
if ($fieldname == "diaspora_handle") {
@@ -641,29 +659,31 @@ class Diaspora {
}
}
- if (($fieldname == "author_signature") && ($entry != ""))
+ if (($fieldname == "author_signature") && ($entry != "")) {
$author_signature = base64_decode($entry);
- elseif (($fieldname == "parent_author_signature") && ($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, array("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")) ||
- ($orig_type == "relayable_retraction"))
- xml::copy($entry, $fields, $fieldname);
+ if (!in_array($fieldname, array("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, array("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"))) {
@@ -680,7 +700,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;
}
@@ -690,7 +710,7 @@ 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 {
@@ -705,14 +725,16 @@ class Diaspora {
*
* @return string The public key
*/
- private static function key($handle) {
+ private static function key($handle)
+ {
$handle = strval($handle);
logger("Fetching diaspora key for: ".$handle);
- $r = self::person_by_handle($handle);
- if ($r)
+ $r = self::personByHandle($handle);
+ if ($r) {
return $r["pubkey"];
+ }
return "";
}
@@ -724,23 +746,26 @@ class Diaspora {
*
* @return array the queried data
*/
- public static function person_by_handle($handle) {
-
- $r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
+ public static function personByHandle($handle)
+ {
+ $r = q(
+ "SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
dbesc(NETWORK_DIASPORA),
dbesc($handle)
);
if ($r) {
$person = $r[0];
- logger("In cache ".print_r($r,true), LOGGER_DEBUG);
+ logger("In cache " . print_r($r, true), LOGGER_DEBUG);
// update record occasionally so it doesn't get stale
$d = strtotime($person["updated"]." +00:00");
- if ($d < strtotime("now - 14 days"))
+ if ($d < strtotime("now - 14 days")) {
$update = true;
+ }
- if ($person["guid"] == "")
+ if ($person["guid"] == "") {
$update = true;
+ }
}
if (!$person || $update) {
@@ -750,7 +775,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;
}
}
@@ -760,15 +785,16 @@ class Diaspora {
/**
* @brief Updates the fcontact table
*
- * @param array $arr The fcontact data
- * @param bool $update Update or insert?
+ * @param array $arr The fcontact data
+ * @param bool $update Update or insert?
*
* @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("UPDATE `fcontact` SET
+ $r = q(
+ "UPDATE `fcontact` SET
`name` = '%s',
`photo` = '%s',
`request` = '%s',
@@ -783,42 +809,43 @@ class Diaspora {
`pubkey` = '%s',
`updated` = '%s'
WHERE `url` = '%s' AND `network` = '%s'",
- dbesc($arr["name"]),
- dbesc($arr["photo"]),
- dbesc($arr["request"]),
- dbesc($arr["nick"]),
- dbesc(strtolower($arr["addr"])),
- dbesc($arr["guid"]),
- dbesc($arr["batch"]),
- dbesc($arr["notify"]),
- dbesc($arr["poll"]),
- dbesc($arr["confirm"]),
- dbesc($arr["alias"]),
- dbesc($arr["pubkey"]),
- dbesc(datetime_convert()),
- dbesc($arr["url"]),
- dbesc($arr["network"])
- );
+ dbesc($arr["name"]),
+ dbesc($arr["photo"]),
+ dbesc($arr["request"]),
+ dbesc($arr["nick"]),
+ dbesc(strtolower($arr["addr"])),
+ dbesc($arr["guid"]),
+ dbesc($arr["batch"]),
+ dbesc($arr["notify"]),
+ dbesc($arr["poll"]),
+ dbesc($arr["confirm"]),
+ dbesc($arr["alias"]),
+ dbesc($arr["pubkey"]),
+ dbesc(datetime_convert()),
+ dbesc($arr["url"]),
+ dbesc($arr["network"])
+ );
} else {
- $r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
+ $r = q(
+ "INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
- dbesc($arr["url"]),
- dbesc($arr["name"]),
- dbesc($arr["photo"]),
- dbesc($arr["request"]),
- dbesc($arr["nick"]),
- dbesc($arr["addr"]),
- dbesc($arr["guid"]),
- dbesc($arr["batch"]),
- dbesc($arr["notify"]),
- dbesc($arr["poll"]),
- dbesc($arr["confirm"]),
- dbesc($arr["network"]),
- dbesc($arr["alias"]),
- dbesc($arr["pubkey"]),
- dbesc(datetime_convert())
- );
+ dbesc($arr["url"]),
+ dbesc($arr["name"]),
+ dbesc($arr["photo"]),
+ dbesc($arr["request"]),
+ dbesc($arr["nick"]),
+ dbesc($arr["addr"]),
+ dbesc($arr["guid"]),
+ dbesc($arr["batch"]),
+ dbesc($arr["notify"]),
+ dbesc($arr["poll"]),
+ dbesc($arr["confirm"]),
+ dbesc($arr["network"]),
+ dbesc($arr["alias"]),
+ dbesc($arr["pubkey"]),
+ dbesc(datetime_convert())
+ );
}
return $r;
@@ -827,27 +854,32 @@ class Diaspora {
/**
* @brief get a handle (user@domain.tld) from a given contact id or gcontact id
*
- * @param int $contact_id The id in the contact table
+ * @param int $contact_id The id in the contact table
* @param int $gcontact_id The id in the gcontact table
*
* @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;
logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
if ($gcontact_id != 0) {
- $r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
- intval($gcontact_id));
+ $r = q(
+ "SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
+ intval($gcontact_id)
+ );
if (DBM::is_result($r)) {
return strtolower($r[0]["addr"]);
}
}
- $r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
- intval($contact_id));
+ $r = q(
+ "SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
+ intval($contact_id)
+ );
if (DBM::is_result($r)) {
$contact = $r[0];
@@ -857,8 +889,9 @@ class Diaspora {
if ($contact['addr'] != "") {
$handle = $contact['addr'];
} else {
- $baseurl_start = strpos($contact['url'],'://') + 3;
- $baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
+ $baseurl_start = strpos($contact['url'], '://') + 3;
+ // allows installations in a subdirectory--not sure how Diaspora will handle
+ $baseurl_length = strpos($contact['url'], '/profile') - $baseurl_start;
$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
$handle = $contact['nick'].'@'.$baseurl;
}
@@ -875,10 +908,12 @@ 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);
- $r = q("SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
+ $r = q(
+ "SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
dbesc(NETWORK_DIASPORA),
dbesc($fcontact_guid)
);
@@ -893,15 +928,18 @@ class Diaspora {
/**
* @brief Get a contact id for a given handle
*
- * @param int $uid The user id
+ * @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("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
+ $r = q(
+ "SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
intval($uid),
dbesc($handle)
);
@@ -913,7 +951,7 @@ class Diaspora {
* We haven't found it?
* We use another function for it that will possibly create a contact entry.
*/
- $cid = get_contact($handle, $uid);
+ $cid = Contact::getIdForURL($handle, $uid);
if ($cid > 0) {
/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
@@ -927,7 +965,8 @@ class Diaspora {
$handle_parts = explode("@", $handle);
$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
- $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
+ $r = q(
+ "SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
dbesc(NETWORK_DFRN),
intval($uid),
dbesc($nurl_sql)
@@ -943,40 +982,45 @@ class Diaspora {
/**
* @brief Check if posting is allowed for this contact
*
- * @param array $importer Array of the importer user
- * @param array $contact The contact that is checked
- * @param bool $is_comment Is the check for a comment?
+ * @param array $importer Array of the importer user
+ * @param array $contact The contact that is checked
+ * @param bool $is_comment Is the check for a comment?
*
* @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;
@@ -988,14 +1032,15 @@ class Diaspora {
/**
* @brief Fetches the contact id for a handle and checks if posting is allowed
*
- * @param array $importer Array of the importer user
- * @param string $handle The checked handle in the format user@domain.tld
- * @param bool $is_comment Is the check for a comment?
+ * @param array $importer Array of the importer user
+ * @param string $handle The checked handle in the format user@domain.tld
+ * @param bool $is_comment Is the check for a comment?
*
* @return array The contact data
*/
- private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
- $contact = self::contact_by_handle($importer["uid"], $handle);
+ private static function allowedContactByHandle($importer, $handle, $is_comment = false)
+ {
+ $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
@@ -1006,7 +1051,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;
}
@@ -1016,13 +1061,15 @@ class Diaspora {
/**
* @brief Does the message already exists on the system?
*
- * @param int $uid The user id
+ * @param int $uid The user id
* @param string $guid The guid of the message
*
* @return int|bool message id if the message already was stored into the system - or false.
*/
- private static function message_exists($uid, $guid) {
- $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ private static function messageExists($uid, $guid)
+ {
+ $r = q(
+ "SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($uid),
dbesc($guid)
);
@@ -1039,37 +1086,47 @@ 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,
+ preg_replace_callback(
+ $expression,
function ($match) use ($item) {
- return self::fetch_guid_sub($match, $item);
- }, $item["body"]);
+ self::fetchGuidSub($match, $item);
+ },
+ $item["body"]
+ );
- preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+ preg_replace_callback(
+ "&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item) {
- return self::fetch_guid_sub($match, $item);
- }, $item["body"]);
+ self::fetchGuidSub($match, $item);
+ },
+ $item["body"]
+ );
}
/**
* @brief Checks for relative /people/* links in an item body to match local
* contacts or prepends the remote host taken from the author link.
*
- * @param string $body The item body to replace links from
+ * @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) {
- $return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
+ public static function replacePeopleGuid($body, $author_link)
+ {
+ $return = preg_replace_callback(
+ "&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($author_link) {
// $match
// 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]';
@@ -1080,32 +1137,38 @@ class Diaspora {
}
return $return;
- }, $body);
+ },
+ $body
+ );
return $return;
}
/**
- * @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
+ * @param array $item The item array
+ * @return void
*/
- private static function fetch_guid_sub($match, $item) {
- if (!self::store_by_guid($match[1], $item["author-link"]))
- self::store_by_guid($match[1], $item["owner-link"]);
+ private static function fetchGuidSub($match, $item)
+ {
+ if (!self::storeByGuid($match[1], $item["author-link"])) {
+ self::storeByGuid($match[1], $item["owner-link"]);
+ }
}
/**
* @brief Fetches an item with a given guid from a given server
*
- * @param string $guid the message guid
+ * @param string $guid the message guid
* @param string $server The server address
- * @param int $uid The user id of the user
+ * @param int $uid The user id of the user
*
* @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"];
@@ -1113,31 +1176,33 @@ class Diaspora {
$msg = self::message($guid, $server);
- if (!$msg)
+ if (!$msg) {
return false;
+ }
logger("Successfully fetched item ".$guid." from ".$server, LOGGER_DEBUG);
// Now call the dispatcher
- return self::dispatch_public($msg);
+ return self::dispatchPublic($msg);
}
/**
* @brief Fetches a message from a server
*
- * @param string $guid message guid
+ * @param string $guid message guid
* @param string $server The url of the server
- * @param int $level Endless loop prevention
+ * @param int $level Endless loop prevention
*
* @return array
* 'message' => The message XML
* 'author' => The author handle
* 'key' => The public key of the author
*/
- private static function message($guid, $server, $level = 0) {
-
- if ($level > 5)
+ private static function message($guid, $server, $level = 0)
+ {
+ if ($level > 5) {
return false;
+ }
// This will work for new Diaspora servers and Friendica servers from 3.5
$source_url = $server."/fetch/post/".urlencode($guid);
@@ -1147,13 +1212,15 @@ class Diaspora {
$envelope = fetch_url($source_url);
if ($envelope) {
logger("Envelope was fetched.", LOGGER_DEBUG);
- $x = self::verify_magic_envelope($envelope);
- if (!$x)
+ $x = self::verifyMagicEnvelope($envelope);
+ if (!$x) {
logger("Envelope could not be verified.", LOGGER_DEBUG);
- else
+ } else {
logger("Envelope was verified.", LOGGER_DEBUG);
- } else
+ }
+ } else {
$x = false;
+ }
// This will work for older Diaspora and Friendica servers
if (!$x) {
@@ -1161,14 +1228,16 @@ class Diaspora {
logger("Fetch post from ".$source_url, LOGGER_DEBUG);
$x = fetch_url($source_url);
- if (!$x)
+ if (!$x) {
return false;
+ }
}
$source_xml = parse_xml_string($x);
- if (!is_object($source_xml))
+ if (!is_object($source_xml)) {
return false;
+ }
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
@@ -1183,10 +1252,11 @@ class Diaspora {
$author = "";
// Fetch the author - for the old and the new Diaspora version
- if ($source_xml->post->status_message->diaspora_handle)
+ if ($source_xml->post->status_message->diaspora_handle) {
$author = (string)$source_xml->post->status_message->diaspora_handle;
- elseif ($source_xml->author && ($source_xml->getName() == "status_message"))
+ } elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
$author = (string)$source_xml->author;
+ }
// If this isn't a "status_message" then quit
if (!$author) {
@@ -1204,36 +1274,43 @@ class Diaspora {
/**
* @brief Fetches the item record of a given guid
*
- * @param int $uid The user id
- * @param string $guid message guid
- * @param string $author The handle of the item
- * @param array $contact The contact of the item owner
+ * @param int $uid The user id
+ * @param string $guid message guid
+ * @param string $author The handle of the item
+ * @param array $contact The contact of the item owner
*
* @return array the item record
*/
- private static function parent_item($uid, $guid, $author, $contact) {
- $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
+ private static function parentItem($uid, $guid, $author, $contact)
+ {
+ $r = q(
+ "SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($uid), dbesc($guid));
+ intval($uid),
+ dbesc($guid)
+ );
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) {
logger("Fetched missing item ".$guid." - result: ".$result, LOGGER_DEBUG);
- $r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
+ $r = q(
+ "SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
`author-name`, `author-link`, `author-avatar`,
`owner-name`, `owner-link`, `owner-avatar`
FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($uid), dbesc($guid));
+ intval($uid),
+ dbesc($guid)
+ );
}
}
@@ -1250,24 +1327,23 @@ class Diaspora {
* @brief returns contact details
*
* @param array $contact The default contact if the person isn't found
- * @param array $person The record of the person
- * @param int $uid The user id
+ * @param array $person The record of the person
+ * @param int $uid The user id
*
* @return array
* 'cid' => contact id
* 'network' => network type
*/
- private static function author_contact_by_url($contact, $person, $uid) {
-
- $r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
- dbesc(normalise_link($person["url"])), intval($uid));
+ private static function authorContactByUrl($contact, $person, $uid)
+ {
+ $r = q(
+ "SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc(normalise_link($person["url"])),
+ intval($uid)
+ );
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.
- unmark_for_death($r[0]);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
@@ -1283,27 +1359,30 @@ class Diaspora {
*
* @return bool is it a hubzilla server?
*/
- public static function is_redmatrix($url) {
+ public static function isRedmatrix($url)
+ {
return(strstr($url, "/channel/"));
}
/**
* @brief Generate a post link with a given handle and message guid
*
- * @param string $addr The user handle
- * @param string $guid message guid
+ * @param string $addr The user handle
+ * @param string $guid message guid
+ * @param string $parent_guid optional parent guid
*
* @return string the post link
*/
- private static function plink($addr, $guid, $parent_guid = '') {
+ private static function plink($addr, $guid, $parent_guid = '')
+ {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
if (!DBM::is_result($r)) {
if ($parent_guid != '') {
- return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+ return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
- return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
+ return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
@@ -1318,31 +1397,32 @@ 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;
}
if ($parent_guid != '') {
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+ return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
/**
* @brief Receives account migration
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @return bool Success
*/
- private static function receiveAccountMigration($importer, $data) {
+ private static function receiveAccountMigration($importer, $data)
+ {
$old_handle = notags(unxmlify($data->author));
$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;
@@ -1353,13 +1433,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);
@@ -1392,16 +1472,23 @@ class Diaspora {
'owner-link' => array($contact["url"], $data["url"]),
'author-link' => array($contact["url"], $data["url"]),
);
- foreach ($fields as $n=>$f) {
- $r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
- $n, dbesc($f[0]),
- intval($importer["uid"]));
+ foreach ($fields as $n => $f) {
+ $r = q(
+ "SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
+ $n,
+ dbesc($f[0]),
+ intval($importer["uid"])
+ );
if (DBM::is_result($r)) {
- $x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
- $n, dbesc($f[1]),
- $n, dbesc($f[0]),
- intval($importer["uid"]));
+ $x = q(
+ "UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
+ $n,
+ dbesc($f[1]),
+ $n,
+ dbesc($f[0]),
+ intval($importer["uid"])
+ );
if ($x === false) {
return false;
@@ -1417,39 +1504,39 @@ class Diaspora {
/**
* @brief Processes an account deletion
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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;
}
// We now remove the contact
- contact_remove($contact["id"]);
+ Contact::remove($contact["id"]);
return true;
}
/**
* @brief Fetch the uri from our database if we already have this item (maybe from ourselves)
*
- * @param string $author Author handle
- * @param string $guid Message guid
+ * @param string $author Author handle
+ * @param string $guid Message guid
* @param boolean $onlyfound Only return uri when found in the database
*
* @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)) {
return $r[0]["uri"];
@@ -1463,13 +1550,13 @@ class Diaspora {
/**
* @brief Fetch the guid from our database with a given uri
*
- * @param string $author Author handle
* @param string $uri Message uri
+ * @param string $uid Author handle
*
* @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)) {
return $r[0]["guid"];
@@ -1485,7 +1572,8 @@ 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);
if (DBM::is_result($item)) {
@@ -1501,14 +1589,15 @@ class Diaspora {
/**
* @brief Processes an incoming comment
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
- * @param string $xml The original XML of the message
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param object $data The message object
+ * @param string $xml The original XML of the message
*
* @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));
$parent_guid = notags(unxmlify($data->parent_guid));
@@ -1522,34 +1611,34 @@ 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();
@@ -1559,14 +1648,14 @@ class Diaspora {
$datarray["author-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
- $datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
+ $datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
- $datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $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;
@@ -1589,9 +1678,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);
@@ -1605,13 +1694,12 @@ class Diaspora {
// If we are the origin of the parent we store the original data and notify our followers
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)));
// notify others
- Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
}
return true;
@@ -1620,16 +1708,17 @@ class Diaspora {
/**
* @brief processes and stores private messages
*
- * @param array $importer Array of the importer user
- * @param array $contact The contact of the message
- * @param object $data The message object
- * @param array $msg Array of the processed message, author handle and key
- * @param object $mesg The private message
- * @param array $conversation The conversation record to which this message belongs
+ * @param array $importer Array of the importer user
+ * @param array $contact The contact of the message
+ * @param object $data The message object
+ * @param array $msg Array of the processed message, author handle and key
+ * @param object $mesg The private message
+ * @param array $conversation The conversation record to which this message belongs
*
* @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));
$subject = notags(unxmlify($data->subject));
@@ -1657,11 +1746,12 @@ 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');
- $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($msg_guid),
intval($importer["uid"])
);
@@ -1670,7 +1760,8 @@ class Diaspora {
return false;
}
- q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
+ q(
+ "INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
dbesc($msg_guid),
@@ -1692,7 +1783,8 @@ class Diaspora {
dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
- notification(array(
+ notification(
+ array(
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
"language" => $importer["language"],
@@ -1704,21 +1796,22 @@ class Diaspora {
"source_link" => $person["url"],
"source_photo" => $person["thumb"],
"verb" => ACTIVITY_POST,
- "otype" => "mail"
- ));
+ "otype" => "mail")
+ );
return true;
}
/**
* @brief Processes new private messages (answers to private messages are processed elsewhere)
*
- * @param array $importer Array of the importer user
- * @param array $msg Array of the processed message, author handle and key
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param array $msg Array of the processed message, author handle and key
+ * @param object $data The message object
*
* @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));
$subject = notags(unxmlify($data->subject));
@@ -1732,20 +1825,23 @@ class Diaspora {
return false;
}
- $contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
- if (!$contact)
+ $contact = self::allowedContactByHandle($importer, $msg["author"], true);
+ if (!$contact) {
return false;
+ }
$conversation = null;
- $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ $c = q(
+ "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($guid)
);
if ($c)
$conversation = $c[0];
else {
- $r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
+ $r = q(
+ "INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
intval($importer["uid"]),
dbesc($guid),
@@ -1755,22 +1851,26 @@ class Diaspora {
dbesc($subject),
dbesc($participants)
);
- if ($r)
- $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ if ($r) {
+ $c = q(
+ "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($guid)
);
+ }
- if ($c)
+ if ($c) {
$conversation = $c[0];
+ }
}
if (!$conversation) {
logger("unable to create conversation.");
return false;
}
- foreach ($messages as $mesg)
- self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
+ foreach ($messages as $mesg) {
+ self::receiveConversationMessage($importer, $contact, $data, $msg, $mesg, $conversation);
+ }
return true;
}
@@ -1778,13 +1878,14 @@ class Diaspora {
/**
* @brief Creates the body for a "like" message
*
- * @param array $contact The contact that send us the "like"
- * @param array $parent_item The item array of the parent item
- * @param string $guid message guid
+ * @param array $contact The contact that send us the "like"
+ * @param array $parent_item The item array of the parent item
+ * @param string $guid message guid
*
* @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]";
@@ -1797,12 +1898,13 @@ class Diaspora {
/**
* @brief Creates a XML object for a "like"
*
- * @param array $importer Array of the importer user
+ * @param array $importer Array of the importer user
* @param array $parent_item The item array of the parent item
*
* @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"];
@@ -1814,19 +1916,20 @@ class Diaspora {
"title" => "",
"content" => $parent_body));
- return xml::from_array($xmldata, $xml, true);
+ return XML::fromArray($xmldata, $xml, true);
}
/**
* @brief Processes "like" messages
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param object $data The message object
*
* @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));
$parent_guid = notags(unxmlify($data->parent_guid));
@@ -1835,36 +1938,41 @@ 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, array("Post", "Comment"))) {
return false;
+ }
- $contact = self::allowed_contact_by_handle($importer, $sender, true);
- if (!$contact)
+ $contact = self::allowedContactByHandle($importer, $sender, true);
+ if (!$contact) {
return false;
+ }
- $message_id = self::message_exists($importer["uid"], $guid);
- if ($message_id)
+ $message_id = self::messageExists($importer["uid"], $guid);
+ if ($message_id) {
return true;
+ }
- $parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
- if (!$parent_item)
+ $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.
- if ($positive == "true")
+ if ($positive == "true") {
$verb = ACTIVITY_LIKE;
- else
+ } else {
$verb = ACTIVITY_DISLIKE;
+ }
$datarray = array();
@@ -1876,14 +1984,14 @@ class Diaspora {
$datarray["author-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
- $datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
+ $datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
$datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
- $datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $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;
@@ -1891,9 +1999,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);
@@ -1907,7 +2015,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::selectOne('item', ['origin'], ['id' => $parent_item["parent"]]);
$origin = $toplevel["origin"];
} else {
$origin = $parent_item["origin"];
@@ -1915,13 +2023,12 @@ class Diaspora {
// If we are the origin of the parent we store the original data and notify our followers
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)));
// notify others
- Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $message_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
}
return true;
@@ -1930,26 +2037,28 @@ class Diaspora {
/**
* @brief Processes private messages
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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));
$conversation_guid = notags(unxmlify($data->conversation_guid));
$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;
}
$conversation = null;
- $c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+ $c = q(
+ "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
intval($importer["uid"]),
dbesc($conversation_guid)
);
@@ -1962,7 +2071,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;
@@ -1970,11 +2079,12 @@ class Diaspora {
$body = diaspora2bb($text);
- $body = self::replace_people_guid($body, $person["url"]);
+ $body = self::replacePeopleGuid($body, $person["url"]);
dba::lock('mail');
- $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($guid),
intval($importer["uid"])
);
@@ -1983,7 +2093,8 @@ class Diaspora {
return false;
}
- q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
+ q(
+ "INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
dbesc($guid),
@@ -2010,12 +2121,13 @@ class Diaspora {
/**
* @brief Processes participations - unsupported by now
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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
return true;
}
@@ -2023,25 +2135,28 @@ class Diaspora {
/**
* @brief Processes photos - unneeded
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @return bool always true
*/
- private static function receive_photo($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
+ 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
return true;
}
/**
* @brief Processes poll participations - unssupported
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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;
}
@@ -2049,17 +2164,19 @@ class Diaspora {
/**
* @brief Processes incoming profile updates
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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);
- if (!$contact)
+ $contact = self::contactByHandle($importer["uid"], $author);
+ if (!$contact) {
return false;
+ }
$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
$image_url = unxmlify($data->image_url);
@@ -2076,8 +2193,9 @@ class Diaspora {
$keywords = array();
foreach ($tags as $tag) {
$tag = trim(strtolower($tag));
- if ($tag != "")
+ if ($tag != "") {
$keywords[] = $tag;
+ }
}
$keywords = implode(", ", $keywords);
@@ -2085,28 +2203,33 @@ class Diaspora {
$handle_parts = explode("@", $author);
$nick = $handle_parts[0];
- if ($name === "")
+ if ($name === "") {
$name = $handle_parts[0];
+ }
- if ( preg_match("|^https?://|", $image_url) === 0)
+ if (preg_match("|^https?://|", $image_url) === 0) {
$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.
$birthday = str_replace("1000", "1901", $birthday);
- if ($birthday != "")
+ if ($birthday != "") {
$birthday = datetime_convert("UTC", "UTC", $birthday, "Y-m-d");
+ }
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
- if (substr($birthday,5) === substr($contact["bd"],5))
+ if (substr($birthday, 5) === substr($contact["bd"], 5)) {
$birthday = $contact["bd"];
+ }
- $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
+ $r = q(
+ "UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
`location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($name),
dbesc($nick),
@@ -2127,9 +2250,9 @@ class Diaspora {
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
"hide" => !$searchable, "nsfw" => $nsfw);
- $gcid = update_gcontact($gcontact);
+ $gcid = GContact::update($gcontact);
- link_gcontact($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);
@@ -2140,32 +2263,36 @@ class Diaspora {
* @brief Processes incoming friend requests
*
* @param array $importer Array of the importer user
- * @param array $contact The contact that send the request
+ * @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"]));
+ dba::update(
+ 'contact',
+ array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+ array('id' => $contact["id"], 'uid' => $importer["uid"])
+ );
}
// send notification
- $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+ $r = q(
+ "SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($importer["uid"])
);
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",
+ $self = q(
+ "SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
);
// 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["protocol"] = PROTOCOL_DIASPORA;
$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
@@ -2184,20 +2311,23 @@ 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;
- $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::selectOne('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)
- Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
+ if ($i) {
+ Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
+ }
}
}
}
@@ -2209,7 +2339,8 @@ 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";
@@ -2219,18 +2350,19 @@ class Diaspora {
"id" => $contact["url"]."/".$contact["name"],
"link" => $link));
- return xml::from_array($xmldata, $xml, true);
+ return XML::fromArray($xmldata, $xml, true);
}
/**
* @brief Processes incoming sharing notification
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
*
* @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);
@@ -2252,17 +2384,17 @@ 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.
@@ -2270,7 +2402,7 @@ class Diaspora {
$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;
@@ -2295,7 +2427,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);
@@ -2304,7 +2436,8 @@ class Diaspora {
$batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
- $r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+ $r = q(
+ "INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
intval($importer["uid"]),
dbesc($ret["network"]),
@@ -2325,7 +2458,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.");
@@ -2334,20 +2467,17 @@ 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);
$hash = random_string().(string)time(); // Generate a confirm_key
- $ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
+ $ret = q(
+ "INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
intval($importer["uid"]),
intval($contact_record["id"]),
@@ -2358,25 +2488,26 @@ class Diaspora {
dbesc(datetime_convert())
);
} else {
-
// automatic friend approval
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
// we are going to change the relationship and make them a follower.
- if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following)
+ if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
$new_relation = CONTACT_IS_FRIEND;
- elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing)
+ } elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
$new_relation = CONTACT_IS_SHARING;
- else
+ } else {
$new_relation = CONTACT_IS_FOLLOWER;
+ }
- $r = q("UPDATE `contact` SET `rel` = %d,
+ $r = q(
+ "UPDATE `contact` SET `rel` = %d,
`name-date` = '%s',
`uri-date` = '%s',
`blocked` = 0,
@@ -2393,10 +2524,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"], array($contact_record));
}
}
@@ -2406,19 +2537,21 @@ class Diaspora {
/**
* @brief Fetches a message with a given guid
*
- * @param string $guid message guid
+ * @param string $guid message guid
* @param string $orig_author handle of the original post
- * @param string $author handle of the sharer
+ * @param string $author handle of the sharer
*
* @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("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
+ $r = q(
+ "SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
`author-name`, `author-link`, `author-avatar`
FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
- dbesc($guid));
+ dbesc($guid)
+ );
if (DBM::is_result($r)) {
logger("reshared message ".$guid." already exists on system.");
@@ -2426,12 +2559,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)) {
+ if (self::isReshare($r[0]["body"], true)) {
$r = array();
- } elseif (self::is_reshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
+ } 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);
@@ -2445,30 +2578,31 @@ 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) {
- $r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
+ $r = q(
+ "SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
`author-name`, `author-link`, `author-avatar`
FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
- intval($item_id));
+ intval($item_id)
+ );
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];
}
-
}
}
return false;
@@ -2477,13 +2611,14 @@ class Diaspora {
/**
* @brief Processes a reshare message
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
- * @param string $xml The original XML of the message
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
+ * @param string $xml The original XML of the message
*
* @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));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -2492,17 +2627,17 @@ 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;
}
@@ -2517,14 +2652,14 @@ class Diaspora {
$datarray["author-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
- $datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
$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;
@@ -2532,8 +2667,14 @@ class Diaspora {
$datarray["protocol"] = PROTOCOL_DIASPORA;
$datarray["source"] = $xml;
- $prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
- $original_item["guid"], $original_item["created"], $orig_url);
+ $prefix = share_header(
+ $original_item["author-name"],
+ $original_item["author-link"],
+ $original_item["author-avatar"],
+ $original_item["guid"],
+ $original_item["created"],
+ $orig_url
+ );
$datarray["body"] = $prefix.$original_item["body"]."[/share]";
$datarray["tag"] = $original_item["tag"];
@@ -2545,9 +2686,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;
@@ -2559,18 +2702,19 @@ class Diaspora {
/**
* @brief Processes retractions
*
- * @param array $importer Array of the importer user
- * @param array $contact The contact of the item owner
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param array $contact The contact of the item owner
+ * @param object $data The message object
*
* @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;
@@ -2597,7 +2741,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::selectOne('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"])) {
@@ -2605,10 +2749,18 @@ class Diaspora {
continue;
}
- // Currently we don't have a central deletion function that we could use in this case. 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"]));
+ // Currently we don't have a central deletion function that we could use in this case.
+ // 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"])
+ );
// Delete the thread - if it is a starting post and not a comment
if ($target_type != 'Comment') {
@@ -2620,7 +2772,7 @@ class Diaspora {
// Now check if the retraction needs to be relayed by us
if ($parent["origin"]) {
// notify others
- Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
}
}
@@ -2630,16 +2782,17 @@ class Diaspora {
/**
* @brief Receives retraction messages
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param object $data The message object
*
* @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);
+ $contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, array("Contact", "Person")))) {
logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
@@ -2653,13 +2806,13 @@ 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":
/// @todo What should we do with an "unshare"?
// Removing the contact isn't correct since we still can read the public items
- contact_remove($contact["id"]);
+ Contact::remove($contact["id"]);
return true;
default:
@@ -2672,13 +2825,14 @@ class Diaspora {
/**
* @brief Receives status messages
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
- * @param string $xml The original XML of the message
+ * @param array $importer Array of the importer user
+ * @param object $data The message object
+ * @param string $xml The original XML of the message
*
* @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));
$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -2686,19 +2840,19 @@ 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();
if ($data->location) {
- foreach ($data->location->children() AS $fieldname => $data) {
+ foreach ($data->location->children() as $fieldname => $data) {
$address[$fieldname] = notags(unxmlify($data));
}
}
@@ -2709,7 +2863,7 @@ class Diaspora {
// Attach embedded pictures to the body
if ($data->photo) {
- foreach ($data->photo AS $photo) {
+ foreach ($data->photo as $photo) {
$body = "[img]".unxmlify($photo->remote_photo_path).
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
}
@@ -2719,7 +2873,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);
}
}
@@ -2739,14 +2893,14 @@ class Diaspora {
$datarray["author-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
- $datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
$datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
$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;
@@ -2754,7 +2908,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;
@@ -2772,9 +2926,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;
@@ -2790,11 +2946,12 @@ class Diaspora {
/**
* @brief returnes the handle of a contact
*
- * @param array $me contact array
+ * @param array $contact contact array
*
* @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"];
}
@@ -2807,23 +2964,23 @@ class Diaspora {
$nick = $contact["nick"];
}
- return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(),"://") + 3);
+ return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
}
/**
* @brief Creates the data for a private message in the new format
*
- * @param string $msg The message that is to be transmitted
- * @param array $user The record of the sender
- * @param array $contact Target of the communication
- * @param string $prvkey The private key of the sender
- * @param string $pubkey The public key of the receiver
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
+ * @param array $contact Target of the communication
+ * @param string $prvkey The private key of the sender
+ * @param string $pubkey The public key of the receiver
*
* @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);
// without a public key nothing will work
@@ -2837,15 +2994,17 @@ 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));
$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)));
+ $json_object = json_encode(
+ array("aes_key" => base64_encode($encrypted_key_bundle),
+ "encrypted_magic_envelope" => base64_encode($ciphertext))
+ );
return $json_object;
}
@@ -2853,27 +3012,28 @@ class Diaspora {
/**
* @brief Creates the envelope for the "fetch" endpoint and for the new format
*
- * @param string $msg The message that is to be transmitted
- * @param array $user The record of the sender
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
*
* @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);
- $key_id = base64url_encode(self::my_handle($user));
+ $key_id = base64url_encode(self::myHandle($user));
$type = "application/xml";
$encoding = "base64url";
$alg = "RSA-SHA256";
$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
// Fallback if the private key wasn't transmitted in the expected field
- if ($user['uprvkey'] == "")
+ if ($user['uprvkey'] == "") {
$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,
@@ -2885,29 +3045,29 @@ class Diaspora {
$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
- return xml::from_array($xmldata, $xml, false, $namespaces);
+ return XML::fromArray($xmldata, $xml, false, $namespaces);
}
/**
* @brief Create the envelope for a message
*
- * @param string $msg The message that is to be transmitted
- * @param array $user The record of the sender
- * @param array $contact Target of the communication
- * @param string $prvkey The private key of the sender
- * @param string $pubkey The public key of the receiver
- * @param bool $public Is the message public?
+ * @param string $msg The message that is to be transmitted
+ * @param array $user The record of the sender
+ * @param array $contact Target of the communication
+ * @param string $prvkey The private key of the sender
+ * @param string $pubkey The public key of the receiver
+ * @param bool $public Is the message public?
*
* @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;
@@ -2916,43 +3076,53 @@ class Diaspora {
/**
* @brief Creates a signature for a message
*
- * @param array $owner the array of the owner of the message
+ * @param array $owner the array of the owner of the message
* @param array $message The message that is to be signed
*
* @return string The signature
*/
- private static function signature($owner, $message) {
+ private static function signature($owner, $message)
+ {
$sigmsg = $message;
unset($sigmsg["author_signature"]);
unset($sigmsg["parent_author_signature"]);
$signed_text = implode(";", $sigmsg);
- return base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+ return base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
}
/**
* @brief Transmit a message to a target server
*
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param string $envelope The message that is to be transmitted
- * @param bool $public_batch Is it a public post?
- * @param bool $queue_run Is the transmission called from the queue?
- * @param string $guid message guid
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param string $envelope The message that is to be transmitted
+ * @param bool $public_batch Is it a public post?
+ * @param bool $queue_run Is the transmission called from the queue?
+ * @param string $guid message guid
*
* @return int Result of the transmission
*/
- public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") {
-
+ public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "")
+ {
$a = get_app();
$enabled = intval(Config::get("system", "diaspora_enabled"));
- if (!$enabled)
+ if (!$enabled) {
return 200;
+ }
$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;
@@ -2979,7 +3149,8 @@ class Diaspora {
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
logger("queue message");
- $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
+ $r = q(
+ "SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
intval($contact["id"]),
dbesc(NETWORK_DIASPORA),
dbesc($envelope),
@@ -2992,11 +3163,11 @@ class Diaspora {
add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch);
// The message could not be delivered. We mark the contact as "dead"
- mark_for_death($contact);
+ Contact::markForArchival($contact);
}
} elseif (($return_code >= 200) && ($return_code <= 299)) {
// We successfully delivered a message, the contact is alive
- unmark_for_death($contact);
+ Contact::unmarkForArchival($contact);
}
return(($return_code) ? $return_code : (-1));
@@ -3006,71 +3177,121 @@ class Diaspora {
/**
* @brief Build the post xml
*
- * @param string $type The message type
- * @param array $message The message data
+ * @param string $type The message type
+ * @param array $message The message data
*
* @return string The post XML
*/
- public static function build_post_xml($type, $message) {
-
+ public static function buildPostXml($type, $message)
+ {
$data = array($type => $message);
- return xml::from_array($data, $xml);
+ return XML::fromArray($data, $xml);
}
/**
* @brief Builds and transmit messages
*
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param string $type The message type
- * @param array $message The message data
- * @param bool $public_batch Is it a public post?
- * @param string $guid message guid
- * @param bool $spool Should the transmission be spooled or transmitted?
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param string $type The message type
+ * @param array $message The message data
+ * @param bool $public_batch Is it a public post?
+ * @param string $guid message guid
+ * @param bool $spool Should the transmission be spooled or transmitted?
*
* @return int Result of the transmission
*/
- private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
-
- $msg = self::build_post_xml($type, $message);
+ private static function buildAndTransmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+ {
+ $msg = self::buildPostXml($type, $message);
logger('message: '.$msg, LOGGER_DATA);
logger('send guid '.$guid, LOGGER_DEBUG);
// Fallback if the private key wasn't transmitted in the expected field
- if ($owner['uprvkey'] == "")
+ if ($owner['uprvkey'] == "") {
$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);
return true;
- } else
+ } 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 an account migration
+ * @brief sends a participation (Used to get all further updates)
*
- * @param array $owner the array of the item owner
* @param array $contact Target of the communication
- * @param int $uid User ID
+ * @param array $item Item array
*
* @return int The result of the transmission
*/
- public static function sendAccountMigration($owner, $contact, $uid) {
+ 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::selectOne('user', ['uid'], $condition);
+ $owner = User::getOwnerDataById($first_user['uid']);
+ } else {
+ $owner = User::getOwnerDataById($item['uid']);
+ }
+
+ $author = self::myHandle($owner);
+
+ $message = array("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
+ *
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param int $uid User ID
+ *
+ * @return int The result of the transmission
+ */
+ public static function sendAccountMigration($owner, $contact, $uid)
+ {
$old_handle = PConfig::get($uid, 'system', 'previous_addr');
$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,
"profile" => $profile,
@@ -3078,24 +3299,24 @@ class Diaspora {
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);
}
/**
* @brief Sends a "share" message
*
- * @param array $owner the array of the item owner
+ * @param array $owner the array of the item owner
* @param array $contact Target of the communication
*
* @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
*/
/*
@@ -3112,80 +3333,91 @@ class Diaspora {
}
*/
- $message = array("author" => self::my_handle($owner),
+ $message = array("author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "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);
}
/**
* @brief sends an "unshare"
*
- * @param array $owner the array of the item owner
+ * @param array $owner the array of the item owner
* @param array $contact Target of the communication
*
* @return int The result of the transmission
*/
- public static function send_unshare($owner, $contact) {
-
- $message = array("author" => self::my_handle($owner),
+ public static function sendUnshare($owner, $contact)
+ {
+ $message = array("author" => self::myHandle($owner),
"recipient" => $contact["addr"],
"following" => "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);
}
/**
* @brief Checks a message body if it is a reshare
*
- * @param string $body The message body that is to be check
- * @param bool $complete Should it be a complete check or a simple check?
+ * @param string $body The message body that is to be check
+ * @param bool $complete Should it be a complete check or a simple check?
*
* @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);
// Skip if it isn't a pure repeated messages
// Does it start with a share?
- if ((strpos($body, "[share") > 0) && $complete)
+ if ((strpos($body, "[share") > 0) && $complete) {
return(false);
+ }
// Does it end with a share?
- if (strlen($body) > (strrpos($body, "[/share]") + 8))
+ if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
return(false);
+ }
- $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+ $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
- if ($body == $attributes)
+ if ($body == $attributes) {
return(false);
+ }
// If we don't do the complete check we quit here
- if (!$complete)
+ if (!$complete) {
return true;
+ }
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$guid = $matches[1];
+ }
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$guid = $matches[1];
+ }
if ($guid != "") {
- $r = q("SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
- dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+ $r = q(
+ "SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
+ dbesc($guid),
+ NETWORK_DFRN,
+ NETWORK_DIASPORA
+ );
if ($r) {
$ret= array();
- $ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
+ $ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]);
$ret["root_guid"] = $guid;
return($ret);
}
@@ -3193,31 +3425,37 @@ class Diaspora {
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$profile = $matches[1];
+ }
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$profile = $matches[1];
+ }
$ret= array();
$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
- if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == ""))
+ if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
return(false);
+ }
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$link = $matches[1];
+ }
preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
+ if ($matches[1] != "") {
$link = $matches[1];
+ }
$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
- if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == ""))
+ if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) {
return(false);
+ }
return($ret);
}
@@ -3229,8 +3467,8 @@ 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();
@@ -3254,7 +3492,7 @@ class Diaspora {
$owner = $r[0];
- $eventdata['author'] = self::my_handle($owner);
+ $eventdata['author'] = self::myHandle($owner);
if ($event['guid']) {
$eventdata['guid'] = $event['guid'];
@@ -3299,30 +3537,30 @@ class Diaspora {
/**
* @brief Create a post (status message or reshare)
*
- * @param array $item The item that will be exported
+ * @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
* @return array
* 'type' -> Message type ("status_message" or "reshare")
* 'message' -> Array of XML elements of the status
*/
- public static function build_status($item, $owner) {
-
- $cachekey = "diaspora:build_status:".$item['guid'];
+ public static function buildStatus($item, $owner)
+ {
+ $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"]))) {
+ if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
$message = array("author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
@@ -3340,15 +3578,17 @@ class Diaspora {
$body = html_entity_decode(bb2diaspora($body));
// Adding the title
- if (strlen($title))
+ if (strlen($title)) {
$body = "## ".html_entity_decode($title)."\n\n".$body;
+ }
if ($item["attach"]) {
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
if (cnt) {
$body .= "\n".t("Attachments:")."\n";
- foreach ($matches as $mtch)
+ foreach ($matches as $mtch) {
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
+ }
}
}
@@ -3377,7 +3617,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;
@@ -3399,34 +3639,37 @@ class Diaspora {
/**
* @brief Sends a post
*
- * @param array $item The item that will be exported
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param bool $public_batch Is it a public post?
+ * @param array $item The item that will be exported
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
*/
- public static function send_status($item, $owner, $contact, $public_batch = false) {
-
- $status = self::build_status($item, $owner);
+ public static function sendStatus($item, $owner, $contact, $public_batch = false)
+ {
+ $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"]);
}
/**
* @brief Creates a "like" object
*
- * @param array $item The item that will be exported
+ * @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
* @return array The data for a "like"
*/
- private static function construct_like($item, $owner) {
-
- $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
- dbesc($item["thr-parent"]));
- if (!DBM::is_result($p))
+ private static function constructLike($item, $owner)
+ {
+ $p = q(
+ "SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+ dbesc($item["thr-parent"])
+ );
+ if (!DBM::is_result($p)) {
return false;
+ }
$parent = $p[0];
@@ -3437,7 +3680,7 @@ class Diaspora {
$positive = "false";
}
- return(array("author" => self::my_handle($owner),
+ return(array("author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"parent_type" => $target_type,
@@ -3448,17 +3691,20 @@ class Diaspora {
/**
* @brief Creates an "EventParticipation" object
*
- * @param array $item The item that will be exported
+ * @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
* @return array The data for an "EventParticipation"
*/
- private static function construct_attend($item, $owner) {
-
- $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
- dbesc($item["thr-parent"]));
- if (!DBM::is_result($p))
+ private static function constructAttend($item, $owner)
+ {
+ $p = q(
+ "SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+ dbesc($item["thr-parent"])
+ );
+ if (!DBM::is_result($p)) {
return false;
+ }
$parent = $p[0];
@@ -3477,7 +3723,7 @@ class Diaspora {
return false;
}
- return(array("author" => self::my_handle($owner),
+ return(array("author" => self::myHandle($owner),
"guid" => $item["guid"],
"parent_guid" => $parent["guid"],
"status" => $attend_answer,
@@ -3487,34 +3733,36 @@ class Diaspora {
/**
* @brief Creates the object for a comment
*
- * @param array $item The item that will be exported
+ * @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
* @return array The data for a comment
*/
- private static function construct_comment($item, $owner) {
-
- $cachekey = "diaspora:construct_comment:".$item['guid'];
+ private static function constructComment($item, $owner)
+ {
+ $cachekey = "diaspora:constructComment:".$item['guid'];
$result = Cache::get($cachekey);
if (!is_null($result)) {
return $result;
}
- $p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
+ $p = q(
+ "SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
intval($item["parent"]),
intval($item["parent"])
);
- if (!DBM::is_result($p))
+ if (!DBM::is_result($p)) {
return false;
+ }
$parent = $p[0];
$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 = array("author" => self::myHandle($owner),
"guid" => $item["guid"],
"created_at" => $created,
"parent_guid" => $parent["guid"],
@@ -3523,7 +3771,7 @@ class Diaspora {
// 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);
@@ -3534,44 +3782,45 @@ class Diaspora {
/**
* @brief Send a like or a comment
*
- * @param array $item The item that will be exported
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param bool $public_batch Is it a public post?
+ * @param array $item The item that will be exported
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param bool $public_batch Is it a public post?
*
* @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);
+ $message = self::constructAttend($item, $owner);
$type = "event_participation";
} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
- $message = self::construct_like($item, $owner);
+ $message = self::constructLike($item, $owner);
$type = "like";
} else {
- $message = self::construct_comment($item, $owner);
+ $message = self::constructComment($item, $owner);
$type = "comment";
}
- if (!$message)
+ if (!$message) {
return false;
+ }
$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"]);
}
/**
* @brief Creates a message from a signature record entry
*
- * @param array $item The item that will be exported
+ * @param array $item The item that will be exported
* @param array $signature The entry of the "sign" record
*
* @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']);
@@ -3613,17 +3862,17 @@ class Diaspora {
/**
* @brief Relays messages (like, comment, retraction) to other servers if we are the thread owner
*
- * @param array $item The item that will be exported
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param bool $public_batch Is it a public post?
+ * @param array $item The item that will be exported
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param bool $public_batch Is it a public post?
*
* @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);
+ return self::sendRetraction($item, $owner, $contact, $public_batch, true);
} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
$type = "like";
} else {
@@ -3634,8 +3883,10 @@ class Diaspora {
// fetch the original signature
- $r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
- intval($item["id"]));
+ $r = q(
+ "SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
+ intval($item["id"])
+ );
if (!$r) {
logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
@@ -3646,14 +3897,14 @@ 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);
- else {// New way
+ if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
+ $message = self::messageFromSignature($item, $signature);
+ } else {// New way
$msg = json_decode($signature['signed_text'], true);
$message = array();
if (is_array($msg)) {
- foreach ($msg AS $field => $data) {
+ foreach ($msg as $field => $data) {
if (!$item["deleted"]) {
if ($field == "diaspora_handle") {
$field = "author";
@@ -3665,31 +3916,32 @@ class Diaspora {
$message[$field] = $data;
}
- } else
+ } else {
logger("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$signature['signed_text'], LOGGER_DEBUG);
+ }
}
$message["parent_author_signature"] = self::signature($owner, $message);
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"]);
}
/**
* @brief Sends a retraction (deletion) of a message, like or comment
*
- * @param array $item The item that will be exported
- * @param array $owner the array of the item owner
- * @param array $contact Target of the communication
- * @param bool $public_batch Is it a public post?
- * @param bool $relay Is the retraction transmitted from a relay?
+ * @param array $item The item that will be exported
+ * @param array $owner the array of the item owner
+ * @param array $contact Target of the communication
+ * @param bool $public_batch Is it a public post?
+ * @param bool $relay Is the retraction transmitted from a relay?
*
* @return int The result of the transmission
*/
- public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) {
-
- $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
+ public static function sendRetraction($item, $owner, $contact, $public_batch = false, $relay = false)
+ {
+ $itemaddr = self::handleFromContact($item["contact-id"], $item["gcontact-id"]);
$msg_type = "retraction";
@@ -3707,23 +3959,24 @@ class Diaspora {
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"]);
}
/**
* @brief Sends a mail
*
- * @param array $item The item that will be exported
- * @param array $owner The owner
+ * @param array $item The item that will be exported
+ * @param array $owner The owner
* @param array $contact Target of the communication
*
* @return int The result of the transmission
*/
- public static function send_mail($item, $owner, $contact) {
-
- $myaddr = self::my_handle($owner);
+ public static function sendMail($item, $owner, $contact)
+ {
+ $myaddr = self::myHandle($owner);
- $r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q(
+ "SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item["convid"]),
intval($item["uid"])
);
@@ -3768,7 +4021,63 @@ class Diaspora {
$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];
}
/**
@@ -3778,8 +4087,10 @@ class Diaspora {
*
* @return array The profile data
*/
- private static function createProfileData($uid) {
- $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
+ private static function createProfileData($uid)
+ {
+ $r = q(
+ "SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
FROM `profile`
INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
@@ -3792,11 +4103,12 @@ class Diaspora {
}
$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';
@@ -3805,22 +4117,24 @@ class Diaspora {
if ($searchable === 'true') {
$dob = '1000-00-00';
- if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
- $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
+ if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) {
+ $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC', 'UTC', $profile['dob'],'m-d');
+ }
$about = $profile['about'];
$about = strip_tags(bbcode($about));
- $location = formatted_location($profile);
+ $location = Profile::formatLocation($profile);
$tags = '';
if ($profile['pub_keywords']) {
- $kw = str_replace(',',' ',$profile['pub_keywords']);
- $kw = str_replace(' ',' ',$kw);
- $arr = explode(' ',$profile['pub_keywords']);
+ $kw = str_replace(',', ' ', $profile['pub_keywords']);
+ $kw = str_replace(' ', ' ', $kw);
+ $arr = explode(' ', $profile['pub_keywords']);
if (count($arr)) {
for ($x = 0; $x < 5; $x ++) {
- if (trim($arr[$x]))
+ if (trim($arr[$x])) {
$tags .= '#'. trim($arr[$x]) .' ';
+ }
}
}
}
@@ -3845,28 +4159,40 @@ class Diaspora {
/**
* @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;
+ }
- if (!$uid)
+ $owner = User::getOwnerDataById($uid);
+ if (!$owner) {
return;
+ }
- if (!$recips)
- $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+ if (!$recips) {
+ $recips = q(
+ "SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
AND `uid` = %d AND `rel` != %d",
dbesc(NETWORK_DIASPORA),
intval($uid),
intval(CONTACT_IS_SHARING)
);
- if (!$recips)
+ }
+
+ if (!$recips) {
return;
+ }
$message = self::createProfileData($uid);
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);
}
}
@@ -3874,12 +4200,12 @@ class Diaspora {
* @brief Stores the signature for likes that are created on our system
*
* @param array $contact The contact array of the "like"
- * @param int $post_id The post id of the "like"
+ * @param int $post_id The post id of the "like"
*
* @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)) {
logger("No owner post, so not storing signature", LOGGER_DEBUG);
@@ -3902,7 +4228,7 @@ class Diaspora {
return false;
}
- $message = self::construct_like($r[0], $contact);
+ $message = self::constructLike($r[0], $contact);
$message["author_signature"] = self::signature($contact, $message);
/*
@@ -3918,15 +4244,15 @@ class Diaspora {
/**
* @brief Stores the signature for comments that are created on our system
*
- * @param array $item The item array of the comment
- * @param array $contact The contact array of the item owner
- * @param string $uprvkey The private key of the sender
- * @param int $message_id The message id of the comment
+ * @param array $item The item array of the comment
+ * @param array $contact The contact array of the item owner
+ * @param string $uprvkey The private key of the sender
+ * @param int $message_id The message id of the comment
*
* @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);
return false;
@@ -3934,7 +4260,7 @@ class Diaspora {
$contact["uprvkey"] = $uprvkey;
- $message = self::construct_comment($item, $contact);
+ $message = self::constructComment($item, $contact);
$message["author_signature"] = self::signature($contact, $message);
/*