X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=f400d033ea3536124f6334860fff544ceff32e3e;hb=2ad162f991fdd32122b029398b9ab9e8801c0462;hp=17bef5d6d9832b0589e7bb2aaba69ea40f8fd40b;hpb=4ca68c7af05b7b41e1b04936b9080802ca2b7716;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 17bef5d6d9..f400d033ea 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1,5 +1,4 @@ formatOutput = true; @@ -76,16 +78,16 @@ class DFRN { * * This function is called when another server is pulling data from the user feed. * - * @param string $dfrn_id DFRN ID from the requesting party - * @param string $owner_nick Owner nick name - * @param string $last_update Date of the last update - * @param int $direction Can be -1, 0 or 1. - * @param boolean $onlyheader Output only the header without content? (Default is "no") + * @param string $dfrn_id DFRN ID from the requesting party + * @param string $owner_nick Owner nick name + * @param string $last_update Date of the last update + * @param int $direction Can be -1, 0 or 1. + * @param boolean $onlyheader Output only the header without content? (Default is "no") * * @return string DFRN feed entries */ - public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) { - + public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) + { $a = get_app(); $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic @@ -113,7 +115,8 @@ class DFRN { $sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' "; - $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` + $r = q( + "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1", dbesc($owner_nick) @@ -130,9 +133,8 @@ class DFRN { $sql_post_table = ""; if (! $public_feed) { - $sql_extra = ''; - switch($direction) { + switch ($direction) { case (-1): $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id)); $my_id = $dfrn_id; @@ -150,7 +152,8 @@ class DFRN { break; // NOTREACHED } - $r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1", + $r = q( + "SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1", intval($owner_id) ); @@ -159,7 +162,7 @@ class DFRN { } $contact = $r[0]; - require_once('include/security.php'); + include_once 'include/security.php'; $groups = init_groups_visitor($contact['id']); if (count($groups)) { @@ -170,7 +173,8 @@ class DFRN { $gs = '<<>>' ; // Impossible to match } - $sql_extra = sprintf(" + $sql_extra = sprintf( + " AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' ) AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' ) @@ -194,8 +198,13 @@ class DFRN { } if (isset($category)) { - $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", - dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id)); + $sql_post_table = sprintf( + "INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", + dbesc(protect_sprintf($category)), + intval(TERM_OBJ_POST), + intval(TERM_CATEGORY), + intval($owner_id) + ); //$sql_extra .= file_tag_file_query('item',$category,'category'); } @@ -205,9 +214,10 @@ class DFRN { } } - $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); + $check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s'); - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $r = q( + "SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, @@ -261,7 +271,6 @@ class DFRN { } foreach ($items as $item) { - // prevent private email from leaking. if ($item['network'] == NETWORK_MAIL) { continue; @@ -281,7 +290,6 @@ class DFRN { $entry = self::entry($doc, $type, $item, $owner, true); $root->appendChild($entry); - } $atom = trim($doc->saveXML()); @@ -294,19 +302,21 @@ class DFRN { /** * @brief Generate an atom entry for a given item id * - * @param int $item_id The item id + * @param int $item_id The item id * @param boolean $conversation Show the conversation. If false show the single post. * * @return string DFRN feed entry */ - public static function itemFeed($item_id, $conversation = false) { + public static function itemFeed($item_id, $conversation = false) + { if ($conversation) { $condition = '`item`.`parent`'; } else { $condition = '`item`.`id`'; } - $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + $r = q( + "SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, @@ -328,7 +338,8 @@ class DFRN { $items = $r; $item = $r[0]; - $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` + $r = q( + "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1", intval($item['uid']) @@ -375,13 +386,14 @@ class DFRN { /** * @brief Create XML text for DFRN mails * - * @param array $item message elements + * @param array $item message elements * @param array $owner Owner record * * @return string DFRN mail * @todo Add type-hints */ - public static function mail($item, $owner) { + public static function mail($item, $owner) + { $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; @@ -410,13 +422,14 @@ class DFRN { /** * @brief Create XML text for DFRN friend suggestions * - * @param array $item suggestion elements + * @param array $item suggestion elements * @param array $owner Owner record * * @return string DFRN suggestions * @todo Add type-hints */ - public static function fsuggest($item, $owner) { + public static function fsuggest($item, $owner) + { $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; @@ -439,23 +452,27 @@ class DFRN { * @brief Create XML text for DFRN relocations * * @param array $owner Owner record - * @param int $uid User ID + * @param int $uid User ID * * @return string DFRN relocations * @todo Add type-hints */ - public static function relocate($owner, $uid) { + public static function relocate($owner, $uid) + { /* get site pubkey. this could be a new installation with no site keys*/ - $pubkey = Config::get('system','site_pubkey'); + $pubkey = Config::get('system', 'site_pubkey'); if (! $pubkey) { $res = new_keypair(1024); - Config::set('system','site_prvkey', $res['prvkey']); - Config::set('system','site_pubkey', $res['pubkey']); + Config::set('system', 'site_prvkey', $res['prvkey']); + Config::set('system', 'site_pubkey', $res['pubkey']); } - $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` - WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid); + $rp = q( + "SELECT `resource-id` , `scale`, type FROM `photo` + WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", + $uid + ); $photos = array(); $ext = Photo::supportedTypes(); @@ -493,16 +510,17 @@ class DFRN { /** * @brief Adds the header elements for the DFRN protocol * - * @param object $doc XML document - * @param array $owner Owner record + * @param object $doc XML document + * @param array $owner Owner record * @param string $authorelement Element name for the author * @param string $alternatelink link to profile or category - * @param bool $public Is it a header for public posts? + * @param bool $public Is it a header for public posts? * * @return object XML root object * @todo Add type-hints */ - private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) { + private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) + { if ($alternatelink == "") { $alternatelink = $owner['url']; @@ -569,19 +587,21 @@ class DFRN { /** * @brief Adds the author element in the header for the DFRN protocol * - * @param object $doc XML document - * @param array $owner Owner record + * @param object $doc XML document + * @param array $owner Owner record * @param string $authorelement Element name for the author * * @return object XML author object * @todo Add type-hints */ - private static function add_author($doc, $owner, $authorelement, $public) { - + private static function add_author($doc, $owner, $authorelement, $public) + { // Is the profile hidden or shouldn't be published in the net? Then add the "hide" element - $r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` + $r = q( + "SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d", - intval($owner['uid'])); + intval($owner['uid']) + ); if (DBM::is_result($r)) { $hidewall = true; } else { @@ -627,17 +647,20 @@ class DFRN { $birthday = feed_birthday($owner['uid'], $owner['timezone']); - if ($birthday) + if ($birthday) { xml::add_element($doc, $author, "dfrn:birthday", $birthday); + } // Only show contact details when we are allowed to - $r = q("SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`, + $r = q( + "SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`, `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`, `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d", - intval($owner['uid'])); + intval($owner['uid']) + ); if (DBM::is_result($r)) { $profile = $r[0]; @@ -670,7 +693,6 @@ class DFRN { foreach ($keywords AS $keyword) { xml::add_element($doc, $author, "poco:tags", trim($keyword)); } - } if (trim($profile["xmpp"]) != "") { @@ -708,15 +730,16 @@ class DFRN { /** * @brief Adds the author elements in the "entry" elements of the DFRN protocol * - * @param object $doc XML document - * @param string $element Element name for the author + * @param object $doc XML document + * @param string $element Element name for the author * @param string $contact_url Link of the contact - * @param array $items Item elements + * @param array $item Item elements * * @return object XML author object * @todo Add type-hints */ - private static function add_entry_author($doc, $element, $contact_url, $item) { + private static function add_entry_author($doc, $element, $contact_url, $item) + { $contact = get_contact_details_by_url($contact_url, $item["uid"]); @@ -750,15 +773,15 @@ class DFRN { /** * @brief Adds the activity elements * - * @param object $doc XML document - * @param string $element Element name for the activity + * @param object $doc XML document + * @param string $element Element name for the activity * @param string $activity activity value * * @return object XML activity object * @todo Add type-hints */ - private static function create_activity($doc, $element, $activity) { - + private static function create_activity($doc, $element, $activity) + { if ($activity) { $entry = $doc->createElement($element); @@ -813,19 +836,20 @@ class DFRN { /** * @brief Adds the elements for attachments * - * @param object $doc XML document + * @param object $doc XML document * @param object $root XML root - * @param array $item Item element + * @param array $item Item element * * @return object XML attachment object * @todo Add type-hints */ - private static function get_attachment($doc, $root, $item) { - $arr = explode('[/attach],',$item['attach']); + private static function get_attachment($doc, $root, $item) + { + $arr = explode('[/attach],', $item['attach']); if (count($arr)) { foreach ($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); if ($cnt) { $attributes = array("rel" => "enclosure", "href" => $matches[1], @@ -848,19 +872,19 @@ class DFRN { /** * @brief Adds the "entry" elements for the DFRN protocol * - * @param object $doc XML document - * @param string $type "text" or "html" - * @param array $item Item element - * @param array $owner Owner record - * @param bool $comment Trigger the sending of the "comment" element - * @param int $cid Contact ID of the recipient - * @param bool $single If set, the entry is created as an XML document with a single "entry" element + * @param object $doc XML document + * @param string $type "text" or "html" + * @param array $item Item element + * @param array $owner Owner record + * @param bool $comment Trigger the sending of the "comment" element + * @param int $cid Contact ID of the recipient + * @param bool $single If set, the entry is created as an XML document with a single "entry" element * * @return object XML entry object * @todo Add type-hints */ - private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false) { - + private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false) + { $mentioned = array(); if (!$item['parent']) { @@ -868,7 +892,7 @@ class DFRN { } if ($item['deleted']) { - $attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)); + $attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME)); return xml::create_element($doc, "at:deleted-entry", "", $attributes); } @@ -890,7 +914,7 @@ class DFRN { } if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) { - $body = fix_private_photos($item['body'],$owner['uid'],$item,$cid); + $body = fix_private_photos($item['body'], $owner['uid'], $item, $cid); } else { $body = $item['body']; } @@ -948,8 +972,8 @@ class DFRN { xml::add_element($doc, $entry, "id", $item["uri"]); xml::add_element($doc, $entry, "title", $item["title"]); - xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME)); - xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME)); + xml::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"] . "+00:00", ATOM_TIME)); + xml::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"] . "+00:00", ATOM_TIME)); // "dfrn:env" is used to read the content xml::add_element($doc, $entry, "dfrn:env", base64url_encode($body, true)); @@ -959,8 +983,14 @@ class DFRN { xml::add_element($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type)); // We save this value in "plink". Maybe we should read it from there as well? - xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl()."/display/".$item["guid"])); + xml::add_element( + $doc, + $entry, + "link", + "", + array("rel" => "alternate", "type" => "text/html", + "href" => System::baseUrl() . "/display/" . $item["guid"]) + ); // "comment-allow" is some old fashioned stuff for old Friendica versions. // It is included in the rewritten code for completeness @@ -1040,18 +1070,32 @@ class DFRN { } foreach ($mentioned AS $mention) { - $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", + $r = q( + "SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", intval($owner["uid"]), - dbesc(normalise_link($mention))); + dbesc(normalise_link($mention)) + ); if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) { - xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_GROUP, - "href" => $mention)); + xml::add_element( + $doc, + $entry, + "link", + "", + array("rel" => "mentioned", + "ostatus:object-type" => ACTIVITY_OBJ_GROUP, + "href" => $mention) + ); } else { - xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned", - "ostatus:object-type" => ACTIVITY_OBJ_PERSON, - "href" => $mention)); + xml::add_element( + $doc, + $entry, + "link", + "", + array("rel" => "mentioned", + "ostatus:object-type" => ACTIVITY_OBJ_PERSON, + "href" => $mention) + ); } } @@ -1064,11 +1108,12 @@ class DFRN { * @brief encrypts data via AES * * @param string $data The data that is to be encrypted - * @param string $key The AES key + * @param string $key The AES key * * @return string encrypted data */ - private static function aes_encrypt($data, $key) { + private static function aes_encrypt($data, $key) + { return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); } @@ -1076,27 +1121,28 @@ class DFRN { * @brief decrypts data via AES * * @param string $encrypted The encrypted data - * @param string $key The AES key + * @param string $key The AES key * * @return string decrypted data */ - public static function aes_decrypt($encrypted, $key) { + public static function aes_decrypt($encrypted, $key) + { return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA); } /** * @brief Delivers the atom content to the contacts * - * @param array $owner Owner record - * @param array $contactr Contact record of the receiver - * @param string $atom Content that will be transmitted - * @param bool $dissolve (to be documented) + * @param array $owner Owner record + * @param array $contact Contact record of the receiver + * @param string $atom Content that will be transmitted + * @param bool $dissolve (to be documented) * * @return int Deliver status. -1 means an error. * @todo Add array type-hint for $owner, $contact */ - public static function deliver($owner,$contact,$atom, $dissolve = false) { - + public static function deliver($owner, $contact, $atom, $dissolve = false) + { $a = get_app(); $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); @@ -1113,7 +1159,7 @@ class DFRN { logger("Local rino version: ". $rino, LOGGER_DEBUG); - $ssl_val = intval(Config::get('system','ssl_policy')); + $ssl_val = intval(Config::get('system', 'ssl_policy')); $ssl_policy = ''; switch ($ssl_val) { @@ -1152,7 +1198,7 @@ class DFRN { return 3; } - if (strpos($xml,'1','0',$atom); + $postvars['data'] = str_replace('1', '0', $atom); $postvars['perm'] = 'r'; } @@ -1278,20 +1327,19 @@ class DFRN { if ($dfrn_version >= 2.1) { if (($contact['duplex'] && strlen($contact['pubkey'])) - || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey'])) - || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) { - openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']); + || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey'])) + || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey'])) + ) { + openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']); } else { - openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']); + openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']); } - } else { if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { - openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']); + openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']); } else { - openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']); + openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']); } - } logger('md5 rawkey ' . md5($postvars['key'])); @@ -1300,7 +1348,7 @@ class DFRN { } - logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA); + logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA); $xml = post_url($contact['notify'], $postvars); @@ -1311,11 +1359,11 @@ class DFRN { return -9; // timed out } - if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) { + if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { return -10; } - if (strpos($xml,' NULL_DATE) { logger("dfrn_deliver: $url back from the dead - removing mark for death"); - require_once('include/Contact.php'); + include_once 'include/Contact.php'; unmark_for_death($contact); } @@ -1343,18 +1391,20 @@ class DFRN { /** * @brief Add new birthday event for this person * - * @param array $contact Contact record + * @param array $contact Contact record * @param string $birthday Birthday of the contact * @todo Add array type-hint for $contact */ - private static function birthday_event($contact, $birthday) { - + private static function birthday_event($contact, $birthday) + { // Check for duplicates - $r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", + $r = q( + "SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", intval($contact["uid"]), intval($contact["id"]), - dbesc(datetime_convert("UTC","UTC", $birthday)), - dbesc("birthday")); + dbesc(datetime_convert("UTC", "UTC", $birthday)), + dbesc("birthday") + ); if (DBM::is_result($r)) { return; @@ -1365,14 +1415,15 @@ class DFRN { $bdtext = sprintf(t("%s\'s birthday"), $contact["name"]); $bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ; - $r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`) + $r = q( + "INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", intval($contact["uid"]), intval($contact["id"]), dbesc(datetime_convert()), dbesc(datetime_convert()), - dbesc(datetime_convert("UTC","UTC", $birthday)), - dbesc(datetime_convert("UTC","UTC", $birthday." + 1 day ")), + dbesc(datetime_convert("UTC", "UTC", $birthday)), + dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")), dbesc($bdtext), dbesc($bdtext2), dbesc("birthday") @@ -1382,25 +1433,29 @@ class DFRN { /** * @brief Fetch the author data from head or entry items * - * @param object $xpath XPath object - * @param object $context In which context should the data be searched - * @param array $importer Record of the importer user mixed with contact of the content - * @param string $element Element name from which the data is fetched - * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well + * @param object $xpath XPath object + * @param object $context In which context should the data be searched + * @param array $importer Record of the importer user mixed with contact of the content + * @param string $element Element name from which the data is fetched + * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well * * @return Returns an array with relevant data of the author * @todo Find good type-hints for all parameter */ - private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") { - + private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") + { $author = array(); $author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue; $author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue; - $r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`, + $r = q( + "SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`, `name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'", - intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET)); + intval($importer["uid"]), + dbesc(normalise_link($author["link"])), + dbesc(NETWORK_STATUSNET) + ); if (DBM::is_result($r)) { $contact = $r[0]; @@ -1589,19 +1644,25 @@ class DFRN { if ($update) { logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG); - q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', + q( + "UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s', `addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d, `xmpp` = '%s', `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d AND `network` = '%s'", - dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]), + dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]), dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]), dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]), dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])), - intval($contact["id"]), dbesc($contact["network"])); + intval($contact["id"]), dbesc($contact["network"]) + ); } - update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"], - (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))); + update_contact_avatar( + $author["avatar"], + $importer["uid"], + $contact["id"], + (strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])) + ); /* * The generation is a sign for the reliability of the provided data. @@ -1625,14 +1686,15 @@ class DFRN { /** * @brief Transforms activity objects into an XML string * - * @param object $xpath XPath object + * @param object $xpath XPath object * @param object $activity Activity object - * @param text $element element name + * @param text $element element name * * @return string XML string * @todo Find good type-hints for all parameter */ - private static function transform_activity($xpath, $activity, $element) { + private static function transform_activity($xpath, $activity, $element) + { if (!is_object($activity)) { return ""; } @@ -1679,13 +1741,13 @@ class DFRN { /** * @brief Processes the mail elements * - * @param object $xpath XPath object - * @param object $mail mail elements - * @param array $importer Record of the importer user mixed with contact of the content + * @param object $xpath XPath object + * @param object $mail mail elements + * @param array $importer Record of the importer user mixed with contact of the content * @todo Find good type-hints for all parameter */ - private static function process_mail($xpath, $mail, $importer) { - + private static function process_mail($xpath, $mail, $importer) + { logger("Processing mails"); /// @TODO Rewrite this to one statement @@ -1730,12 +1792,13 @@ class DFRN { /** * @brief Processes the suggestion elements * - * @param object $xpath XPath object + * @param object $xpath XPath object * @param object $suggestion suggestion elements - * @param array $importer Record of the importer user mixed with contact of the content + * @param array $importer Record of the importer user mixed with contact of the content * @todo Find good type-hints for all parameter */ - private static function process_suggestion($xpath, $suggestion, $importer) { + private static function process_suggestion($xpath, $suggestion, $importer) + { $a = get_app(); logger("Processing suggestions"); @@ -1752,7 +1815,8 @@ class DFRN { // Does our member already have a friend matching this description? - $r = q("SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1", + $r = q( + "SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1", dbesc($suggest["name"]), dbesc(normalise_link($suggest["url"])), intval($suggest["uid"]) @@ -1772,7 +1836,8 @@ class DFRN { // Do we already have an fcontact record for this person? $fid = 0; - $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1", + $r = q( + "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1", dbesc($suggest["url"]), dbesc($suggest["name"]), dbesc($suggest["request"]) @@ -1781,7 +1846,8 @@ class DFRN { $fid = $r[0]["id"]; // OK, we do. Do we already have an introduction for this person ? - $r = q("SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1", + $r = q( + "SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1", intval($suggest["uid"]), intval($fid) ); @@ -1798,14 +1864,16 @@ class DFRN { } } if (!$fid) { - $r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')", + $r = q( + "INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')", dbesc($suggest["name"]), dbesc($suggest["url"]), dbesc($suggest["photo"]), dbesc($suggest["request"]) ); } - $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1", + $r = q( + "SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1", dbesc($suggest["url"]), dbesc($suggest["name"]), dbesc($suggest["request"]) @@ -1824,7 +1892,8 @@ class DFRN { $hash = random_string(); - $r = q("INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`) + $r = q( + "INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`) VALUES(%d, %d, %d, '%s', '%s', '%s', %d)", intval($suggest["uid"]), intval($fid), @@ -1848,23 +1917,22 @@ class DFRN { "source_link" => $importer["url"], "source_photo" => $importer["photo"], "verb" => ACTIVITY_REQ_FRIEND, - "otype" => "intro" - )); + "otype" => "intro") + ); return true; - } /** * @brief Processes the relocation elements * - * @param object $xpath XPath object + * @param object $xpath XPath object * @param object $relocation relocation elements - * @param array $importer Record of the importer user mixed with contact of the content + * @param array $importer Record of the importer user mixed with contact of the content * @todo Find good type-hints for all parameter */ - private static function process_relocation($xpath, $relocation, $importer) { - + private static function process_relocation($xpath, $relocation, $importer) + { logger("Processing relocations"); /// @TODO Rewrite this to one statement @@ -1893,9 +1961,11 @@ class DFRN { } // update contact - $r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;", + $r = q( + "SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;", intval($importer["id"]), - intval($importer["importer_uid"])); + intval($importer["importer_uid"]) + ); if (!DBM::is_result($r)) { logger("Query failed to execute, no result returned in " . __FUNCTION__); @@ -1907,7 +1977,8 @@ class DFRN { // Update the gcontact entry $relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]); - $x = q("UPDATE `gcontact` SET + $x = q( + "UPDATE `gcontact` SET `name` = '%s', `photo` = '%s', `url` = '%s', @@ -1917,18 +1988,20 @@ class DFRN { `notify` = '%s', `server_url` = '%s' WHERE `nurl` = '%s';", - dbesc($relocate["name"]), - dbesc($relocate["avatar"]), - dbesc($relocate["url"]), - dbesc(normalise_link($relocate["url"])), - dbesc($relocate["addr"]), - dbesc($relocate["addr"]), - dbesc($relocate["notify"]), - dbesc($relocate["server_url"]), - dbesc(normalise_link($old["url"]))); + dbesc($relocate["name"]), + dbesc($relocate["avatar"]), + dbesc($relocate["url"]), + dbesc(normalise_link($relocate["url"])), + dbesc($relocate["addr"]), + dbesc($relocate["addr"]), + dbesc($relocate["notify"]), + dbesc($relocate["server_url"]), + dbesc(normalise_link($old["url"])) + ); // Update the contact table. We try to find every entry. - $x = q("UPDATE `contact` SET + $x = q( + "UPDATE `contact` SET `name` = '%s', `avatar` = '%s', `url` = '%s', @@ -1940,19 +2013,20 @@ class DFRN { `poll` = '%s', `site-pubkey` = '%s' WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');", - dbesc($relocate["name"]), - dbesc($relocate["avatar"]), - dbesc($relocate["url"]), - dbesc(normalise_link($relocate["url"])), - dbesc($relocate["addr"]), - dbesc($relocate["request"]), - dbesc($relocate["confirm"]), - dbesc($relocate["notify"]), - dbesc($relocate["poll"]), - dbesc($relocate["sitepubkey"]), - intval($importer["id"]), - intval($importer["importer_uid"]), - dbesc(normalise_link($old["url"]))); + dbesc($relocate["name"]), + dbesc($relocate["avatar"]), + dbesc($relocate["url"]), + dbesc(normalise_link($relocate["url"])), + dbesc($relocate["addr"]), + dbesc($relocate["request"]), + dbesc($relocate["confirm"]), + dbesc($relocate["notify"]), + dbesc($relocate["poll"]), + dbesc($relocate["sitepubkey"]), + intval($importer["id"]), + intval($importer["importer_uid"]), + dbesc(normalise_link($old["url"])) + ); update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); @@ -1968,20 +2042,27 @@ class DFRN { //'owner-avatar' => array($old["photo"], $relocate["photo"]), //'author-avatar' => array($old["photo"], $relocate["photo"]), ); - 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["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["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["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["importer_uid"]) + ); - if ($x === false) { - return false; - } + if ($x === false) { + return false; + } } } @@ -1996,19 +2077,19 @@ class DFRN { /** * @brief Updates an item * - * @param array $current the current item record - * @param array $item the new item record - * @param array $importer Record of the importer user mixed with contact of the content - * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? + * @param array $current the current item record + * @param array $item the new item record + * @param array $importer Record of the importer user mixed with contact of the content + * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? * @todo set proper type-hints (array?) */ - private static function update_content($current, $item, $importer, $entrytype) { + private static function update_content($current, $item, $importer, $entrytype) + { $changed = false; if (edited_timestamp_is_newer($current, $item)) { - // do not accept (ignore) an earlier edit than one we currently have. - if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) { + if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) { return false; } @@ -2025,18 +2106,20 @@ class DFRN { $changed = true; if ($entrytype == DFRN_REPLY_RC) { - Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]); + Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $current["id"]); } } // update last-child if it changes if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) { - $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", + $r = q( + "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", dbesc(datetime_convert()), dbesc($item["parent-uri"]), intval($importer["importer_uid"]) ); - $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)", + $r = q( + "UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)", intval($item["last-child"]), dbesc(datetime_convert()), dbesc($item["uri"]), @@ -2050,12 +2133,13 @@ class DFRN { * @brief Detects the entry type of the item * * @param array $importer Record of the importer user mixed with contact of the content - * @param array $item the new item record + * @param array $item the new item record * * @return int Is it a toplevel entry, a comment or a relayed comment? * @todo set proper type-hints (array?) */ - private static function get_entry_type($importer, $item) { + private static function get_entry_type($importer, $item) + { if ($item["parent-uri"] != $item["uri"]) { $community = false; @@ -2072,13 +2156,15 @@ class DFRN { $is_a_remote_action = false; - $r = q("SELECT `item`.`parent-uri` FROM `item` + $r = q( + "SELECT `item`.`parent-uri` FROM `item` WHERE `item`.`uri` = '%s' LIMIT 1", dbesc($item["parent-uri"]) ); if (DBM::is_result($r)) { - $r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` + $r = q( + "SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s') AND `item`.`uid` = %d @@ -2115,26 +2201,25 @@ class DFRN { } else { return DFRN_TOP_LEVEL; } - } /** * @brief Send a "poke" * - * @param array $item the new item record - * @param array $importer Record of the importer user mixed with contact of the content - * @param int $posted_id The record number of item record that was just posted + * @param array $item the new item record + * @param array $importer Record of the importer user mixed with contact of the content + * @param int $posted_id The record number of item record that was just posted * @todo set proper type-hints (array?) */ - private static function do_poke($item, $importer, $posted_id) { - $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1)); + private static function do_poke($item, $importer, $posted_id) + { + $verb = urldecode(substr($item["verb"], strpos($item["verb"], "#")+1)); if (!$verb) { return; } - $xo = parse_xml_string($item["object"],false); + $xo = parse_xml_string($item["object"], false); if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) { - // somebody was poked/prodded. Was it me? foreach ($xo->link as $l) { $atts = $l->attributes(); @@ -2148,9 +2233,9 @@ class DFRN { } if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) { - // send a notification - notification(array( + notification( + array( "type" => NOTIFY_POKE, "notify_flags" => $importer["notify-flags"], "language" => $importer["language"], @@ -2166,8 +2251,8 @@ class DFRN { "verb" => $item["verb"], "otype" => "person", "activity" => $verb, - "parent" => $item["parent"] - )); + "parent" => $item["parent"]) + ); } } } @@ -2175,16 +2260,16 @@ class DFRN { /** * @brief Processes several actions, depending on the verb * - * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? - * @param array $importer Record of the importer user mixed with contact of the content - * @param array $item the new item record - * @param bool $is_like Is the verb a "like"? + * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment? + * @param array $importer Record of the importer user mixed with contact of the content + * @param array $item the new item record + * @param bool $is_like Is the verb a "like"? * * @return bool Should the processing of the entries be continued? * @todo set proper type-hints (array?) */ - private static function process_verbs($entrytype, $importer, &$item, &$is_like) { - + private static function process_verbs($entrytype, $importer, &$item, &$is_like) + { logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG); if (($entrytype == DFRN_TOP_LEVEL)) { @@ -2201,7 +2286,7 @@ class DFRN { new_follower($importer, $contact, $item, $nickname); return false; } - if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) { + if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) { logger("Lost follower"); lose_follower($importer, $contact, $item); return false; @@ -2211,7 +2296,7 @@ class DFRN { new_follower($importer, $contact, $item, $nickname, true); return false; } - if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) { + if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) { logger("Lost sharer"); lose_sharer($importer, $contact, $item); return false; @@ -2221,13 +2306,15 @@ class DFRN { || ($item["verb"] == ACTIVITY_DISLIKE) || ($item["verb"] == ACTIVITY_ATTEND) || ($item["verb"] == ACTIVITY_ATTENDNO) - || ($item["verb"] == ACTIVITY_ATTENDMAYBE)) { + || ($item["verb"] == ACTIVITY_ATTENDMAYBE) + ) { $is_like = true; $item["type"] = "activity"; $item["gravity"] = GRAVITY_LIKE; // only one like or dislike per person // splitted into two queries for performance issues - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1", + $r = q( + "SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1", intval($item["uid"]), dbesc($item["author-link"]), dbesc($item["verb"]), @@ -2237,7 +2324,8 @@ class DFRN { return false; } - $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1", + $r = q( + "SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1", intval($item["uid"]), dbesc($item["author-link"]), dbesc($item["verb"]), @@ -2252,11 +2340,12 @@ class DFRN { if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) { - $xo = parse_xml_string($item["object"],false); - $xt = parse_xml_string($item["target"],false); + $xo = parse_xml_string($item["object"], false); + $xt = parse_xml_string($item["target"], false); if ($xt->type == ACTIVITY_OBJ_NOTE) { - $r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q( + "SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($xt->id), intval($importer["importer_uid"]) ); @@ -2286,10 +2375,11 @@ class DFRN { * @brief Processes the link elements * * @param object $links link elements - * @param array $item the item record + * @param array $item the item record * @todo set proper type-hints */ - private static function parse_links($links, &$item) { + private static function parse_links($links, &$item) + { $rel = ""; $href = ""; $type = ""; @@ -2341,8 +2431,8 @@ class DFRN { * @param array $importer Record of the importer user mixed with contact of the content * @todo Add type-hints */ - private static function process_entry($header, $xpath, $entry, $importer, $xml) { - + private static function process_entry($header, $xpath, $entry, $importer, $xml) + { logger("Processing entries"); $item = $header; @@ -2356,14 +2446,16 @@ class DFRN { $item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue; - $current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $current = q( + "SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item["uri"]), intval($importer["importer_uid"]) ); // Is there an existing item? - if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item) && - (datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) { + if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item) + && (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"]) + ) { logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); return; } @@ -2387,16 +2479,15 @@ class DFRN { $item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue; $item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue; - $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]); + $item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''), $item["body"]); // make sure nobody is trying to sneak some html tags by us $item["body"] = notags(base64url_decode($item["body"])); $item["body"] = limit_body_size($item["body"]); /// @todo Do we really need this check for HTML elements? (It was copied from the old function) - if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) { - - $item['body'] = reltoabs($item['body'],$base_url); + if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) { + $item['body'] = reltoabs($item['body'], $base_url); $item['body'] = html2bb_video($item['body']); @@ -2593,7 +2684,8 @@ class DFRN { $ev['private'] = $item['private']; $ev["guid"] = $item["guid"]; - $r = q("SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q( + "SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item["uri"]), intval($importer["uid"]) ); @@ -2628,12 +2720,12 @@ class DFRN { $parent = 0; if ($posted_id) { - logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG); $item["id"] = $posted_id; - $r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q( + "SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($posted_id), intval($importer["importer_uid"]) ); @@ -2643,13 +2735,15 @@ class DFRN { } if (!$is_like) { - $r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d", + $r1 = q( + "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d", dbesc(datetime_convert()), intval($importer["importer_uid"]), intval($r[0]["parent"]) ); - $r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d", + $r2 = q( + "UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(datetime_convert()), intval($importer["importer_uid"]), intval($posted_id) @@ -2664,7 +2758,7 @@ class DFRN { return true; } } else { // $entrytype == DFRN_TOP_LEVEL - if (!link_compare($item["owner-link"],$importer["url"])) { + if (!link_compare($item["owner-link"], $importer["url"])) { /* * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, * but otherwise there's a possible data mixup on the sender's system. @@ -2698,13 +2792,13 @@ class DFRN { /** * @brief Deletes items * - * @param object $xpath XPath object + * @param object $xpath XPath object * @param object $deletion deletion elements - * @param array $importer Record of the importer user mixed with contact of the content + * @param array $importer Record of the importer user mixed with contact of the content * @todo set proper type-hints */ - private static function process_deletion($xpath, $deletion, $importer) { - + private static function process_deletion($xpath, $deletion, $importer) + { logger("Processing deletions"); foreach ($deletion->attributes AS $attributes) { @@ -2726,17 +2820,17 @@ class DFRN { } /// @todo Only select the used fields - $r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id` - WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1", - dbesc($uri), - intval($importer["uid"]), - intval($importer["id"]) - ); + $r = q( + "SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id` + WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1", + dbesc($uri), + intval($importer["uid"]), + intval($importer["id"]) + ); if (!DBM::is_result($r)) { logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG); return; } else { - $item = $r[0]; $entrytype = self::get_entry_type($importer, $item); @@ -2754,16 +2848,16 @@ class DFRN { if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) { - $xo = parse_xml_string($item["object"],false); - $xt = parse_xml_string($item["target"],false); + $xo = parse_xml_string($item["object"], false); + $xt = parse_xml_string($item["target"], false); if ($xt->type == ACTIVITY_OBJ_NOTE) { - $i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $i = q( + "SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($xt->id), intval($importer["importer_uid"]) ); if (DBM::is_result($i)) { - // For tags, the owner cannot remove the tag on the author's copy of the post. $owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false); @@ -2774,7 +2868,7 @@ class DFRN { return; } if ($author_remove || $owner_remove) { - $tags = explode(',',$i[0]["tag"]); + $tags = explode(',', $i[0]["tag"]); $newtags = array(); if (count($tags)) { foreach ($tags as $tag) { @@ -2783,7 +2877,8 @@ class DFRN { } } } - q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d", + q( + "UPDATE `item` SET `tag` = '%s' WHERE `id` = %d", dbesc(implode(',', $newtags)), intval($i[0]["id"]) ); @@ -2794,44 +2889,49 @@ class DFRN { } if ($entrytype == DFRN_TOP_LEVEL) { - $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', + $r = q( + "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '', `title` = '' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", - dbesc($when), - dbesc(datetime_convert()), - dbesc($uri), - intval($importer["uid"]) - ); + dbesc($when), + dbesc(datetime_convert()), + dbesc($uri), + intval($importer["uid"]) + ); create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["uid"]); } else { - $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', + $r = q( + "UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '', `title` = '' WHERE `uri` = '%s' AND `uid` IN (0, %d)", - dbesc($when), - dbesc(datetime_convert()), - dbesc($uri), - intval($importer["uid"]) - ); + dbesc($when), + dbesc(datetime_convert()), + dbesc($uri), + intval($importer["uid"]) + ); create_tags_from_itemuri($uri, $importer["uid"]); create_files_from_itemuri($uri, $importer["uid"]); update_thread_uri($uri, $importer["importer_uid"]); if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. - q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", + q( + "UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", dbesc(datetime_convert()), dbesc($item["parent-uri"]), intval($item["uid"]) ); // who is the last child now? - $r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d + $r = q( + "SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d ORDER BY `created` DESC LIMIT 1", - dbesc($item["parent-uri"]), - intval($importer["uid"]) + dbesc($item["parent-uri"]), + intval($importer["uid"]) ); if (DBM::is_result($r)) { - q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", + q( + "UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]["id"]) ); } @@ -2840,7 +2940,7 @@ class DFRN { if ($entrytype == DFRN_REPLY_RC) { logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG); - Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]); + Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]); } } } @@ -2849,14 +2949,14 @@ class DFRN { /** * @brief Imports a DFRN message * - * @param text $xml The DFRN message - * @param array $importer Record of the importer user mixed with contact of the content - * @param bool $sort_by_date Is used when feeds are polled + * @param text $xml The DFRN message + * @param array $importer Record of the importer user mixed with contact of the content + * @param bool $sort_by_date Is used when feeds are polled * @return integer Import status * @todo set proper type-hints */ - public static function import($xml, $importer, $sort_by_date = false) { - + public static function import($xml, $importer, $sort_by_date = false) + { if ($xml == "") { return 400; }