Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Continued:

Browse source 
- added missing space/curly braces
- added TODOs for later adding a lot type-hints, without these (and they are
  long time around in PHP) anything can be handled over to the method/function.

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-01-26 09:38:52 +01:00 committed by Roland Haeder
parent 6a171a96aa
commit c6ef84a964
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 281 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

343
include/dfrn.php
View file

@ -41,6 +41,7 @@ class dfrn {
* @param array $owner Owner record * @param array $owner Owner record
* *
* @return string DFRN entries * @return string DFRN entries
* @todo Add type-hints
*/ */
public static function entries($items,$owner) { public static function entries($items,$owner) {
@ -49,8 +50,9 @@ class dfrn {
$root = self::add_header($doc, $owner, "dfrn:owner", "", false); $root = self::add_header($doc, $owner, "dfrn:owner", "", false);
if(! count($items)) if (! count($items)) {
return trim($doc->saveXML()); return trim($doc->saveXML());
}
foreach ($items as $item) { foreach ($items as $item) {
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]); $entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
@ -84,14 +86,17 @@ class dfrn {
if ($public_feed && $a->argc > 2) { if ($public_feed && $a->argc > 2) {
for ($x = 2; $x < $a->argc; $x++) { for ($x = 2; $x < $a->argc; $x++) {
if($a->argv[$x] == 'converse') if ($a->argv[$x] == 'converse') {
$converse = true; $converse = true;
if($a->argv[$x] == 'starred') }
if ($a->argv[$x] == 'starred') {
$starred = true; $starred = true;
if($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) }
if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) {
$category = $a->argv[$x+1]; $category = $a->argv[$x+1];
} }
} }
}
@ -152,8 +157,9 @@ class dfrn {
for ($x = 0; $x < count($groups); $x ++) for ($x = 0; $x < count($groups); $x ++)
$groups[$x] = '<' . intval($groups[$x]) . '>' ; $groups[$x] = '<' . intval($groups[$x]) . '>' ;
$gs = implode('|', $groups); $gs = implode('|', $groups);
} else } else {
$gs = '<<>>' ; // Impossible to match $gs = '<<>>' ; // Impossible to match
}
$sql_extra = sprintf(" $sql_extra = sprintf("
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' ) AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
@ -168,13 +174,15 @@ class dfrn {
); );
} }
if($public_feed) if ($public_feed) {
$sort = 'DESC'; $sort = 'DESC';
else } else {
$sort = 'ASC'; $sort = 'ASC';
}
if(! strlen($last_update)) if (! strlen($last_update)) {
$last_update = 'now -30 days'; $last_update = 'now -30 days';
}
if (isset($category)) { 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` ", $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` ",
@ -183,9 +191,10 @@ class dfrn {
} }
if ($public_feed) { if ($public_feed) {
if(! $converse) if (! $converse) {
$sql_extra .= " AND `contact`.`self` = 1 "; $sql_extra .= " AND `contact`.`self` = 1 ";
} }
}
$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');
@ -207,6 +216,11 @@ class dfrn {
dbesc($sort) dbesc($sort)
); );
if (!dbm::is_result($r)) {
/// @TODO Some logging?
killme();
}
// Will check further below if this actually returned results. // Will check further below if this actually returned results.
// We will provide an empty feed if that is the case. // We will provide an empty feed if that is the case.
@ -217,13 +231,15 @@ class dfrn {
$alternatelink = $owner['url']; $alternatelink = $owner['url'];
if(isset($category)) if (isset($category)) {
$alternatelink .= "/category/".$category; $alternatelink .= "/category/".$category;
}
if ($public_feed) if ($public_feed) {
$author = "dfrn:owner"; $author = "dfrn:owner";
else } else {
$author = "author"; $author = "author";
}
$root = self::add_header($doc, $owner, $author, $alternatelink, true); $root = self::add_header($doc, $owner, $author, $alternatelink, true);
@ -241,18 +257,21 @@ class dfrn {
foreach ($items as $item) { foreach ($items as $item) {
// prevent private email from leaking. // prevent private email from leaking.
if($item['network'] == NETWORK_MAIL) if ($item['network'] == NETWORK_MAIL) {
continue; continue;
}
// public feeds get html, our own nodes use bbcode // public feeds get html, our own nodes use bbcode
if ($public_feed) { if ($public_feed) {
$type = 'html'; $type = 'html';
// catch any email that's in a public conversation and make sure it doesn't leak // catch any email that's in a public conversation and make sure it doesn't leak
if($item['private']) if ($item['private']) {
continue; continue;
} else }
} else {
$type = 'text'; $type = 'text';
}
$entry = self::entry($doc, $type, $item, $owner, true); $entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry); $root->appendChild($entry);
@ -273,6 +292,7 @@ class dfrn {
* @param array $owner Owner record * @param array $owner Owner record
* *
* @return string DFRN mail * @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 = new DOMDocument('1.0', 'utf-8');
@ -307,6 +327,7 @@ class dfrn {
* @param array $owner Owner record * @param array $owner Owner record
* *
* @return string DFRN suggestions * @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 = new DOMDocument('1.0', 'utf-8');
@ -334,6 +355,7 @@ class dfrn {
* @param int $uid User ID * @param int $uid User ID
* *
* @return string DFRN relocations * @return string DFRN relocations
* @todo Add type-hints
*/ */
public static function relocate($owner, $uid) { public static function relocate($owner, $uid) {
@ -350,8 +372,9 @@ class dfrn {
$photos = array(); $photos = array();
$ext = Photo::supportedTypes(); $ext = Photo::supportedTypes();
foreach($rp as $p) foreach ($rp as $p) {
$photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; $photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
unset($rp, $ext); unset($rp, $ext);
@ -390,11 +413,13 @@ class dfrn {
* @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 * @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 == "") if ($alternatelink == "") {
$alternatelink = $owner['url']; $alternatelink = $owner['url'];
}
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed'); $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
$doc->appendChild($root); $doc->appendChild($root);
@ -437,8 +462,9 @@ class dfrn {
} }
// For backward compatibility we keep this element // For backward compatibility we keep this element
if ($owner['page-flags'] == PAGE_COMMUNITY) if ($owner['page-flags'] == PAGE_COMMUNITY) {
xml::add_element($doc, $root, "dfrn:community", 1); xml::add_element($doc, $root, "dfrn:community", 1);
}
// The former element is replaced by this one // The former element is replaced by this one
xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]); xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
@ -461,6 +487,7 @@ class dfrn {
* @param string $authorelement Element name for the author * @param string $authorelement Element name for the author
* *
* @return object XML author object * @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) {
@ -468,10 +495,11 @@ class dfrn {
$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", WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
intval($owner['uid'])); intval($owner['uid']));
if ($r) if (dbm::is_result($r)) {
$hidewall = true; $hidewall = true;
else } else {
$hidewall = false; $hidewall = false;
}
$author = $doc->createElement($authorelement); $author = $doc->createElement($authorelement);
@ -479,11 +507,12 @@ class dfrn {
$uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME); $uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
$picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME); $picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
if (!$public OR !$hidewall)
$attributes = array("dfrn:updated" => $namdate);
else
$attributes = array(); $attributes = array();
if (!$public OR !$hidewall) {
$attributes = array("dfrn:updated" => $namdate);
}
xml::add_element($doc, $author, "name", $owner["name"], $attributes); xml::add_element($doc, $author, "name", $owner["name"], $attributes);
xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes); xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes); xml::add_element($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
@ -491,20 +520,23 @@ class dfrn {
$attributes = array("rel" => "photo", "type" => "image/jpeg", $attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']); "media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
if (!$public OR !$hidewall) if (!$public OR !$hidewall) {
$attributes["dfrn:updated"] = $picdate; $attributes["dfrn:updated"] = $picdate;
}
xml::add_element($doc, $author, "link", "", $attributes); xml::add_element($doc, $author, "link", "", $attributes);
$attributes["rel"] = "avatar"; $attributes["rel"] = "avatar";
xml::add_element($doc, $author, "link", "", $attributes); xml::add_element($doc, $author, "link", "", $attributes);
if ($hidewall) if ($hidewall) {
xml::add_element($doc, $author, "dfrn:hide", "true"); xml::add_element($doc, $author, "dfrn:hide", "true");
}
// The following fields will only be generated if the data isn't meant for a public feed // The following fields will only be generated if the data isn't meant for a public feed
if ($public) if ($public) {
return $author; return $author;
}
$birthday = feed_birthday($owner['uid'], $owner['timezone']); $birthday = feed_birthday($owner['uid'], $owner['timezone']);
@ -519,7 +551,7 @@ class dfrn {
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d", WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
intval($owner['uid'])); intval($owner['uid']));
if ($r) { if (dbm::is_result($r)) {
$profile = $r[0]; $profile = $r[0];
xml::add_element($doc, $author, "poco:displayName", $profile["name"]); xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
@ -547,8 +579,9 @@ class dfrn {
if (trim($profile["pub_keywords"]) != "") { if (trim($profile["pub_keywords"]) != "") {
$keywords = explode(",", $profile["pub_keywords"]); $keywords = explode(",", $profile["pub_keywords"]);
foreach ($keywords AS $keyword) foreach ($keywords AS $keyword) {
xml::add_element($doc, $author, "poco:tags", trim($keyword)); xml::add_element($doc, $author, "poco:tags", trim($keyword));
}
} }
@ -565,14 +598,17 @@ class dfrn {
xml::add_element($doc, $element, "poco:formatted", formatted_location($profile)); xml::add_element($doc, $element, "poco:formatted", formatted_location($profile));
if (trim($profile["locality"]) != "") if (trim($profile["locality"]) != "") {
xml::add_element($doc, $element, "poco:locality", $profile["locality"]); xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
}
if (trim($profile["region"]) != "") if (trim($profile["region"]) != "") {
xml::add_element($doc, $element, "poco:region", $profile["region"]); xml::add_element($doc, $element, "poco:region", $profile["region"]);
}
if (trim($profile["country-name"]) != "") if (trim($profile["country-name"]) != "") {
xml::add_element($doc, $element, "poco:country", $profile["country-name"]); xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
}
$author->appendChild($element); $author->appendChild($element);
} }
@ -590,6 +626,7 @@ class dfrn {
* @param array $items Item elements * @param array $items Item elements
* *
* @return object XML author object * @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) {
@ -630,6 +667,7 @@ class dfrn {
* @param string $activity activity value * @param string $activity activity value
* *
* @return object XML activity object * @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) {
@ -692,6 +730,7 @@ class dfrn {
* @param array $item Item element * @param array $item Item element
* *
* @return object XML attachment object * @return object XML attachment object
* @todo Add type-hints
*/ */
private static function get_attachment($doc, $root, $item) { private static function get_attachment($doc, $root, $item) {
$arr = explode('[/attach],',$item['attach']); $arr = explode('[/attach],',$item['attach']);
@ -729,6 +768,7 @@ class dfrn {
* @param int $cid Contact ID of the recipient * @param int $cid Contact ID of the recipient
* *
* @return object XML entry object * @return object XML entry object
* @todo Add type-hints
*/ */
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) { private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
@ -878,6 +918,11 @@ class dfrn {
intval($owner["uid"]), intval($owner["uid"]),
dbesc(normalise_link($mention))); dbesc(normalise_link($mention)));
if (!dbm::is_result($r)) {
/// @TODO Maybe some logging?
killme();
}
if ($r[0]["forum"] OR $r[0]["prv"]) { if ($r[0]["forum"] OR $r[0]["prv"]) {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned", xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP, "ostatus:object-type" => ACTIVITY_OBJ_GROUP,
@ -903,6 +948,7 @@ class dfrn {
* @param bool $dissolve (to be documented) * @param bool $dissolve (to be documented)
* *
* @return int Deliver status. -1 means an error. * @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) {
@ -1152,7 +1198,7 @@ class dfrn {
* *
* @param array $contact Contact record * @param array $contact Contact record
* @param string $birthday Birthday of the contact * @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) {
@ -1196,6 +1242,7 @@ class dfrn {
* @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well * @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 * @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 = "") {
@ -1213,8 +1260,9 @@ class dfrn {
$author["contact-id"] = $r[0]["id"]; $author["contact-id"] = $r[0]["id"];
$author["network"] = $r[0]["network"]; $author["network"] = $r[0]["network"];
} else { } else {
if (!$onlyfetch) if (!$onlyfetch) {
logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG); logger("Contact ".$author["link"]." wasn't found for user ".$importer["uid"]." XML: ".$xml, LOGGER_DEBUG);
}
$author["contact-id"] = $importer["id"]; $author["contact-id"] = $importer["id"];
$author["network"] = $importer["network"]; $author["network"] = $importer["network"];
@ -1229,6 +1277,7 @@ class dfrn {
$href = ""; $href = "";
$width = 0; $width = 0;
foreach ($avatar->attributes AS $attributes) { foreach ($avatar->attributes AS $attributes) {
/// @TODO Rewrite these similar if() to one switch
if ($attributes->name == "href") { if ($attributes->name == "href") {
$href = $attributes->textContent; $href = $attributes->textContent;
} }
@ -1248,7 +1297,7 @@ class dfrn {
$author["avatar"] = current($avatarlist); $author["avatar"] = current($avatarlist);
} }
if ($r AND !$onlyfetch) { if (dbm::is_result($r) AND !$onlyfetch) {
logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG); logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
$poco = array("url" => $contact["url"]); $poco = array("url" => $contact["url"]);
@ -1376,17 +1425,19 @@ class dfrn {
// Update check for this field has to be done differently // Update check for this field has to be done differently
$datefields = array("name-date", "uri-date"); $datefields = array("name-date", "uri-date");
foreach ($datefields AS $field) foreach ($datefields AS $field) {
if (strtotime($contact[$field]) > strtotime($r[0][$field])) { if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true; $update = true;
} }
}
foreach ($fields AS $field => $data) foreach ($fields AS $field => $data) {
if ($contact[$field] != $r[0][$field]) { if ($contact[$field] != $r[0][$field]) {
logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
$update = true; $update = true;
} }
}
if ($update) { if ($update) {
logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG); logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
@ -1428,6 +1479,7 @@ class dfrn {
* @param text $element element name * @param text $element element name
* *
* @return string XML string * @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)) { if (!is_object($activity)) {
@ -1443,21 +1495,26 @@ class dfrn {
xml::add_element($obj_doc, $obj_element, "type", $activity_type); xml::add_element($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0); $id = $xpath->query("atom:id", $activity)->item(0);
if (is_object($id)) if (is_object($id)) {
$obj_element->appendChild($obj_doc->importNode($id, true)); $obj_element->appendChild($obj_doc->importNode($id, true));
}
$title = $xpath->query("atom:title", $activity)->item(0); $title = $xpath->query("atom:title", $activity)->item(0);
if (is_object($title)) if (is_object($title)) {
$obj_element->appendChild($obj_doc->importNode($title, true)); $obj_element->appendChild($obj_doc->importNode($title, true));
}
$links = $xpath->query("atom:link", $activity); $links = $xpath->query("atom:link", $activity);
if (is_object($links)) if (is_object($links)) {
foreach ($links AS $link) foreach ($links AS $link) {
$obj_element->appendChild($obj_doc->importNode($link, true)); $obj_element->appendChild($obj_doc->importNode($link, true));
}
}
$content = $xpath->query("atom:content", $activity)->item(0); $content = $xpath->query("atom:content", $activity)->item(0);
if (is_object($content)) if (is_object($content)) {
$obj_element->appendChild($obj_doc->importNode($content, true)); $obj_element->appendChild($obj_doc->importNode($content, true));
}
$obj_doc->appendChild($obj_element); $obj_doc->appendChild($obj_element);
@ -1474,11 +1531,13 @@ class dfrn {
* @param object $xpath XPath object * @param object $xpath XPath object
* @param object $mail mail elements * @param object $mail mail 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_mail($xpath, $mail, $importer) { private static function process_mail($xpath, $mail, $importer) {
logger("Processing mails"); logger("Processing mails");
/// @TODO Rewrite this to one statement
$msg = array(); $msg = array();
$msg["uid"] = $importer["importer_uid"]; $msg["uid"] = $importer["importer_uid"];
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue; $msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
@ -1498,7 +1557,7 @@ class dfrn {
$r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")"); $r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
// send notifications. // send notifications.
/// @TODO Arange this mess
$notif_params = array( $notif_params = array(
"type" => NOTIFY_MAIL, "type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"], "notify_flags" => $importer["notify-flags"],
@ -1525,12 +1584,14 @@ class dfrn {
* @param object $xpath XPath object * @param object $xpath XPath object
* @param object $suggestion suggestion elements * @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(); $a = get_app();
logger("Processing suggestions"); logger("Processing suggestions");
/// @TODO Rewrite this to one statement
$suggest = array(); $suggest = array();
$suggest["uid"] = $importer["importer_uid"]; $suggest["uid"] = $importer["importer_uid"];
$suggest["cid"] = $importer["id"]; $suggest["cid"] = $importer["id"];
@ -1547,8 +1608,10 @@ class dfrn {
dbesc(normalise_link($suggest["url"])), dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"]) intval($suggest["uid"])
); );
if (dbm::is_result($r)) /// @TODO Really abort on valid result??? Maybe missed ! here?
if (dbm::is_result($r)) {
return false; return false;
}
// Do we already have an fcontact record for this person? // Do we already have an fcontact record for this person?
@ -1566,9 +1629,11 @@ class dfrn {
intval($suggest["uid"]), intval($suggest["uid"]),
intval($fid) intval($fid)
); );
if (dbm::is_result($r)) /// @TODO Really abort on valid result??? Maybe missed ! here?
if (dbm::is_result($r)) {
return false; return false;
} }
}
if (!$fid) 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["name"]),
@ -1581,11 +1646,12 @@ class dfrn {
dbesc($suggest["name"]), dbesc($suggest["name"]),
dbesc($suggest["request"]) dbesc($suggest["request"])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$fid = $r[0]["id"]; $fid = $r[0]["id"];
else } else {
// database record did not get created. Quietly give up. // database record did not get created. Quietly give up.
return false; killme();
}
$hash = random_string(); $hash = random_string();
@ -1627,11 +1693,13 @@ class dfrn {
* @param object $xpath XPath object * @param object $xpath XPath object
* @param object $relocation relocation elements * @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"); logger("Processing relocations");
/// @TODO Rewrite this to one statement
$relocate = array(); $relocate = array();
$relocate["uid"] = $importer["importer_uid"]; $relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"]; $relocate["cid"] = $importer["id"];
@ -1648,18 +1716,22 @@ class dfrn {
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue; $relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue; $relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) {
$relocate["avatar"] = $relocate["photo"]; $relocate["avatar"] = $relocate["photo"];
}
if ($relocate["addr"] == "") if ($relocate["addr"] == "") {
$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]); $relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
}
// update contact // 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["id"]),
intval($importer["importer_uid"])); intval($importer["importer_uid"]));
if (!$r)
return false; if (!dbm::is_result($r)) {
killme();
}
$old = $r[0]; $old = $r[0];
@ -1715,8 +1787,9 @@ class dfrn {
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false) if ($x === false) {
return false; return false;
}
// update items // update items
/// @todo This is an extreme performance killer /// @todo This is an extreme performance killer
@ -1731,7 +1804,7 @@ class dfrn {
$n, dbesc($f[0]), $n, dbesc($f[0]),
intval($importer["importer_uid"])); intval($importer["importer_uid"]));
if ($r) { if (dbm::is_result($r)) {
$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d", $x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n, dbesc($f[1]), $n, dbesc($f[1]),
$n, dbesc($f[0]), $n, dbesc($f[0]),
@ -1780,9 +1853,10 @@ class dfrn {
$changed = true; $changed = true;
if ($entrytype == DFRN_REPLY_RC) if ($entrytype == DFRN_REPLY_RC) {
proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]); proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
} }
}
// update last-child if it changes // update last-child if it changes
if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) { if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
@ -1817,8 +1891,9 @@ class dfrn {
$sql_extra = ""; $sql_extra = "";
$community = true; $community = true;
logger("possible community action"); logger("possible community action");
} else } else {
$sql_extra = " AND `contact`.`self` AND `item`.`wall` "; $sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
}
// was the top-level post for this action written by somebody on this site? // was the top-level post for this action written by somebody on this site?
// Specifically, the recipient? // Specifically, the recipient?
@ -1842,9 +1917,10 @@ class dfrn {
dbesc($r[0]["parent-uri"]), dbesc($r[0]["parent-uri"]),
intval($importer["importer_uid"]) intval($importer["importer_uid"])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$is_a_remote_action = true; $is_a_remote_action = true;
} }
}
// Does this have the characteristics of a community or private group action? // Does this have the characteristics of a community or private group action?
// If it's an action to a wall post on a community/prvgroup page it's a // If it's an action to a wall post on a community/prvgroup page it's a
@ -1858,13 +1934,15 @@ class dfrn {
} }
} }
if ($is_a_remote_action) if ($is_a_remote_action) {
return DFRN_REPLY_RC; return DFRN_REPLY_RC;
else } else {
return DFRN_REPLY; return DFRN_REPLY;
}
} else } else {
return DFRN_TOP_LEVEL; return DFRN_TOP_LEVEL;
}
} }
@ -1877,8 +1955,9 @@ class dfrn {
*/ */
private static function do_poke($item, $importer, $posted_id) { private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1)); $verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
if(!$verb) if (!$verb) {
return; return;
}
$xo = parse_xml_string($item["object"],false); $xo = parse_xml_string($item["object"],false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) { if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
@ -1980,8 +2059,9 @@ class dfrn {
dbesc($item["verb"]), dbesc($item["verb"]),
dbesc($item["parent-uri"]) dbesc($item["parent-uri"])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
return false; 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"]), intval($item["uid"]),
@ -1989,10 +2069,12 @@ class dfrn {
dbesc($item["verb"]), dbesc($item["verb"]),
dbesc($item["parent-uri"]) dbesc($item["parent-uri"])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
return false; return false;
} else }
} else {
$is_like = false; $is_like = false;
}
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) { if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
@ -2005,8 +2087,9 @@ class dfrn {
intval($importer["importer_uid"]) intval($importer["importer_uid"])
); );
if (!dbm::is_result($r)) if (!dbm::is_result($r)) {
return false; killme();
}
// extract tag, if not duplicate, add to parent item // extract tag, if not duplicate, add to parent item
if ($xo->content) { if ($xo->content) {
@ -2029,6 +2112,7 @@ class dfrn {
* *
* @param object $links link elements * @param object $links link elements
* @param array $item the item record * @param array $item the item record
* @todo Add type-hints
*/ */
private static function parse_links($links, &$item) { private static function parse_links($links, &$item) {
$rel = ""; $rel = "";
@ -2038,17 +2122,23 @@ class dfrn {
$title = ""; $title = "";
foreach ($links AS $link) { foreach ($links AS $link) {
foreach ($link->attributes AS $attributes) { foreach ($link->attributes AS $attributes) {
if ($attributes->name == "href") /// @TODO Rewrite these repeated (same) if() statements to a switch()
if ($attributes->name == "href") {
$href = $attributes->textContent; $href = $attributes->textContent;
if ($attributes->name == "rel") }
if ($attributes->name == "rel") {
$rel = $attributes->textContent; $rel = $attributes->textContent;
if ($attributes->name == "type") }
if ($attributes->name == "type") {
$type = $attributes->textContent; $type = $attributes->textContent;
if ($attributes->name == "length") }
if ($attributes->name == "length") {
$length = $attributes->textContent; $length = $attributes->textContent;
if ($attributes->name == "title") }
if ($attributes->name == "title") {
$title = $attributes->textContent; $title = $attributes->textContent;
} }
}
if (($rel != "") AND ($href != "")) if (($rel != "") AND ($href != ""))
switch($rel) { switch($rel) {
case "alternate": case "alternate":
@ -2056,8 +2146,9 @@ class dfrn {
break; break;
case "enclosure": case "enclosure":
$enclosure = $href; $enclosure = $href;
if(strlen($item["attach"])) if (strlen($item["attach"])) {
$item["attach"] .= ","; $item["attach"] .= ",";
}
$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]'; $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
break; break;
@ -2072,6 +2163,7 @@ class dfrn {
* @param object $xpath XPath object * @param object $xpath XPath object
* @param object $entry entry elements * @param object $entry entry 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 Add type-hints
*/ */
private static function process_entry($header, $xpath, $entry, $importer) { private static function process_entry($header, $xpath, $entry, $importer) {
@ -2151,44 +2243,50 @@ class dfrn {
$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue; $item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
$georsspoint = $xpath->query("georss:point", $entry); $georsspoint = $xpath->query("georss:point", $entry);
if ($georsspoint) if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue; $item["coord"] = $georsspoint->item(0)->nodeValue;
}
$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue; $item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue; $item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
$item["bookmark"] = true; $item["bookmark"] = true;
}
$notice_info = $xpath->query("statusnet:notice_info", $entry); $notice_info = $xpath->query("statusnet:notice_info", $entry);
if ($notice_info AND ($notice_info->length > 0)) { if ($notice_info AND ($notice_info->length > 0)) {
foreach ($notice_info->item(0)->attributes AS $attributes) { foreach ($notice_info->item(0)->attributes AS $attributes) {
if ($attributes->name == "source") if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent); $item["app"] = strip_tags($attributes->textContent);
} }
} }
}
$item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue; $item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store" // We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue); $dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
if ($dsprsig != "") if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig; $item["dsprsig"] = $dsprsig;
}
$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue; $item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue; $item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
}
$object = $xpath->query("activity:object", $entry)->item(0); $object = $xpath->query("activity:object", $entry)->item(0);
$item["object"] = self::transform_activity($xpath, $object, "object"); $item["object"] = self::transform_activity($xpath, $object, "object");
if (trim($item["object"]) != "") { if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false); $r = parse_xml_string($item["object"], false);
if (isset($r->type)) if (isset($r->type)) {
$item["object-type"] = $r->type; $item["object-type"] = $r->type;
} }
}
$target = $xpath->query("activity:target", $entry)->item(0); $target = $xpath->query("activity:target", $entry)->item(0);
$item["target"] = self::transform_activity($xpath, $target, "target"); $item["target"] = self::transform_activity($xpath, $target, "target");
@ -2199,12 +2297,14 @@ class dfrn {
$term = ""; $term = "";
$scheme = ""; $scheme = "";
foreach ($category->attributes AS $attributes) { foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") if ($attributes->name == "term") {
$term = $attributes->textContent; $term = $attributes->textContent;
}
if ($attributes->name == "scheme") if ($attributes->name == "scheme") {
$scheme = $attributes->textContent; $scheme = $attributes->textContent;
} }
}
if (($term != "") AND ($scheme != "")) { if (($term != "") AND ($scheme != "")) {
$parts = explode(":", $scheme); $parts = explode(":", $scheme);
@ -2212,8 +2312,9 @@ class dfrn {
$termhash = array_shift($parts); $termhash = array_shift($parts);
$termurl = implode(":", $parts); $termurl = implode(":", $parts);
if(strlen($item["tag"])) if (strlen($item["tag"])) {
$item["tag"] .= ","; $item["tag"] .= ",";
}
$item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]"; $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
} }
@ -2224,37 +2325,46 @@ class dfrn {
$enclosure = ""; $enclosure = "";
$links = $xpath->query("atom:link", $entry); $links = $xpath->query("atom:link", $entry);
if ($links) if ($links) {
self::parse_links($links, $item); self::parse_links($links, $item);
}
// Is it a reply or a top level posting? // Is it a reply or a top level posting?
$item["parent-uri"] = $item["uri"]; $item["parent-uri"] = $item["uri"];
$inreplyto = $xpath->query("thr:in-reply-to", $entry); $inreplyto = $xpath->query("thr:in-reply-to", $entry);
if (is_object($inreplyto->item(0))) if (is_object($inreplyto->item(0))) {
foreach($inreplyto->item(0)->attributes AS $attributes) foreach ($inreplyto->item(0)->attributes AS $attributes) {
if ($attributes->name == "ref") if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent; $item["parent-uri"] = $attributes->textContent;
}
}
}
// Get the type of the item (Top level post, reply or remote reply) // Get the type of the item (Top level post, reply or remote reply)
$entrytype = self::get_entry_type($importer, $item); $entrytype = self::get_entry_type($importer, $item);
// Now assign the rest of the values that depend on the type of the message // Now assign the rest of the values that depend on the type of the message
if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) { if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
if (!isset($item["object-type"])) if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_COMMENT; $item["object-type"] = ACTIVITY_OBJ_COMMENT;
}
if ($item["contact-id"] != $owner["contact-id"]) if ($item["contact-id"] != $owner["contact-id"]) {
$item["contact-id"] = $owner["contact-id"]; $item["contact-id"] = $owner["contact-id"];
}
if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
$item["network"] = $owner["network"]; $item["network"] = $owner["network"];
}
if ($item["contact-id"] != $author["contact-id"]) if ($item["contact-id"] != $author["contact-id"]) {
$item["contact-id"] = $author["contact-id"]; $item["contact-id"] = $author["contact-id"];
}
if (($item["network"] != $author["network"]) AND ($author["network"] != "")) if (($item["network"] != $author["network"]) AND ($author["network"] != "")) {
$item["network"] = $author["network"]; $item["network"] = $author["network"];
}
// This code was taken from the old DFRN code // This code was taken from the old DFRN code
// When activated, forums don't work. // When activated, forums don't work.
@ -2270,8 +2380,9 @@ class dfrn {
$item["type"] = "remote-comment"; $item["type"] = "remote-comment";
$item["wall"] = 1; $item["wall"] = 1;
} elseif ($entrytype == DFRN_TOP_LEVEL) { } elseif ($entrytype == DFRN_TOP_LEVEL) {
if (!isset($item["object-type"])) if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_NOTE; $item["object-type"] = ACTIVITY_OBJ_NOTE;
}
// Is it an event? // Is it an event?
if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
@ -2290,8 +2401,9 @@ class dfrn {
dbesc($item["uri"]), dbesc($item["uri"]),
intval($importer["uid"]) intval($importer["uid"])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$ev["id"] = $r[0]["id"]; $ev["id"] = $r[0]["id"];
}
$event_id = event_store($ev); $event_id = event_store($ev);
logger("Event ".$event_id." was stored", LOGGER_DEBUG); logger("Event ".$event_id." was stored", LOGGER_DEBUG);
@ -2309,8 +2421,9 @@ class dfrn {
if (dbm::is_result($current)) { if (dbm::is_result($current)) {
if (self::update_content($r[0], $item, $importer, $entrytype)) if (self::update_content($r[0], $item, $importer, $entrytype))
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
else } else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
}
return; return;
} }
@ -2396,18 +2509,22 @@ class dfrn {
logger("Processing deletions"); logger("Processing deletions");
foreach ($deletion->attributes AS $attributes) { foreach ($deletion->attributes AS $attributes) {
if ($attributes->name == "ref") if ($attributes->name == "ref") {
$uri = $attributes->textContent; $uri = $attributes->textContent;
if ($attributes->name == "when") }
if ($attributes->name == "when") {
$when = $attributes->textContent; $when = $attributes->textContent;
} }
if ($when) }
if ($when) {
$when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s"); $when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
else } else {
$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s"); $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
}
if (!$uri OR !$importer["id"]) if (!$uri OR !$importer["id"]) {
return false; return false;
}
/// @todo Only select the used fields /// @todo Only select the used fields
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id` $r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
@ -2425,10 +2542,11 @@ class dfrn {
$entrytype = self::get_entry_type($importer, $item); $entrytype = self::get_entry_type($importer, $item);
if(!$item["deleted"]) if (!$item["deleted"]) {
logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG); logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
else } else {
return; return;
}
if ($item["object-type"] == ACTIVITY_OBJ_EVENT) { if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Deleting event ".$item["event-id"], LOGGER_DEBUG); logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
@ -2453,16 +2571,19 @@ class dfrn {
$author_remove = (($item["origin"] && $item["self"]) ? true : false); $author_remove = (($item["origin"] && $item["self"]) ? true : false);
$author_copy = (($item["origin"]) ? true : false); $author_copy = (($item["origin"]) ? true : false);
if($owner_remove && $author_copy) if ($owner_remove && $author_copy) {
return; return;
}
if ($author_remove || $owner_remove) { if ($author_remove || $owner_remove) {
$tags = explode(',',$i[0]["tag"]); $tags = explode(',',$i[0]["tag"]);
$newtags = array(); $newtags = array();
if (count($tags)) { if (count($tags)) {
foreach($tags as $tag) foreach ($tags as $tag) {
if(trim($tag) !== trim($xo->body)) if (trim($tag) !== trim($xo->body)) {
$newtags[] = trim($tag); $newtags[] = trim($tag);
} }
}
}
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d", q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc(implode(',',$newtags)), dbesc(implode(',',$newtags)),
intval($i[0]["id"]) intval($i[0]["id"])
@ -2602,25 +2723,30 @@ class dfrn {
); );
$mails = $xpath->query("/atom:feed/dfrn:mail"); $mails = $xpath->query("/atom:feed/dfrn:mail");
foreach ($mails AS $mail) foreach ($mails AS $mail) {
self::process_mail($xpath, $mail, $importer); self::process_mail($xpath, $mail, $importer);
}
$suggestions = $xpath->query("/atom:feed/dfrn:suggest"); $suggestions = $xpath->query("/atom:feed/dfrn:suggest");
foreach ($suggestions AS $suggestion) foreach ($suggestions AS $suggestion) {
self::process_suggestion($xpath, $suggestion, $importer); self::process_suggestion($xpath, $suggestion, $importer);
}
$relocations = $xpath->query("/atom:feed/dfrn:relocate"); $relocations = $xpath->query("/atom:feed/dfrn:relocate");
foreach ($relocations AS $relocation) foreach ($relocations AS $relocation) {
self::process_relocation($xpath, $relocation, $importer); self::process_relocation($xpath, $relocation, $importer);
}
$deletions = $xpath->query("/atom:feed/at:deleted-entry"); $deletions = $xpath->query("/atom:feed/at:deleted-entry");
foreach ($deletions AS $deletion) foreach ($deletions AS $deletion) {
self::process_deletion($xpath, $deletion, $importer); self::process_deletion($xpath, $deletion, $importer);
}
if (!$sort_by_date) { if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry"); $entries = $xpath->query("/atom:feed/atom:entry");
foreach ($entries AS $entry) foreach ($entries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer); self::process_entry($header, $xpath, $entry, $importer);
}
} else { } else {
$newentries = array(); $newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry"); $entries = $xpath->query("/atom:feed/atom:entry");
@ -2632,9 +2758,10 @@ class dfrn {
// Now sort after the publishing date // Now sort after the publishing date
ksort($newentries); ksort($newentries);
foreach ($newentries AS $entry) foreach ($newentries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer); self::process_entry($header, $xpath, $entry, $importer);
} }
}
logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG); logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
} }
} }