X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=70965a72fd8e78121384bbe33eee592d6ba1b0e8;hb=79eeb409695716fae8a501a02ef57ed855acb3a8;hp=73f6f85f80ce13520c618063054ef3e8eb9c989b;hpb=c742c62f0aae6a033823dd34ae97426dc90e7580;p=friendica.git diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 73f6f85f80..70965a72fd 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -1,11 +1,22 @@ . * - * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html - * This implementation here interprets the old and the new protocol and sends the new one. - * In the future we will remove most stuff from "validPosting" and interpret only the new protocol. */ namespace Friendica\Protocol; @@ -14,10 +25,7 @@ use Friendica\Content\Feature; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Markdown; use Friendica\Core\Cache\Duration; -use Friendica\Core\Config; -use Friendica\Core\L10n; use Friendica\Core\Logger; -use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; @@ -42,8 +50,7 @@ use Friendica\Worker\Delivery; use SimpleXMLElement; /** - * @brief This class contain functions to create and send Diaspora XML files - * + * This class contain functions to create and send Diaspora XML files */ class Diaspora { @@ -78,7 +85,7 @@ class Diaspora } /** - * @brief Return a list of relay servers + * Return a list of relay servers * * The list contains not only the official relays but also servers that we serve directly * @@ -93,7 +100,7 @@ class Diaspora $serverlist = []; // Fetching relay servers - $serverdata = Config::get("system", "relay_server"); + $serverdata = DI::config()->get("system", "relay_server"); if (!empty($serverdata)) { $servers = explode(",", $serverdata); @@ -102,7 +109,7 @@ class Diaspora } } - if (Config::get("system", "relay_directly", false)) { + if (DI::config()->get("system", "relay_directly", false)) { // We distribute our stuff based on the parent to ensure that the thread will be complete $parent = Item::selectFirst(['parent'], ['id' => $item_id]); if (!DBA::isResult($parent)) { @@ -168,7 +175,7 @@ class Diaspora } /** - * @brief Return a contact for a given server address or creates a dummy entry + * Return a contact for a given server address or creates a dummy entry * * @param string $server_url The url of the server * @param array $fields Fieldlist @@ -201,7 +208,7 @@ class Diaspora } /** - * @brief Update or insert a relay contact + * Update or insert a relay contact * * @param string $server_url The url of the server * @param array $network_fields Optional network specific fields @@ -235,7 +242,7 @@ class Diaspora } /** - * @brief Return a list of participating contacts for a thread + * Return a list of participating contacts for a thread * * This is used for the participation feature. * One of the parameters is a contact array. @@ -287,7 +294,7 @@ class Diaspora } /** - * @brief repairs a signature that was double encoded + * repairs a signature that was double encoded * * The function is unused at the moment. It was copied from the old implementation. * @@ -318,7 +325,7 @@ class Diaspora } /** - * @brief verify the envelope and return the verified data + * verify the envelope and return the verified data * * @param string $envelope The magic envelope * @@ -383,7 +390,7 @@ class Diaspora } /** - * @brief encrypts data via AES + * encrypts data via AES * * @param string $key The AES key * @param string $iv The IV (is used for CBC encoding) @@ -397,7 +404,7 @@ class Diaspora } /** - * @brief decrypts data via AES + * decrypts data via AES * * @param string $key The AES key * @param string $iv The IV (is used for CBC encoding) @@ -411,7 +418,7 @@ class Diaspora } /** - * @brief: Decodes incoming Diaspora message in the new format + * Decodes incoming Diaspora message in the new format * * @param string $raw raw post message * @param string $privKey The private key of the importer @@ -517,7 +524,7 @@ class Diaspora } /** - * @brief: Decodes incoming Diaspora message in the deprecated format + * Decodes incoming Diaspora message in the deprecated format * * @param string $xml urldecoded Diaspora salmon * @param string $privKey The private key of the importer @@ -660,7 +667,7 @@ class Diaspora /** - * @brief Dispatches public messages and find the fitting receivers + * Dispatches public messages and find the fitting receivers * * @param array $msg The post that will be dispatched * @@ -670,7 +677,7 @@ class Diaspora */ public static function dispatchPublic($msg) { - $enabled = intval(Config::get("system", "diaspora_enabled")); + $enabled = intval(DI::config()->get("system", "diaspora_enabled")); if (!$enabled) { Logger::log("diaspora is disabled"); return false; @@ -688,7 +695,7 @@ class Diaspora } /** - * @brief Dispatches the different message types to the different functions + * 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 @@ -793,7 +800,7 @@ class Diaspora } /** - * @brief Checks if a posting is valid and fetches the data fields. + * Checks if a posting is valid and fetches the data fields. * * This function does not only check the signature. * It also does the conversion between the old and the new diaspora format. @@ -946,7 +953,7 @@ class Diaspora } /** - * @brief Fetches the public key for a given handle + * Fetches the public key for a given handle * * @param string $handle The handle * @@ -969,7 +976,7 @@ class Diaspora } /** - * @brief Fetches data for a given handle + * Fetches data for a given handle * * @param string $handle The handle * @param boolean $update true = always update, false = never update, null = update when not found or outdated @@ -1023,7 +1030,7 @@ class Diaspora } /** - * @brief Updates the fcontact table + * Updates the fcontact table * * @param array $arr The fcontact data * @throws \Exception @@ -1044,7 +1051,7 @@ class Diaspora } /** - * @brief get a handle (user@domain.tld) from a given contact id + * get a handle (user@domain.tld) from a given contact id * * @param int $contact_id The id in the contact table * @param int $pcontact_id The id in the contact table (Used for the public contact) @@ -1091,7 +1098,7 @@ class Diaspora } /** - * @brief get a url (scheme://domain.tld/u/user) from a given Diaspora* + * get a url (scheme://domain.tld/u/user) from a given Diaspora* * fcontact guid * * @param mixed $fcontact_guid Hexadecimal string guid @@ -1117,7 +1124,7 @@ class Diaspora } /** - * @brief Get a contact id for a given handle + * Get a contact id for a given handle * * @todo Move to Friendica\Model\Contact * @@ -1161,7 +1168,7 @@ class Diaspora } /** - * @brief Check if posting is allowed for this contact + * Check if posting is allowed for this contact * * @param array $importer Array of the importer user * @param array $contact The contact that is checked @@ -1214,7 +1221,7 @@ class Diaspora } /** - * @brief Fetches the contact id for a handle and checks if posting is allowed + * 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 @@ -1246,7 +1253,7 @@ class Diaspora } /** - * @brief Does the message already exists on the system? + * Does the message already exists on the system? * * @param int $uid The user id * @param string $guid The guid of the message @@ -1266,7 +1273,7 @@ class Diaspora } /** - * @brief Checks for links to posts in a message + * Checks for links to posts in a message * * @param array $item The item array * @return void @@ -1292,7 +1299,7 @@ class Diaspora } /** - * @brief Checks for relative /people/* links in an item body to match local + * 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 @@ -1328,7 +1335,7 @@ class Diaspora } /** - * @brief sub function of "fetchGuid" which checks for links in messages + * 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 @@ -1344,7 +1351,7 @@ class Diaspora } /** - * @brief Fetches an item with a given guid from a given server + * Fetches an item with a given guid from a given server * * @param string $guid the message guid * @param string $server The server address @@ -1379,7 +1386,7 @@ class Diaspora } /** - * @brief Fetches a message from a server + * Fetches a message from a server * * @param string $guid message guid * @param string $server The url of the server @@ -1458,7 +1465,7 @@ class Diaspora } /** - * @brief Fetches an item with a given URL + * Fetches an item with a given URL * * @param string $url the message url * @@ -1491,7 +1498,7 @@ class Diaspora } /** - * @brief Fetches the item record of a given guid + * Fetches the item record of a given guid * * @param int $uid The user id * @param string $guid message guid @@ -1535,7 +1542,7 @@ class Diaspora } /** - * @brief returns contact details + * returns contact details * * @param array $def_contact The default contact if the person isn't found * @param array $person The record of the person @@ -1562,7 +1569,7 @@ class Diaspora } /** - * @brief Is the profile a hubzilla profile? + * Is the profile a hubzilla profile? * * @param string $url The profile link * @@ -1574,7 +1581,7 @@ class Diaspora } /** - * @brief Generate a post link with a given handle and message guid + * Generate a post link with a given handle and message guid * * @param string $addr The user handle * @param string $guid message guid @@ -1613,7 +1620,7 @@ class Diaspora } /** - * @brief Receives account migration + * Receives account migration * * @param array $importer Array of the importer user * @param object $data The message object @@ -1676,7 +1683,7 @@ class Diaspora } /** - * @brief Processes an account deletion + * Processes an account deletion * * @param object $data The message object * @@ -1700,7 +1707,7 @@ class Diaspora } /** - * @brief Fetch the uri from our database if we already have this item (maybe from ourselves) + * 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 @@ -1729,7 +1736,7 @@ class Diaspora } /** - * @brief Fetch the guid from our database with a given uri + * Fetch the guid from our database with a given uri * * @param string $uri Message uri * @param string $uid Author handle @@ -1748,7 +1755,7 @@ class Diaspora } /** - * @brief Find the best importer for a comment, like, ... + * Find the best importer for a comment, like, ... * * @param string $guid The guid of the item * @@ -1769,7 +1776,7 @@ class Diaspora } /** - * @brief Processes an incoming comment + * Processes an incoming comment * * @param array $importer Array of the importer user * @param string $sender The sender of the message @@ -1886,7 +1893,7 @@ class Diaspora } /** - * @brief processes and stores private messages + * processes and stores private messages * * @param array $importer Array of the importer user * @param array $contact The contact of the message @@ -1946,7 +1953,7 @@ class Diaspora } /** - * @brief Processes new private messages (answers to private messages are processed elsewhere) + * 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 @@ -2005,7 +2012,7 @@ class Diaspora } /** - * @brief Processes "like" messages + * Processes "like" messages * * @param array $importer Array of the importer user * @param string $sender The sender of the message @@ -2117,7 +2124,7 @@ class Diaspora } /** - * @brief Processes private messages + * Processes private messages * * @param array $importer Array of the importer user * @param object $data The message object @@ -2178,7 +2185,7 @@ class Diaspora } /** - * @brief Processes participations - unsupported by now + * Processes participations - unsupported by now * * @param array $importer Array of the importer user * @param object $data The message object @@ -2204,7 +2211,7 @@ class Diaspora return false; } - $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]); + $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED]]); if (!DBA::isResult($item)) { Logger::log('Item not found, no origin or private: '.$parent_guid); return false; @@ -2242,7 +2249,7 @@ class Diaspora } /** - * @brief Processes photos - unneeded + * Processes photos - unneeded * * @param array $importer Array of the importer user * @param object $data The message object @@ -2257,7 +2264,7 @@ class Diaspora } /** - * @brief Processes poll participations - unssupported + * Processes poll participations - unssupported * * @param array $importer Array of the importer user * @param object $data The message object @@ -2271,7 +2278,7 @@ class Diaspora } /** - * @brief Processes incoming profile updates + * Processes incoming profile updates * * @param array $importer Array of the importer user * @param object $data The message object @@ -2292,7 +2299,6 @@ class Diaspora $name = XML::unescape($data->first_name).((strlen($data->last_name)) ? " ".XML::unescape($data->last_name) : ""); $image_url = XML::unescape($data->image_url); $birthday = XML::unescape($data->birthday); - $gender = XML::unescape($data->gender); $about = Markdown::toBBCode(XML::unescape($data->bio)); $location = Markdown::toBBCode(XML::unescape($data->location)); $searchable = (XML::unescape($data->searchable) == "true"); @@ -2340,8 +2346,7 @@ class Diaspora } $fields = ['name' => $name, 'location' => $location, - 'name-date' => DateTimeFormat::utcNow(), - 'about' => $about, 'gender' => $gender, + 'name-date' => DateTimeFormat::utcNow(), 'about' => $about, 'addr' => $author, 'nick' => $nick, 'keywords' => $keywords, 'unsearchable' => !$searchable, 'sensitive' => $nsfw]; @@ -2355,7 +2360,7 @@ class Diaspora $gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2, "photo" => $image_url, "name" => $name, "location" => $location, - "about" => $about, "birthday" => $birthday, "gender" => $gender, + "about" => $about, "birthday" => $birthday, "addr" => $author, "nick" => $nick, "keywords" => $keywords, "hide" => !$searchable, "nsfw" => $nsfw]; @@ -2369,7 +2374,7 @@ class Diaspora } /** - * @brief Processes incoming friend requests + * Processes incoming friend requests * * @param array $importer Array of the importer user * @param array $contact The contact that send the request @@ -2388,7 +2393,7 @@ class Diaspora } /** - * @brief Processes incoming sharing notification + * Processes incoming sharing notification * * @param array $importer Array of the importer user * @param object $data The message object @@ -2500,7 +2505,7 @@ class Diaspora } /** - * @brief Fetches a message with a given guid + * Fetches a message with a given guid * * @param string $guid message guid * @param string $orig_author handle of the original post @@ -2518,7 +2523,7 @@ class Diaspora // Do we already have this item? $fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid', 'author-name', 'author-link', 'author-avatar']; - $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; + $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]]; $item = Item::selectFirst($fields, $condition); if (DBA::isResult($item)) { @@ -2562,7 +2567,7 @@ class Diaspora if ($stored) { $fields = ['body', 'title', 'attach', 'tag', 'app', 'created', 'object-type', 'uri', 'guid', 'author-name', 'author-link', 'author-avatar']; - $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; + $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]]; $item = Item::selectFirst($fields, $condition); if (DBA::isResult($item)) { @@ -2580,7 +2585,7 @@ class Diaspora } /** - * @brief Stores a reshare activity + * Stores a reshare activity * * @param array $item Array of reshare post * @param integer $parent_message_id Id of the parent post @@ -2628,7 +2633,7 @@ class Diaspora } /** - * @brief Processes a reshare message + * Processes a reshare message * * @param array $importer Array of the importer user * @param object $data The message object @@ -2706,7 +2711,7 @@ class Diaspora $datarray["app"] = $original_item["app"]; $datarray["plink"] = self::plink($author, $guid); - $datarray["private"] = (($public == "false") ? 1 : 0); + $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC); $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at; $datarray["object-type"] = $original_item["object-type"]; @@ -2733,7 +2738,7 @@ class Diaspora } /** - * @brief Processes retractions + * Processes retractions * * @param array $importer Array of the importer user * @param array $contact The contact of the item owner @@ -2789,7 +2794,7 @@ class Diaspora continue; } - Item::delete(['id' => $item['id']]); + Item::markForDeletion(['id' => $item['id']]); Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG); } @@ -2798,7 +2803,7 @@ class Diaspora } /** - * @brief Receives retraction messages + * Receives retraction messages * * @param array $importer Array of the importer user * @param string $sender The sender of the message @@ -2844,7 +2849,7 @@ class Diaspora } /** - * @brief Receives status messages + * Receives status messages * * @param array $importer Array of the importer user * @param SimpleXMLElement $data The message object @@ -2936,7 +2941,7 @@ class Diaspora } $datarray["plink"] = self::plink($author, $guid); - $datarray["private"] = (($public == "false") ? 1 : 0); + $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC); $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at; if (isset($address["address"])) { @@ -2968,7 +2973,7 @@ class Diaspora * ************************************************************************************** */ /** - * @brief returnes the handle of a contact + * returnes the handle of a contact * * @param array $contact contact array * @@ -2994,7 +2999,7 @@ class Diaspora /** - * @brief Creates the data for a private message in the new format + * 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 @@ -3036,7 +3041,7 @@ class Diaspora } /** - * @brief Creates the envelope for the "fetch" endpoint and for the new format + * 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 @@ -3076,7 +3081,7 @@ class Diaspora } /** - * @brief Create the envelope for a message + * Create the envelope for a message * * @param string $msg The message that is to be transmitted * @param array $user The record of the sender @@ -3102,7 +3107,7 @@ class Diaspora } /** - * @brief Creates a signature for a message + * Creates a signature for a message * * @param array $owner the array of the owner of the message * @param array $message The message that is to be signed @@ -3121,7 +3126,7 @@ class Diaspora } /** - * @brief Transmit a message to a target server + * Transmit a message to a target server * * @param array $owner the array of the item owner * @param array $contact Target of the communication @@ -3135,7 +3140,7 @@ class Diaspora */ private static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "") { - $enabled = intval(Config::get("system", "diaspora_enabled")); + $enabled = intval(DI::config()->get("system", "diaspora_enabled")); if (!$enabled) { return 200; } @@ -3162,7 +3167,7 @@ class Diaspora Logger::log("transmit: ".$logid."-".$guid." ".$dest_url); - if (!intval(Config::get("system", "diaspora_test"))) { + if (!intval(DI::config()->get("system", "diaspora_test"))) { $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json"); $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]); @@ -3179,7 +3184,7 @@ class Diaspora /** - * @brief Build the post xml + * Build the post xml * * @param string $type The message type * @param array $message The message data @@ -3194,7 +3199,7 @@ class Diaspora } /** - * @brief Builds and transmit messages + * Builds and transmit messages * * @param array $owner the array of the item owner * @param array $contact Target of the communication @@ -3229,7 +3234,7 @@ class Diaspora } /** - * @brief sends a participation (Used to get all further updates) + * sends a participation (Used to get all further updates) * * @param array $contact Target of the communication * @param array $item Item array @@ -3240,7 +3245,7 @@ class Diaspora private static function sendParticipation(array $contact, array $item) { // Don't send notifications for private postings - if ($item['private']) { + if ($item['private'] == Item::PRIVATE) { return; } @@ -3278,7 +3283,7 @@ class Diaspora } /** - * @brief sends an account migration + * sends an account migration * * @param array $owner the array of the item owner * @param array $contact Target of the communication @@ -3290,7 +3295,7 @@ class Diaspora */ public static function sendAccountMigration(array $owner, array $contact, $uid) { - $old_handle = PConfig::get($uid, 'system', 'previous_addr'); + $old_handle = DI::pConfig()->get($uid, 'system', 'previous_addr'); $profile = self::createProfileData($uid); $signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author']; @@ -3306,7 +3311,7 @@ class Diaspora } /** - * @brief Sends a "share" message + * Sends a "share" message * * @param array $owner the array of the item owner * @param array $contact Target of the communication @@ -3350,7 +3355,7 @@ class Diaspora } /** - * @brief sends an "unshare" + * sends an "unshare" * * @param array $owner the array of the item owner * @param array $contact Target of the communication @@ -3371,7 +3376,7 @@ class Diaspora } /** - * @brief Checks a message body if it is a reshare + * 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? @@ -3429,7 +3434,7 @@ class Diaspora } /** - * @brief Create an event array + * Create an event array * * @param integer $event_id The id of the event * @@ -3509,7 +3514,7 @@ class Diaspora } /** - * @brief Create a post (status message or reshare) + * Create a post (status message or reshare) * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3531,12 +3536,12 @@ class Diaspora $myaddr = self::myHandle($owner); - $public = ($item["private"] ? "false" : "true"); + $public = ($item["private"] == Item::PRIVATE ? "false" : "true"); $created = DateTimeFormat::utc($item['received'], DateTimeFormat::ATOM); $edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM); // Detect a share element and do a reshare - if (!$item['private'] && ($ret = self::isReshare($item["body"]))) { + if (($item['private'] != Item::PRIVATE) && ($ret = self::isReshare($item["body"]))) { $message = ["author" => $myaddr, "guid" => $item["guid"], "created_at" => $created, @@ -3551,7 +3556,7 @@ class Diaspora $body = $item["body"]; // Fetch the title from an attached link - if there is one - if (empty($item["title"]) && PConfig::get($owner['uid'], 'system', 'attach_link_title')) { + if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) { $page_data = BBCode::getAttachmentData($item['body']); if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) { $title = $page_data['title']; @@ -3575,7 +3580,7 @@ class Diaspora if ($item["attach"]) { $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); if ($cnt) { - $body .= "\n".L10n::t("Attachments:")."\n"; + $body .= "\n".DI::l10n()->t("Attachments:")."\n"; foreach ($matches as $mtch) { $body .= "[".$mtch[3]."](".$mtch[1].")\n"; } @@ -3648,7 +3653,7 @@ class Diaspora } /** - * @brief Sends a post + * Sends a post * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3667,7 +3672,7 @@ class Diaspora } /** - * @brief Creates a "like" object + * Creates a "like" object * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3699,7 +3704,7 @@ class Diaspora } /** - * @brief Creates an "EventParticipation" object + * Creates an "EventParticipation" object * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3737,7 +3742,7 @@ class Diaspora } /** - * @brief Creates the object for a comment + * Creates the object for a comment * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3774,7 +3779,7 @@ class Diaspora if ( $item['author-id'] != $thread_parent_item['author-id'] && (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) - && !Config::get('system', 'disable_implicit_mentions') + && !DI::config()->get('system', 'disable_implicit_mentions') ) { $body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']); } @@ -3804,7 +3809,7 @@ class Diaspora } /** - * @brief Send a like or a comment + * Send a like or a comment * * @param array $item The item that will be exported * @param array $owner the array of the item owner @@ -3838,7 +3843,7 @@ class Diaspora } /** - * @brief Creates a message from a signature record entry + * Creates a message from a signature record entry * * @param array $item The item that will be exported * @return array The message @@ -3883,7 +3888,7 @@ class Diaspora } /** - * @brief Relays messages (like, comment, retraction) to other servers if we are the thread owner + * 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 @@ -3939,7 +3944,7 @@ class Diaspora } /** - * @brief Sends a retraction (deletion) of a message, like or comment + * 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 @@ -3974,7 +3979,7 @@ class Diaspora } /** - * @brief Sends a mail + * Sends a mail * * @param array $item The item that will be exported * @param array $owner The owner @@ -4025,7 +4030,7 @@ class Diaspora } /** - * @brief Split a name into first name and last name + * Split a name into first name and last name * * @param string $name The name * @@ -4081,7 +4086,7 @@ class Diaspora } /** - * @brief Create profile data + * Create profile data * * @param int $uid The user id * @@ -4095,7 +4100,7 @@ class Diaspora FROM `profile` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid` - WHERE `user`.`uid` = %d AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", + WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1", intval($uid) ); @@ -4113,7 +4118,7 @@ class Diaspora $large = DI::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg'; $medium = DI::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg'; $small = DI::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg'; - $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'); + $searchable = ($profile['net-publish'] ? 'true' : 'false'); $dob = null; $about = null; @@ -4130,8 +4135,7 @@ class Diaspora $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d'); } - $about = $profile['about']; - $about = strip_tags(BBCode::convert($about)); + $about = BBCode::toMarkdown($profile['about']); $location = Profile::formatLocation($profile); $tags = ''; @@ -4157,7 +4161,6 @@ class Diaspora "image_url_medium" => $medium, "image_url_small" => $small, "birthday" => $dob, - "gender" => $profile['gender'], "bio" => $about, "location" => $location, "searchable" => $searchable, @@ -4166,7 +4169,7 @@ class Diaspora } /** - * @brief Sends profile data + * Sends profile data * * @param int $uid The user id * @param bool $recips optional, default false @@ -4208,7 +4211,7 @@ class Diaspora } /** - * @brief Creates the signature for likes that are created on our system + * Creates the signature for likes that are created on our system * * @param integer $uid The user of that comment * @param array $item Item array @@ -4239,7 +4242,7 @@ class Diaspora } /** - * @brief Creates the signature for Comments that are created on our system + * Creates the signature for Comments that are created on our system * * @param integer $uid The user of that comment * @param array $item Item array